summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/Logic/Regions/East.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'mm/2s2h/Rando/Logic/Regions/East.cpp')
-rw-r--r--mm/2s2h/Rando/Logic/Regions/East.cpp38
1 files changed, 38 insertions, 0 deletions
diff --git a/mm/2s2h/Rando/Logic/Regions/East.cpp b/mm/2s2h/Rando/Logic/Regions/East.cpp
index 541f65420..5592f5e24 100644
--- a/mm/2s2h/Rando/Logic/Regions/East.cpp
+++ b/mm/2s2h/Rando/Logic/Regions/East.cpp
@@ -168,6 +168,10 @@ static RegisterShipInitFunc initFunc([]() {
};
Regions[RR_IKANA_CANYON_UPPER] = RandoRegion{ .name = "Upper", .sceneId = SCENE_IKANA,
.checks = {
+ CHECK(RC_IKANA_CANYON_GRASS_01, true),
+ CHECK(RC_IKANA_CANYON_GRASS_02, true),
+ CHECK(RC_IKANA_CANYON_GRASS_03, true),
+ CHECK(RC_IKANA_CANYON_GRASS_04, true),
CHECK(RC_IKANA_CANYON_OWL_STATUE, CAN_USE_SWORD),
CHECK(RC_IKANA_CANYON_TINGLE_MAP_01, CAN_USE_PROJECTILE && CAN_AFFORD(RC_IKANA_CANYON_TINGLE_MAP_01)),
CHECK(RC_IKANA_CANYON_TINGLE_MAP_02, CAN_USE_PROJECTILE && CAN_AFFORD(RC_IKANA_CANYON_TINGLE_MAP_02)),
@@ -219,6 +223,11 @@ static RegisterShipInitFunc initFunc([]() {
};
Regions[RR_IKANA_GRAVEYARD_LOWER] = RandoRegion{ .name = "Lower", .sceneId = SCENE_BOTI,
.checks = {
+ CHECK(RC_IKANA_GRAVEYARD_LOWER_GRASS_01, true),
+ CHECK(RC_IKANA_GRAVEYARD_LOWER_GRASS_02, true),
+ CHECK(RC_IKANA_GRAVEYARD_LOWER_GRASS_03, true),
+ CHECK(RC_IKANA_GRAVEYARD_LOWER_GRASS_04, true),
+ CHECK(RC_IKANA_GRAVEYARD_LOWER_GRASS_05, true),
CHECK(RC_IKANA_GRAVEYARD_GRASS_01, true),
CHECK(RC_IKANA_GRAVEYARD_GRASS_02, true),
CHECK(RC_IKANA_GRAVEYARD_GRASS_03, true),
@@ -368,6 +377,12 @@ static RegisterShipInitFunc initFunc([]() {
};
Regions[RR_SECRET_SHRINE_ENTRANCE] = RandoRegion{ .name = "Entrance", .sceneId = SCENE_RANDOM,
.checks = {
+ CHECK(RC_SECRET_SHRINE_ENTRANCE_GRASS_01, true),
+ CHECK(RC_SECRET_SHRINE_ENTRANCE_GRASS_02, true),
+ CHECK(RC_SECRET_SHRINE_ENTRANCE_GRASS_03, true),
+ CHECK(RC_SECRET_SHRINE_ENTRANCE_GRASS_04, true),
+ CHECK(RC_SECRET_SHRINE_ENTRANCE_GRASS_05, true),
+ CHECK(RC_SECRET_SHRINE_ENTRANCE_GRASS_06, true),
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),
@@ -398,6 +413,29 @@ static RegisterShipInitFunc initFunc([]() {
};
Regions[RR_SECRET_SHRINE] = RandoRegion{ .sceneId = SCENE_RANDOM,
.checks = {
+ CHECK(RC_SECRET_SHRINE_DINOLFOS_GRASS_01, true),
+ CHECK(RC_SECRET_SHRINE_DINOLFOS_GRASS_02, true),
+ CHECK(RC_SECRET_SHRINE_DINOLFOS_GRASS_03, true),
+ CHECK(RC_SECRET_SHRINE_DINOLFOS_GRASS_04, true),
+ CHECK(RC_SECRET_SHRINE_WIZZROBE_GRASS_01, true),
+ CHECK(RC_SECRET_SHRINE_WIZZROBE_GRASS_02, true),
+ CHECK(RC_SECRET_SHRINE_WIZZROBE_GRASS_03, true),
+ CHECK(RC_SECRET_SHRINE_WIZZROBE_GRASS_04, true),
+ CHECK(RC_SECRET_SHRINE_WIZZROBE_GRASS_05, true),
+ CHECK(RC_SECRET_SHRINE_WART_GRASS_01, true),
+ CHECK(RC_SECRET_SHRINE_WART_GRASS_02, true),
+ CHECK(RC_SECRET_SHRINE_WART_GRASS_03, true),
+ CHECK(RC_SECRET_SHRINE_WART_GRASS_04, true),
+ CHECK(RC_SECRET_SHRINE_WART_GRASS_05, true),
+ CHECK(RC_SECRET_SHRINE_WART_GRASS_06, true),
+ CHECK(RC_SECRET_SHRINE_WART_GRASS_07, true),
+ CHECK(RC_SECRET_SHRINE_WART_GRASS_08, true),
+ CHECK(RC_SECRET_SHRINE_GARO_MASTER_GRASS_01, true),
+ CHECK(RC_SECRET_SHRINE_GARO_MASTER_GRASS_02, true),
+ CHECK(RC_SECRET_SHRINE_GARO_MASTER_GRASS_03, true),
+ CHECK(RC_SECRET_SHRINE_GARO_MASTER_GRASS_04, true),
+ CHECK(RC_SECRET_SHRINE_GARO_MASTER_GRASS_05, true),
+ CHECK(RC_SECRET_SHRINE_GARO_MASTER_GRASS_06, true),
CHECK(RC_SECRET_SHRINE_DINOLFOS_CHEST, RANDO_EVENTS[RE_SECRET_SHRINE_DINOLFOS]),
CHECK(RC_SECRET_SHRINE_WIZZROBE_CHEST, RANDO_EVENTS[RE_SECRET_SHRINE_WIZZROBE]),
CHECK(RC_SECRET_SHRINE_WART_CHEST, RANDO_EVENTS[RE_SECRET_SHRINE_WART]),