fix big wall, fix toilet

Author: serprex

soh/soh/Enhancements/randomizer/location_access/dungeons/gerudo_training_ground.cpp

@@ -186,7 +186,7 @@ void RegionTable_Init_GerudoTrainingGround() {
         EventAccess(LOGIC_GTG_SILVER_WATER, []{return logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->HasItem(RG_BRONZE_SCALE) && logic->WaterTimer() >= 24;}),
     }, {
         //Locations
-        LOCATION(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->HasItem(RG_BRONZE_SCALE) && logic->WaterTimer() >= 24),
+        LOCATION(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, logic->HasItem(RG_GTG_SILVER_WATER)),
         // 3 & 5 can be retrieved with only iron boots by attempting to backflip underwater
         LOCATION(RC_GTG_SILVER_WATER_1, logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
         LOCATION(RC_GTG_SILVER_WATER_2, logic->CanUse(RG_SONG_OF_TIME) && (logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16) || logic->HasItem(RG_GOLDEN_SCALE)),

soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp

@@ -1058,11 +1058,6 @@ void RegionTable_Init_SpiritTemple() {
         //Locations
         LOCATION(RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1, logic->CanBreakPots()),
         LOCATION(RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2, logic->CanBreakPots()),
-        LOCATION(RC_SPIRIT_MQ_SILVER_BIG_WALL_1, true),
-        LOCATION(RC_SPIRIT_MQ_SILVER_BIG_WALL_2, true),
-        LOCATION(RC_SPIRIT_MQ_SILVER_BIG_WALL_3, true),
-        LOCATION(RC_SPIRIT_MQ_SILVER_BIG_WALL_4, true),
-        LOCATION(RC_SPIRIT_MQ_SILVER_BIG_WALL_5, true),
     }, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_BEAMOS_PITS,    []{return true;}),
@@ -1073,11 +1068,17 @@ void RegionTable_Init_SpiritTemple() {
     areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_WALL_UPPER] = Region("Spirit Temple MQ Big Wall Upper", SCENE_SPIRIT_TEMPLE, {
         //Events
         //Getting some of these with just climbing downwards is theoretically possible but definitely a trick
-        EventAccess(LOGIC_SPIRIT_MQ_BIG_WALL_SILVERS, []{return /*(*/logic->CanKillEnemy(RE_KEESE)/*|| CanUse(RG_SKULL_MASK)) && CanClimbHigh()*/;}),
-    }, {}, {
+        EventAccess(LOGIC_SPIRIT_MQ_SILVER_BIG_WALL, []{return /*(*/logic->CanKillEnemy(RE_KEESE)/*|| CanUse(RG_SKULL_MASK)) && CanClimbHigh()*/;}),
+    }, {
+        LOCATION(RC_SPIRIT_MQ_SILVER_BIG_WALL_1, logic->Get(LOGIC_SPIRIT_MQ_SILVER_BIG_WALL) || logic->TakeDamage()),
+        LOCATION(RC_SPIRIT_MQ_SILVER_BIG_WALL_2, logic->Get(LOGIC_SPIRIT_MQ_SILVER_BIG_WALL) || logic->TakeDamage()),
+        LOCATION(RC_SPIRIT_MQ_SILVER_BIG_WALL_3, logic->Get(LOGIC_SPIRIT_MQ_SILVER_BIG_WALL) || logic->TakeDamage()),
+        LOCATION(RC_SPIRIT_MQ_SILVER_BIG_WALL_4, logic->Get(LOGIC_SPIRIT_MQ_SILVER_BIG_WALL) || logic->TakeDamage()),
+        LOCATION(RC_SPIRIT_MQ_SILVER_BIG_WALL_5, logic->Get(LOGIC_SPIRIT_MQ_SILVER_BIG_WALL) || logic->TakeDamage()),
+    }, {
         //Exits
         Entrance(RR_SPIRIT_TEMPLE_MQ_BIG_WALL_BASE, []{return true;}),
-        Entrance(RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL,    []{return logic->Get(LOGIC_SPIRIT_MQ_BIG_WALL_SILVERS);}),
+        Entrance(RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL,    []{return logic->HasItem(RG_SPIRIT_MQ_SILVER_BIG_WALL);}),
     });
 
     areaTable[RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL] = Region("Spirit Temple MQ 4F Central", SCENE_SPIRIT_TEMPLE, {}, {

soh/soh/Enhancements/randomizer/randomizerTypes.h

@@ -353,7 +353,6 @@ typedef enum {
     LOGIC_SPIRIT_MQ_STATUE_ROOM_TORCHES,
     LOGIC_SPIRIT_MQ_3SUNS_ENEMIES,
     LOGIC_SPIRIT_MQ_SYMPHONY_ROOM_DOOR,
-    LOGIC_SPIRIT_MQ_BIG_WALL_SILVERS,
     LOGIC_REVERSE_SPIRIT_CHILD,
     LOGIC_REVERSE_SPIRIT_ADULT,
     LOGIC_FORWARDS_SPIRIT_CHILD,