From f31172c6478f80dbfe36b8380be53821c5e76898 Mon Sep 17 00:00:00 2001 From: A Green Spoon <121978037+A-Green-Spoon@users.noreply.github.com> Date: Sat, 14 Feb 2026 14:04:34 -0500 Subject: [PATCH] remove extra zf condition + add vb call (#6258) --- .../TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp | 3 +-- soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp index da4d439d6..a1386d2b2 100644 --- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp +++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp @@ -168,8 +168,7 @@ void RegisterShouldPlayBlueWarp() { // This is outside the above condition because we want to handle both first and following visits to the blue // 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) { + if (sEnteredBlueWarp && overrideBlueWarpDestinations) { Entrance_OverrideBlueWarp(); } } diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 25e33243e..114399d48 100644 --- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -557,6 +557,7 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) { gSaveContext.nextCutsceneIndex = 0; } } else if (play->sceneNum == SCENE_JABU_JABU_BOSS) { + if (GameInteractor_Should(VB_PLAY_BLUE_WARP_CS, true)) {}; play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP; gSaveContext.nextCutsceneIndex = 0; }