diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp index 0682f4de1..77910d687 100644 --- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp +++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp @@ -317,9 +317,11 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void* case VB_NAVI_TALK: { if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO)) { ElfMsg* naviTalk = static_cast(opt); - Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F); - Actor_Kill(&naviTalk->actor); - *should = false; + if (((naviTalk->actor.params >> 8) & 0x3F) != 0x3F) { + Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F); + Actor_Kill(&naviTalk->actor); + *should = false; + } } break; }