From dcebdcac0d57c2ea6e53a3f90aa3896237eb754b Mon Sep 17 00:00:00 2001 From: MysterD Date: Fri, 27 Oct 2023 19:54:12 -0700 Subject: [PATCH] Prevent pausing in transitions if singleplayer pause is active --- src/game/level_update.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/game/level_update.c b/src/game/level_update.c index b409522a..ab39df42 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -253,6 +253,13 @@ u16 level_control_timer(s32 timerOp) { } u32 pressed_pause(void) { + if (configSingleplayerPause && network_player_connected_count() == 1) { + // prevent softlock in singleplayer pause, by not allowing pause in transitions + if (gWarpTransition.isActive || sDelayedWarpOp != WARP_OP_NONE) { + return FALSE; + } + } + if (get_dialog_id() < 0) { return gPlayer1Controller->buttonPressed & START_BUTTON; }