fix assertion error due to CanUse(RG_BRONZE_SCALE) (HarbourMasters#4814)

PurpleHato · Jan 6, 2025 · 2f8bb02 · 2f8bb02
1 parent 34f77dd
commit 2f8bb02
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@@ -453,7 +453,7 @@ void RegionTable_Init_WaterTemple() {
   areaTable[RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1] = Region("Water Temple MQ Central Pillar B1", "Water Temple", {RA_WATER_TEMPLE}, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   //Can't know water level, so we'll just assume any possibility and skip to MAIN
-                  Entrance(RR_WATER_TEMPLE_MQ_MAIN,                    {[]{return logic->MQWaterOpenedPillarB1 && logic->CanUse(RG_IRON_BOOTS) && logic->CanUse(RG_BRONZE_SCALE);}}),
+                  Entrance(RR_WATER_TEMPLE_MQ_MAIN,                    {[]{return logic->MQWaterOpenedPillarB1 && logic->CanUse(RG_IRON_BOOTS) && logic->HasItem(RG_BRONZE_SCALE);}}),
                   //Child needs to release irons for height to push down the larger "peg", however they can push the lower one down by climbing and then hit the switch through the larger peg, but it's a trick
                   Entrance(RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1_FINAL, {[]{return ((logic->IsAdult && logic->CanUse(RG_LONGSHOT)) || (logic->CanUse(RG_HOOKSHOT) && logic->HasItem(RG_BRONZE_SCALE)));}}),
   });
@@ -700,7 +700,7 @@ void RegionTable_Init_WaterTemple() {
                   //Child can use the crate to get the height to make it with hovers, but it's annoyingly tight so would be a trick
                   Entrance(RR_WATER_TEMPLE_MQ_SINGLE_STALFOS_ROOM,    {[]{return logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 8 &&
                                                                               //We're putting the requirement to get out of the water here as the scarecrow method in includes hook which satisfies it
-                                                                              ((logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_BRONZE_SCALE))) ||
+                                                                              ((logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP)) && (logic->CanUse(RG_HOOKSHOT) || logic->HasItem(RG_BRONZE_SCALE))) ||
                                                                                (Here(RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_ROOM, []{return logic->ScarecrowsSong();}) && logic->CanUse(RG_HOOKSHOT)));}}),
                   Entrance(RR_WATER_TEMPLE_MQ_4_TORCH_ROOM,           {[]{return logic->IsAdult && 
                                                                               (logic->CanUse(RG_HOVER_BOOTS) || ctx->GetTrickOption(RT_WATER_NORTH_BASEMENT_LEDGE_JUMP) ||