Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/game/inv.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,13 @@ s32 invAddOneIfCantHaveSlayer(s32 index)
{
if (mainGetStageNum());

#ifdef PLATFORM_N64
if (mainGetStageNum() != STAGE_ATTACKSHIP
&& mainGetStageNum() != STAGE_SKEDARRUINS
Comment on lines 284 to 285
Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the N64 there are 2 exception to the "no Slayer for All Guns" rule which is these 2 stages. Let's make it so we get the behavior for ALL levels.

&& index >= WEAPON_SLAYER) {
index++;
}
#endif

#if (VERSION >= VERSION_JPN_FINAL) && defined(PLATFORM_N64)
if (index >= 26) {
Expand All @@ -299,9 +301,11 @@ s32 currentStageForbidsSlayer(void)
{
bool value = VERSION >= VERSION_JPN_FINAL ? 1 : 0;

#ifdef PLATFORM_N64
if (mainGetStageNum() != STAGE_ATTACKSHIP && mainGetStageNum() != STAGE_SKEDARRUINS) {
value++;
}
#endif

return value;
}
Expand All @@ -316,9 +320,11 @@ bool invCanHaveAllGunsWeapon(s32 weaponnum)
}
#endif

#ifdef PLATFORM_N64
if (weaponnum == WEAPON_SLAYER) {
canhave = false;
}
#endif

// @bug: The stage conditions need an OR. This condition can never pass.
if ((mainGetStageNum() == STAGE_ATTACKSHIP && mainGetStageNum() == STAGE_SKEDARRUINS)
Expand Down