From ce67b11b7739f239f6f1aeeb853141f5277599da Mon Sep 17 00:00:00 2001 From: Caladius Date: Wed, 5 Aug 2026 13:43:50 -0400 Subject: [PATCH 1/2] Fix BGS Switches for the 1000th time. --- src/port/Rando/MiscBehavior/WorldState.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/port/Rando/MiscBehavior/WorldState.cpp b/src/port/Rando/MiscBehavior/WorldState.cpp index 902477c3b..d079e920e 100644 --- a/src/port/Rando/MiscBehavior/WorldState.cpp +++ b/src/port/Rando/MiscBehavior/WorldState.cpp @@ -180,6 +180,20 @@ void Rando::MiscBehavior::InitWorldStateBehavior() { break; } } + if (ev->jiggyId == JIGGY_20_BGS_ELEVATED_WALKWAY) { + if (currenLevel == LEVEL_4_BUBBLEGLOOP_SWAMP) { + event->Cancelled = true; + ev->result = RANDO_SAVE_CHECKS[RC_BGS_JIGGY_ELEVATED_WALKWAY].obtained; + break; + } + } + if (ev->jiggyId == JIGGY_25_BGS_MAZE) { + if (currenLevel == LEVEL_4_BUBBLEGLOOP_SWAMP) { + event->Cancelled = true; + ev->result = RANDO_SAVE_CHECKS[RC_BGS_JIGGY_MAZE].obtained; + break; + } + } event->Cancelled = true; ev->result = randoSaveCheck.obtained; From 5512a0e161c773d25e6eca21fa24c618e99de69b Mon Sep 17 00:00:00 2001 From: Caladius Date: Wed, 5 Aug 2026 14:07:29 -0400 Subject: [PATCH 2/2] Fix Boggy as well. --- src/port/Rando/MiscBehavior/WorldState.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/port/Rando/MiscBehavior/WorldState.cpp b/src/port/Rando/MiscBehavior/WorldState.cpp index d079e920e..4e141d169 100644 --- a/src/port/Rando/MiscBehavior/WorldState.cpp +++ b/src/port/Rando/MiscBehavior/WorldState.cpp @@ -194,6 +194,27 @@ void Rando::MiscBehavior::InitWorldStateBehavior() { break; } } + if (ev->jiggyId == JIGGY_2A_FP_BOGGY_1) { + if (currenLevel == LEVEL_5_FREEZEEZY_PEAK) { + event->Cancelled = true; + ev->result = RANDO_SAVE_CHECKS[RC_FP_JIGGY_SLED_TO_BOGGY].obtained; + break; + } + } + if (ev->jiggyId == JIGGY_30_FP_BOGGY_2) { + if (currenLevel == LEVEL_5_FREEZEEZY_PEAK) { + event->Cancelled = true; + ev->result = RANDO_SAVE_CHECKS[RC_FP_JIGGY_BOGGY_RACE_1].obtained; + break; + } + } + if (ev->jiggyId == JIGGY_2C_FP_BOGGY_3) { + if (currenLevel == LEVEL_5_FREEZEEZY_PEAK) { + event->Cancelled = true; + ev->result = RANDO_SAVE_CHECKS[RC_FP_JIGGY_BOGGY_RACE_2].obtained; + break; + } + } event->Cancelled = true; ev->result = randoSaveCheck.obtained;