diff options
| author | sitton76 <58642183+sitton76@users.noreply.github.com> | 2026-02-09 19:02:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-09 20:02:34 -0500 |
| commit | 889656bf4223313ff38353ebef1b813ec4408d74 (patch) | |
| tree | 2c3361984eef4e1924f7192ebcfa55e0fcecd6eb | |
| parent | 71c94dee1edad488c80ee072b9eca7ad90d01ede (diff) | |
Factor Big Poe for enemy soul shuffle (#1535)
| -rw-r--r-- | mm/2s2h/Rando/Logic/Logic.h | 2 | ||||
| -rw-r--r-- | mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp | 2 | ||||
| -rw-r--r-- | mm/2s2h/Rando/Logic/Regions/East.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/mm/2s2h/Rando/Logic/Logic.h b/mm/2s2h/Rando/Logic/Logic.h index 9f5a7b439..1093e5341 100644 --- a/mm/2s2h/Rando/Logic/Logic.h +++ b/mm/2s2h/Rando/Logic/Logic.h @@ -737,6 +737,8 @@ inline bool CanKillEnemy(ActorId EnemyId) { CAN_USE_PROJECTILE || CAN_USE_EXPLOSIVE || HAS_ITEM(ITEM_DEKU_NUT)); case ACTOR_EN_DRAGON: // Deep Python return (CAN_BE_ZORA && HAS_MAGIC); + case ACTOR_EN_BIGPO: + return HAS_ITEM(ITEM_BOW); case ACTOR_EN_PO_SISTERS: // The first three sisters can be damaged with almost anything, but Meg requires ranged attacks. Not using // CAN_USE_EXPLOSIVE here, as the Blast Mask cannot reach, and the Powder Keg can only be used once. diff --git a/mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp b/mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp index 4ae5d4662..21f459385 100644 --- a/mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp +++ b/mm/2s2h/Rando/Logic/Regions/BeneathTheWell.cpp @@ -47,7 +47,7 @@ static RegisterShipInitFunc initFunc([]() { CONNECTION(RR_BENEATH_THE_WELL_RIGHT_FIRE_KEESE, true), }, .events = { - EVENT(RE_ACCESS_BIG_POE, HAS_ITEM(ITEM_BOW)), + EVENT(RE_ACCESS_BIG_POE, CanKillEnemy(ACTOR_EN_BIGPO)), } }; Regions[RR_BENEATH_THE_WELL_COW_ROOM] = RandoRegion{ .name = "Cow Room", .sceneId = SCENE_REDEAD, diff --git a/mm/2s2h/Rando/Logic/Regions/East.cpp b/mm/2s2h/Rando/Logic/Regions/East.cpp index 514ae967c..bff5e8d3a 100644 --- a/mm/2s2h/Rando/Logic/Regions/East.cpp +++ b/mm/2s2h/Rando/Logic/Regions/East.cpp @@ -9,7 +9,7 @@ using namespace Rando::Logic; static RegisterShipInitFunc initFunc([]() { Regions[RR_BENEATH_THE_GRAVEYARD_DAMPE] = RandoRegion{ .sceneId = SCENE_DANPEI2TEST, .checks = { - CHECK(RC_BENEATH_THE_GRAVEYARD_DAMPE_CHEST, HAS_ITEM(ITEM_BOW)), + CHECK(RC_BENEATH_THE_GRAVEYARD_DAMPE_CHEST, CanKillEnemy(ACTOR_EN_BIGPO)), CHECK(RC_BENEATH_THE_GRAVEYARD_DAMPE_POT_01, true), CHECK(RC_BENEATH_THE_GRAVEYARD_DAMPE_POT_02, true), CHECK(RC_BENEATH_THE_GRAVEYARD_DAMPE_POT_03, true), |