From 12194c0aa9a0126624322107be46d52d5d13b084 Mon Sep 17 00:00:00 2001
From: Demur Rumed <junkmute@hotmail.com>
Date: Sat, 5 Jul 2025 15:10:55 +0000
Subject: [PATCH] MQ: make switch across chasm an event

---
 .../randomizer/location_access/dungeons/shadow_temple.cpp    | 5 +++--
 soh/soh/Enhancements/randomizer/logic.cpp                    | 1 +
 soh/soh/Enhancements/randomizer/logic.h                      | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/shadow_temple.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/shadow_temple.cpp
index bec4aa36f..d9b1186eb 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/shadow_temple.cpp
@@ -560,11 +560,13 @@ void RegionTable_Init_ShadowTemple() {
     }, {
         //Exits
         Entrance(RR_SHADOW_TEMPLE_MQ_ACROSS_CHASM,   []{return logic->ShadowBridgeBeyondBoatLowered;}),
+        Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, []{return logic->MQShadowSwitchAcrossChasm;}),
     });
 
     areaTable[RR_SHADOW_TEMPLE_MQ_ACROSS_CHASM] = Region("Shadow Temple MQ Across Chasm", SCENE_SHADOW_TEMPLE, {
         //Events
-        EventAccess(&logic->ShadowBridgeBeyondBoatLowered, []{return logic->CanDetonateUprightBombFlower();})
+        EventAccess(&logic->ShadowBridgeBeyondBoatLowered, []{return logic->CanDetonateUprightBombFlower();}),
+        EventAccess(&logic->MQShadowSwitchAcrossChasm,     []{return logic->CanHitEyeTargets() && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_LONGSHOT);}),
     }, {
         //Locations
         LOCATION(RC_SHADOW_TEMPLE_MQ_AFTER_CHASM_WEST_POT,         logic->CanBreakPots()),
@@ -576,7 +578,6 @@ void RegionTable_Init_ShadowTemple() {
     }, {
         //Exits
         Entrance(RR_SHADOW_TEMPLE_MQ_BEYOND_BOAT,    []{return logic->ShadowBridgeBeyondBoatLowered && logic->IsAdult;}),
-        Entrance(RR_SHADOW_TEMPLE_MQ_INVISIBLE_MAZE, []{return Here(RR_SHADOW_TEMPLE_MQ_ACROSS_CHASM, []{return logic->CanHitEyeTargets() && logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_LONGSHOT);});}),
         Entrance(RR_SHADOW_TEMPLE_MQ_PRE_BOSS_ROOM,  []{return true;}),
     });
 
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index 237185823..c7014dbf7 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -2520,6 +2520,7 @@ void Logic::Reset(bool resetSaveContext /*= true*/) {
     LoweredJabuPath = false;
     MQJabuLiftRoomCow = false;
     MQShadowFloorSpikeRupees = false;
+    MQShadowSwitchAcrossChasm = false;
     ShadowShortcutBlock = false;
     ShadowBridgeBeyondBoatLowered = false;
     MQWaterStalfosPit = false;
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 27d6c23c8..d2b864fcc 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -169,6 +169,7 @@ class Logic {
     bool LoweredJabuPath = false;
     bool MQJabuLiftRoomCow = false;
     bool MQShadowFloorSpikeRupees = false;
+    bool MQShadowSwitchAcrossChasm = false;
     bool ShadowShortcutBlock = false;
     bool ShadowBridgeBeyondBoatLowered = false;
     bool MQWaterStalfosPit = false;