Merge branch 'testing-out-item-replacement' into melon-randomizer

soh/include/z64save.h

@@ -179,7 +179,7 @@ typedef struct {
     /* 0x1420 */ s16 worldMapArea;
     /* 0x1422 */ s16 sunsSongState; // controls the effects of suns song
     /* 0x1424 */ s16 healthAccumulator;
-    ItemLocation itemLocations[268];
+    ItemLocation itemLocations[700];
     Sprite seedIcons[5];
 } SaveContext; // size = 0x1428
 

soh/randomizerTypes.h

@@ -18,6 +18,8 @@ typedef enum {
     MORPHA,
     BONGO_BONGO,
     TWINROVA,
+    GANON,
+    GIFT_FROM_SAGES,
     SONG_FROM_IMPA,
     SONG_FROM_MALON,
     SONG_FROM_SARIA,
@@ -36,6 +38,19 @@ typedef enum {
     KF_MIDOS_BOTTOM_RIGHT_CHEST,
     KF_KOKIRI_SWORD_CHEST,
     KF_STORMS_GROTTO_CHEST,
+    KF_LINKS_HOUSE_COW,
+    KF_GS_KNOW_IT_ALL_HOUSE,
+    KF_GS_BEAN_PATCH,
+    KF_GS_HOUSE_OF_TWINS,
+    KF_SHOP_ITEM_1,
+    KF_SHOP_ITEM_2,
+    KF_SHOP_ITEM_3,
+    KF_SHOP_ITEM_4,
+    KF_SHOP_ITEM_5,
+    KF_SHOP_ITEM_6,
+    KF_SHOP_ITEM_7,
+    KF_SHOP_ITEM_8,
+    LW_GIFT_FROM_SARIA,
     LW_OCARINA_MEMORY_GAME,
     LW_TARGET_IN_WOODS,
     LW_NEAR_SHORTCUTS_GROTTO_CHEST,
@@ -43,23 +58,77 @@ typedef enum {
     DEKU_THEATER_MASK_OF_TRUTH,
     LW_SKULL_KID,
     LW_DEKU_SCRUB_NEAR_BRIDGE,
+    LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT,
+    LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT,
     LW_DEKU_SCRUB_GROTTO_FRONT,
+    LW_DEKU_SCRUB_GROTTO_REAR,
+    LW_GS_BEAN_PATCH_NEAR_BRIDGE,
+    LW_GS_BEAN_PATCH_NEAR_THEATER,
+    LW_GS_ABOVE_THEATER,
     SFM_WOLFOS_GROTTO_CHEST,
+    SFM_DEKU_SCRUB_GROTTO_FRONT,
+    SFM_DEKU_SCRUB_GROTTO_REAR,
+    SFM_GS,
+    HF_OCARINA_OF_TIME_ITEM,
     HF_NEAR_MARKET_GROTTO_CHEST,
     HF_TEKTITE_GROTTO_FREESTANDING_POH,
     HF_SOUTHEAST_GROTTO_CHEST,
     HF_OPEN_GROTTO_CHEST,
     HF_DEKU_SCRUB_GROTTO,
+    HF_COW_GROTTO_COW,
+    HF_GS_COW_GROTTO,
+    HF_GS_NEAR_KAK_GROTTO,
     MARKET_SHOOTING_GALLERY_REWARD,
     MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,
     MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,
+    MARKET_BOMBCHU_BOWLING_BOMBCHUS,
     MARKET_LOST_DOG,
     MARKET_TREASURE_CHEST_GAME_REWARD,
     MARKET_10_BIG_POES,
+    MARKET_GS_GUARD_HOUSE,
+    MARKET_BAZAAR_ITEM_1,
+    MARKET_BAZAAR_ITEM_2,
+    MARKET_BAZAAR_ITEM_3,
+    MARKET_BAZAAR_ITEM_4,
+    MARKET_BAZAAR_ITEM_5,
+    MARKET_BAZAAR_ITEM_6,
+    MARKET_BAZAAR_ITEM_7,
+    MARKET_BAZAAR_ITEM_8,
+    MARKET_POTION_SHOP_ITEM_1,
+    MARKET_POTION_SHOP_ITEM_2,
+    MARKET_POTION_SHOP_ITEM_3,
+    MARKET_POTION_SHOP_ITEM_4,
+    MARKET_POTION_SHOP_ITEM_5,
+    MARKET_POTION_SHOP_ITEM_6,
+    MARKET_POTION_SHOP_ITEM_7,
+    MARKET_POTION_SHOP_ITEM_8,
+    MARKET_BOMBCHU_SHOP_ITEM_1,
+    MARKET_BOMBCHU_SHOP_ITEM_2,
+    MARKET_BOMBCHU_SHOP_ITEM_3,
+    MARKET_BOMBCHU_SHOP_ITEM_4,
+    MARKET_BOMBCHU_SHOP_ITEM_5,
+    MARKET_BOMBCHU_SHOP_ITEM_6,
+    MARKET_BOMBCHU_SHOP_ITEM_7,
+    MARKET_BOMBCHU_SHOP_ITEM_8,
     TOT_LIGHT_ARROWS_CUTSCENE,
+    HC_MALON_EGG,
+    HC_ZELDAS_LETTER,
     HC_GREAT_FAIRY_REWARD,
+    HC_GS_TREE,
+    HC_GS_STORMS_GROTTO,
     LLR_TALONS_CHICKENS,
     LLR_FREESTANDING_POH,
+    LLR_DEKU_SCRUB_GROTTO_LEFT,
+    LLR_DEKU_SCRUB_GROTTO_CENTER,
+    LLR_DEKU_SCRUB_GROTTO_RIGHT,
+    LLR_STABLES_LEFT_COW,
+    LLR_STABLES_RIGHT_COW,
+    LLR_TOWER_LEFT_COW,
+    LLR_TOWER_RIGHT_COW,
+    LLR_GS_HOUSE_WINDOW,
+    LLR_GS_TREE,
+    LLR_GS_RAIN_SHED,
+    LLR_GS_BACK_WALL,
     KAK_ANJU_AS_CHILD,
     KAK_ANJU_AS_ADULT,
     KAK_IMPAS_HOUSE_FREESTANDING_POH,
@@ -73,6 +142,29 @@ typedef enum {
     KAK_30_GOLD_SKULLTULA_REWARD,
     KAK_40_GOLD_SKULLTULA_REWARD,
     KAK_50_GOLD_SKULLTULA_REWARD,
+    KAK_IMPAS_HOUSE_COW,
+    KAK_GS_TREE,
+    KAK_GS_GUARDS_HOUSE,
+    KAK_GS_WATCHTOWER,
+    KAK_GS_SKULLTULA_HOUSE,
+    KAK_GS_HOUSE_UNDER_CONSTRUCTION,
+    KAK_GS_ABOVE_IMPAS_HOUSE,
+    KAK_BAZAAR_ITEM_1,
+    KAK_BAZAAR_ITEM_2,
+    KAK_BAZAAR_ITEM_3,
+    KAK_BAZAAR_ITEM_4,
+    KAK_BAZAAR_ITEM_5,
+    KAK_BAZAAR_ITEM_6,
+    KAK_BAZAAR_ITEM_7,
+    KAK_BAZAAR_ITEM_8,
+    KAK_POTION_SHOP_ITEM_1,
+    KAK_POTION_SHOP_ITEM_2,
+    KAK_POTION_SHOP_ITEM_3,
+    KAK_POTION_SHOP_ITEM_4,
+    KAK_POTION_SHOP_ITEM_5,
+    KAK_POTION_SHOP_ITEM_6,
+    KAK_POTION_SHOP_ITEM_7,
+    KAK_POTION_SHOP_ITEM_8,
     GRAVEYARD_SHIELD_GRAVE_CHEST,
     GRAVEYARD_HEART_PIECE_GRAVE_CHEST,
     GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,
@@ -80,66 +172,208 @@ typedef enum {
     GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,
     GRAVEYARD_HOOKSHOT_CHEST,
     GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,
+    GRAVEYARD_GS_BEAN_PATCH,
+    GRAVEYARD_GS_WALL,
     DMT_FREESTANDING_POH,
     DMT_CHEST,
     DMT_STORMS_GROTTO_CHEST,
     DMT_GREAT_FAIRY_REWARD,
     DMT_BIGGORON,
+    DMT_COW_GROTTO_COW,
+    DMT_GS_NEAR_KAK,
+    DMT_GS_BEAN_PATCH,
+    DMT_GS_ABOVE_DODONGOS_CAVERN,
+    DMT_GS_FALLING_ROCKS_PATH,
     GC_DARUNIAS_JOY,
     GC_POT_FREESTANDING_POH,
     GC_ROLLING_GORON_AS_CHILD,
     GC_ROLLING_GORON_AS_ADULT,
+    GC_MEDIGORON,
     GC_MAZE_LEFT_CHEST,
     GC_MAZE_RIGHT_CHEST,
     GC_MAZE_CENTER_CHEST,
+    GC_DEKU_SCRUB_GROTTO_LEFT,
+    GC_DEKU_SCRUB_GROTTO_CENTER,
+    GC_DEKU_SCRUB_GROTTO_RIGHT,
+    GC_GS_CENTER_PLATFORM,
+    GC_GS_BOULDER_MAZE,
+    GC_SHOP_ITEM_1,
+    GC_SHOP_ITEM_2,
+    GC_SHOP_ITEM_3,
+    GC_SHOP_ITEM_4,
+    GC_SHOP_ITEM_5,
+    GC_SHOP_ITEM_6,
+    GC_SHOP_ITEM_7,
+    GC_SHOP_ITEM_8,
     DMC_VOLCANO_FREESTANDING_POH,
     DMC_WALL_FREESTANDING_POH,
     DMC_UPPER_GROTTO_CHEST,
     DMC_GREAT_FAIRY_REWARD,
+    DMC_DEKU_SCRUB,
+    DMC_DEKU_SCRUB_GROTTO_LEFT,
+    DMC_DEKU_SCRUB_GROTTO_CENTER,
+    DMC_DEKU_SCRUB_GROTTO_RIGHT,
+    DMC_GS_CRATE,
+    DMC_GS_BEAN_PATCH,
+    ZR_MAGIC_BEAN_SALESMAN,
     ZR_OPEN_GROTTO_CHEST,
+    ZR_FROGS_ZELDAS_LULLABY,
+    ZR_FROGS_EPONAS_SONG,
+    ZR_FROGS_SARIAS_SONG,
+    ZR_FROGS_SUNS_SONG,
+    ZR_FROGS_SONG_OF_TIME,
     ZR_FROGS_IN_THE_RAIN,
     ZR_FROGS_OCARINA_GAME,
     ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,
     ZR_NEAR_DOMAIN_FREESTANDING_POH,
+    ZR_DEKU_SCRUB_GROTTO_FRONT,
+    ZR_DEKU_SCRUB_GROTTO_REAR,
+    ZR_GS_TREE,
+    ZR_GS_LADDER,
+    ZR_GS_NEAR_RAISED_GROTTOS,
+    ZR_GS_ABOVE_BRIDGE,
     ZD_DIVING_MINIGAME,
     ZD_CHEST,
     ZD_KING_ZORA_THAWED,
+    ZD_GS_FROZEN_WATERFALL,
+    ZD_SHOP_ITEM_1,
+    ZD_SHOP_ITEM_2,
+    ZD_SHOP_ITEM_3,
+    ZD_SHOP_ITEM_4,
+    ZD_SHOP_ITEM_5,
+    ZD_SHOP_ITEM_6,
+    ZD_SHOP_ITEM_7,
+    ZD_SHOP_ITEM_8,
     ZF_GREAT_FAIRY_REWARD,
     ZF_ICEBERG_FREESTANDING_POH,
     ZF_BOTTOM_FREESTANDING_POH,
+    ZF_GS_ABOVE_THE_LOG,
+    ZF_GS_TREE,
+    ZF_GS_HIDDEN_CAVE,
     LH_UNDERWATER_ITEM,
     LH_CHILD_FISHING,
     LH_ADULT_FISHING,
     LH_LAB_DIVE,
     LH_FREESTANDING_POH,
     LH_SUN,
+    LH_DEKU_SCRUB_GROTTO_LEFT,
+    LH_DEKU_SCRUB_GROTTO_CENTER,
+    LH_DEKU_SCRUB_GROTTO_RIGHT,
+    LH_GS_BEAN_PATCH,
+    LH_GS_LAB_WALL,
+    LH_GS_SMALL_ISLAND,
+    LH_GS_LAB_CRATE,
+    LH_GS_TREE,
     GV_CRATE_FREESTANDING_POH,
     GV_WATERFALL_FREESTANDING_POH,
     GV_CHEST,
+    GV_DEKU_SCRUB_GROTTO_FRONT,
+    GV_DEKU_SCRUB_GROTTO_REAR,
+    GV_COW,
+    GV_GS_SMALL_BRIDGE,
+    GV_GS_BEAN_PATCH,
+    GV_GS_BEHIND_TENT,
+    GV_GS_PILLAR,
     GF_CHEST,
     GF_HBA_1000_POINTS,
     GF_HBA_1500_POINTS,
+    GF_GS_TOP_FLOOR,
+    GF_GS_ARCHERY_RANGE,
+    HIDEOUT_JAIL_GUARD_1_TORCH,
+    HIDEOUT_JAIL_GUARD_2_TORCHES,
+    HIDEOUT_JAIL_GUARD_3_TORCHES,
+    HIDEOUT_JAIL_GUARD_4_TORCHES,
+    HIDEOUT_GERUDO_MEMBERSHIP_CARD,
+    WASTELAND_BOMBCHU_SALESMAN,
     WASTELAND_CHEST,
+    WASTELAND_GS,
     COLOSSUS_GREAT_FAIRY_REWARD,
     COLOSSUS_FREESTANDING_POH,
+    COLOSSUS_DEKU_SCRUB_GROTTO_FRONT,
+    COLOSSUS_DEKU_SCRUB_GROTTO_REAR,
+    COLOSSUS_GS_BEAN_PATCH,
+    COLOSSUS_GS_TREE,
+    COLOSSUS_GS_HILL,
     OGC_GREAT_FAIRY_REWARD,
+    OGC_GS,
     DEKU_TREE_MAP_CHEST,
     DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST,
     DEKU_TREE_SLINGSHOT_CHEST,
     DEKU_TREE_COMPASS_CHEST,
     DEKU_TREE_COMPASS_ROOM_SIDE_CHEST,
     DEKU_TREE_BASEMENT_CHEST,
+    DEKU_TREE_GS_COMPASS_ROOM,
+    DEKU_TREE_GS_BASEMENT_VINES,
+    DEKU_TREE_GS_BASEMENT_GATE,
+    DEKU_TREE_GS_BASEMENT_BACK_ROOM,
+    DEKU_TREE_MQ_MAP_CHEST,
+    DEKU_TREE_MQ_SLINGSHOT_CHEST,
+    DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST,
+    DEKU_TREE_MQ_COMPASS_CHEST,
+    DEKU_TREE_MQ_BASEMENT_CHEST,
+    DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST,
+    DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST,
+    DEKU_TREE_MQ_DEKU_SCRUB,
+    DEKU_TREE_MQ_GS_LOBBY,
+    DEKU_TREE_MQ_GS_COMPASS_ROOM,
+    DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM,
+    DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM,
     DEKU_TREE_QUEEN_GOHMA_HEART,
     DODONGOS_CAVERN_MAP_CHEST,
     DODONGOS_CAVERN_COMPASS_CHEST,
     DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST,
     DODONGOS_CAVERN_BOMB_BAG_CHEST,
     DODONGOS_CAVERN_END_OF_BRIDGE_CHEST,
+    DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS,
+    DODONGOS_CAVERN_DEKU_SCRUB_LOBBY,
+    DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT,
+    DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT,
+    DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
+    DODONGOS_CAVERN_GS_SCARECROW,
+    DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,
+    DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS,
+    DODONGOS_CAVERN_GS_BACK_ROOM,
+    DODONGOS_CAVERN_MQ_MAP_CHEST,
+    DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST,
+    DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST,
+    DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST,
+    DODONGOS_CAVERN_MQ_COMPASS_CHEST,
+    DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST,
+    DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT,
+    DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR,
+    DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
+    DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE,
+    DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM,
+    DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,
+    DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,
+    DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM,
+    DODONGOS_CAVERN_MQ_GS_BACK_AREA,
     DODONGOS_CAVERN_BOSS_ROOM_CHEST,
     DODONGOS_CAVERN_KING_DODONGO_HEART,
     JABU_JABUS_BELLY_BOOMERANG_CHEST,
     JABU_JABUS_BELLY_MAP_CHEST,
     JABU_JABUS_BELLY_COMPASS_CHEST,
+    JABU_JABUS_BELLY_DEKU_SCRUB,
+    JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,
+    JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER,
+    JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,
+    JABU_JABUS_BELLY_GS_NEAR_BOSS,
+    JABU_JABUS_BELLY_MQ_MAP_CHEST,
+    JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST,
+    JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,
+    JABU_JABUS_BELLY_MQ_COMPASS_CHEST,
+    JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST,
+    JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,
+    JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,
+    JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,
+    JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST,
+    JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,
+    JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST,
+    JABU_JABUS_BELLY_MQ_COW,
+    JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,
+    JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM,
+    JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,
+    JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,
     JABU_JABUS_BELLY_BARINADE_HEART,
     BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
     BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,
@@ -155,6 +389,17 @@ typedef enum {
     BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,
     BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,
     BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,
+    BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,
+    BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,
+    BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,
+    BOTTOM_OF_THE_WELL_MQ_MAP_CHEST,
+    BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY,
+    BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST,
+    BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY,
+    BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST,
+    BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,
+    BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,
+    BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,
     FOREST_TEMPLE_FIRST_ROOM_CHEST,
     FOREST_TEMPLE_FIRST_STALFOS_CHEST,
     FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,
@@ -168,6 +413,28 @@ typedef enum {
     FOREST_TEMPLE_BLUE_POE_CHEST,
     FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,
     FOREST_TEMPLE_BASEMENT_CHEST,
+    FOREST_TEMPLE_GS_FIRST_ROOM,
+    FOREST_TEMPLE_GS_LOBBY,
+    FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD,
+    FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,
+    FOREST_TEMPLE_GS_BASEMENT,
+    FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST,
+    FOREST_TEMPLE_MQ_WOLFOS_CHEST,
+    FOREST_TEMPLE_MQ_WELL_CHEST,
+    FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST,
+    FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST,
+    FOREST_TEMPLE_MQ_BOSS_KEY_CHEST,
+    FOREST_TEMPLE_MQ_REDEAD_CHEST,
+    FOREST_TEMPLE_MQ_MAP_CHEST,
+    FOREST_TEMPLE_MQ_BOW_CHEST,
+    FOREST_TEMPLE_MQ_COMPASS_CHEST,
+    FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST,
+    FOREST_TEMPLE_MQ_BASEMENT_CHEST,
+    FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY,
+    FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,
+    FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,
+    FOREST_TEMPLE_MQ_GS_WELL,
+    FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM,
     FOREST_TEMPLE_PHANTOM_GANON_HEART,
     FIRE_TEMPLE_NEAR_BOSS_CHEST,
     FIRE_TEMPLE_FLARE_DANCER_CHEST,
@@ -183,6 +450,28 @@ typedef enum {
     FIRE_TEMPLE_COMPASS_CHEST,
     FIRE_TEMPLE_MEGATON_HAMMER_CHEST,
     FIRE_TEMPLE_HIGHEST_GORON_CHEST,
+    FIRE_TEMPLE_GS_BOSS_KEY_LOOP,
+    FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM,
+    FIRE_TEMPLE_GS_BOULDER_MAZE,
+    FIRE_TEMPLE_GS_SCARECROW_CLIMB,
+    FIRE_TEMPLE_GS_SCARECROW_TOP,
+    FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST,
+    FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST,
+    FIRE_TEMPLE_MQ_MAP_CHEST,
+    FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST,
+    FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
+    FIRE_TEMPLE_MQ_BOSS_KEY_CHEST,
+    FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST,
+    FIRE_TEMPLE_MQ_COMPASS_CHEST,
+    FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST,
+    FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST,
+    FIRE_TEMPLE_MQ_FREESTANDING_KEY,
+    FIRE_TEMPLE_MQ_CHEST_ON_FIRE,
+    FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,
+    FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,
+    FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER,
+    FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,
+    FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE,
     FIRE_TEMPLE_VOLVAGIA_HEART,
     WATER_TEMPLE_COMPASS_CHEST,
     WATER_TEMPLE_MAP_CHEST,
@@ -194,6 +483,22 @@ typedef enum {
     WATER_TEMPLE_LONGSHOT_CHEST,
     WATER_TEMPLE_RIVER_CHEST,
     WATER_TEMPLE_DRAGON_CHEST,
+    WATER_TEMPLE_GS_BEHIND_GATE,
+    WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,
+    WATER_TEMPLE_GS_CENTRAL_PILLAR,
+    WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM,
+    WATER_TEMPLE_GS_RIVER,
+    WATER_TEMPLE_MQ_LONGSHOT_CHEST,
+    WATER_TEMPLE_MQ_MAP_CHEST,
+    WATER_TEMPLE_MQ_COMPASS_CHEST,
+    WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST,
+    WATER_TEMPLE_MQ_BOSS_KEY_CHEST,
+    WATER_TEMPLE_MQ_FREESTANDING_KEY,
+    WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,
+    WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH,
+    WATER_TEMPLE_MQ_GS_RIVER,
+    WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA,
+    WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,
     WATER_TEMPLE_MORPHA_HEART,
     SHADOW_TEMPLE_MAP_CHEST,
     SHADOW_TEMPLE_HOVER_BOOTS_CHEST,
@@ -212,6 +517,36 @@ typedef enum {
     SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,
     SHADOW_TEMPLE_BOSS_KEY_CHEST,
     SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,
+    SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,
+    SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM,
+    SHADOW_TEMPLE_GS_SINGLE_GIANT_POT,
+    SHADOW_TEMPLE_GS_NEAR_SHIP,
+    SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,
+    SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST,
+    SHADOW_TEMPLE_MQ_MAP_CHEST,
+    SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST,
+    SHADOW_TEMPLE_MQ_COMPASS_CHEST,
+    SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST,
+    SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST,
+    SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST,
+    SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST,
+    SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST,
+    SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST,
+    SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST,
+    SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST,
+    SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST,
+    SHADOW_TEMPLE_MQ_WIND_HINT_CHEST,
+    SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST,
+    SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST,
+    SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST,
+    SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST,
+    SHADOW_TEMPLE_MQ_FREESTANDING_KEY,
+    SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST,
+    SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM,
+    SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM,
+    SHADOW_TEMPLE_MQ_GS_AFTER_WIND,
+    SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,
+    SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,
     SHADOW_TEMPLE_BONGO_BONGO_HEART,
     SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
     SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,
@@ -219,6 +554,17 @@ typedef enum {
     SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,
     SPIRIT_TEMPLE_MAP_CHEST,
     SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,
+    SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST,
+    SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST,
+    SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST,
+    SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST,
+    SPIRIT_TEMPLE_MQ_MAP_CHEST,
+    SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST,
+    SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST,
+    SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST,
+    SPIRIT_TEMPLE_MQ_COMPASS_CHEST,
+    SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST,
+    SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST,
     SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,
     SPIRIT_TEMPLE_COMPASS_CHEST,
     SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,
@@ -229,14 +575,43 @@ typedef enum {
     SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,
     SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,
     SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,
+    SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST,
+    SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST,
+    SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST,
+    SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST,
+    SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST,
+    SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST,
+    SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST,
+    SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST,
     SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,
     SPIRIT_TEMPLE_BOSS_KEY_CHEST,
     SPIRIT_TEMPLE_TOPMOST_CHEST,
+    SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST,
+    SPIRIT_TEMPLE_GS_METAL_FENCE,
+    SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,
+    SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM,
+    SPIRIT_TEMPLE_GS_LOBBY,
+    SPIRIT_TEMPLE_GS_BOULDER_ROOM,
+    SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,
+    SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM,
+    SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM,
+    SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,
+    SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,
     SPIRIT_TEMPLE_TWINROVA_HEART,
     ICE_CAVERN_MAP_CHEST,
     ICE_CAVERN_COMPASS_CHEST,
     ICE_CAVERN_FREESTANDING_POH,
     ICE_CAVERN_IRON_BOOTS_CHEST,
+    ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,
+    ICE_CAVERN_GS_HEART_PIECE_ROOM,
+    ICE_CAVERN_GS_PUSH_BLOCK_ROOM,
+    ICE_CAVERN_MQ_MAP_CHEST,
+    ICE_CAVERN_MQ_COMPASS_CHEST,
+    ICE_CAVERN_MQ_FREESTANDING_POH,
+    ICE_CAVERN_MQ_IRON_BOOTS_CHEST,
+    ICE_CAVERN_MQ_GS_RED_ICE,
+    ICE_CAVERN_MQ_GS_ICE_BLOCK,
+    ICE_CAVERN_MQ_GS_SCARECROW,
     GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,
     GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,
     GERUDO_TRAINING_GROUND_STALFOS_CHEST,
@@ -259,6 +634,23 @@ typedef enum {
     GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,
     GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,
     GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST,
+    GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST,
     GANONS_CASTLE_FOREST_TRIAL_CHEST,
     GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,
     GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,
@@ -274,8 +666,32 @@ typedef enum {
     GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,
     GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,
     GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,
+    GANONS_CASTLE_DEKU_SCRUB_LEFT,
+    GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
+    GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
+    GANONS_CASTLE_DEKU_SCRUB_RIGHT,
+    GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY,
+    GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST,
+    GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST,
+    GANONS_CASTLE_MQ_WATER_TRIAL_CHEST,
+    GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST,
+    GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST,
+    GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST,
+    GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST,
+    GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST,
+    GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST,
+    GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST,
+    GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST,
+    GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST,
+    GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
+    GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT,
+    GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
+    GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
+    GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT,
     GANONS_TOWER_BOSS_KEY_CHEST,
-    HC_ZELDAS_LETTER,
+    PIERRE,
+    DELIVER_RUTOS_LETTER,
+    MASTER_SWORD_PEDESTAL,
     UNKNOWN_CHECK
 } RandomizerCheck;
 

soh/soh/Enhancements/randomizer.cpp

@@ -16,7 +16,7 @@ std::unordered_map<std::string, Sprite> gSeedTextures;
 
 Randomizer::Randomizer() {
     // this isn't as clean as i'd like it to be but it's working
-    Sprite dekuStickSprite = { gHookshotIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b };
+    Sprite dekuStickSprite = { gDekuStickIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b };
     gSeedTextures["Deku Stick"] = dekuStickSprite;
     Sprite dekuNutSprite = { gDekuNutIconTex, 32, 32, G_IM_FMT_RGBA, G_IM_SIZ_32b };
     gSeedTextures["Deku Nut"] = dekuNutSprite;
@@ -96,6 +96,8 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Morpha", MORPHA},
     {"Bongo Bongo", BONGO_BONGO},
     {"Twinrova", TWINROVA},
+    {"Ganon", GANON},
+    {"Gift from Sages", GIFT_FROM_SAGES},
     {"Song from Impa", SONG_FROM_IMPA},
     {"Song from Malon", SONG_FROM_MALON},
     {"Song from Saria", SONG_FROM_SARIA},
@@ -114,6 +116,19 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"KF Midos Bottom Right Chest", KF_MIDOS_BOTTOM_RIGHT_CHEST},
     {"KF Kokiri Sword Chest", KF_KOKIRI_SWORD_CHEST},
     {"KF Storms Grotto Chest", KF_STORMS_GROTTO_CHEST},
+    {"KF Links House Cow", KF_LINKS_HOUSE_COW},
+    {"KF GS Know It All House", KF_GS_KNOW_IT_ALL_HOUSE},
+    {"KF GS Bean Patch", KF_GS_BEAN_PATCH},
+    {"KF GS House of Twins", KF_GS_HOUSE_OF_TWINS},
+    {"KF Shop Item 1", KF_SHOP_ITEM_1},
+    {"KF Shop Item 2", KF_SHOP_ITEM_2},
+    {"KF Shop Item 3", KF_SHOP_ITEM_3},
+    {"KF Shop Item 4", KF_SHOP_ITEM_4},
+    {"KF Shop Item 5", KF_SHOP_ITEM_5},
+    {"KF Shop Item 6", KF_SHOP_ITEM_6},
+    {"KF Shop Item 7", KF_SHOP_ITEM_7},
+    {"KF Shop Item 8", KF_SHOP_ITEM_8},
+    {"LW Gift from Saria", LW_GIFT_FROM_SARIA},
     {"LW Ocarina Memory Game", LW_OCARINA_MEMORY_GAME},
     {"LW Target in Woods", LW_TARGET_IN_WOODS},
     {"LW Near Shortcuts Grotto Chest", LW_NEAR_SHORTCUTS_GROTTO_CHEST},
@@ -121,23 +136,77 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Deku Theater Mask of Truth", DEKU_THEATER_MASK_OF_TRUTH},
     {"LW Skull Kid", LW_SKULL_KID},
     {"LW Deku Scrub Near Bridge", LW_DEKU_SCRUB_NEAR_BRIDGE},
+    {"LW Deku Scrub Near Deku Theater Left", LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT},
+    {"LW Deku Scrub Near Deku Theater Right", LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT},
     {"LW Deku Scrub Grotto Front", LW_DEKU_SCRUB_GROTTO_FRONT},
+    {"LW Deku Scrub Grotto Rear", LW_DEKU_SCRUB_GROTTO_REAR},
+    {"LW GS Bean Patch Near Bridge", LW_GS_BEAN_PATCH_NEAR_BRIDGE},
+    {"LW GS Bean Patch Near Theater", LW_GS_BEAN_PATCH_NEAR_THEATER},
+    {"LW GS Above Theater", LW_GS_ABOVE_THEATER},
     {"SFM Wolfos Grotto Chest", SFM_WOLFOS_GROTTO_CHEST},
+    {"SFM Deku Scrub Grotto Front", SFM_DEKU_SCRUB_GROTTO_FRONT},
+    {"SFM Deku Scrub Grotto Rear", SFM_DEKU_SCRUB_GROTTO_REAR},
+    {"SFM GS", SFM_GS},
+    {"HF Ocarina of Time Item", HF_OCARINA_OF_TIME_ITEM},
     {"HF Near Market Grotto Chest", HF_NEAR_MARKET_GROTTO_CHEST},
     {"HF Tektite Grotto Freestanding PoH", HF_TEKTITE_GROTTO_FREESTANDING_POH},
     {"HF Southeast Grotto Chest", HF_SOUTHEAST_GROTTO_CHEST},
     {"HF Open Grotto Chest", HF_OPEN_GROTTO_CHEST},
     {"HF Deku Scrub Grotto", HF_DEKU_SCRUB_GROTTO},
+    {"HF Cow Grotto Cow", HF_COW_GROTTO_COW},
+    {"HF GS Cow Grotto", HF_GS_COW_GROTTO},
+    {"HF GS Near Kak Grotto", HF_GS_NEAR_KAK_GROTTO},
     {"Market Shooting Gallery Reward", MARKET_SHOOTING_GALLERY_REWARD},
     {"Market Bombchu Bowling First Prize", MARKET_BOMBCHU_BOWLING_FIRST_PRIZE},
     {"Market Bombchu Bowling Second Prize", MARKET_BOMBCHU_BOWLING_SECOND_PRIZE},
+    {"Market Bombchu Bowling Bombchus", MARKET_BOMBCHU_BOWLING_BOMBCHUS},
     {"Market Lost Dog", MARKET_LOST_DOG},
     {"Market Treasure Chest Game Reward", MARKET_TREASURE_CHEST_GAME_REWARD},
     {"Market 10 Big Poes", MARKET_10_BIG_POES},
+    {"Market GS Guard House", MARKET_GS_GUARD_HOUSE},
+    {"Market Bazaar Item 1", MARKET_BAZAAR_ITEM_1},
+    {"Market Bazaar Item 2", MARKET_BAZAAR_ITEM_2},
+    {"Market Bazaar Item 3", MARKET_BAZAAR_ITEM_3},
+    {"Market Bazaar Item 4", MARKET_BAZAAR_ITEM_4},
+    {"Market Bazaar Item 5", MARKET_BAZAAR_ITEM_5},
+    {"Market Bazaar Item 6", MARKET_BAZAAR_ITEM_6},
+    {"Market Bazaar Item 7", MARKET_BAZAAR_ITEM_7},
+    {"Market Bazaar Item 8", MARKET_BAZAAR_ITEM_8},
+    {"Market Potion Shop Item 1", MARKET_POTION_SHOP_ITEM_1},
+    {"Market Potion Shop Item 2", MARKET_POTION_SHOP_ITEM_2},
+    {"Market Potion Shop Item 3", MARKET_POTION_SHOP_ITEM_3},
+    {"Market Potion Shop Item 4", MARKET_POTION_SHOP_ITEM_4},
+    {"Market Potion Shop Item 5", MARKET_POTION_SHOP_ITEM_5},
+    {"Market Potion Shop Item 6", MARKET_POTION_SHOP_ITEM_6},
+    {"Market Potion Shop Item 7", MARKET_POTION_SHOP_ITEM_7},
+    {"Market Potion Shop Item 8", MARKET_POTION_SHOP_ITEM_8},
+    {"Market Bombchu Shop Item 1", MARKET_BOMBCHU_SHOP_ITEM_1},
+    {"Market Bombchu Shop Item 2", MARKET_BOMBCHU_SHOP_ITEM_2},
+    {"Market Bombchu Shop Item 3", MARKET_BOMBCHU_SHOP_ITEM_3},
+    {"Market Bombchu Shop Item 4", MARKET_BOMBCHU_SHOP_ITEM_4},
+    {"Market Bombchu Shop Item 5", MARKET_BOMBCHU_SHOP_ITEM_5},
+    {"Market Bombchu Shop Item 6", MARKET_BOMBCHU_SHOP_ITEM_6},
+    {"Market Bombchu Shop Item 7", MARKET_BOMBCHU_SHOP_ITEM_7},
+    {"Market Bombchu Shop Item 8", MARKET_BOMBCHU_SHOP_ITEM_8},
     {"ToT Light Arrows Cutscene", TOT_LIGHT_ARROWS_CUTSCENE},
+    {"HC Malon Egg", HC_MALON_EGG},
+    {"HC Zeldas Letter", HC_ZELDAS_LETTER},
     {"HC Great Fairy Reward", HC_GREAT_FAIRY_REWARD},
+    {"HC GS Tree", HC_GS_TREE},
+    {"HC GS Storms Grotto", HC_GS_STORMS_GROTTO},
     {"LLR Talons Chickens", LLR_TALONS_CHICKENS},
     {"LLR Freestanding PoH", LLR_FREESTANDING_POH},
+    {"LLR Deku Scrub Grotto Left", LLR_DEKU_SCRUB_GROTTO_LEFT},
+    {"LLR Deku Scrub Grotto Center", LLR_DEKU_SCRUB_GROTTO_CENTER},
+    {"LLR Deku Scrub Grotto Right", LLR_DEKU_SCRUB_GROTTO_RIGHT},
+    {"LLR Stables Left Cow", LLR_STABLES_LEFT_COW},
+    {"LLR Stables Right Cow", LLR_STABLES_RIGHT_COW},
+    {"LLR Tower Left Cow", LLR_TOWER_LEFT_COW},
+    {"LLR Tower Right Cow", LLR_TOWER_RIGHT_COW},
+    {"LLR GS House Window", LLR_GS_HOUSE_WINDOW},
+    {"LLR GS Tree", LLR_GS_TREE},
+    {"LLR GS Rain Shed", LLR_GS_RAIN_SHED},
+    {"LLR GS Back Wall", LLR_GS_BACK_WALL},
     {"Kak Anju as Child", KAK_ANJU_AS_CHILD},
     {"Kak Anju as Adult", KAK_ANJU_AS_ADULT},
     {"Kak Impas House Freestanding PoH", KAK_IMPAS_HOUSE_FREESTANDING_POH},
@@ -151,6 +220,29 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Kak 30 Gold Skulltula Reward", KAK_30_GOLD_SKULLTULA_REWARD},
     {"Kak 40 Gold Skulltula Reward", KAK_40_GOLD_SKULLTULA_REWARD},
     {"Kak 50 Gold Skulltula Reward", KAK_50_GOLD_SKULLTULA_REWARD},
+    {"Kak Impas House Cow", KAK_IMPAS_HOUSE_COW},
+    {"Kak GS Tree", KAK_GS_TREE},
+    {"Kak GS Guards House", KAK_GS_GUARDS_HOUSE},
+    {"Kak GS Watchtower", KAK_GS_WATCHTOWER},
+    {"Kak GS Skulltula House", KAK_GS_SKULLTULA_HOUSE},
+    {"Kak GS House Under Construction", KAK_GS_HOUSE_UNDER_CONSTRUCTION},
+    {"Kak GS Above Impas House", KAK_GS_ABOVE_IMPAS_HOUSE},
+    {"Kak Bazaar Item 1", KAK_BAZAAR_ITEM_1},
+    {"Kak Bazaar Item 2", KAK_BAZAAR_ITEM_2},
+    {"Kak Bazaar Item 3", KAK_BAZAAR_ITEM_3},
+    {"Kak Bazaar Item 4", KAK_BAZAAR_ITEM_4},
+    {"Kak Bazaar Item 5", KAK_BAZAAR_ITEM_5},
+    {"Kak Bazaar Item 6", KAK_BAZAAR_ITEM_6},
+    {"Kak Bazaar Item 7", KAK_BAZAAR_ITEM_7},
+    {"Kak Bazaar Item 8", KAK_BAZAAR_ITEM_8},
+    {"Kak Potion Shop Item 1", KAK_POTION_SHOP_ITEM_1},
+    {"Kak Potion Shop Item 2", KAK_POTION_SHOP_ITEM_2},
+    {"Kak Potion Shop Item 3", KAK_POTION_SHOP_ITEM_3},
+    {"Kak Potion Shop Item 4", KAK_POTION_SHOP_ITEM_4},
+    {"Kak Potion Shop Item 5", KAK_POTION_SHOP_ITEM_5},
+    {"Kak Potion Shop Item 6", KAK_POTION_SHOP_ITEM_6},
+    {"Kak Potion Shop Item 7", KAK_POTION_SHOP_ITEM_7},
+    {"Kak Potion Shop Item 8", KAK_POTION_SHOP_ITEM_8},
     {"Graveyard Shield Grave Chest", GRAVEYARD_SHIELD_GRAVE_CHEST},
     {"Graveyard Heart Piece Grave Chest", GRAVEYARD_HEART_PIECE_GRAVE_CHEST},
     {"Graveyard Royal Familys Tomb Chest", GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST},
@@ -158,67 +250,208 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Graveyard Dampe Gravedigging Tour", GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR},
     {"Graveyard Hookshot Chest", GRAVEYARD_HOOKSHOT_CHEST},
     {"Graveyard Dampe Race Freestanding PoH", GRAVEYARD_DAMPE_RACE_FREESTANDING_POH},
+    {"Graveyard GS Bean Patch", GRAVEYARD_GS_BEAN_PATCH},
+    {"Graveyard GS Wall", GRAVEYARD_GS_WALL},
     {"DMT Freestanding PoH", DMT_FREESTANDING_POH},
     {"DMT Chest", DMT_CHEST},
     {"DMT Storms Grotto Chest", DMT_STORMS_GROTTO_CHEST},
     {"DMT Great Fairy Reward", DMT_GREAT_FAIRY_REWARD},
     {"DMT Biggoron", DMT_BIGGORON},
+    {"DMT Cow Grotto Cow", DMT_COW_GROTTO_COW},
+    {"DMT GS Near Kak", DMT_GS_NEAR_KAK},
+    {"DMT GS Bean Patch", DMT_GS_BEAN_PATCH},
+    {"DMT GS Above Dodongos Cavern", DMT_GS_ABOVE_DODONGOS_CAVERN},
+    {"DMT GS Falling Rocks Path", DMT_GS_FALLING_ROCKS_PATH},
     {"GC Darunias Joy", GC_DARUNIAS_JOY},
     {"GC Pot Freestanding PoH", GC_POT_FREESTANDING_POH},
     {"GC Rolling Goron as Child", GC_ROLLING_GORON_AS_CHILD},
     {"GC Rolling Goron as Adult", GC_ROLLING_GORON_AS_ADULT},
+    {"GC Medigoron", GC_MEDIGORON},
     {"GC Maze Left Chest", GC_MAZE_LEFT_CHEST},
     {"GC Maze Right Chest", GC_MAZE_RIGHT_CHEST},
     {"GC Maze Center Chest", GC_MAZE_CENTER_CHEST},
+    {"GC Deku Scrub Grotto Left", GC_DEKU_SCRUB_GROTTO_LEFT},
+    {"GC Deku Scrub Grotto Center", GC_DEKU_SCRUB_GROTTO_CENTER},
+    {"GC Deku Scrub Grotto Right", GC_DEKU_SCRUB_GROTTO_RIGHT},
+    {"GC GS Center Platform", GC_GS_CENTER_PLATFORM},
+    {"GC GS Boulder Maze", GC_GS_BOULDER_MAZE},
+    {"GC Shop Item 1", GC_SHOP_ITEM_1},
+    {"GC Shop Item 2", GC_SHOP_ITEM_2},
+    {"GC Shop Item 3", GC_SHOP_ITEM_3},
+    {"GC Shop Item 4", GC_SHOP_ITEM_4},
+    {"GC Shop Item 5", GC_SHOP_ITEM_5},
+    {"GC Shop Item 6", GC_SHOP_ITEM_6},
+    {"GC Shop Item 7", GC_SHOP_ITEM_7},
+    {"GC Shop Item 8", GC_SHOP_ITEM_8},
     {"DMC Volcano Freestanding PoH", DMC_VOLCANO_FREESTANDING_POH},
     {"DMC Wall Freestanding PoH", DMC_WALL_FREESTANDING_POH},
     {"DMC Upper Grotto Chest", DMC_UPPER_GROTTO_CHEST},
     {"DMC Great Fairy Reward", DMC_GREAT_FAIRY_REWARD},
+    {"DMC Deku Scrub", DMC_DEKU_SCRUB},
+    {"DMC Deku Scrub Grotto Left", DMC_DEKU_SCRUB_GROTTO_LEFT},
+    {"DMC Deku Scrub Grotto Center", DMC_DEKU_SCRUB_GROTTO_CENTER},
+    {"DMC Deku Scrub Grotto Right", DMC_DEKU_SCRUB_GROTTO_RIGHT},
+    {"DMC GS Crate", DMC_GS_CRATE},
+    {"DMC GS Bean Patch", DMC_GS_BEAN_PATCH},
+    {"ZR Magic Bean Salesman", ZR_MAGIC_BEAN_SALESMAN},
     {"ZR Open Grotto Chest", ZR_OPEN_GROTTO_CHEST},
+    {"ZR Frogs Zeldas Lullaby", ZR_FROGS_ZELDAS_LULLABY},
+    {"ZR Frogs Eponas Song", ZR_FROGS_EPONAS_SONG},
+    {"ZR Frogs Sarias Song", ZR_FROGS_SARIAS_SONG},
+    {"ZR Frogs Suns Song", ZR_FROGS_SUNS_SONG},
+    {"ZR Frogs Song of Time", ZR_FROGS_SONG_OF_TIME},
     {"ZR Frogs in the Rain", ZR_FROGS_IN_THE_RAIN},
     {"ZR Frogs Ocarina Game", ZR_FROGS_OCARINA_GAME},
     {"ZR Near Open Grotto Freestanding PoH", ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH},
     {"ZR Near Domain Freestanding PoH", ZR_NEAR_DOMAIN_FREESTANDING_POH},
+    {"ZR Deku Scrub Grotto Front", ZR_DEKU_SCRUB_GROTTO_FRONT},
+    {"ZR Deku Scrub Grotto Rear", ZR_DEKU_SCRUB_GROTTO_REAR},
+    {"ZR GS Tree", ZR_GS_TREE},
+    {"ZR GS Ladder", ZR_GS_LADDER},
+    {"ZR GS Near Raised Grottos", ZR_GS_NEAR_RAISED_GROTTOS},
+    {"ZR GS Above Bridge", ZR_GS_ABOVE_BRIDGE},
     {"ZD Diving Minigame", ZD_DIVING_MINIGAME},
     {"ZD Chest", ZD_CHEST},
     {"ZD King Zora Thawed", ZD_KING_ZORA_THAWED},
+    {"ZD GS Frozen Waterfall", ZD_GS_FROZEN_WATERFALL},
+    {"ZD Shop Item 1", ZD_SHOP_ITEM_1},
+    {"ZD Shop Item 2", ZD_SHOP_ITEM_2},
+    {"ZD Shop Item 3", ZD_SHOP_ITEM_3},
+    {"ZD Shop Item 4", ZD_SHOP_ITEM_4},
+    {"ZD Shop Item 5", ZD_SHOP_ITEM_5},
+    {"ZD Shop Item 6", ZD_SHOP_ITEM_6},
+    {"ZD Shop Item 7", ZD_SHOP_ITEM_7},
+    {"ZD Shop Item 8", ZD_SHOP_ITEM_8},
     {"ZF Great Fairy Reward", ZF_GREAT_FAIRY_REWARD},
     {"ZF Iceberg Freestanding PoH", ZF_ICEBERG_FREESTANDING_POH},
     {"ZF Bottom Freestanding PoH", ZF_BOTTOM_FREESTANDING_POH},
+    {"ZF GS Above the Log", ZF_GS_ABOVE_THE_LOG},
+    {"ZF GS Tree", ZF_GS_TREE},
+    {"ZF GS Hidden Cave", ZF_GS_HIDDEN_CAVE},
     {"LH Underwater Item", LH_UNDERWATER_ITEM},
     {"LH Child Fishing", LH_CHILD_FISHING},
     {"LH Adult Fishing", LH_ADULT_FISHING},
     {"LH Lab Dive", LH_LAB_DIVE},
     {"LH Freestanding PoH", LH_FREESTANDING_POH},
     {"LH Sun", LH_SUN},
+    {"LH Deku Scrub Grotto Left", LH_DEKU_SCRUB_GROTTO_LEFT},
+    {"LH Deku Scrub Grotto Center", LH_DEKU_SCRUB_GROTTO_CENTER},
+    {"LH Deku Scrub Grotto Right", LH_DEKU_SCRUB_GROTTO_RIGHT},
+    {"LH GS Bean Patch", LH_GS_BEAN_PATCH},
+    {"LH GS Lab Wall", LH_GS_LAB_WALL},
+    {"LH GS Small Island", LH_GS_SMALL_ISLAND},
+    {"LH GS Lab Crate", LH_GS_LAB_CRATE},
+    {"LH GS Tree", LH_GS_TREE},
     {"GV Crate Freestanding PoH", GV_CRATE_FREESTANDING_POH},
     {"GV Waterfall Freestanding PoH", GV_WATERFALL_FREESTANDING_POH},
     {"GV Chest", GV_CHEST},
+    {"GV Deku Scrub Grotto Front", GV_DEKU_SCRUB_GROTTO_FRONT},
+    {"GV Deku Scrub Grotto Rear", GV_DEKU_SCRUB_GROTTO_REAR},
+    {"GV Cow", GV_COW},
+    {"GV GS Small Bridge", GV_GS_SMALL_BRIDGE},
+    {"GV GS Bean Patch", GV_GS_BEAN_PATCH},
+    {"GV GS Behind Tent", GV_GS_BEHIND_TENT},
+    {"GV GS Pillar", GV_GS_PILLAR},
     {"GF Chest", GF_CHEST},
     {"GF HBA 1000 Points", GF_HBA_1000_POINTS},
     {"GF HBA 1500 Points", GF_HBA_1500_POINTS},
-    {"HC Zeldas Letter", HC_ZELDAS_LETTER},
+    {"GF GS Top Floor", GF_GS_TOP_FLOOR},
+    {"GF GS Archery Range", GF_GS_ARCHERY_RANGE},
+    {"Hideout Jail Guard (1 Torch)", HIDEOUT_JAIL_GUARD_1_TORCH},
+    {"Hideout Jail Guard (2 Torches)", HIDEOUT_JAIL_GUARD_2_TORCHES},
+    {"Hideout Jail Guard (3 Torches)", HIDEOUT_JAIL_GUARD_3_TORCHES},
+    {"Hideout Jail Guard (4 Torches)", HIDEOUT_JAIL_GUARD_4_TORCHES},
+    {"Hideout Gerudo Membership Card", HIDEOUT_GERUDO_MEMBERSHIP_CARD},
+    {"Wasteland Bombchu Salesman", WASTELAND_BOMBCHU_SALESMAN},
     {"Wasteland Chest", WASTELAND_CHEST},
+    {"Wasteland GS", WASTELAND_GS},
     {"Colossus Great Fairy Reward", COLOSSUS_GREAT_FAIRY_REWARD},
     {"Colossus Freestanding PoH", COLOSSUS_FREESTANDING_POH},
+    {"Colossus Deku Scrub Grotto Front", COLOSSUS_DEKU_SCRUB_GROTTO_FRONT},
+    {"Colossus Deku Scrub Grotto Rear", COLOSSUS_DEKU_SCRUB_GROTTO_REAR},
+    {"Colossus GS Bean Patch", COLOSSUS_GS_BEAN_PATCH},
+    {"Colossus GS Tree", COLOSSUS_GS_TREE},
+    {"Colossus GS Hill", COLOSSUS_GS_HILL},
     {"OGC Great Fairy Reward", OGC_GREAT_FAIRY_REWARD},
+    {"OGC GS", OGC_GS},
     {"Deku Tree Map Chest", DEKU_TREE_MAP_CHEST},
     {"Deku Tree Slingshot Room Side Chest", DEKU_TREE_SLINGSHOT_ROOM_SIDE_CHEST},
     {"Deku Tree Slingshot Chest", DEKU_TREE_SLINGSHOT_CHEST},
     {"Deku Tree Compass Chest", DEKU_TREE_COMPASS_CHEST},
     {"Deku Tree Compass Room Side Chest", DEKU_TREE_COMPASS_ROOM_SIDE_CHEST},
     {"Deku Tree Basement Chest", DEKU_TREE_BASEMENT_CHEST},
+    {"Deku Tree GS Compass Room", DEKU_TREE_GS_COMPASS_ROOM},
+    {"Deku Tree GS Basement Vines", DEKU_TREE_GS_BASEMENT_VINES},
+    {"Deku Tree GS Basement Gate", DEKU_TREE_GS_BASEMENT_GATE},
+    {"Deku Tree GS Basement Back Room", DEKU_TREE_GS_BASEMENT_BACK_ROOM},
+    {"Deku Tree MQ Map Chest", DEKU_TREE_MQ_MAP_CHEST},
+    {"Deku Tree MQ Slingshot Chest", DEKU_TREE_MQ_SLINGSHOT_CHEST},
+    {"Deku Tree MQ Slingshot Room Back Chest", DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST},
+    {"Deku Tree MQ Compass Chest", DEKU_TREE_MQ_COMPASS_CHEST},
+    {"Deku Tree MQ Basement Chest", DEKU_TREE_MQ_BASEMENT_CHEST},
+    {"Deku Tree MQ Before Spinning Log Chest", DEKU_TREE_MQ_BEFORE_SPINNING_LOG_CHEST},
+    {"Deku Tree MQ After Spinning Log Chest", DEKU_TREE_MQ_AFTER_SPINNING_LOG_CHEST},
+    {"Deku Tree MQ Deku Scrub", DEKU_TREE_MQ_DEKU_SCRUB},
+    {"Deku Tree MQ GS Lobby", DEKU_TREE_MQ_GS_LOBBY},
+    {"Deku Tree MQ GS Compass Room", DEKU_TREE_MQ_GS_COMPASS_ROOM},
+    {"Deku Tree MQ GS Basement Graves Room", DEKU_TREE_MQ_GS_BASEMENT_GRAVES_ROOM},
+    {"Deku Tree MQ GS Basement Back Room", DEKU_TREE_MQ_GS_BASEMENT_BACK_ROOM},
     {"Deku Tree Queen Gohma Heart", DEKU_TREE_QUEEN_GOHMA_HEART},
     {"Dodongos Cavern Map Chest", DODONGOS_CAVERN_MAP_CHEST},
     {"Dodongos Cavern Compass Chest", DODONGOS_CAVERN_COMPASS_CHEST},
     {"Dodongos Cavern Bomb Flower Platform Chest", DODONGOS_CAVERN_BOMB_FLOWER_PLATFORM_CHEST},
     {"Dodongos Cavern Bomb Bag Chest", DODONGOS_CAVERN_BOMB_BAG_CHEST},
     {"Dodongos Cavern End of Bridge Chest", DODONGOS_CAVERN_END_OF_BRIDGE_CHEST},
+    {"Dodongos Cavern Deku Scrub Side Room Near Dodongos", DODONGOS_CAVERN_DEKU_SCRUB_SIDE_ROOM_NEAR_DODONGOS},
+    {"Dodongos Cavern Deku Scrub Lobby", DODONGOS_CAVERN_DEKU_SCRUB_LOBBY},
+    {"Dodongos Cavern Deku Scrub Near Bomb Bag Left", DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_LEFT},
+    {"Dodongos Cavern Deku Scrub Near Bomb Bag Right", DODONGOS_CAVERN_DEKU_SCRUB_NEAR_BOMB_BAG_RIGHT},
+    {"Dodongos Cavern GS Side Room Near Lower Lizalfos", DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS},
+    {"Dodongos Cavern GS Scarecrow", DODONGOS_CAVERN_GS_SCARECROW},
+    {"Dodongos Cavern GS Alcove Above Stairs", DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS},
+    {"Dodongos Cavern GS Vines Above Stairs", DODONGOS_CAVERN_GS_VINES_ABOVE_STAIRS},
+    {"Dodongos Cavern GS Back Room", DODONGOS_CAVERN_GS_BACK_ROOM},
+    {"Dodongos Cavern MQ Map Chest", DODONGOS_CAVERN_MQ_MAP_CHEST},
+    {"Dodongos Cavern MQ Bomb Bag Chest", DODONGOS_CAVERN_MQ_BOMB_BAG_CHEST},
+    {"Dodongos Cavern MQ Torch Puzzle Room Chest", DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST},
+    {"Dodongos Cavern MQ Larvae Room Chest", DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST},
+    {"Dodongos Cavern MQ Compass Chest", DODONGOS_CAVERN_MQ_COMPASS_CHEST},
+    {"Dodongos Cavern MQ Under Grave Chest", DODONGOS_CAVERN_MQ_UNDER_GRAVE_CHEST},
+    {"Dodongos Cavern MQ Deku Scrub Lobby Front", DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_FRONT},
+    {"Dodongos Cavern MQ Deku Scrub Lobby Rear", DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR},
+    {"Dodongos Cavern MQ Deku Scrub Side Room Near Lower Lizalfos", DODONGOS_CAVERN_MQ_DEKU_SCRUB_SIDE_ROOM_NEAR_LOWER_LIZALFOS},
+    {"Dodongos Cavern MQ Deku Scrub Staircase", DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE},
+    {"Dodongos Cavern MQ GS Scrub Room", DODONGOS_CAVERN_MQ_GS_SCRUB_ROOM},
+    {"Dodongos Cavern MQ GS Larvae Room", DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM},
+    {"Dodongos Cavern MQ GS Lizalfos Room", DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM},
+    {"Dodongos Cavern MQ GS Song of Time Block Room", DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM},
+    {"Dodongos Cavern MQ GS Back Area", DODONGOS_CAVERN_MQ_GS_BACK_AREA},
     {"Dodongos Cavern Boss Room Chest", DODONGOS_CAVERN_BOSS_ROOM_CHEST},
     {"Dodongos Cavern King Dodongo Heart", DODONGOS_CAVERN_KING_DODONGO_HEART},
     {"Jabu Jabus Belly Boomerang Chest", JABU_JABUS_BELLY_BOOMERANG_CHEST},
     {"Jabu Jabus Belly Map Chest", JABU_JABUS_BELLY_MAP_CHEST},
     {"Jabu Jabus Belly Compass Chest", JABU_JABUS_BELLY_COMPASS_CHEST},
+    {"Jabu Jabus Belly Deku Scrub", JABU_JABUS_BELLY_DEKU_SCRUB},
+    {"Jabu Jabus Belly GS Water Switch Room", JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM},
+    {"Jabu Jabus Belly GS Lobby Basement Lower", JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_LOWER},
+    {"Jabu Jabus Belly GS Lobby Basement Upper", JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER},
+    {"Jabu Jabus Belly GS Near Boss", JABU_JABUS_BELLY_GS_NEAR_BOSS},
+    {"Jabu Jabus Belly MQ Map Chest", JABU_JABUS_BELLY_MQ_MAP_CHEST},
+    {"Jabu Jabus Belly MQ First Room Side Chest", JABU_JABUS_BELLY_MQ_FIRST_ROOM_SIDE_CHEST},
+    {"Jabu Jabus Belly MQ Second Room Lower Chest", JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST},
+    {"Jabu Jabus Belly MQ Compass Chest", JABU_JABUS_BELLY_MQ_COMPASS_CHEST},
+    {"Jabu Jabus Belly MQ Basement Near Switches Chest", JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST},
+    {"Jabu Jabus Belly MQ Basement Near Vines Chest", JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST},
+    {"Jabu Jabus Belly MQ Boomerang Room Small Chest", JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST},
+    {"Jabu Jabus Belly MQ Boomerang Chest", JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST},
+    {"Jabu Jabus Belly MQ Falling Like Like Room Chest", JABU_JABUS_BELLY_MQ_FALLING_LIKE_LIKE_ROOM_CHEST},
+    {"Jabu Jabus Belly MQ Second Room Upper Chest", JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST},
+    {"Jabu Jabus Belly MQ Near Boss Chest", JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST},
+    {"Jabu Jabus Belly MQ Cow", JABU_JABUS_BELLY_MQ_COW},
+    {"Jabu Jabus Belly MQ GS Boomerang Chest Room", JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM},
+    {"Jabu Jabus Belly MQ GS Tailpasaran Room", JABU_JABUS_BELLY_MQ_GS_TAILPASARAN_ROOM},
+    {"Jabu Jabus Belly MQ GS Invisible Enemies Room", JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM},
+    {"Jabu Jabus Belly MQ GS Near Boss", JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS},
     {"Jabu Jabus Belly Barinade Heart", JABU_JABUS_BELLY_BARINADE_HEART},
     {"Bottom of the Well Front Left Fake Wall Chest", BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST},
     {"Bottom of the Well Front Center Bombable Chest", BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST},
@@ -234,6 +467,17 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Bottom of the Well Underwater Front Chest", BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST},
     {"Bottom of the Well Invisible Chest", BOTTOM_OF_THE_WELL_INVISIBLE_CHEST},
     {"Bottom of the Well Lens of Truth Chest", BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST},
+    {"Bottom of the Well GS West Inner Room", BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM},
+    {"Bottom of the Well GS East Inner Room", BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM},
+    {"Bottom of the Well GS Like Like Cage", BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE},
+    {"Bottom of the Well MQ Map Chest", BOTTOM_OF_THE_WELL_MQ_MAP_CHEST},
+    {"Bottom of the Well MQ East Inner Room Freestanding Key", BOTTOM_OF_THE_WELL_MQ_EAST_INNER_ROOM_FREESTANDING_KEY},
+    {"Bottom of the Well MQ Compass Chest", BOTTOM_OF_THE_WELL_MQ_COMPASS_CHEST},
+    {"Bottom of the Well MQ Dead Hand Freestanding Key", BOTTOM_OF_THE_WELL_MQ_DEAD_HAND_FREESTANDING_KEY},
+    {"Bottom of the Well MQ Lens of Truth Chest", BOTTOM_OF_THE_WELL_MQ_LENS_OF_TRUTH_CHEST},
+    {"Bottom of the Well MQ GS Coffin Room", BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM},
+    {"Bottom of the Well MQ GS West Inner Room", BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM},
+    {"Bottom of the Well MQ GS Basement", BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT},
     {"Forest Temple First Room Chest", FOREST_TEMPLE_FIRST_ROOM_CHEST},
     {"Forest Temple First Stalfos Chest", FOREST_TEMPLE_FIRST_STALFOS_CHEST},
     {"Forest Temple Raised Island Courtyard Chest", FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST},
@@ -247,6 +491,28 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Forest Temple Blue Poe Chest", FOREST_TEMPLE_BLUE_POE_CHEST},
     {"Forest Temple Falling Ceiling Room Chest", FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST},
     {"Forest Temple Basement Chest", FOREST_TEMPLE_BASEMENT_CHEST},
+    {"Forest Temple GS First Room", FOREST_TEMPLE_GS_FIRST_ROOM},
+    {"Forest Temple GS Lobby", FOREST_TEMPLE_GS_LOBBY},
+    {"Forest Temple GS Raised Island Courtyard", FOREST_TEMPLE_GS_RAISED_ISLAND_COURTYARD},
+    {"Forest Temple GS Level Island Courtyard", FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD},
+    {"Forest Temple GS Basement", FOREST_TEMPLE_GS_BASEMENT},
+    {"Forest Temple MQ First Room Chest", FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST},
+    {"Forest Temple MQ Wolfos Chest", FOREST_TEMPLE_MQ_WOLFOS_CHEST},
+    {"Forest Temple MQ Well Chest", FOREST_TEMPLE_MQ_WELL_CHEST},
+    {"Forest Temple MQ Raised Island Courtyard Lower Chest", FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_LOWER_CHEST},
+    {"Forest Temple MQ Raised Island Courtyard Upper Chest", FOREST_TEMPLE_MQ_RAISED_ISLAND_COURTYARD_UPPER_CHEST},
+    {"Forest Temple MQ Boss Key Chest", FOREST_TEMPLE_MQ_BOSS_KEY_CHEST},
+    {"Forest Temple MQ Redead Chest", FOREST_TEMPLE_MQ_REDEAD_CHEST},
+    {"Forest Temple MQ Map Chest", FOREST_TEMPLE_MQ_MAP_CHEST},
+    {"Forest Temple MQ Bow Chest", FOREST_TEMPLE_MQ_BOW_CHEST},
+    {"Forest Temple MQ Compass Chest", FOREST_TEMPLE_MQ_COMPASS_CHEST},
+    {"Forest Temple MQ Falling Ceiling Room Chest", FOREST_TEMPLE_MQ_FALLING_CEILING_ROOM_CHEST},
+    {"Forest Temple MQ Basement Chest", FOREST_TEMPLE_MQ_BASEMENT_CHEST},
+    {"Forest Temple MQ GS First Hallway", FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY},
+    {"Forest Temple MQ GS Raised Island Courtyard", FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD},
+    {"Forest Temple MQ GS Level Island Courtyard", FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD},
+    {"Forest Temple MQ GS Well", FOREST_TEMPLE_MQ_GS_WELL},
+    {"Forest Temple MQ GS Block Push Room", FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM},
     {"Forest Temple Phantom Ganon Heart", FOREST_TEMPLE_PHANTOM_GANON_HEART},
     {"Fire Temple Near Boss Chest", FIRE_TEMPLE_NEAR_BOSS_CHEST},
     {"Fire Temple Flare Dancer Chest", FIRE_TEMPLE_FLARE_DANCER_CHEST},
@@ -262,6 +528,28 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Fire Temple Compass Chest", FIRE_TEMPLE_COMPASS_CHEST},
     {"Fire Temple Megaton Hammer Chest", FIRE_TEMPLE_MEGATON_HAMMER_CHEST},
     {"Fire Temple Highest Goron Chest", FIRE_TEMPLE_HIGHEST_GORON_CHEST},
+    {"Fire Temple GS Boss Key Loop", FIRE_TEMPLE_GS_BOSS_KEY_LOOP},
+    {"Fire Temple GS Song of Time Room", FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM},
+    {"Fire Temple GS Boulder Maze", FIRE_TEMPLE_GS_BOULDER_MAZE},
+    {"Fire Temple GS Scarecrow Climb", FIRE_TEMPLE_GS_SCARECROW_CLIMB},
+    {"Fire Temple GS Scarecrow Top", FIRE_TEMPLE_GS_SCARECROW_TOP},
+    {"Fire Temple MQ Map Room Side Chest", FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST},
+    {"Fire Temple MQ Megaton Hammer Chest", FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST},
+    {"Fire Temple MQ Map Chest", FIRE_TEMPLE_MQ_MAP_CHEST},
+    {"Fire Temple MQ Near Boss Chest", FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST},
+    {"Fire Temple MQ Big Lava Room Blocked Door Chest", FIRE_TEMPLE_MQ_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST},
+    {"Fire Temple MQ Boss Key Chest", FIRE_TEMPLE_MQ_BOSS_KEY_CHEST},
+    {"Fire Temple MQ Lizalfos Maze Side Room Chest", FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST},
+    {"Fire Temple MQ Compass Chest", FIRE_TEMPLE_MQ_COMPASS_CHEST},
+    {"Fire Temple MQ Lizalfos Maze Upper Chest", FIRE_TEMPLE_MQ_LIZALFOS_MAZE_UPPER_CHEST},
+    {"Fire Temple MQ Lizalfos Maze Lower Chest", FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST},
+    {"Fire Temple MQ Freestanding Key", FIRE_TEMPLE_MQ_FREESTANDING_KEY},
+    {"Fire Temple MQ Chest On Fire", FIRE_TEMPLE_MQ_CHEST_ON_FIRE},
+    {"Fire Temple MQ GS Big Lava Room Open Door", FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR},
+    {"Fire Temple MQ GS Skull On Fire", FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE},
+    {"Fire Temple MQ GS Fire Wall Maze Center", FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_CENTER},
+    {"Fire Temple MQ GS Fire Wall Maze Side Room", FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM},
+    {"Fire Temple MQ GS Above Fire Wall Maze", FIRE_TEMPLE_MQ_GS_ABOVE_FIRE_WALL_MAZE},
     {"Fire Temple Volvagia Heart", FIRE_TEMPLE_VOLVAGIA_HEART},
     {"Water Temple Compass Chest", WATER_TEMPLE_COMPASS_CHEST},
     {"Water Temple Map Chest", WATER_TEMPLE_MAP_CHEST},
@@ -273,6 +561,22 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Water Temple Longshot Chest", WATER_TEMPLE_LONGSHOT_CHEST},
     {"Water Temple River Chest", WATER_TEMPLE_RIVER_CHEST},
     {"Water Temple Dragon Chest", WATER_TEMPLE_DRAGON_CHEST},
+    {"Water Temple GS Behind Gate", WATER_TEMPLE_GS_BEHIND_GATE},
+    {"Water Temple GS Near Boss Key Chest", WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST},
+    {"Water Temple GS Central Pillar", WATER_TEMPLE_GS_CENTRAL_PILLAR},
+    {"Water Temple GS Falling Platform Room", WATER_TEMPLE_GS_FALLING_PLATFORM_ROOM},
+    {"Water Temple GS River", WATER_TEMPLE_GS_RIVER},
+    {"Water Temple MQ Longshot Chest", WATER_TEMPLE_MQ_LONGSHOT_CHEST},
+    {"Water Temple MQ Map Chest", WATER_TEMPLE_MQ_MAP_CHEST},
+    {"Water Temple MQ Compass Chest", WATER_TEMPLE_MQ_COMPASS_CHEST},
+    {"Water Temple MQ Central Pillar Chest", WATER_TEMPLE_MQ_CENTRAL_PILLAR_CHEST},
+    {"Water Temple MQ Boss Key Chest", WATER_TEMPLE_MQ_BOSS_KEY_CHEST},
+    {"Water Temple MQ Freestanding Key", WATER_TEMPLE_MQ_FREESTANDING_KEY},
+    {"Water Temple MQ GS Lizalfos Hallway", WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY},
+    {"Water Temple MQ GS Before Upper Water Switch", WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH},
+    {"Water Temple MQ GS River", WATER_TEMPLE_MQ_GS_RIVER},
+    {"Water Temple MQ GS Freestanding Key Area", WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA},
+    {"Water Temple MQ GS Triple Wall Torch", WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH},
     {"Water Temple Morpha Heart", WATER_TEMPLE_MORPHA_HEART},
     {"Shadow Temple Map Chest", SHADOW_TEMPLE_MAP_CHEST},
     {"Shadow Temple Hover Boots Chest", SHADOW_TEMPLE_HOVER_BOOTS_CHEST},
@@ -291,6 +595,36 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Shadow Temple Spike Walls Left Chest", SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST},
     {"Shadow Temple Boss Key Chest", SHADOW_TEMPLE_BOSS_KEY_CHEST},
     {"Shadow Temple Invisible Floormaster Chest", SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST},
+    {"Shadow Temple GS Like Like Room", SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM},
+    {"Shadow Temple GS Falling Spikes Room", SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM},
+    {"Shadow Temple GS Single Giant Pot", SHADOW_TEMPLE_GS_SINGLE_GIANT_POT},
+    {"Shadow Temple GS Near Ship", SHADOW_TEMPLE_GS_NEAR_SHIP},
+    {"Shadow Temple GS Triple Giant Pot", SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT},
+    {"Shadow Temple MQ Early Gibdos Chest", SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST},
+    {"Shadow Temple MQ Map Chest", SHADOW_TEMPLE_MQ_MAP_CHEST},
+    {"Shadow Temple MQ Near Ship Invisible Chest", SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST},
+    {"Shadow Temple MQ Compass Chest", SHADOW_TEMPLE_MQ_COMPASS_CHEST},
+    {"Shadow Temple MQ Hover Boots Chest", SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST},
+    {"Shadow Temple MQ Invisible Blades Invisible Chest", SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST},
+    {"Shadow Temple MQ Invisible Blades Visible Chest", SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST},
+    {"Shadow Temple MQ Beamos Silver Rupees Chest", SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST},
+    {"Shadow Temple MQ Falling Spikes Lower Chest", SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST},
+    {"Shadow Temple MQ Falling Spikes Upper Chest", SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST},
+    {"Shadow Temple MQ Falling Spikes Switch Chest", SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST},
+    {"Shadow Temple MQ Invisible Spikes Chest", SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST},
+    {"Shadow Temple MQ Stalfos Room Chest", SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST},
+    {"Shadow Temple MQ Wind Hint Chest", SHADOW_TEMPLE_MQ_WIND_HINT_CHEST},
+    {"Shadow Temple MQ After Wind Hidden Chest", SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST},
+    {"Shadow Temple MQ After Wind Enemy Chest", SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST},
+    {"Shadow Temple MQ Boss Key Chest", SHADOW_TEMPLE_MQ_BOSS_KEY_CHEST},
+    {"Shadow Temple MQ Spike Walls Left Chest", SHADOW_TEMPLE_MQ_SPIKE_WALLS_LEFT_CHEST},
+    {"Shadow Temple MQ Freestanding Key", SHADOW_TEMPLE_MQ_FREESTANDING_KEY},
+    {"Shadow Temple MQ Bomb Flower Chest", SHADOW_TEMPLE_MQ_BOMB_FLOWER_CHEST},
+    {"Shadow Temple MQ GS Falling Spikes Room", SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM},
+    {"Shadow Temple MQ GS Wind Hint Room", SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM},
+    {"Shadow Temple MQ GS After Wind", SHADOW_TEMPLE_MQ_GS_AFTER_WIND},
+    {"Shadow Temple MQ GS After Ship", SHADOW_TEMPLE_MQ_GS_AFTER_SHIP},
+    {"Shadow Temple MQ GS Near Boss", SHADOW_TEMPLE_MQ_GS_NEAR_BOSS},
     {"Shadow Temple Bongo Bongo Heart", SHADOW_TEMPLE_BONGO_BONGO_HEART},
     {"Spirit Temple Child Bridge Chest", SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST},
     {"Spirit Temple Child Early Torches Chest", SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST},
@@ -298,6 +632,17 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Spirit Temple Child Climb East Chest", SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST},
     {"Spirit Temple Map Chest", SPIRIT_TEMPLE_MAP_CHEST},
     {"Spirit Temple Sun Block Room Chest", SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST},
+    {"Spirit Temple MQ Entrance Front Left Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_LEFT_CHEST},
+    {"Spirit Temple MQ Entrance Back Right Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST},
+    {"Spirit Temple MQ Entrance Front Right Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST},
+    {"Spirit Temple MQ Entrance Back Left Chest", SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST},
+    {"Spirit Temple MQ Map Chest", SPIRIT_TEMPLE_MQ_MAP_CHEST},
+    {"Spirit Temple MQ Map Room Enemy Chest", SPIRIT_TEMPLE_MQ_MAP_ROOM_ENEMY_CHEST},
+    {"Spirit Temple MQ Child Climb North Chest", SPIRIT_TEMPLE_MQ_CHILD_CLIMB_NORTH_CHEST},
+    {"Spirit Temple MQ Child Climb South Chest", SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST},
+    {"Spirit Temple MQ Compass Chest", SPIRIT_TEMPLE_MQ_COMPASS_CHEST},
+    {"Spirit Temple MQ Silver Block Hallway Chest", SPIRIT_TEMPLE_MQ_SILVER_BLOCK_HALLWAY_CHEST},
+    {"Spirit Temple MQ Sun Block Room Chest", SPIRIT_TEMPLE_MQ_SUN_BLOCK_ROOM_CHEST},
     {"Spirit Temple Silver Gauntlets Chest", SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST},
     {"Spirit Temple Compass Chest", SPIRIT_TEMPLE_COMPASS_CHEST},
     {"Spirit Temple Early Adult Right Chest", SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST},
@@ -308,14 +653,43 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Spirit Temple Near Four Armos Chest", SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST},
     {"Spirit Temple Hallway Right Invisible Chest", SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST},
     {"Spirit Temple Hallway Left Invisible Chest", SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST},
+    {"Spirit Temple MQ Child Hammer Switch Chest", SPIRIT_TEMPLE_MQ_CHILD_HAMMER_SWITCH_CHEST},
+    {"Spirit Temple MQ Statue Room Lullaby Chest", SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST},
+    {"Spirit Temple MQ Statue Room Invisible Chest", SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST},
+    {"Spirit Temple MQ Leever Room Chest", SPIRIT_TEMPLE_MQ_LEEVER_ROOM_CHEST},
+    {"Spirit Temple MQ Symphony Room Chest", SPIRIT_TEMPLE_MQ_SYMPHONY_ROOM_CHEST},
+    {"Spirit Temple MQ Beamos Room Chest", SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST},
+    {"Spirit Temple MQ Chest Switch Chest", SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST},
+    {"Spirit Temple MQ Boss Key Chest", SPIRIT_TEMPLE_MQ_BOSS_KEY_CHEST},
     {"Spirit Temple Mirror Shield Chest", SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST},
     {"Spirit Temple Boss Key Chest", SPIRIT_TEMPLE_BOSS_KEY_CHEST},
     {"Spirit Temple Topmost Chest", SPIRIT_TEMPLE_TOPMOST_CHEST},
+    {"Spirit Temple MQ Mirror Puzzle Invisible Chest", SPIRIT_TEMPLE_MQ_MIRROR_PUZZLE_INVISIBLE_CHEST},
+    {"Spirit Temple GS Metal Fence", SPIRIT_TEMPLE_GS_METAL_FENCE},
+    {"Spirit Temple GS Sun on Floor Room", SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM},
+    {"Spirit Temple GS Hall After Sun Block Room", SPIRIT_TEMPLE_GS_HALL_AFTER_SUN_BLOCK_ROOM},
+    {"Spirit Temple GS Lobby", SPIRIT_TEMPLE_GS_LOBBY},
+    {"Spirit Temple GS Boulder Room", SPIRIT_TEMPLE_GS_BOULDER_ROOM},
+    {"Spirit Temple MQ GS Sun Block Room", SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM},
+    {"Spirit Temple MQ GS Leever Room", SPIRIT_TEMPLE_MQ_GS_LEEVER_ROOM},
+    {"Spirit Temple MQ GS Symphony Room", SPIRIT_TEMPLE_MQ_GS_SYMPHONY_ROOM},
+    {"Spirit Temple MQ GS Nine Thrones Room West", SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST},
+    {"Spirit Temple MQ GS Nine Thrones Room North", SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH},
     {"Spirit Temple Twinrova Heart", SPIRIT_TEMPLE_TWINROVA_HEART},
     {"Ice Cavern Map Chest", ICE_CAVERN_MAP_CHEST},
     {"Ice Cavern Compass Chest", ICE_CAVERN_COMPASS_CHEST},
     {"Ice Cavern Freestanding PoH", ICE_CAVERN_FREESTANDING_POH},
     {"Ice Cavern Iron Boots Chest", ICE_CAVERN_IRON_BOOTS_CHEST},
+    {"Ice Cavern GS Spinning Scythe Room", ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM},
+    {"Ice Cavern GS Heart Piece Room", ICE_CAVERN_GS_HEART_PIECE_ROOM},
+    {"Ice Cavern GS Push Block Room", ICE_CAVERN_GS_PUSH_BLOCK_ROOM},
+    {"Ice Cavern MQ Map Chest", ICE_CAVERN_MQ_MAP_CHEST},
+    {"Ice Cavern MQ Compass Chest", ICE_CAVERN_MQ_COMPASS_CHEST},
+    {"Ice Cavern MQ Freestanding PoH", ICE_CAVERN_MQ_FREESTANDING_POH},
+    {"Ice Cavern MQ Iron Boots Chest", ICE_CAVERN_MQ_IRON_BOOTS_CHEST},
+    {"Ice Cavern MQ GS Red Ice", ICE_CAVERN_MQ_GS_RED_ICE},
+    {"Ice Cavern MQ GS Ice Block", ICE_CAVERN_MQ_GS_ICE_BLOCK},
+    {"Ice Cavern MQ GS Scarecrow", ICE_CAVERN_MQ_GS_SCARECROW},
     {"Gerudo Training Ground Lobby Left Chest", GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST},
     {"Gerudo Training Ground Lobby Right Chest", GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST},
     {"Gerudo Training Ground Stalfos Chest", GERUDO_TRAINING_GROUND_STALFOS_CHEST},
@@ -338,6 +712,23 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Gerudo Training Ground Maze Path Second Chest", GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST},
     {"Gerudo Training Ground Maze Path Third Chest", GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST},
     {"Gerudo Training Ground Maze Path Final Chest", GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST},
+    {"Gerudo Training Ground MQ Lobby Left Chest", GERUDO_TRAINING_GROUND_MQ_LOBBY_LEFT_CHEST},
+    {"Gerudo Training Ground MQ Lobby Right Chest", GERUDO_TRAINING_GROUND_MQ_LOBBY_RIGHT_CHEST},
+    {"Gerudo Training Ground MQ First Iron Knuckle Chest", GERUDO_TRAINING_GROUND_MQ_FIRST_IRON_KNUCKLE_CHEST},
+    {"Gerudo Training Ground MQ Before Heavy Block Chest", GERUDO_TRAINING_GROUND_MQ_BEFORE_HEAVY_BLOCK_CHEST},
+    {"Gerudo Training Ground MQ Heavy Block Chest", GERUDO_TRAINING_GROUND_MQ_HEAVY_BLOCK_CHEST},
+    {"Gerudo Training Ground MQ Eye Statue Chest", GERUDO_TRAINING_GROUND_MQ_EYE_STATUE_CHEST},
+    {"Gerudo Training Ground MQ Ice Arrows Chest", GERUDO_TRAINING_GROUND_MQ_ICE_ARROWS_CHEST},
+    {"Gerudo Training Ground MQ Second Iron Knuckle Chest", GERUDO_TRAINING_GROUND_MQ_SECOND_IRON_KNUCKLE_CHEST},
+    {"Gerudo Training Ground MQ Flame Circle Chest", GERUDO_TRAINING_GROUND_MQ_FLAME_CIRCLE_CHEST},
+    {"Gerudo Training Ground MQ Maze Right Central Chest", GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST},
+    {"Gerudo Training Ground MQ Maze Right Side Chest", GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST},
+    {"Gerudo Training Ground MQ Underwater Silver Rupee Chest", GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST},
+    {"Gerudo Training Ground MQ Dinolfos Chest", GERUDO_TRAINING_GROUND_MQ_DINOLFOS_CHEST},
+    {"Gerudo Training Ground MQ Hidden Ceiling Chest", GERUDO_TRAINING_GROUND_MQ_HIDDEN_CEILING_CHEST},
+    {"Gerudo Training Ground MQ Maze Path First Chest", GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_FIRST_CHEST},
+    {"Gerudo Training Ground MQ Maze Path Third Chest", GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_THIRD_CHEST},
+    {"Gerudo Training Ground MQ Maze Path Second Chest", GERUDO_TRAINING_GROUND_MQ_MAZE_PATH_SECOND_CHEST},
     {"Ganons Castle Forest Trial Chest", GANONS_CASTLE_FOREST_TRIAL_CHEST},
     {"Ganons Castle Water Trial Left Chest", GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST},
     {"Ganons Castle Water Trial Right Chest", GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST},
@@ -353,7 +744,32 @@ std::unordered_map<std::string, RandomizerCheck> SpoilerfileCheckNameToEnum = {
     {"Ganons Castle Light Trial Lullaby Chest", GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST},
     {"Ganons Castle Spirit Trial Crystal Switch Chest", GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST},
     {"Ganons Castle Spirit Trial Invisible Chest", GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST},
-    {"Ganons Tower Boss Key Chest", GANONS_TOWER_BOSS_KEY_CHEST}
+    {"Ganons Castle Deku Scrub Left", GANONS_CASTLE_DEKU_SCRUB_LEFT},
+    {"Ganons Castle Deku Scrub Center-Left", GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT},
+    {"Ganons Castle Deku Scrub Center-Right", GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT},
+    {"Ganons Castle Deku Scrub Right", GANONS_CASTLE_DEKU_SCRUB_RIGHT},
+    {"Ganons Castle MQ Forest Trial Freestanding Key", GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY},
+    {"Ganons Castle MQ Forest Trial Eye Switch Chest", GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST},
+    {"Ganons Castle MQ Forest Trial Frozen Eye Switch Chest", GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST},
+    {"Ganons Castle MQ Water Trial Chest", GANONS_CASTLE_MQ_WATER_TRIAL_CHEST},
+    {"Ganons Castle MQ Shadow Trial Bomb Flower Chest", GANONS_CASTLE_MQ_SHADOW_TRIAL_BOMB_FLOWER_CHEST},
+    {"Ganons Castle MQ Shadow Trial Eye Switch Chest", GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST},
+    {"Ganons Castle MQ Light Trial Lullaby Chest", GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST},
+    {"Ganons Castle MQ Spirit Trial First Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_FIRST_CHEST},
+    {"Ganons Castle MQ Spirit Trial Invisible Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_INVISIBLE_CHEST},
+    {"Ganons Castle MQ Spirit Trial Sun Front Left Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_FRONT_LEFT_CHEST},
+    {"Ganons Castle MQ Spirit Trial Sun Back Left Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_LEFT_CHEST},
+    {"Ganons Castle MQ Spirit Trial Sun Back Right Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_SUN_BACK_RIGHT_CHEST},
+    {"Ganons Castle MQ Spirit Trial Golden Gauntlets Chest", GANONS_CASTLE_MQ_SPIRIT_TRIAL_GOLDEN_GAUNTLETS_CHEST},
+    {"Ganons Castle MQ Deku Scrub Left", GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT},
+    {"Ganons Castle MQ Deku Scrub Center-Left", GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_LEFT},
+    {"Ganons Castle MQ Deku Scrub Center", GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER},
+    {"Ganons Castle MQ Deku Scrub Center-Right", GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT},
+    {"Ganons Castle MQ Deku Scrub Right", GANONS_CASTLE_MQ_DEKU_SCRUB_RIGHT},
+    {"Ganons Tower Boss Key Chest", GANONS_TOWER_BOSS_KEY_CHEST},
+    {"Pierre", PIERRE},
+    {"Deliver Rutos Letter", DELIVER_RUTOS_LETTER},
+    {"Master Sword Pedestal", MASTER_SWORD_PEDESTAL}
 };
 
 std::unordered_map<s16, s16> itemIdToModel = { { GI_NONE, GID_MAX },