Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Slayer missiles to go out of bounds for exploration #445

Draft
wants to merge 2 commits into
base: port
Choose a base branch
from
Draft

Allow Slayer missiles to go out of bounds for exploration #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f755846
Include Slayer in "All Guns" cheat
blaiz May 20, 2024
ac9fae2
Slayer missiles can go out of bounds
blaiz May 20, 2024
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
View file
Open in desktop
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
&& 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
2 changes: 2 additions & 0 deletions src/game/player.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3470,6 +3470,7 @@ void playerTick(bool arg0)

bgFindRoomsByPos(&rocketpos, inrooms, aboverooms, 20, &bestroom);

#ifdef PLATFORM_N64
if (inrooms[0] == -1) {
outofbounds = true;
}
Expand All @@ -3494,6 +3495,7 @@ void playerTick(bool arg0)
g_Vars.currentplayer->badrockettime = 0;
}
}
#endif

mtx00016208(sp2b8, &sp2f0);
mtx00016208(sp2b8, &sp2e4);
Expand Down