From ca1e4c22505a7c2101ca816c31023daaf4e2638e Mon Sep 17 00:00:00 2001 From: Jordan Longstaff Date: Sat, 26 Sep 2026 12:26:36 -0400 Subject: [PATCH] Fix Skip Forced Text softlock (#7254) --- soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp index 5ad585885b..bd6efb6db6 100644 --- a/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp +++ b/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp @@ -456,6 +456,11 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li if (ForcedDialogIsDisabled(FORCED_DIALOG_SKIP_NPC) && !(gPlayState->sceneNum == SCENE_ZORAS_RIVER && IS_RANDO && RAND_GET_OPTION(RSK_FROGS_HINT))) { *should = false; + + // We should still come out of a softlock if the setting was changed during forced dialogue + if (GET_PLAYER(gPlayState)->csAction != 7) { + Player_SetCsAction(gPlayState, NULL, 7); + } } // If it's near a jailed carpenter, skip it along with introduction of Gerudo mini-boss