From 07414fd722500d5d1bc58fc66438a2602729b8ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?=
 <159546+serprex@users.noreply.github.com>
Date: Sun, 23 Aug 2026 21:08:55 +0000
Subject: [PATCH] Clear fire timer when blue warp skip bypasses chamber of sage
 (#7112)

Avoids timer from Volvagia carrying over to DMC
---
 soh/include/z64save.h                                        | 2 +-
 .../TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index b920ce634a..11d91f7dcb 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -4,7 +4,7 @@
 #include <libultraship/libultra.h>
 #include "z64math.h"
 #include "z64audio.h"
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
+#include "soh/Enhancements/randomizer/randomizerEnums.h"
 #include "soh/Enhancements/gameplaystats.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 #include "soh/Enhancements/boss-rush/BossRush.h"
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
index 1bbbc3cd01..e565e0550d 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
@@ -157,6 +157,11 @@ void RegisterShouldPlayBlueWarp() {
             }
 
             if (isBlueWarpCutscene) {
+                // Skip bypasses Chamber of Sages, which would have cleared heat timer
+                if (gSaveContext.timerState <= TIMER_STATE_ENV_HAZARD_TICK) {
+                    gSaveContext.timerState = TIMER_STATE_OFF;
+                }
+
                 if (gSaveContext.entranceIndex != ENTR_LAKE_HYLIA_WATER_TEMPLE_BLUE_WARP) {
                     // Normally set in the blue warp cutscene
                     gSaveContext.dayTime = gSaveContext.skyboxTime = 0x8000;