thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-20 15:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert new pressed_pause behavior

Browse source
This commit is contained in:
Agent X 2023-10-30 17:37:20 -04:00
parent 49bca1cc01
commit f4b08ddf52
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/game/level_update.c
View file

@ -263,10 +263,19 @@ u32 pressed_pause(void) {
}
}
if (get_dialog_id() < 0) {
return gPlayer1Controller->buttonPressed & START_BUTTON;
u32 val4 = get_dialog_id() >= 0;
u32 intangible = (gMarioState->action & ACT_FLAG_INTANGIBLE) != 0;
if (!intangible && !val4 && !gWarpTransition.isActive && sDelayedWarpOp == WARP_OP_NONE
&& (gPlayer1Controller->buttonPressed & START_BUTTON)) {
return TRUE;
}
// I don't agree with this official change, mods use ACT_FLAG_INTANGIBLE to prevent the player from pausing in things like cutscenes
// if (get_dialog_id() < 0) {
// return gPlayer1Controller->buttonPressed & START_BUTTON;
// }
return FALSE;
}