diff options
| author | Eblo <7004497+Eblo@users.noreply.github.com> | 2025-10-15 12:38:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-15 12:38:00 -0400 |
| commit | 3b88dd05ed4e1c9c1a30af4b767db1e1e91d0b3d (patch) | |
| tree | bdcf91b6c7566ee9aeba50fd377b89e43a9d871b | |
| parent | 86a1187ed5b1f345f6adbf339f08aba26d25b217 (diff) | |
Use correct macro for Secret Shrine freestandings (#1286)
Also can be Zora
| -rw-r--r-- | mm/2s2h/Rando/Logic/Regions/East.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/mm/2s2h/Rando/Logic/Regions/East.cpp b/mm/2s2h/Rando/Logic/Regions/East.cpp index fedc4859f..3f5a1031e 100644 --- a/mm/2s2h/Rando/Logic/Regions/East.cpp +++ b/mm/2s2h/Rando/Logic/Regions/East.cpp @@ -328,23 +328,23 @@ static RegisterShipInitFunc initFunc([]() { }; Regions[RR_SECRET_SHRINE_ENTRANCE] = RandoRegion{ .name = "Entrance", .sceneId = SCENE_RANDOM, .checks = { - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_01, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_02, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_03, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_04, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_05, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_06, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_07, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_08, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_09, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_10, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_11, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_12, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_13, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_14, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_15, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_16, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), - CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_17, HAS_ITEM(ITEM_MAGIC_BEANS) && CAN_ACCESS(SPRING_WATER)), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_01, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_02, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_03, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_04, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_05, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_06, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_07, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_08, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_09, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_10, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_11, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_12, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_13, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_14, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_15, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_16, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), + CHECK(RC_SECRET_SHRINE_FREESTANDING_RUPEE_17, CAN_GROW_BEAN_PLANT || CAN_BE_ZORA), CHECK(RC_SECRET_SHRINE_POT_01, true), CHECK(RC_SECRET_SHRINE_POT_02, true), CHECK(RC_SECRET_SHRINE_POT_03, true), |