Handle ignoring 0x3F for navi talk skips (#4364)

HarbourMasters · Sep 24, 2024 · 4e4c1c4 · 4e4c1c4
1 parent 0f02201
commit 4e4c1c4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git 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<ElfMsg*>(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;
  }