summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Cox <garrettjcox@gmail.com>2026-01-20 19:01:30 -0600
committerGitHub <noreply@github.com>2026-01-20 19:01:30 -0600
commitcc5d87143d3ec163919568d43dcced32187f8ce2 (patch)
tree8bdaaf8cf52b7143facca5065ec62988e12f2c49
parenta0411a1b05d6aa53c21612a4f5100c2eb57ec4a4 (diff)
Add ITEM_MASK_ROMANI to RC_MILK_BAR_CIRCUS_LEADER_MASK (#1473)
-rw-r--r--mm/2s2h/Rando/Logic/Regions/Central.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/2s2h/Rando/Logic/Regions/Central.cpp b/mm/2s2h/Rando/Logic/Regions/Central.cpp
index 8f3402602..0938a4db9 100644
--- a/mm/2s2h/Rando/Logic/Regions/Central.cpp
+++ b/mm/2s2h/Rando/Logic/Regions/Central.cpp
@@ -339,7 +339,8 @@ static RegisterShipInitFunc initFunc([]() {
};
Regions[RR_MILK_BAR] = RandoRegion{ .sceneId = SCENE_MILK_BAR,
.checks = {
- CHECK(RC_MILK_BAR_CIRCUS_LEADER_MASK, HAS_ITEM(ITEM_OCARINA_OF_TIME) && (BETWEEN(TIME_NIGHT1_PM_10_00, TIME_NIGHT1_AM_05_00) ||
+ CHECK(RC_MILK_BAR_CIRCUS_LEADER_MASK, HAS_ITEM(ITEM_OCARINA_OF_TIME) && HAS_ITEM(ITEM_MASK_ROMANI) &&
+ (BETWEEN(TIME_NIGHT1_PM_10_00, TIME_NIGHT1_AM_05_00) ||
BETWEEN(TIME_NIGHT2_PM_10_00, TIME_NIGHT2_AM_05_00))
&& (canPlaySong(OCARINA_SONG_WIND_FISH_HUMAN) &&
(CAN_BE_DEKU && canPlaySong(OCARINA_SONG_WIND_FISH_DEKU)) &&