From 6794cba2b906e659f919766304c8a8bc6457698a Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Mon, 23 Sep 2024 20:16:28 -0500
Subject: [PATCH] Handle ignoring 0x3F for navi talk skips

---
 soh/soh/Enhancements/timesaver_hook_handlers.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp
index 0682f4de13d..77910d68714 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<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;
         }