diff options
Diffstat (limited to 'mm/2s2h/Rando/StaticData/Checks.cpp')
| -rw-r--r-- | mm/2s2h/Rando/StaticData/Checks.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/mm/2s2h/Rando/StaticData/Checks.cpp b/mm/2s2h/Rando/StaticData/Checks.cpp index 3d0c3cc80..0bd5d3c9e 100644 --- a/mm/2s2h/Rando/StaticData/Checks.cpp +++ b/mm/2s2h/Rando/StaticData/Checks.cpp @@ -42,8 +42,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = { RC(RC_CLOCK_TOWN_GREAT_FAIRY, RCTYPE_NPC, SCENE_YOUSEI_IZUMI, FLAG_NONE, 0x00, RI_PROGRESSIVE_MAGIC), RC(RC_CLOCK_TOWN_LAUNDRY_GURU_GURU, RCTYPE_NPC, SCENE_ALLEY, FLAG_WEEK_EVENT_REG, WEEKEVENTREG_38_40, RI_MASK_BREMEN), RC(RC_CLOCK_TOWN_NORTH_BOMB_LADY, RCTYPE_NPC, SCENE_BACKTOWN, FLAG_CYCL_SCENE_COLLECTIBLE, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_BLAST_MASK, RI_MASK_BLAST), - RC(RC_CLOCK_TOWN_NORTH_TINGLE_MAP_1, RCTYPE_NPC, SCENE_BACKTOWN, FLAG_NONE, 0x00, RI_CLOCK_TOWN_MAP), - RC(RC_CLOCK_TOWN_NORTH_TINGLE_MAP_2, RCTYPE_NPC, SCENE_BACKTOWN, FLAG_NONE, 0x00, RI_WOODFALL_MAP), + RC(RC_CLOCK_TOWN_NORTH_TINGLE_MAP_1, RCTYPE_NPC, SCENE_BACKTOWN, FLAG_NONE, 0x00, RI_TINGLE_MAP_CLOCK_TOWN), + RC(RC_CLOCK_TOWN_NORTH_TINGLE_MAP_2, RCTYPE_NPC, SCENE_BACKTOWN, FLAG_NONE, 0x00, RI_TINGLE_MAP_WOODFALL), RC(RC_CLOCK_TOWN_NORTH_TREE_HP, RCTYPE_FREESTANDING, SCENE_BACKTOWN, FLAG_CYCL_SCENE_COLLECTIBLE, 0x0A, RI_HEART_PIECE), RC(RC_CLOCK_TOWN_SCRUB_DEED, RCTYPE_NPC, SCENE_CLOCKTOWER, FLAG_WEEK_EVENT_REG, WEEKEVENTREG_17_80, RI_DEED_LAND), RC(RC_CLOCK_TOWN_SOUTH_CHEST_LOWER, RCTYPE_CHEST, SCENE_CLOCKTOWER, FLAG_CYCL_SCENE_CHEST, 0x00, RI_RUPEE_RED), @@ -76,8 +76,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = { RC(RC_GREAT_BAY_COAST_MIKAU, RCTYPE_NPC, SCENE_30GYOSON, FLAG_NONE, 0x00, RI_MASK_ZORA), RC(RC_GREAT_BAY_COAST_NEW_WAVE_BOSSA_NOVA, RCTYPE_NPC, SCENE_LABO, FLAG_WEEK_EVENT_REG, WEEKEVENTREG_20_40, RI_SONG_NOVA), RC(RC_GREAT_BAY_COAST_OWL_STATUE, RCTYPE_OWL, SCENE_30GYOSON, FLAG_NONE, 0x00, RI_OWL_GREAT_BAY_COAST), - RC(RC_GREAT_BAY_COAST_TINGLE_MAP_1, RCTYPE_NPC, SCENE_30GYOSON, FLAG_NONE, 0x00, RI_GREAT_BAY_MAP), - RC(RC_GREAT_BAY_COAST_TINGLE_MAP_2, RCTYPE_NPC, SCENE_30GYOSON, FLAG_NONE, 0x00, RI_STONE_TOWER_MAP), + RC(RC_GREAT_BAY_COAST_TINGLE_MAP_1, RCTYPE_NPC, SCENE_30GYOSON, FLAG_NONE, 0x00, RI_TINGLE_MAP_GREAT_BAY), + RC(RC_GREAT_BAY_COAST_TINGLE_MAP_2, RCTYPE_NPC, SCENE_30GYOSON, FLAG_NONE, 0x00, RI_TINGLE_MAP_STONE_TOWER), RC(RC_GREAT_BAY_GREAT_FAIRY, RCTYPE_NPC, SCENE_YOUSEI_IZUMI, FLAG_NONE, 0x00, RI_DOUBLE_DEFENSE), RC(RC_GREAT_BAY_TEMPLE_BABA_CHEST, RCTYPE_CHEST, SCENE_SEA, FLAG_CYCL_SCENE_CHEST, 0x19, RI_GREAT_BAY_STRAY_FAIRY), RC(RC_GREAT_BAY_TEMPLE_BOSS_HC, RCTYPE_FREESTANDING, SCENE_SEA_BS, FLAG_CYCL_SCENE_COLLECTIBLE, 0x1f, RI_HEART_CONTAINER), @@ -91,7 +91,7 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = { RC(RC_GREAT_BAY_TEMPLE_GREEN_PIPE_2_UPPER_CHEST, RCTYPE_CHEST, SCENE_SEA, FLAG_CYCL_SCENE_CHEST, 0x14, RI_GREAT_BAY_STRAY_FAIRY), RC(RC_GREAT_BAY_TEMPLE_GREEN_PIPE_3_CHEST, RCTYPE_CHEST, SCENE_SEA, FLAG_CYCL_SCENE_CHEST, 0x16, RI_GREAT_BAY_STRAY_FAIRY), RC(RC_GREAT_BAY_TEMPLE_ICE_ARROW, RCTYPE_CHEST, SCENE_SEA, FLAG_CYCL_SCENE_CHEST, 0x1B, RI_ARROW_ICE), - RC(RC_GREAT_BAY_TEMPLE_MAP, RCTYPE_CHEST, SCENE_SEA, FLAG_CYCL_SCENE_CHEST, 0x1D, RI_GREAT_BAY_TEMPLE_MAP), + RC(RC_GREAT_BAY_TEMPLE_MAP, RCTYPE_CHEST, SCENE_SEA, FLAG_CYCL_SCENE_CHEST, 0x1D, RI_GREAT_BAY_MAP), RC(RC_GREAT_BAY_TEMPLE_SF_CENTRAL_ROOM_BARREL, RCTYPE_STRAY_FAIRY, SCENE_SEA, FLAG_CYCL_SCENE_COLLECTIBLE, 0x1C, RI_GREAT_BAY_STRAY_FAIRY), RC(RC_GREAT_BAY_TEMPLE_SF_CENTRAL_ROOM_UNDERWATER_POT, RCTYPE_STRAY_FAIRY, SCENE_SEA, FLAG_CYCL_SCENE_COLLECTIBLE, 0x1B, RI_GREAT_BAY_STRAY_FAIRY), RC(RC_GREAT_BAY_TEMPLE_SF_COMPASS_ROOM_POT, RCTYPE_STRAY_FAIRY, SCENE_SEA, FLAG_CYCL_SCENE_COLLECTIBLE, 0x1D, RI_GREAT_BAY_STRAY_FAIRY), @@ -109,8 +109,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = { RC(RC_IKANA_CANYON_SCRUB_HP, RCTYPE_FREESTANDING, SCENE_IKANA, FLAG_CYCL_SCENE_COLLECTIBLE, 0x1e, RI_HEART_PIECE), RC(RC_IKANA_CANYON_SCRUB_HUGE_RUPEE, RCTYPE_NPC, SCENE_IKANA, FLAG_WEEK_EVENT_REG, WEEKEVENTREG_62_20, RI_RUPEE_HUGE), RC(RC_IKANA_CANYON_SCRUB_POTION_REFILL, RCTYPE_NPC, SCENE_IKANA, FLAG_RANDO_INF, RANDO_INF_PURCHASED_POTION_FROM_IKANA_CANYON_SCRUB, RI_BLUE_POTION_REFILL), - RC(RC_IKANA_CANYON_TINGLE_MAP_1, RCTYPE_NPC, SCENE_IKANA, FLAG_NONE, 0x00, RI_STONE_TOWER_MAP), - RC(RC_IKANA_CANYON_TINGLE_MAP_2, RCTYPE_NPC, SCENE_IKANA, FLAG_NONE, 0x00, RI_CLOCK_TOWN_MAP), + RC(RC_IKANA_CANYON_TINGLE_MAP_1, RCTYPE_NPC, SCENE_IKANA, FLAG_NONE, 0x00, RI_TINGLE_MAP_STONE_TOWER), + RC(RC_IKANA_CANYON_TINGLE_MAP_2, RCTYPE_NPC, SCENE_IKANA, FLAG_NONE, 0x00, RI_TINGLE_MAP_CLOCK_TOWN), RC(RC_IKANA_GRAVEYARD_CAPTAIN_MASK, RCTYPE_CHEST, SCENE_BOTI, FLAG_CYCL_SCENE_CHEST, 0x00, RI_MASK_CAPTAIN), RC(RC_IKANA_GRAVEYARD_GROTTO, RCTYPE_CHEST, SCENE_KAKUSIANA, FLAG_CYCL_SCENE_CHEST, 0x18, RI_BOMBCHU_5), RC(RC_IKANA_GREAT_FAIRY, RCTYPE_NPC, SCENE_YOUSEI_IZUMI, FLAG_NONE, 0x00, RI_GREAT_FAIRY_SWORD), @@ -121,8 +121,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = { RC(RC_MAYORS_OFFICE_HP, RCTYPE_NPC, SCENE_SONCHONOIE, FLAG_WEEK_EVENT_REG, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_MAYOR_HP, RI_HEART_PIECE), RC(RC_MAYORS_OFFICE_KAFEIS_MASK, RCTYPE_NPC, SCENE_SONCHONOIE, FLAG_WEEK_EVENT_REG, WEEKEVENTREG_BOMBERS_NOTEBOOK_EVENT_RECEIVED_KAFEIS_MASK, RI_MASK_KAFEIS_MASK), RC(RC_MILK_ROAD_OWL_STATUE, RCTYPE_OWL, SCENE_ROMANYMAE, FLAG_NONE, 0x00, RI_OWL_MILK_ROAD), - RC(RC_MILK_ROAD_TINGLE_MAP_1, RCTYPE_NPC, SCENE_ROMANYMAE, FLAG_NONE, 0x00, RI_ROMANI_RANCH_MAP), - RC(RC_MILK_ROAD_TINGLE_MAP_2, RCTYPE_NPC, SCENE_ROMANYMAE, FLAG_NONE, 0x00, RI_GREAT_BAY_MAP), + RC(RC_MILK_ROAD_TINGLE_MAP_1, RCTYPE_NPC, SCENE_ROMANYMAE, FLAG_NONE, 0x00, RI_TINGLE_MAP_ROMANI_RANCH), + RC(RC_MILK_ROAD_TINGLE_MAP_2, RCTYPE_NPC, SCENE_ROMANYMAE, FLAG_NONE, 0x00, RI_TINGLE_MAP_GREAT_BAY), RC(RC_MOON_TRIAL_DEKU_HP, RCTYPE_FREESTANDING, SCENE_LAST_DEKU, FLAG_CYCL_SCENE_COLLECTIBLE, 0x01, RI_HEART_PIECE), RC(RC_MOON_TRIAL_GORON_HP, RCTYPE_FREESTANDING, SCENE_LAST_GORON, FLAG_CYCL_SCENE_COLLECTIBLE, 0x01, RI_HEART_PIECE), RC(RC_MOON_TRIAL_LINK_GARO_MASTER_CHEST, RCTYPE_CHEST, SCENE_LAST_LINK, FLAG_CYCL_SCENE_CHEST, 0x01, RI_ARROWS_30), @@ -190,8 +190,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = { RC(RC_ROAD_TO_IKANA_STONE_MASK, RCTYPE_NPC, SCENE_KAKUSIANA, FLAG_WEEK_EVENT_REG, WEEKEVENTREG_41_40, RI_MASK_STONE), RC(RC_ROAD_TO_SOUTHERN_SWAMP_GROTTO, RCTYPE_CHEST, SCENE_KAKUSIANA, FLAG_CYCL_SCENE_CHEST, 0x1e, RI_RUPEE_RED), RC(RC_ROAD_TO_SOUTHERN_SWAMP_HP, RCTYPE_FREESTANDING, SCENE_24KEMONOMITI, FLAG_CYCL_SCENE_COLLECTIBLE, 0x01, RI_HEART_PIECE), - RC(RC_ROAD_TO_SOUTHERN_SWAMP_TINGLE_MAP_1, RCTYPE_NPC, SCENE_24KEMONOMITI, FLAG_NONE, 0x00, RI_WOODFALL_MAP), - RC(RC_ROAD_TO_SOUTHERN_SWAMP_TINGLE_MAP_2, RCTYPE_NPC, SCENE_24KEMONOMITI, FLAG_NONE, 0x00, RI_SNOWHEAD_MAP), + RC(RC_ROAD_TO_SOUTHERN_SWAMP_TINGLE_MAP_1, RCTYPE_NPC, SCENE_24KEMONOMITI, FLAG_NONE, 0x00, RI_TINGLE_MAP_WOODFALL), + RC(RC_ROAD_TO_SOUTHERN_SWAMP_TINGLE_MAP_2, RCTYPE_NPC, SCENE_24KEMONOMITI, FLAG_NONE, 0x00, RI_TINGLE_MAP_SNOWHEAD), RC(RC_ROMANI_RANCH_BARN_COW_LEFT, RCTYPE_COW, SCENE_OMOYA, FLAG_NONE, 0x12, RI_MILK_REFILL), RC(RC_ROMANI_RANCH_BARN_COW_MIDDLE, RCTYPE_COW, SCENE_OMOYA, FLAG_NONE, 0x10, RI_MILK_REFILL), RC(RC_ROMANI_RANCH_BARN_COW_RIGHT, RCTYPE_COW, SCENE_OMOYA, FLAG_NONE, 0x11, RI_MILK_REFILL), @@ -220,7 +220,7 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = { RC(RC_SNOWHEAD_TEMPLE_ICICLE_ROOM_ALCOVE_CHEST, RCTYPE_CHEST, SCENE_HAKUGIN, FLAG_CYCL_SCENE_CHEST, 0x16, RI_SNOWHEAD_STRAY_FAIRY), RC(RC_SNOWHEAD_TEMPLE_ICICLE_ROOM, RCTYPE_CHEST, SCENE_HAKUGIN, FLAG_CYCL_SCENE_CHEST, 0x04, RI_SNOWHEAD_SMALL_KEY), RC(RC_SNOWHEAD_TEMPLE_MAP_ALCOVE_CHEST, RCTYPE_CHEST, SCENE_HAKUGIN, FLAG_CYCL_SCENE_CHEST, 0x13, RI_SNOWHEAD_STRAY_FAIRY), - RC(RC_SNOWHEAD_TEMPLE_MAP, RCTYPE_CHEST, SCENE_HAKUGIN, FLAG_CYCL_SCENE_CHEST, 0x1D, RI_SNOWHEAD_TEMPLE_MAP), + RC(RC_SNOWHEAD_TEMPLE_MAP, RCTYPE_CHEST, SCENE_HAKUGIN, FLAG_CYCL_SCENE_CHEST, 0x1D, RI_SNOWHEAD_MAP), RC(RC_SNOWHEAD_TEMPLE_PILLARS_ROOM_CHEST, RCTYPE_CHEST, SCENE_HAKUGIN, FLAG_CYCL_SCENE_CHEST, 0x18, RI_SNOWHEAD_STRAY_FAIRY), RC(RC_SNOWHEAD_TEMPLE_SF_BRIDGE_PILLAR, RCTYPE_STRAY_FAIRY, SCENE_HAKUGIN, FLAG_CYCL_SCENE_SWITCH, 0x30, RI_SNOWHEAD_STRAY_FAIRY), RC(RC_SNOWHEAD_TEMPLE_SF_BRIDGE_UNDER_PLATFORM, RCTYPE_STRAY_FAIRY, SCENE_HAKUGIN, FLAG_CYCL_SCENE_SWITCH, 0x2F, RI_SNOWHEAD_STRAY_FAIRY), @@ -263,7 +263,7 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = { RC(RC_STONE_TOWER_TEMPLE_INVERTED_GIANT_MASK, RCTYPE_CHEST, SCENE_INISIE_N, FLAG_CYCL_SCENE_CHEST, 0x1a, RI_MASK_GIANT), RC(RC_STONE_TOWER_TEMPLE_INVERTED_WIZZROBE_CHEST, RCTYPE_CHEST, SCENE_INISIE_N, FLAG_CYCL_SCENE_CHEST, 0x11, RI_STONE_TOWER_STRAY_FAIRY), RC(RC_STONE_TOWER_TEMPLE_LIGHT_ARROW, RCTYPE_CHEST, SCENE_INISIE_N, FLAG_CYCL_SCENE_CHEST, 0x1b, RI_ARROW_LIGHT), - RC(RC_STONE_TOWER_TEMPLE_MAP, RCTYPE_CHEST, SCENE_INISIE_N, FLAG_CYCL_SCENE_CHEST, 0x1d, RI_STONE_TOWER_TEMPLE_MAP), + RC(RC_STONE_TOWER_TEMPLE_MAP, RCTYPE_CHEST, SCENE_INISIE_N, FLAG_CYCL_SCENE_CHEST, 0x1d, RI_STONE_TOWER_MAP), RC(RC_STONE_TOWER_TEMPLE_MIRRORS_ROOM_CENTER_CHEST, RCTYPE_CHEST, SCENE_INISIE_N, FLAG_CYCL_SCENE_CHEST, 0x0f, RI_STONE_TOWER_STRAY_FAIRY), RC(RC_STONE_TOWER_TEMPLE_MIRRORS_ROOM_RIGHT_CHEST, RCTYPE_CHEST, SCENE_INISIE_N, FLAG_CYCL_SCENE_CHEST, 0x0b, RI_STONE_TOWER_STRAY_FAIRY), RC(RC_STONE_TOWER_TEMPLE_UNDER_WEST_GARDEN_LAVA_CHEST, RCTYPE_CHEST, SCENE_INISIE_N, FLAG_CYCL_SCENE_CHEST, 0x02, RI_STONE_TOWER_SMALL_KEY), @@ -324,8 +324,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = { RC(RC_TRADING_POST_SHOP_ITEM_8, RCTYPE_SHOP, SCENE_8ITEMSHOP, FLAG_NONE, 0x00, RI_ARROWS_50), RC(RC_TWIN_ISLANDS_FROZEN_GROTTO_CHEST, RCTYPE_CHEST, SCENE_KAKUSIANA, FLAG_CYCL_SCENE_CHEST, 0x02, RI_RUPEE_RED), RC(RC_TWIN_ISLANDS_RAMP_GROTTO_CHEST, RCTYPE_CHEST, SCENE_KAKUSIANA, FLAG_CYCL_SCENE_CHEST, 0x19, RI_BOMBCHU), - RC(RC_TWIN_ISLANDS_TINGLE_MAP_1, RCTYPE_NPC, SCENE_17SETUGEN, FLAG_NONE, 0x00, RI_SNOWHEAD_MAP), - RC(RC_TWIN_ISLANDS_TINGLE_MAP_2, RCTYPE_NPC, SCENE_17SETUGEN, FLAG_NONE, 0x00, RI_ROMANI_RANCH_MAP), + RC(RC_TWIN_ISLANDS_TINGLE_MAP_1, RCTYPE_NPC, SCENE_17SETUGEN, FLAG_NONE, 0x00, RI_TINGLE_MAP_SNOWHEAD), + RC(RC_TWIN_ISLANDS_TINGLE_MAP_2, RCTYPE_NPC, SCENE_17SETUGEN, FLAG_NONE, 0x00, RI_TINGLE_MAP_ROMANI_RANCH), RC(RC_TWIN_ISLANDS_UNDERWATER_CHEST_1, RCTYPE_CHEST, SCENE_17SETUGEN, FLAG_CYCL_SCENE_CHEST, 0x06, RI_HEART_PIECE), RC(RC_TWIN_ISLANDS_UNDERWATER_CHEST_2, RCTYPE_CHEST, SCENE_17SETUGEN, FLAG_CYCL_SCENE_CHEST, 0x00, RI_RUPEE_RED), RC(RC_WOODFALL_ENTRANCE_CHEST, RCTYPE_CHEST, SCENE_21MITURINMAE, FLAG_CYCL_SCENE_CHEST, 0x00, RI_RUPEE_RED), @@ -341,7 +341,7 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = { RC(RC_WOODFALL_TEMPLE_COMPASS, RCTYPE_CHEST, SCENE_MITURIN, FLAG_CYCL_SCENE_CHEST, 0x1c, RI_WOODFALL_COMPASS), RC(RC_WOODFALL_TEMPLE_DARK_CHEST, RCTYPE_CHEST, SCENE_MITURIN, FLAG_CYCL_SCENE_CHEST, 0x19, RI_WOODFALL_STRAY_FAIRY), RC(RC_WOODFALL_TEMPLE_ENTRANCE_CHEST, RCTYPE_CHEST, SCENE_MITURIN, FLAG_CYCL_SCENE_CHEST, 0x18, RI_WOODFALL_STRAY_FAIRY), - RC(RC_WOODFALL_TEMPLE_MAP, RCTYPE_CHEST, SCENE_MITURIN, FLAG_CYCL_SCENE_CHEST, 0x1d, RI_WOODFALL_TEMPLE_MAP), + RC(RC_WOODFALL_TEMPLE_MAP, RCTYPE_CHEST, SCENE_MITURIN, FLAG_CYCL_SCENE_CHEST, 0x1d, RI_WOODFALL_MAP), RC(RC_WOODFALL_TEMPLE_SF_ENTRANCE, RCTYPE_STRAY_FAIRY, SCENE_MITURIN, FLAG_CYCL_SCENE_SWITCH, 0x2B, RI_WOODFALL_STRAY_FAIRY), RC(RC_WOODFALL_TEMPLE_SF_MAIN_BUBBLE, RCTYPE_STRAY_FAIRY, SCENE_MITURIN, FLAG_CYCL_SCENE_SWITCH, 0x30, RI_WOODFALL_STRAY_FAIRY), RC(RC_WOODFALL_TEMPLE_SF_MAIN_DEKU_BABA, RCTYPE_STRAY_FAIRY, SCENE_MITURIN, FLAG_CYCL_SCENE_SWITCH, 0x2E, RI_WOODFALL_STRAY_FAIRY), |