summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Dubé <159546+serprex@users.noreply.github.com>2026-04-19 20:50:11 +0000
committerGitHub <noreply@github.com>2026-04-19 20:50:11 +0000
commit3b65eaa4ef7c24611e2884210191c4519d494db9 (patch)
treee1e48d7b4e779836167e77b6c43bbc8b0c1845c2
parent3be7eff02c7c85dab4127aeb0d6379398e3496b1 (diff)
Fix cutscene skips causing credits to spawn player in Lake Hylia (#6534)
SkipBlueWarp was intercepting credits. Disable during GAMEMODE_END_CREDITS
-rw-r--r--soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
index 0ade592d6..1bbbc3cd0 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
@@ -86,8 +86,7 @@ void RegisterShouldPlayBlueWarp() {
* should also account for the difference between your first and following visits to the blue warp.
*/
REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
- // Do nothing when in a boss rush
- if (IS_BOSS_RUSH) {
+ if (IS_BOSS_RUSH || gSaveContext.gameMode == GAMEMODE_END_CREDITS) {
return;
}