Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow pausing in most circumstances

This commit is contained in:
David Joslin 2023-10-26 17:07:27 -07:00
parent 3cd9b60f87
commit 19f878e858
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/level_update.c
View File

@ -253,12 +253,8 @@ u16 level_control_timer(s32 timerOp) {
}
u32 pressed_pause(void) {
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;
if (get_dialog_id() < 0) {
return gPlayer1Controller->buttonPressed & START_BUTTON;
}
return FALSE;