summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp b/mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp
index 34d9a358e..c551a82ee 100644
--- a/mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp
+++ b/mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp
@@ -94,11 +94,11 @@ static RegisterShipInitFunc initFunc([]() {
};
Regions[RR_BENEATH_THE_WELL_FOUR_SPIKED_BARS] = RandoRegion{ .name = "Four Spikes Room", .sceneId = SCENE_REDEAD,
.checks = {
- CHECK(RC_BENEATH_THE_WELL_FOUR_SPIKED_BARS_GRASS_01, CAN_LIGHT_TORCH_NEAR_ANOTHER),
- CHECK(RC_BENEATH_THE_WELL_FOUR_SPIKED_BARS_GRASS_02, CAN_LIGHT_TORCH_NEAR_ANOTHER),
- CHECK(RC_BENEATH_THE_WELL_FOUR_SPIKED_BARS_GRASS_03, CAN_LIGHT_TORCH_NEAR_ANOTHER),
- CHECK(RC_BENEATH_THE_WELL_FOUR_SPIKED_BARS_GRASS_04, CAN_LIGHT_TORCH_NEAR_ANOTHER),
- CHECK(RC_BENEATH_THE_WELL_FOUR_SPIKED_BARS_GRASS_05, CAN_LIGHT_TORCH_NEAR_ANOTHER),
+ CHECK(RC_BENEATH_THE_WELL_FOUR_SPIKED_BARS_GRASS_01, CAN_USE_MAGIC_ARROW(FIRE) || (HAS_ITEM(ITEM_DEKU_STICK) && HAS_BOTTLE && CAN_ACCESS(BIG_POE) && HAS_ITEM(ITEM_MASK_GIBDO))),
+ CHECK(RC_BENEATH_THE_WELL_FOUR_SPIKED_BARS_GRASS_02, CAN_USE_MAGIC_ARROW(FIRE) || (HAS_ITEM(ITEM_DEKU_STICK) && HAS_BOTTLE && CAN_ACCESS(BIG_POE) && HAS_ITEM(ITEM_MASK_GIBDO))),
+ CHECK(RC_BENEATH_THE_WELL_FOUR_SPIKED_BARS_GRASS_03, CAN_USE_MAGIC_ARROW(FIRE) || (HAS_ITEM(ITEM_DEKU_STICK) && HAS_BOTTLE && CAN_ACCESS(BIG_POE) && HAS_ITEM(ITEM_MASK_GIBDO))),
+ CHECK(RC_BENEATH_THE_WELL_FOUR_SPIKED_BARS_GRASS_04, CAN_USE_MAGIC_ARROW(FIRE) || (HAS_ITEM(ITEM_DEKU_STICK) && HAS_BOTTLE && CAN_ACCESS(BIG_POE) && HAS_ITEM(ITEM_MASK_GIBDO))),
+ CHECK(RC_BENEATH_THE_WELL_FOUR_SPIKED_BARS_GRASS_05, CAN_USE_MAGIC_ARROW(FIRE) || (HAS_ITEM(ITEM_DEKU_STICK) && HAS_BOTTLE && CAN_ACCESS(BIG_POE) && HAS_ITEM(ITEM_MASK_GIBDO))),
CHECK(RC_ENEMY_DROP_SKULLTULA, CanKillEnemy(ACTOR_EN_ST)),
CHECK(RC_ENEMY_DROP_WALLMASTER, CanKillEnemy(ACTOR_EN_WALLMAS)),
},