From 6c724382f5171113cf051ace271c48726fc2a279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Sun, 5 Oct 2025 01:54:53 +0000 Subject: [PATCH] rando: fix reentry of jabu blue warp (#5829) * rando: fix reentry of jabu blue warp entrance randomizer uses VB_PLAY_BLUE_WARP_CS to set a flag, which was not called when entering jabu blue warp without ruto * alternative --- .../TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp index 83e459fab..29b56e87b 100644 --- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp +++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp @@ -168,8 +168,9 @@ void RegisterShouldPlayBlueWarp() { } // This is outside the above condition because we want to handle both first and following visits to the blue - // warp - if (sEnteredBlueWarp && overrideBlueWarpDestinations) { + // warp. Jabu's blue warp doesn't call VB_PLAY_BLUE_WARP_CS without Ruto + if ((sEnteredBlueWarp || gSaveContext.entranceIndex == ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP) && + overrideBlueWarpDestinations) { Entrance_OverrideBlueWarp(); } }