mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-27 00:44:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clear fire timer when blue warp skip bypasses chamber of sage (#7112)

Browse Source 
Avoids timer from Volvagia carrying over to DMC
This commit is contained in:
Philip Dubé
2026-08-23 21:08:55 +00:00
committed by GitHub
parent 47d1383020
commit 07414fd722
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/include/z64save.h
+1 -1
View File
@@ -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"
soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
+5
View File
@@ -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;