diff options
| -rw-r--r-- | mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp b/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp index bc8c1f0e0..4b36c4779 100644 --- a/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp +++ b/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp @@ -36,7 +36,8 @@ static u16 sOwlWarpEntrances[OWL_WARP_MAX - 1] = { extern "C" bool PauseOwlWarp_IsOwlWarpEnabled() { return CVAR && CHECK_QUEST_ITEM(QUEST_SONG_SOARING) && gSaveContext.save.saveInfo.playerData.owlActivationFlags != 0 && - gPlayState->pauseCtx.debugEditor == DEBUG_EDITOR_NONE; + gPlayState->pauseCtx.debugEditor == DEBUG_EDITOR_NONE && + gPlayState->interfaceCtx.restrictions.songOfSoaring == 0; } void HandleConfirmingState(PauseContext* pauseCtx, Input* input) { @@ -59,6 +60,9 @@ void HandleConfirmingState(PauseContext* pauseCtx, Input* input) { gHorseIsMounted = false; } + // Clear pictograph/camera event flag to prevent UI state from persisting after warp + CLEAR_EVENTINF(EVENTINF_41); + Interface_SetAButtonDoAction(gPlayState, DO_ACTION_NONE); pauseCtx->state = PAUSE_STATE_UNPAUSE_SETUP; sPauseMenuVerticalOffset = -6240.0f; |