nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove extra zf condition + add vb call (#6258)

Browse Source
This commit is contained in:
A Green Spoon
2026-02-14 14:04:34 -05:00
committed by GitHub
parent 1e1ba54cf6
commit f31172c647
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
View File

@@ -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 // 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 // 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) && if (sEnteredBlueWarp && overrideBlueWarpDestinations) {
overrideBlueWarpDestinations) {
Entrance_OverrideBlueWarp(); Entrance_OverrideBlueWarp();
} }
} }

1
soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
View File

@@ -557,6 +557,7 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
gSaveContext.nextCutsceneIndex = 0; gSaveContext.nextCutsceneIndex = 0;
} }
} else if (play->sceneNum == SCENE_JABU_JABU_BOSS) { } 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; play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_JABU_JABU_BLUE_WARP;
gSaveContext.nextCutsceneIndex = 0; gSaveContext.nextCutsceneIndex = 0;
} }