diff options
| author | Xander <121578706+Xandervile@users.noreply.github.com> | 2026-11-02 22:46:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-11-02 16:46:17 -0600 |
| commit | a9a6009ad3501937a41500215359db51dcefbdd9 (patch) | |
| tree | 8a2111ebb9e90ec66a671cef6deb9a1cd82e01e3 | |
| parent | e9a5636663fc3050a2f5376988fb2c7c3c4b9f10 (diff) | |
[Rando] Beneath The Well Grass Logic Fix (#2018)develop-battler
* Beneath The Well Grass Fix
Logic only checked for lit torch or Fire Arrow, but this requires moving between rooms. If going FROM Castle side, logic broke.
* how did I delete this
| -rw-r--r-- | mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp | 10 |
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)), }, |