diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index 982da9d5c5d..34cd54e9a97 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -3,6 +3,7 @@
 
 #include "ultra64.h"
 #include "z64math.h"
+#include <randomizerTypes.h>
 
 typedef struct {
     /* 0x00 */ u8 buttonItems[4];
@@ -60,6 +61,11 @@ typedef struct {
     /* 0x24 */ s32 tempCollectFlags;
 } FaroresWindData; // size = 0x28
 
+typedef struct {
+    RandomizerCheck check;
+    RandomizerGet get;
+} ItemLocation;
+
 typedef struct {
     /* 0x0000 */ s32 entranceIndex; // start of `save` substruct, originally called "memory"
     /* 0x0004 */ s32 linkAge; // 0: Adult; 1: Child
@@ -173,6 +179,7 @@ typedef struct {
     /* 0x1420 */ s16 worldMapArea;
     /* 0x1422 */ s16 sunsSongState; // controls the effects of suns song
     /* 0x1424 */ s16 healthAccumulator;
+    ItemLocation itemLocations[512];
 } SaveContext; // size = 0x1428
 
 typedef enum {
diff --git a/soh/randomizerTypes.h b/soh/randomizerTypes.h
new file mode 100644
index 00000000000..b9fa7a8330c
--- /dev/null
+++ b/soh/randomizerTypes.h
@@ -0,0 +1,499 @@
+#pragma once
+
+
+typedef enum {
+    LINKS_POCKET,
+    QUEEN_GOHMA,
+    KING_DODONGO,
+    BARINADE,
+    PHANTOM_GANON,
+    VOLVAGIA,
+    MORPHA,
+    BONGO_BONGO,
+    TWINROVA,
+    SONG_FROM_IMPA,
+    SONG_FROM_MALON,
+    SONG_FROM_SARIA,
+    SONG_FROM_ROYAL_FAMILYS_TOMB,
+    SONG_FROM_OCARINA_OF_TIME,
+    SONG_FROM_WINDMILL,
+    SHEIK_IN_FOREST,
+    SHEIK_IN_CRATER,
+    SHEIK_IN_ICE_CAVERN,
+    SHEIK_AT_COLOSSUS,
+    SHEIK_IN_KAKARIKO,
+    SHEIK_AT_TEMPLE,
+    KF_MIDOS_TOP_LEFT_CHEST,
+    KF_MIDOS_TOP_RIGHT_CHEST,
+    KF_MIDOS_BOTTOM_LEFT_CHEST,
+    KF_MIDOS_BOTTOM_RIGHT_CHEST,
+    KF_KOKIRI_SWORD_CHEST,
+    KF_STORMS_GROTTO_CHEST,
+    LW_OCARINA_MEMORY_GAME,
+    LW_TARGET_IN_WOODS,
+    LW_NEAR_SHORTCUTS_GROTTO_CHEST,
+    DEKU_THEATER_SKULL_MASK,
+    DEKU_THEATER_MASK_OF_TRUTH,
+    LW_SKULL_KID,
+    LW_DEKU_SCRUB_NEAR_BRIDGE,
+    LW_DEKU_SCRUB_GROTTO_FRONT,
+    SFM_WOLFOS_GROTTO_CHEST,
+    HF_NEAR_MARKET_GROTTO_CHEST,
+    HF_TEKTITE_GROTTO_FREESTANDING_POH,
+    HF_SOUTHEAST_GROTTO_CHEST,
+    HF_OPEN_GROTTO_CHEST,
+    HF_DEKU_SCRUB_GROTTO,
+    MARKET_SHOOTING_GALLERY_REWARD,
+    MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,
+    MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,
+    MARKET_LOST_DOG,
+    MARKET_TREASURE_CHEST_GAME_REWARD,
+    MARKET_10_BIG_POES,
+    TOT_LIGHT_ARROWS_CUTSCENE,
+    HC_GREAT_FAIRY_REWARD,
+    LLR_TALONS_CHICKENS,
+    LLR_FREESTANDING_POH,
+    KAK_ANJU_AS_CHILD,
+    KAK_ANJU_AS_ADULT,
+    KAK_IMPAS_HOUSE_FREESTANDING_POH,
+    KAK_WINDMILL_FREESTANDING_POH,
+    KAK_MAN_ON_ROOF,
+    KAK_OPEN_GROTTO_CHEST,
+    KAK_REDEAD_GROTTO_CHEST,
+    KAK_SHOOTING_GALLERY_REWARD,
+    KAK_10_GOLD_SKULLTULA_REWARD,
+    KAK_20_GOLD_SKULLTULA_REWARD,
+    KAK_30_GOLD_SKULLTULA_REWARD,
+    KAK_40_GOLD_SKULLTULA_REWARD,
+    KAK_50_GOLD_SKULLTULA_REWARD,
+    GRAVEYARD_SHIELD_GRAVE_CHEST,
+    GRAVEYARD_HEART_PIECE_GRAVE_CHEST,
+    GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,
+    GRAVEYARD_FREESTANDING_POH,
+    GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,
+    GRAVEYARD_HOOKSHOT_CHEST,
+    GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,
+    DMT_FREESTANDING_POH,
+    DMT_CHEST,
+    DMT_STORMS_GROTTO_CHEST,
+    DMT_GREAT_FAIRY_REWARD,
+    DMT_BIGGORON,
+    GC_DARUNIAS_JOY,
+    GC_POT_FREESTANDING_POH,
+    GC_ROLLING_GORON_AS_CHILD,
+    GC_ROLLING_GORON_AS_ADULT,
+    GC_MAZE_LEFT_CHEST,
+    GC_MAZE_RIGHT_CHEST,
+    GC_MAZE_CENTER_CHEST,
+    DMC_VOLCANO_FREESTANDING_POH,
+    DMC_WALL_FREESTANDING_POH,
+    DMC_UPPER_GROTTO_CHEST,
+    DMC_GREAT_FAIRY_REWARD,
+    ZR_OPEN_GROTTO_CHEST,
+    ZR_FROGS_IN_THE_RAIN,
+    ZR_FROGS_OCARINA_GAME,
+    ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,
+    ZR_NEAR_DOMAIN_FREESTANDING_POH,
+    ZD_DIVING_MINIGAME,
+    ZD_CHEST,
+    ZD_KING_ZORA_THAWED,
+    ZF_GREAT_FAIRY_REWARD,
+    ZF_ICEBERG_FREESTANDING_POH,
+    ZF_BOTTOM_FREESTANDING_POH,
+    LH_UNDERWATER_ITEM,
+    LH_CHILD_FISHING,
+    LH_ADULT_FISHING,
+    LH_LAB_DIVE,
+    LH_FREESTANDING_POH,
+    LH_SUN,
+    GV_CRATE_FREESTANDING_POH,
+    GV_WATERFALL_FREESTANDING_POH,
+    GV_CHEST,
+    GF_CHEST,
+    GF_HBA_1000_POINTS,
+    GF_HBA_1500_POINTS,
+    WASTELAND_CHEST,
+    COLOSSUS_GREAT_FAIRY_REWARD,
+    COLOSSUS_FREESTANDING_POH,
+    OGC_GREAT_FAIRY_REWARD,
+    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_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_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_BARINADE_HEART,
+    BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
+    BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,
+    BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,
+    BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,
+    BOTTOM_OF_THE_WELL_FREESTANDING_KEY,
+    BOTTOM_OF_THE_WELL_COMPASS_CHEST,
+    BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,
+    BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,
+    BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,
+    BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,
+    BOTTOM_OF_THE_WELL_MAP_CHEST,
+    BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,
+    BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,
+    BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,
+    FOREST_TEMPLE_FIRST_ROOM_CHEST,
+    FOREST_TEMPLE_FIRST_STALFOS_CHEST,
+    FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,
+    FOREST_TEMPLE_MAP_CHEST,
+    FOREST_TEMPLE_WELL_CHEST,
+    FOREST_TEMPLE_EYE_SWITCH_CHEST,
+    FOREST_TEMPLE_BOSS_KEY_CHEST,
+    FOREST_TEMPLE_FLOORMASTER_CHEST,
+    FOREST_TEMPLE_RED_POE_CHEST,
+    FOREST_TEMPLE_BOW_CHEST,
+    FOREST_TEMPLE_BLUE_POE_CHEST,
+    FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,
+    FOREST_TEMPLE_BASEMENT_CHEST,
+    FOREST_TEMPLE_PHANTOM_GANON_HEART,
+    FIRE_TEMPLE_NEAR_BOSS_CHEST,
+    FIRE_TEMPLE_FLARE_DANCER_CHEST,
+    FIRE_TEMPLE_BOSS_KEY_CHEST,
+    FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,
+    FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
+    FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,
+    FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,
+    FIRE_TEMPLE_MAP_CHEST,
+    FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,
+    FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,
+    FIRE_TEMPLE_SCARECROW_CHEST,
+    FIRE_TEMPLE_COMPASS_CHEST,
+    FIRE_TEMPLE_MEGATON_HAMMER_CHEST,
+    FIRE_TEMPLE_HIGHEST_GORON_CHEST,
+    FIRE_TEMPLE_VOLVAGIA_HEART,
+    WATER_TEMPLE_COMPASS_CHEST,
+    WATER_TEMPLE_MAP_CHEST,
+    WATER_TEMPLE_CRACKED_WALL_CHEST,
+    WATER_TEMPLE_TORCHES_CHEST,
+    WATER_TEMPLE_BOSS_KEY_CHEST,
+    WATER_TEMPLE_CENTRAL_PILLAR_CHEST,
+    WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,
+    WATER_TEMPLE_LONGSHOT_CHEST,
+    WATER_TEMPLE_RIVER_CHEST,
+    WATER_TEMPLE_DRAGON_CHEST,
+    WATER_TEMPLE_MORPHA_HEART,
+    SHADOW_TEMPLE_MAP_CHEST,
+    SHADOW_TEMPLE_HOVER_BOOTS_CHEST,
+    SHADOW_TEMPLE_COMPASS_CHEST,
+    SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,
+    SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,
+    SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,
+    SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,
+    SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,
+    SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,
+    SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,
+    SHADOW_TEMPLE_FREESTANDING_KEY,
+    SHADOW_TEMPLE_WIND_HINT_CHEST,
+    SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,
+    SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,
+    SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,
+    SHADOW_TEMPLE_BOSS_KEY_CHEST,
+    SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,
+    SHADOW_TEMPLE_BONGO_BONGO_HEART,
+    SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
+    SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,
+    SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,
+    SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,
+    SPIRIT_TEMPLE_MAP_CHEST,
+    SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,
+    SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,
+    SPIRIT_TEMPLE_COMPASS_CHEST,
+    SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,
+    SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,
+    SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,
+    SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,
+    SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,
+    SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,
+    SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,
+    SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,
+    SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,
+    SPIRIT_TEMPLE_BOSS_KEY_CHEST,
+    SPIRIT_TEMPLE_TOPMOST_CHEST,
+    SPIRIT_TEMPLE_TWINROVA_HEART,
+    ICE_CAVERN_MAP_CHEST,
+    ICE_CAVERN_COMPASS_CHEST,
+    ICE_CAVERN_FREESTANDING_POH,
+    ICE_CAVERN_IRON_BOOTS_CHEST,
+    GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,
+    GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,
+    GERUDO_TRAINING_GROUND_STALFOS_CHEST,
+    GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,
+    GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,
+    GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,
+    GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,
+    GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,
+    GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,
+    GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,
+    GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,
+    GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,
+    GERUDO_TRAINING_GROUND_FREESTANDING_KEY,
+    GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,
+    GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,
+    GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,
+    GERUDO_TRAINING_GROUND_BEAMOS_CHEST,
+    GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,
+    GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,
+    GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,
+    GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,
+    GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,
+    GANONS_CASTLE_FOREST_TRIAL_CHEST,
+    GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,
+    GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,
+    GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,
+    GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,
+    GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,
+    GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,
+    GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,
+    GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,
+    GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,
+    GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,
+    GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,
+    GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,
+    GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,
+    GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,
+    GANONS_TOWER_BOSS_KEY_CHEST,
+    UNKNOWN_CHECK
+} RandomizerCheck;
+
+// based on https://github.com/TestRunnerSRL/OoT-Randomizer/blob/e337d7f603b91a6bacb618fb32cc7fd70ed9ffca/ItemList.py
+typedef enum {
+    UNKNOWN_GET = 0,
+    BOMBS_5,
+    DEKU_NUTS_5,
+    BOMBCHUS_10,
+    BOOMERANG,
+    DEKU_STICK_1,
+    LENS_OF_TRUTH,
+    MEGATON_HAMMER,
+    COJIRO,
+    BOTTLE,
+    BOTTLE_WITH_MILK,
+    RUTOS_LETTER,
+    DELIVER_LETTER,
+    SELL_BIG_POE,
+    MAGIC_BEAN,
+    SKULL_MASK,
+    SPOOKY_MASK,
+    KEATON_MASK,
+    BUNNY_HOOD,
+    MASK_OF_TRUTH,
+    POCKET_EGG,
+    POCKET_CUCCO,
+    ODD_MUSHROOM,
+    ODD_POTION,
+    POACHERS_SAW,
+    BROKEN_SWORD,
+    PRESCRIPTION,
+    EYEBALL_FROG,
+    EYEDROPS,
+    CLAIM_CHECK,
+    KOKIRI_SWORD,
+    GIANTS_KNIFE,
+    DEKU_SHIELD,
+    HYLIAN_SHIELD,
+    MIRROR_SHIELD,
+    GORON_TUNIC,
+    ZORA_TUNIC,
+    IRON_BOOTS,
+    HOVER_BOOTS,
+    STONE_OF_AGONY,
+    GERUDO_MEMBERSHIP_CARD,
+    HEART_CONTAINER,
+    PIECE_OF_HEART,
+    BOSS_KEY,
+    COMPASS,
+    MAP,
+    SMALL_KEY,
+    WEIRD_EGG,
+    RECOVERY_HEART,
+    ARROWS_5,
+    ARROWS_10,
+    ARROWS_30,
+    RUPEE_1,
+    RUPEES_5,
+    RUPEES_20,
+    MILK,
+    GORON_MASK,
+    ZORA_MASK,
+    GERUDO_MASK,
+    RUPEES_50,
+    RUPEES_200,
+    BIGGORON_SWORD,
+    FIRE_ARROWS,
+    ICE_ARROWS,
+    LIGHT_ARROWS,
+    GOLD_SKULLTULA_TOKEN,
+    DINS_FIRE,
+    NAYRUS_LOVE,
+    FARORES_WIND,
+    DEKU_NUTS_10,
+    BOMBS_10,
+    BOMBS_20,
+    DEKU_SEEDS_30,
+    BOMBCHUS_5,
+    BOMBCHUS_20,
+    RUPEE_TREASURE_CHEST_GAME,
+    PIECE_OF_HEART_TREASURE_CHEST_GAME,
+    ICE_TRAP,
+    PROGRESSIVE_HOOKSHOT,
+    PROGRESSIVE_STRENGTH_UPGRADE,
+    BOMB_BAG,
+    BOW,
+    SLINGSHOT,
+    PROGRESSIVE_WALLET,
+    PROGRESSIVE_SCALE,
+    DEKU_NUT_CAPACITY,
+    DEKU_STICK_CAPACITY,
+    BOMBCHUS,
+    MAGIC_METER,
+    OCARINA,
+    BOTTLE_WITH_RED_POTION,
+    BOTTLE_WITH_GREEN_POTION,
+    BOTTLE_WITH_BLUE_POTION,
+    BOTTLE_WITH_FAIRY,
+    BOTTLE_WITH_FISH,
+    BOTTLE_WITH_BLUE_FIRE,
+    BOTTLE_WITH_BUGS,
+    BOTTLE_WITH_BIG_POE,
+    BOTTLE_WITH_POE,
+    BOSS_KEY_FOREST_TEMPLE,
+    BOSS_KEY_FIRE_TEMPLE,
+    BOSS_KEY_WATER_TEMPLE,
+    BOSS_KEY_SPIRIT_TEMPLE,
+    BOSS_KEY_SHADOW_TEMPLE,
+    BOSS_KEY_GANONS_CASTLE,
+    COMPASS_DEKU_TREE,
+    COMPASS_DODONGOS_CAVERN,
+    COMPASS_JABU_JABUS_BELLY,
+    COMPASS_FOREST_TEMPLE,
+    COMPASS_FIRE_TEMPLE,
+    COMPASS_WATER_TEMPLE,
+    COMPASS_SPIRIT_TEMPLE,
+    COMPASS_SHADOW_TEMPLE,
+    COMPASS_BOTTOM_OF_THE_WELL,
+    COMPASS_ICE_CAVERN,
+    MAP_DEKU_TREE,
+    MAP_DODONGOS_CAVERN,
+    MAP_JABU_JABUS_BELLY,
+    MAP_FOREST_TEMPLE,
+    MAP_FIRE_TEMPLE,
+    MAP_WATER_TEMPLE,
+    MAP_SPIRIT_TEMPLE,
+    MAP_SHADOW_TEMPLE,
+    MAP_BOTTOM_OF_THE_WELL,
+    MAP_ICE_CAVERN,
+    SMALL_KEY_FOREST_TEMPLE,
+    SMALL_KEY_FIRE_TEMPLE,
+    SMALL_KEY_WATER_TEMPLE,
+    SMALL_KEY_SPIRIT_TEMPLE,
+    SMALL_KEY_SHADOW_TEMPLE,
+    SMALL_KEY_BOTTOM_OF_THE_WELL,
+    SMALL_KEY_GERUDO_TRAINING_GROUND,
+    SMALL_KEY_THIEVES_HIDEOUT,
+    SMALL_KEY_GANONS_CASTLE,
+    DOUBLE_DEFENSE,
+    MAGIC_BEAN_PACK,
+    TRIFORCE_PIECE,
+    ZELDAS_LETTER,
+    TIME_TRAVEL,
+    SCARECROW_SONG,
+    TRIFORCE,
+    SMALL_KEY_RING_FOREST_TEMPLE,
+    SMALL_KEY_RING_FIRE_TEMPLE,
+    SMALL_KEY_RING_WATER_TEMPLE,
+    SMALL_KEY_RING_SPIRIT_TEMPLE,
+    SMALL_KEY_RING_SHADOW_TEMPLE,
+    SMALL_KEY_RING_BOTTOM_OF_THE_WELL,
+    SMALL_KEY_RING_GERUDO_TRAINING_GROUND,
+    SMALL_KEY_RING_THIEVES_HIDEOUT,
+    SMALL_KEY_RING_GANONS_CASTLE,
+    WATER_TEMPLE_CLEAR,
+    FOREST_TRIAL_CLEAR,
+    FIRE_TRIAL_CLEAR,
+    WATER_TRIAL_CLEAR,
+    SHADOW_TRIAL_CLEAR,
+    SPIRIT_TRIAL_CLEAR,
+    LIGHT_TRIAL_CLEAR,
+    DEKU_STICK_DROP,
+    DEKU_NUT_DROP,
+    BLUE_FIRE,
+    FAIRY,
+    FISH,
+    BUGS,
+    BIG_POE,
+    BOMBCHU_DROP,
+    ARROWS_CONSUMABLE_REFILL,
+    BOMBS_CONSUMABLE_REFILL,
+    DEKU_SEEDS_CONSUMABLE_REFILL,
+    DEKU_STICKS_CONSUMABLE_REFILL,
+    DEKU_NUTS_CONSUMABLE_REFILL,
+    RUPEES_CONSUMABLE_REFILL,
+    MINUET_OF_FOREST,
+    BOLERO_OF_FIRE,
+    SERENADE_OF_WATER,
+    REQUIEM_OF_SPIRIT,
+    NOCTURNE_OF_SHADOW,
+    PRELUDE_OF_LIGHT,
+    ZELDAS_LULLABY,
+    EPONAS_SONG,
+    SARIAS_SONG,
+    SUNS_SONG,
+    SONG_OF_TIME,
+    SONG_OF_STORMS,
+    BUY_DEKU_NUT_5,
+    BUY_ARROWS_30,
+    BUY_ARROWS_50,
+    BUY_BOMBS_5_FOR_25_RUPEES,
+    BUY_DEKU_NUT_10,
+    BUY_DEKU_STICK_1,
+    BUY_BOMBS_10,
+    BUY_FISH,
+    BUY_RED_POTION_FOR_30_RUPEES,
+    BUY_GREEN_POTION,
+    BUY_BLUE_POTION,
+    BUY_HYLIAN_SHIELD,
+    BUY_DEKU_SHIELD,
+    BUY_GORON_TUNIC,
+    BUY_ZORA_TUNIC,
+    BUY_HEART,
+    BUY_BOMBCHU_10,
+    BUY_BOMBCHU_20,
+    BUY_BOMBCHU_5,
+    BUY_DEKU_SEEDS_30,
+    SOLD_OUT,
+    BUY_BLUE_FIRE,
+    BUY_BOTTLE_BUG,
+    BUY_POE,
+    BUY_FAIRYS_SPIRIT,
+    BUY_ARROWS_10,
+    BUY_BOMBS_20,
+    BUY_BOMBS_30,
+    BUY_BOMBS_5_FOR_35_RUPEES,
+    BUY_RED_POTION_FOR_40_RUPEES,
+    BUY_RED_POTION_FOR_50_RUPEES,
+    KOKIRI_EMERALD,
+    GORON_RUBY,
+    ZORA_SAPPHIRE,
+    FOREST_MEDALLION,
+    FIRE_MEDALLION,
+    WATER_MEDALLION,
+    SPIRIT_MEDALLION,
+    SHADOW_MEDALLION,
+    LIGHT_MEDALLION
+} RandomizerGet;
\ No newline at end of file
diff --git a/soh/soh.vcxproj b/soh/soh.vcxproj
index 180d3b4cdb0..230d74e54ca 100644
--- a/soh/soh.vcxproj
+++ b/soh/soh.vcxproj
@@ -881,6 +881,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="soh\Enhancements\randomizer.h" />
+    <ClInclude Include="randomizerTypes.h" />
     <ClInclude Include="soh\frame_interpolation.h" />
     <ClInclude Include="include\alloca.h" />
     <ClInclude Include="include\bgm.h" />
diff --git a/soh/soh.vcxproj.filters b/soh/soh.vcxproj.filters
index 04f6030a858..24b65d11f7a 100644
--- a/soh/soh.vcxproj.filters
+++ b/soh/soh.vcxproj.filters
@@ -1,3778 +1,1244 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\src">
-      <UniqueIdentifier>{8d479b58-9306-40c3-9728-2cf5b185f5c4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\libultra">
-      <UniqueIdentifier>{8ebc52ba-5b1d-4bb3-9848-ba9ea57fc49f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\buffers">
-      <UniqueIdentifier>{54c2fe99-a68e-4ce2-813d-bce0ab1ac24f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\code">
-      <UniqueIdentifier>{0b91ecc8-6f20-4da1-87ca-6c7263aab3db}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\boot">
-      <UniqueIdentifier>{2104d3ab-707c-4ab2-bb1a-5cdce5c3d07d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays">
-      <UniqueIdentifier>{022552c8-3bb8-4ba5-904c-e2c3eb28ce10}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\include">
-      <UniqueIdentifier>{3ab8c311-cbfb-4eca-88af-2446ce3c89b0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays\effects">
-      <UniqueIdentifier>{8f2da1b8-973e-4be0-a036-c79a63bc3067}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays\gamestates">
-      <UniqueIdentifier>{1a584bc2-7081-4251-a953-cdc7b611d62b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays\gamestates\ovl_title">
-      <UniqueIdentifier>{49bb84e4-a0b9-4733-9720-1ea120795083}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays\gamestates\ovl_select">
-      <UniqueIdentifier>{d4794b4c-ae5d-4bf0-96f4-077f03807f5e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays\gamestates\ovl_opening">
-      <UniqueIdentifier>{981df102-b362-4e2b-8efc-62756c28aa60}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays\gamestates\ovl_file_choose">
-      <UniqueIdentifier>{f8b2165f-9b32-4be1-a285-49349e09bef5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\soh">
-      <UniqueIdentifier>{fcaae731-4e17-448b-b6c7-36e4c8413838}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\soh\Enhancements">
-      <UniqueIdentifier>{264ed8f8-f42b-475f-82ca-c264225ef56c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\soh">
-      <UniqueIdentifier>{5fde6633-a728-4eea-a616-59d413bec476}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\soh\Enhancements">
-      <UniqueIdentifier>{3aeae6ac-1340-4a7b-bf34-cd196667fe37}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays\misc">
-      <UniqueIdentifier>{fe745190-d4ec-4dc3-a9fd-ea553a971b14}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays\misc\ovl_map_mark_data">
-      <UniqueIdentifier>{06ba0ec4-2ee7-4454-93b5-5fd804723b6d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays\misc\ovl_kaleido_scope">
-      <UniqueIdentifier>{ffe200b9-a955-4843-a1ce-3603c132e591}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\src\overlays\actors">
-      <UniqueIdentifier>{18b9727f-30de-4ab8-a317-916090d4a110}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\soh\Enhancements\debugger">
-      <UniqueIdentifier>{9a4378ec-e30f-47b6-9ad6-5ce738b4cf99}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\soh\Enhancements\debugger">
-      <UniqueIdentifier>{04fc1c52-49ff-48e2-ae23-2c00867374f8}</UniqueIdentifier>
-    </Filter>
+    <ClCompile Include="soh\Enhancements\randomizer.cpp" />
+    <ClCompile Include="soh\frame_interpolation.cpp" />
+    <ClCompile Include="soh\Enhancements\bootcommands.c" />
+    <ClCompile Include="soh\Enhancements\debugconsole.cpp" />
+    <ClCompile Include="soh\Enhancements\debugger\colViewer.cpp" />
+    <ClCompile Include="soh\Enhancements\debugger\debugger.cpp" />
+    <ClCompile Include="soh\Enhancements\debugger\debugSaveEditor.cpp" />
+    <ClCompile Include="soh\Enhancements\debugger\ImGuiHelpers.cpp" />
+    <ClCompile Include="soh\Enhancements\gameconsole.c" />
+    <ClCompile Include="soh\Enhancements\savestates.cpp" />
+    <ClCompile Include="soh\GbiWrap.cpp" />
+    <ClCompile Include="soh\gu_pc.c" />
+    <ClCompile Include="soh\OTRGlobals.cpp" />
+    <ClCompile Include="soh\stubs.c" />
+    <ClCompile Include="soh\util.cpp" />
+    <ClCompile Include="soh\z_message_OTR.cpp" />
+    <ClCompile Include="soh\z_play_otr.cpp" />
+    <ClCompile Include="soh\z_scene_otr.cpp" />
+    <ClCompile Include="src\boot\assert.c" />
+    <ClCompile Include="src\boot\boot_main.c" />
+    <ClCompile Include="src\boot\build.c" />
+    <ClCompile Include="src\boot\idle.c" />
+    <ClCompile Include="src\boot\is_debug.c" />
+    <ClCompile Include="src\boot\logutils.c" />
+    <ClCompile Include="src\boot\missing_gcc_functions.c" />
+    <ClCompile Include="src\boot\stackcheck.c" />
+    <ClCompile Include="src\boot\viconfig.c" />
+    <ClCompile Include="src\boot\yaz0.c" />
+    <ClCompile Include="src\boot\z_locale.c" />
+    <ClCompile Include="src\boot\z_std_dma.c" />
+    <ClCompile Include="src\buffers\gfxbuffers.c" />
+    <ClCompile Include="src\buffers\heaps.c" />
+    <ClCompile Include="src\buffers\zbuffer.c" />
+    <ClCompile Include="src\code\audioMgr.c" />
+    <ClCompile Include="src\code\audio_data.c" />
+    <ClCompile Include="src\code\audio_effects.c" />
+    <ClCompile Include="src\code\audio_heap.c" />
+    <ClCompile Include="src\code\audio_init_params.c" />
+    <ClCompile Include="src\code\audio_load.c" />
+    <ClCompile Include="src\code\audio_playback.c" />
+    <ClCompile Include="src\code\audio_seqplayer.c" />
+    <ClCompile Include="src\code\audio_sound_params.c" />
+    <ClCompile Include="src\code\audio_synthesis.c" />
+    <ClCompile Include="src\code\code_800430A0.c" />
+    <ClCompile Include="src\code\code_80043480.c" />
+    <ClCompile Include="src\code\code_8006C3A0.c" />
+    <ClCompile Include="src\code\code_8006C510.c" />
+    <ClCompile Include="src\code\code_80097A00.c" />
+    <ClCompile Include="src\code\code_800A9F30.c" />
+    <ClCompile Include="src\code\code_800ACE70.c" />
+    <ClCompile Include="src\code\code_800AD920.c" />
+    <ClCompile Include="src\code\code_800BB0A0.c" />
+    <ClCompile Include="src\code\code_800C3C20.c" />
+    <ClCompile Include="src\code\code_800D2E30.c" />
+    <ClCompile Include="src\code\code_800D31A0.c" />
+    <ClCompile Include="src\code\code_800E4FE0.c" />
+    <ClCompile Include="src\code\code_800E6840.c" />
+    <ClCompile Include="src\code\code_800EC960.c" />
+    <ClCompile Include="src\code\code_800F7260.c" />
+    <ClCompile Include="src\code\code_800F9280.c" />
+    <ClCompile Include="src\code\code_800FBCE0.c" />
+    <ClCompile Include="src\code\code_800FC620.c" />
+    <ClCompile Include="src\code\code_800FCE80.c" />
+    <ClCompile Include="src\code\code_800FD970.c" />
+    <ClCompile Include="src\code\code_801067F0.c" />
+    <ClCompile Include="src\code\code_801068B0.c" />
+    <ClCompile Include="src\code\db_camera.c" />
+    <ClCompile Include="src\code\debug_malloc.c" />
+    <ClCompile Include="src\code\fault.c" />
+    <ClCompile Include="src\code\fault_drawer.c" />
+    <ClCompile Include="src\code\flg_set.c" />
+    <ClCompile Include="src\code\game.c" />
+    <ClCompile Include="src\code\gamealloc.c" />
+    <ClCompile Include="src\code\gfxprint.c" />
+    <ClCompile Include="src\code\graph.c" />
+    <ClCompile Include="src\code\irqmgr.c" />
+    <ClCompile Include="src\code\jpegdecoder.c" />
+    <ClCompile Include="src\code\jpegutils.c" />
+    <ClCompile Include="src\code\listalloc.c" />
+    <ClCompile Include="src\code\loadfragment2.c" />
+    <ClCompile Include="src\code\logseverity.c" />
+    <ClCompile Include="src\code\main.c" />
+    <ClCompile Include="src\code\mempak.c" />
+    <ClCompile Include="src\code\mtxuty-cvt.c" />
+    <ClCompile Include="src\code\padmgr.c" />
+    <ClCompile Include="src\code\padsetup.c" />
+    <ClCompile Include="src\code\padutils.c" />
+    <ClCompile Include="src\code\PreRender.c" />
+    <ClCompile Include="src\code\printutils.c" />
+    <ClCompile Include="src\code\relocation.c" />
+    <ClCompile Include="src\code\sched.c" />
+    <ClCompile Include="src\code\shrink_window.c" />
+    <ClCompile Include="src\code\sleep.c" />
+    <ClCompile Include="src\code\speed_meter.c" />
+    <ClCompile Include="src\code\system_malloc.c" />
+    <ClCompile Include="src\code\sys_cfb.c" />
+    <ClCompile Include="src\code\sys_math.c" />
+    <ClCompile Include="src\code\sys_math3d.c" />
+    <ClCompile Include="src\code\sys_math_atan.c" />
+    <ClCompile Include="src\code\sys_matrix.c" />
+    <ClCompile Include="src\code\sys_ucode.c" />
+    <ClCompile Include="src\code\title_setup.c" />
+    <ClCompile Include="src\code\TwoHeadArena.c" />
+    <ClCompile Include="src\code\ucode_disas.c" />
+    <ClCompile Include="src\code\z_actor.c" />
+    <ClCompile Include="src\code\z_actor_dlftbls.c" />
+    <ClCompile Include="src\code\z_bgcheck.c" />
+    <ClCompile Include="src\code\z_camera.c" />
+    <ClCompile Include="src\code\z_cheap_proc.c" />
+    <ClCompile Include="src\code\z_collision_btltbls.c" />
+    <ClCompile Include="src\code\z_collision_check.c" />
+    <ClCompile Include="src\code\z_common_data.c" />
+    <ClCompile Include="src\code\z_construct.c" />
+    <ClCompile Include="src\code\z_debug.c" />
+    <ClCompile Include="src\code\z_debug_display.c" />
+    <ClCompile Include="src\code\z_demo.c" />
+    <ClCompile Include="src\code\z_DLF.c" />
+    <ClCompile Include="src\code\z_draw.c" />
+    <ClCompile Include="src\code\z_effect.c" />
+    <ClCompile Include="src\code\z_effect_soft_sprite.c" />
+    <ClCompile Include="src\code\z_effect_soft_sprite_dlftbls.c" />
+    <ClCompile Include="src\code\z_effect_soft_sprite_old_init.c" />
+    <ClCompile Include="src\code\z_eff_blure.c" />
+    <ClCompile Include="src\code\z_eff_shield_particle.c" />
+    <ClCompile Include="src\code\z_eff_spark.c" />
+    <ClCompile Include="src\code\z_eff_ss_dead.c" />
+    <ClCompile Include="src\code\z_elf_message.c" />
+    <ClCompile Include="src\code\z_en_a_keep.c" />
+    <ClCompile Include="src\code\z_en_item00.c" />
+    <ClCompile Include="src\code\z_face_reaction.c" />
+    <ClCompile Include="src\code\z_fbdemo.c" />
+    <ClCompile Include="src\code\z_fbdemo_circle.c" />
+    <ClCompile Include="src\code\z_fbdemo_fade.c" />
+    <ClCompile Include="src\code\z_fbdemo_triforce.c" />
+    <ClCompile Include="src\code\z_fbdemo_wipe1.c" />
+    <ClCompile Include="src\code\z_fcurve_data_skelanime.c" />
+    <ClCompile Include="src\code\z_frame_advance.c" />
+    <ClCompile Include="src\code\z_game_dlftbls.c" />
+    <ClCompile Include="src\code\z_game_over.c" />
+    <ClCompile Include="src\code\z_horse.c" />
+    <ClCompile Include="src\code\z_jpeg.c" />
+    <ClCompile Include="src\code\z_kaleido_manager.c" />
+    <ClCompile Include="src\code\z_kaleido_scope_call.c" />
+    <ClCompile Include="src\code\z_kaleido_setup.c" />
+    <ClCompile Include="src\code\z_kanfont.c" />
+    <ClCompile Include="src\code\z_kankyo.c" />
+    <ClCompile Include="src\code\z_lib.c" />
+    <ClCompile Include="src\code\z_lifemeter.c" />
+    <ClCompile Include="src\code\z_lights.c" />
+    <ClCompile Include="src\code\z_malloc.c" />
+    <ClCompile Include="src\code\z_map_data.c" />
+    <ClCompile Include="src\code\z_map_exp.c" />
+    <ClCompile Include="src\code\z_map_mark.c" />
+    <ClCompile Include="src\code\z_message_PAL.c" />
+    <ClCompile Include="src\code\z_moji.c" />
+    <ClCompile Include="src\code\z_msgevent.c" />
+    <ClCompile Include="src\code\z_olib.c" />
+    <ClCompile Include="src\code\z_onepointdemo.c" />
+    <ClCompile Include="src\code\z_parameter.c" />
+    <ClCompile Include="src\code\z_path.c" />
+    <ClCompile Include="src\code\z_play.c" />
+    <ClCompile Include="src\code\z_player_call.c" />
+    <ClCompile Include="src\code\z_player_lib.c" />
+    <ClCompile Include="src\code\z_prenmi.c" />
+    <ClCompile Include="src\code\z_prenmi_buff.c" />
+    <ClCompile Include="src\code\z_quake.c" />
+    <ClCompile Include="src\code\z_rcp.c" />
+    <ClCompile Include="src\code\z_room.c" />
+    <ClCompile Include="src\code\z_sample.c" />
+    <ClCompile Include="src\code\z_scene.c" />
+    <ClCompile Include="src\code\z_scene_table.c" />
+    <ClCompile Include="src\code\z_skelanime.c" />
+    <ClCompile Include="src\code\z_skin.c" />
+    <ClCompile Include="src\code\z_skin_awb.c" />
+    <ClCompile Include="src\code\z_skin_matrix.c" />
+    <ClCompile Include="src\code\z_sound_source.c" />
+    <ClCompile Include="src\code\z_sram.c" />
+    <ClCompile Include="src\code\z_ss_sram.c" />
+    <ClCompile Include="src\code\z_view.c" />
+    <ClCompile Include="src\code\z_vimode.c" />
+    <ClCompile Include="src\code\z_vismono.c" />
+    <ClCompile Include="src\code\z_vr_box.c" />
+    <ClCompile Include="src\code\z_vr_box_draw.c" />
+    <ClCompile Include="src\code\__osMalloc.c" />
+    <ClCompile Include="src\libultra\gu\coss.c" />
+    <ClCompile Include="src\libultra\gu\guLookAt.c" />
+    <ClCompile Include="src\libultra\gu\guLookAtHilite.c" />
+    <ClCompile Include="src\libultra\gu\guPerspectiveF.c" />
+    <ClCompile Include="src\libultra\gu\guPosition.c" />
+    <ClCompile Include="src\libultra\gu\guS2DInitBg.c" />
+    <ClCompile Include="src\libultra\gu\ortho.c" />
+    <ClCompile Include="src\libultra\gu\rotate.c" />
+    <ClCompile Include="src\libultra\gu\sins.c" />
+    <ClCompile Include="src\libultra\gu\sintable.c" />
+    <ClCompile Include="src\libultra\libc\sprintf.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Arms_Hook\z_arms_hook.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Arrow_Fire\z_arrow_fire.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Arrow_Ice\z_arrow_ice.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Arrow_Light\z_arrow_light.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Bdan_Objects\z_bg_bdan_objects.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Bdan_Switch\z_bg_bdan_switch.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Bombwall\z_bg_bombwall.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Bom_Guard\z_bg_bom_guard.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Bowl_Wall\z_bg_bowl_wall.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Breakwall\z_bg_breakwall.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ddan_Jd\z_bg_ddan_jd.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ddan_Kd\z_bg_ddan_kd.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Dodoago\z_bg_dodoago.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Dy_Yoseizo\z_bg_dy_yoseizo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ganon_Otyuka\z_bg_ganon_otyuka.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Gate_Shutter\z_bg_gate_shutter.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Gjyo_Bridge\z_bg_gjyo_bridge.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Darkmeiro\z_bg_gnd_darkmeiro.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Firemeiro\z_bg_gnd_firemeiro.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Iceblock\z_bg_gnd_iceblock.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Nisekabe\z_bg_gnd_nisekabe.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Soulmeiro\z_bg_gnd_soulmeiro.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka\z_bg_haka.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Gate\z_bg_haka_gate.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Huta\z_bg_haka_huta.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_MeganeBG\z_bg_haka_meganebg.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Megane\z_bg_haka_megane.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Sgami\z_bg_haka_sgami.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Ship\z_bg_haka_ship.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Trap\z_bg_haka_trap.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Tubo\z_bg_haka_tubo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Water\z_bg_haka_water.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Zou\z_bg_haka_zou.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Heavy_Block\z_bg_heavy_block.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Curtain\z_bg_hidan_curtain.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Dalm\z_bg_hidan_dalm.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Firewall\z_bg_hidan_firewall.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Fslift\z_bg_hidan_fslift.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Fwbig\z_bg_hidan_fwbig.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Hamstep\z_bg_hidan_hamstep.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Hrock\z_bg_hidan_hrock.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Kousi\z_bg_hidan_kousi.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Kowarerukabe\z_bg_hidan_kowarerukabe.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Rock\z_bg_hidan_rock.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Rsekizou\z_bg_hidan_rsekizou.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Sekizou\z_bg_hidan_sekizou.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Sima\z_bg_hidan_sima.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Syoku\z_bg_hidan_syoku.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Objects\z_bg_ice_objects.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Shelter\z_bg_ice_shelter.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Shutter\z_bg_ice_shutter.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Turara\z_bg_ice_turara.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ingate\z_bg_ingate.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_1flift\z_bg_jya_1flift.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Amishutter\z_bg_jya_amishutter.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Bigmirror\z_bg_jya_bigmirror.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Block\z_bg_jya_block.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Bombchuiwa\z_bg_jya_bombchuiwa.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Bombiwa\z_bg_jya_bombiwa.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Cobra\z_bg_jya_cobra.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Goroiwa\z_bg_jya_goroiwa.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Haheniron\z_bg_jya_haheniron.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Ironobj\z_bg_jya_ironobj.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Kanaami\z_bg_jya_kanaami.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Lift\z_bg_jya_lift.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Megami\z_bg_jya_megami.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Zurerukabe\z_bg_jya_zurerukabe.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Menkuri_Eye\z_bg_menkuri_eye.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Menkuri_Kaiten\z_bg_menkuri_kaiten.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Menkuri_Nisekabe\z_bg_menkuri_nisekabe.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Bwall\z_bg_mizu_bwall.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Movebg\z_bg_mizu_movebg.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Shutter\z_bg_mizu_shutter.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Uzu\z_bg_mizu_uzu.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Water\z_bg_mizu_water.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mjin\z_bg_mjin.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Bigst\z_bg_mori_bigst.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Elevator\z_bg_mori_elevator.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Hashigo\z_bg_mori_hashigo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Hashira4\z_bg_mori_hashira4.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Hineri\z_bg_mori_hineri.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Idomizu\z_bg_mori_idomizu.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Kaitenkabe\z_bg_mori_kaitenkabe.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Rakkatenjo\z_bg_mori_rakkatenjo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Po_Event\z_bg_po_event.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Po_Syokudai\z_bg_po_syokudai.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Pushbox\z_bg_pushbox.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Relay_Objects\z_bg_relay_objects.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot00_Break\z_bg_spot00_break.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot00_Hanebasi\z_bg_spot00_hanebasi.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Fusya\z_bg_spot01_fusya.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Idohashira\z_bg_spot01_idohashira.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Idomizu\z_bg_spot01_idomizu.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Idosoko\z_bg_spot01_idosoko.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Objects2\z_bg_spot01_objects2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot02_Objects\z_bg_spot02_objects.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot03_Taki\z_bg_spot03_taki.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot05_Soko\z_bg_spot05_soko.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot06_Objects\z_bg_spot06_objects.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot07_Taki\z_bg_spot07_taki.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot08_Bakudankabe\z_bg_spot08_bakudankabe.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot08_Iceblock\z_bg_spot08_iceblock.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot09_Obj\z_bg_spot09_obj.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot11_Bakudankabe\z_bg_spot11_bakudankabe.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot11_Oasis\z_bg_spot11_oasis.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot12_Gate\z_bg_spot12_gate.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot12_Saku\z_bg_spot12_saku.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot15_Rrbox\z_bg_spot15_rrbox.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot15_Saku\z_bg_spot15_saku.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot16_Bombstone\z_bg_spot16_bombstone.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot16_Doughnut\z_bg_spot16_doughnut.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot17_Bakudankabe\z_bg_spot17_bakudankabe.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot17_Funen\z_bg_spot17_funen.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Basket\z_bg_spot18_basket.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Futa\z_bg_spot18_futa.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Obj\z_bg_spot18_obj.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Shutter\z_bg_spot18_shutter.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Sst_Floor\z_bg_sst_floor.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Hikari\z_bg_toki_hikari.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd_cutscene_data_1.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd_cutscene_data_2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd_cutscene_data_3.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Treemouth\z_bg_treemouth.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Treemouth\z_bg_treemouth_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Umajump\z_bg_umajump.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Vb_Sima\z_bg_vb_sima.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ydan_Hasi\z_bg_ydan_hasi.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ydan_Maruta\z_bg_ydan_maruta.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Ydan_Sp\z_bg_ydan_sp.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Bg_Zg\z_bg_zg.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Dodongo\z_boss_dodongo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Dodongo\z_boss_dodongo_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Fd2\z_boss_fd2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Fd2\z_boss_fd2_colchk.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Fd\z_boss_fd.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Fd\z_boss_fd_colchk.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Ganon2\z_boss_ganon2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Ganon2\z_boss_ganon2_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Ganondrof\z_boss_ganondrof.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Ganon\z_boss_ganon.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Goma\z_boss_goma.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Mo\z_boss_mo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Mo\z_boss_mo_colchk.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Sst\z_boss_sst.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Sst\z_boss_sst_colchk.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Tw\z_boss_tw.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Boss_Va\z_boss_va.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_6K\z_demo_6k.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Du\z_demo_du.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Du\z_demo_du_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Ec\z_demo_ec.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Effect\z_demo_effect.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Ext\z_demo_ext.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Geff\z_demo_geff.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Gj\z_demo_gj.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Go\z_demo_go.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Gt\z_demo_gt.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Ik\z_demo_ik.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Im\z_demo_im.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Im\z_demo_im_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data1.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data3.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data4.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data5.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data6.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data7.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data8.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Kekkai\z_demo_kekkai.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Sa\z_demo_sa.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Sa\z_demo_sa_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Shd\z_demo_shd.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Demo_Tre_Lgt\z_demo_tre_lgt.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Door_Ana\z_door_ana.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Door_Gerudo\z_door_gerudo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Door_Killer\z_door_killer.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Door_Shutter\z_door_shutter.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Door_Toki\z_door_toki.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Door_Warp1\z_door_warp1.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Efc_Erupc\z_efc_erupc.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Eff_Dust\z_eff_dust.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Elf_Msg2\z_elf_msg2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Elf_Msg\z_elf_msg.c" />
+    <ClCompile Include="src\overlays\actors\ovl_End_Title\z_end_title.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Am\z_en_am.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ani\z_en_ani.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Anubice\z_en_anubice.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Anubice_Fire\z_en_anubice_fire.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Anubice_Tag\z_en_anubice_tag.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Arow_Trap\z_en_arow_trap.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Arrow\z_en_arrow.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Attack_Niw\z_en_attack_niw.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ba\z_en_ba.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bb\z_en_bb.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bdfire\z_en_bdfire.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bigokuta\z_en_bigokuta.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bili\z_en_bili.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bird\z_en_bird.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Blkobj\z_en_blkobj.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bombf\z_en_bombf.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bom\z_en_bom.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bom_Bowl_Man\z_en_bom_bowl_man.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bom_Bowl_Pit\z_en_bom_bowl_pit.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bom_Chu\z_en_bom_chu.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Boom\z_en_boom.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Box\z_en_box.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Brob\z_en_brob.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bubble\z_en_bubble.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Butte\z_en_butte.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bw\z_en_bw.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Bx\z_en_bx.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Changer\z_en_changer.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Clear_Tag\z_en_clear_tag.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Cow\z_en_cow.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Crow\z_en_crow.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Cs\z_en_cs.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Daiku\z_en_daiku.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Daiku_Kakariko\z_en_daiku_kakariko.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dekubaba\z_en_dekubaba.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dekunuts\z_en_dekunuts.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dha\z_en_dha.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dh\z_en_dh.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Diving_Game\z_en_diving_game.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dns\z_en_dns.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dnt_Demo\z_en_dnt_demo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dnt_Jiji\z_en_dnt_jiji.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dnt_Nomal\z_en_dnt_nomal.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dodojr\z_en_dodojr.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dodongo\z_en_dodongo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dog\z_en_dog.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Door\z_en_door.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ds\z_en_ds.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Du\z_en_du.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Dy_Extra\z_en_dy_extra.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Eg\z_en_eg.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Eiyer\z_en_eiyer.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Elf\z_en_elf.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Encount1\z_en_encount1.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Encount2\z_en_encount2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ex_Item\z_en_ex_item.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ex_Ruppy\z_en_ex_ruppy.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Fd\z_en_fd.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Fd_Fire\z_en_fd_fire.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_fHG\z_en_fhg.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Fhg_Fire\z_en_fhg_fire.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Firefly\z_en_firefly.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Fire_Rock\z_en_fire_rock.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Fish\z_en_fish.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Floormas\z_en_floormas.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Fr\z_en_fr.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Fu\z_en_fu.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Fw\z_en_fw.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Fz\z_en_fz.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ganon_Mant\z_en_ganon_mant.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ganon_Organ\z_en_ganon_organ.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Gb\z_en_gb.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ge1\z_en_ge1.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ge2\z_en_ge2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ge3\z_en_ge3.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_GeldB\z_en_geldb.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_GirlA\z_en_girla.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Gm\z_en_gm.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Go2\z_en_go2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Goma\z_en_goma.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Goroiwa\z_en_goroiwa.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Go\z_en_go.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Gs\z_en_gs.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Guest\z_en_guest.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_G_Switch\z_en_g_switch.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Hata\z_en_hata.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Heishi1\z_en_heishi1.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Heishi2\z_en_heishi2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Heishi3\z_en_heishi3.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Heishi4\z_en_heishi4.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Hintnuts\z_en_hintnuts.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Holl\z_en_holl.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Honotrap\z_en_honotrap.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Horse\z_en_horse.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Horse_Game_Check\z_en_horse_game_check.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Horse_Ganon\z_en_horse_ganon.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Horse_Link_Child\z_en_horse_link_child.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Horse_Normal\z_en_horse_normal.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Horse_Zelda\z_en_horse_zelda.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Hs2\z_en_hs2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Hs\z_en_hs.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Hy\z_en_hy.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ice_Hono\z_en_ice_hono.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ik\z_en_ik.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Insect\z_en_insect.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_In\z_en_in.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ishi\z_en_ishi.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_It\z_en_it.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Jj\z_en_jj.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Jj\z_en_jj_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Jsjutan\z_en_jsjutan.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Js\z_en_js.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Kakasi2\z_en_kakasi2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Kakasi3\z_en_kakasi3.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Kakasi\z_en_kakasi.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Kanban\z_en_kanban.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Kanban\z_en_kanban_gfx.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Karebaba\z_en_karebaba.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ko\z_en_ko.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Kusa\z_en_kusa.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Kz\z_en_kz.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Lightbox\z_en_lightbox.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Light\z_en_light.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ma1\z_en_ma1.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ma2\z_en_ma2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ma3\z_en_ma3.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Mag\z_en_mag.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Mb\z_en_mb.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Md\z_en_md.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Mk\z_en_mk.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Mm2\z_en_mm2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Mm\z_en_mm.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ms\z_en_ms.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Mu\z_en_mu.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_M_Fire1\z_en_m_fire1.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_M_Thunder\z_en_m_thunder.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Nb\z_en_nb.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Nb\z_en_nb_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Niw\z_en_niw.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Niw_Girl\z_en_niw_girl.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Niw_Lady\z_en_niw_lady.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Nutsball\z_en_nutsball.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Nwc\z_en_nwc.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ny\z_en_ny.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_OE2\z_en_oe2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Okarina_Effect\z_en_okarina_effect.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Okarina_Tag\z_en_okarina_tag.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Okarina_Tag\z_en_okarina_tag_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Okuta\z_en_okuta.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ossan\z_en_ossan.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Owl\z_en_owl.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Part\z_en_part.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Peehat\z_en_peehat.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Poh\z_en_poh.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Po_Desert\z_en_po_desert.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Po_Field\z_en_po_field.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Po_Relay\z_en_po_relay.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Po_Sisters\z_en_po_sisters.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Pu_box\z_en_pu_box.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Rd\z_en_rd.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Reeba\z_en_reeba.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_River_Sound\z_en_river_sound.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Rl\z_en_rl.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Rr\z_en_rr.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ru1\z_en_ru1.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ru1\z_en_ru1_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ru2\z_en_ru2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ru2\z_en_ru2_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Sa\z_en_sa.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Sb\z_en_sb.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Scene_Change\z_en_scene_change.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Sda\z_en_sda.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Shopnuts\z_en_shopnuts.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Siofuki\z_en_siofuki.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Si\z_en_si.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Skb\z_en_skb.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Skjneedle\z_en_skjneedle.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Skj\z_en_skj.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ssh\z_en_ssh.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Sth\z_en_sth.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Stream\z_en_stream.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_St\z_en_st.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Sw\z_en_sw.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Syateki_Itm\z_en_syateki_itm.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Syateki_Man\z_en_syateki_man.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Syateki_Niw\z_en_syateki_niw.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Takara_Man\z_en_takara_man.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Tana\z_en_tana.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Ta\z_en_ta.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Test\z_en_test.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Tg\z_en_tg.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Tite\z_en_tite.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Tk\z_en_tk.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Torch2\z_en_torch2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Torch\z_en_torch.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Toryo\z_en_toryo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Tp\z_en_tp.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Trap\z_en_trap.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Tr\z_en_tr.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Tubo_Trap\z_en_tubo_trap.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Vali\z_en_vali.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Vase\z_en_vase.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Vb_Ball\z_en_vb_ball.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Viewer\z_en_viewer.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Vm\z_en_vm.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Wallmas\z_en_wallmas.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Wall_Tubo\z_en_wall_tubo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Weather_Tag\z_en_weather_tag.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Weiyer\z_en_weiyer.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Wf\z_en_wf.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Wonder_Item\z_en_wonder_item.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Wonder_Talk2\z_en_wonder_talk2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Wonder_Talk\z_en_wonder_talk.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Wood02\z_en_wood02.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Xc\z_en_xc.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Yabusame_Mark\z_en_yabusame_mark.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Yukabyun\z_en_yukabyun.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Zf\z_en_zf.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1_camera_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Zl2\z_en_zl2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Zl3\z_en_zl3.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Zl4\z_en_zl4.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Zl4\z_en_zl4_cutscene_data.c" />
+    <ClCompile Include="src\overlays\actors\ovl_En_Zo\z_en_zo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Fishing\z_fishing.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Item_B_Heart\z_item_b_heart.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Item_Etcetera\z_item_etcetera.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Item_Inbox\z_item_inbox.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Item_Ocarina\z_item_ocarina.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Item_Shield\z_item_shield.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Magic_Dark\z_magic_dark.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Magic_Fire\z_magic_fire.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Magic_Wind\z_magic_wind.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Mir_Ray\z_mir_ray.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Object_Kankyo\z_object_kankyo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Bean\z_obj_bean.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Blockstop\z_obj_blockstop.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Bombiwa\z_obj_bombiwa.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Comb\z_obj_comb.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Dekujr\z_obj_dekujr.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Elevator\z_obj_elevator.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Hamishi\z_obj_hamishi.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Hana\z_obj_hana.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Hsblock\z_obj_hsblock.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Ice_Poly\z_obj_ice_poly.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Kibako2\z_obj_kibako2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Kibako\z_obj_kibako.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Lift\z_obj_lift.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Lightswitch\z_obj_lightswitch.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Makekinsuta\z_obj_makekinsuta.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Makeoshihiki\z_obj_makeoshihiki.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Mure2\z_obj_mure2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Mure3\z_obj_mure3.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Mure\z_obj_mure.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Oshihiki\z_obj_oshihiki.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Roomtimer\z_obj_roomtimer.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Switch\z_obj_switch.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Syokudai\z_obj_syokudai.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Timeblock\z_obj_timeblock.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Tsubo\z_obj_tsubo.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Obj_Warp2block\z_obj_warp2block.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Oceff_Spot\z_oceff_spot.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Oceff_Storm\z_oceff_storm.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe2\z_oceff_wipe2.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe3\z_oceff_wipe3.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe4\z_oceff_wipe4.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe\z_oceff_wipe.c" />
+    <ClCompile Include="src\overlays\actors\ovl_player_actor\z_player.c" />
+    <ClCompile Include="src\overlays\actors\ovl_Shot_Sun\z_shot_sun.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Blast\z_eff_ss_blast.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Bomb2\z_eff_ss_bomb2.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Bomb\z_eff_ss_bomb.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Bubble\z_eff_ss_bubble.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Db\z_eff_ss_dead_db.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Dd\z_eff_ss_dead_dd.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Ds\z_eff_ss_dead_ds.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Sound\z_eff_ss_dead_sound.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dt_Bubble\z_eff_ss_dt_bubble.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dust\z_eff_ss_dust.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_D_Fire\z_eff_ss_d_fire.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_En_Fire\z_eff_ss_en_fire.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_En_Ice\z_eff_ss_en_ice.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Extra\z_eff_ss_extra.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Fcircle\z_eff_ss_fcircle.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Fhg_Flash\z_eff_ss_fhg_flash.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Fire_Tail\z_eff_ss_fire_tail.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Fire\z_eff_ss_g_fire.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Magma2\z_eff_ss_g_magma2.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Magma\z_eff_ss_g_magma.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Ripple\z_eff_ss_g_ripple.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Spk\z_eff_ss_g_spk.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Splash\z_eff_ss_g_splash.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Hahen\z_eff_ss_hahen.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_HitMark\z_eff_ss_hitmark.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Ice_Piece\z_eff_ss_ice_piece.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Ice_Smoke\z_eff_ss_ice_smoke.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Kakera\z_eff_ss_kakera.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_KiraKira\z_eff_ss_kirakira.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_K_Fire\z_eff_ss_k_fire.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Lightning\z_eff_ss_lightning.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Sibuki2\z_eff_ss_sibuki2.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Sibuki\z_eff_ss_sibuki.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Solder_Srch_Ball\z_eff_ss_solder_srch_ball.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Stick\z_eff_ss_stick.c" />
+    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Stone1\z_eff_ss_stone1.c" />
+    <ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_choose.c" />
+    <ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_copy_erase.c" />
+    <ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_nameset_data.c" />
+    <ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_nameset_PAL.c" />
+    <ClCompile Include="src\overlays\gamestates\ovl_opening\z_opening.c" />
+    <ClCompile Include="src\overlays\gamestates\ovl_select\z_select.c" />
+    <ClCompile Include="src\overlays\gamestates\ovl_title\z_title.c" />
+    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_collect.c" />
+    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_debug.c" />
+    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_equipment.c" />
+    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_item.c" />
+    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_map_PAL.c" />
+    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_prompt.c" />
+    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_scope_PAL.c" />
+    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_lmap_mark.c" />
+    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_lmap_mark_data.c" />
+    <ClCompile Include="src\overlays\misc\ovl_map_mark_data\z_map_mark_data.c" />
+    <ClCompile Include="soh\Enhancements\randomizer.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\boot\assert.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\boot_main.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\build.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\idle.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\is_debug.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\logutils.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\missing_gcc_functions.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\stackcheck.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\viconfig.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\yaz0.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\z_locale.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\boot\z_std_dma.c">
-      <Filter>Source Files\src\boot</Filter>
-    </ClCompile>
-    <ClCompile Include="src\buffers\gfxbuffers.c">
-      <Filter>Source Files\src\buffers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\buffers\heaps.c">
-      <Filter>Source Files\src\buffers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\buffers\zbuffer.c">
-      <Filter>Source Files\src\buffers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Blast\z_eff_ss_blast.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Bomb\z_eff_ss_bomb.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Bomb2\z_eff_ss_bomb2.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Bubble\z_eff_ss_bubble.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_D_Fire\z_eff_ss_d_fire.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Db\z_eff_ss_dead_db.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Dd\z_eff_ss_dead_dd.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Ds\z_eff_ss_dead_ds.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Sound\z_eff_ss_dead_sound.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dt_Bubble\z_eff_ss_dt_bubble.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dust\z_eff_ss_dust.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_En_Fire\z_eff_ss_en_fire.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_En_Ice\z_eff_ss_en_ice.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Extra\z_eff_ss_extra.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Fcircle\z_eff_ss_fcircle.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Fhg_Flash\z_eff_ss_fhg_flash.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Fire_Tail\z_eff_ss_fire_tail.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Fire\z_eff_ss_g_fire.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Magma\z_eff_ss_g_magma.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Magma2\z_eff_ss_g_magma2.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Ripple\z_eff_ss_g_ripple.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Spk\z_eff_ss_g_spk.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Splash\z_eff_ss_g_splash.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Hahen\z_eff_ss_hahen.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_HitMark\z_eff_ss_hitmark.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Ice_Piece\z_eff_ss_ice_piece.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Ice_Smoke\z_eff_ss_ice_smoke.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_K_Fire\z_eff_ss_k_fire.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Kakera\z_eff_ss_kakera.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_KiraKira\z_eff_ss_kirakira.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Lightning\z_eff_ss_lightning.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Sibuki\z_eff_ss_sibuki.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Sibuki2\z_eff_ss_sibuki2.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Solder_Srch_Ball\z_eff_ss_solder_srch_ball.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Stick\z_eff_ss_stick.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Stone1\z_eff_ss_stone1.c">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\gamestates\ovl_title\z_title.c">
-      <Filter>Source Files\src\overlays\gamestates\ovl_title</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\gamestates\ovl_select\z_select.c">
-      <Filter>Source Files\src\overlays\gamestates\ovl_select</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\gamestates\ovl_opening\z_opening.c">
-      <Filter>Source Files\src\overlays\gamestates\ovl_opening</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_nameset_PAL.c">
-      <Filter>Source Files\src\overlays\gamestates\ovl_file_choose</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_choose.c">
-      <Filter>Source Files\src\overlays\gamestates\ovl_file_choose</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\OTRGlobals.cpp">
-      <Filter>Source Files\soh</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\stubs.c">
-      <Filter>Source Files\soh</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\z_play_otr.cpp">
-      <Filter>Source Files\soh</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\z_scene_otr.cpp">
-      <Filter>Source Files\soh</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\__osMalloc.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\audio_effects.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\audio_heap.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\audio_load.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\audio_playback.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\audio_seqplayer.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\audio_sound_params.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\audio_synthesis.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\audioMgr.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800A9F30.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800ACE70.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800AD920.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800BB0A0.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800C3C20.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800D2E30.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800D31A0.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800E4FE0.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800EC960.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800F7260.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800F9280.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800FBCE0.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800FC620.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800FCE80.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800FD970.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_8006C3A0.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_8006C510.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_80097A00.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800430A0.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_801067F0.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_801068B0.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_80043480.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\db_camera.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\debug_malloc.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\fault.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\fault_drawer.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\flg_set.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\game.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\gamealloc.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\gfxprint.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\graph.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\irqmgr.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\jpegdecoder.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\jpegutils.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\listalloc.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\loadfragment2.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\logseverity.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\main.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\mempak.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\mtxuty-cvt.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\padmgr.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\padsetup.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\padutils.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\PreRender.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\printutils.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\relocation.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\sched.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\shrink_window.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\sleep.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\speed_meter.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\sys_cfb.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\sys_math.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\sys_math_atan.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\sys_math3d.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\sys_matrix.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\sys_ucode.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\system_malloc.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\title_setup.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\TwoHeadArena.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\ucode_disas.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_actor.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_actor_dlftbls.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_bgcheck.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_camera.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_collision_btltbls.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_collision_check.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_common_data.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_construct.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_debug.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_debug_display.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_demo.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_DLF.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_draw.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_eff_blure.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_eff_shield_particle.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_eff_spark.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_eff_ss_dead.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_effect.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_effect_soft_sprite.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_effect_soft_sprite_dlftbls.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_effect_soft_sprite_old_init.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_elf_message.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_en_a_keep.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_en_item00.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_face_reaction.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_fbdemo.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_fbdemo_circle.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_fbdemo_fade.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_fbdemo_triforce.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_fbdemo_wipe1.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_fcurve_data_skelanime.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_frame_advance.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_game_dlftbls.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_game_over.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_horse.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_jpeg.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_kaleido_manager.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_kaleido_scope_call.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_kaleido_setup.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_kanfont.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_kankyo.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_lib.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_lifemeter.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_lights.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_malloc.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_map_data.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_map_exp.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_map_mark.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_message_PAL.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_moji.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_msgevent.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_olib.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_onepointdemo.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_parameter.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_path.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_play.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_player_call.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_player_lib.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_prenmi.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_prenmi_buff.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_quake.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_rcp.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_room.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_sample.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_scene.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_scene_table.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_skelanime.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_skin.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_skin_awb.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_skin_matrix.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_sram.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_ss_sram.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_view.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_vimode.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_vismono.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_vr_box.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_vr_box_draw.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\gu\coss.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\gu\guLookAt.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\gu\guLookAtHilite.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\gu\guPosition.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\gu\guS2DInitBg.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\gu\ortho.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\gu\rotate.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\gu\sins.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\gu\sintable.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\libc\sprintf.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libultra\gu\guPerspectiveF.c">
-      <Filter>Source Files\src\libultra</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_collect.c">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_debug.c">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_equipment.c">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_item.c">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_map_PAL.c">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_prompt.c">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_scope_PAL.c">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_lmap_mark.c">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_lmap_mark_data.c">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_copy_erase.c">
-      <Filter>Source Files\src\overlays\gamestates\ovl_file_choose</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\audio_data.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\code_800E6840.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\audio_init_params.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_sound_source.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_nameset_data.c">
-      <Filter>Source Files\src\overlays\gamestates\ovl_file_choose</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\misc\ovl_map_mark_data\z_map_mark_data.c">
-      <Filter>Source Files\src\overlays\misc\ovl_map_mark_data</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\z_message_OTR.cpp">
-      <Filter>Source Files\soh</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\Enhancements\bootcommands.c">
-      <Filter>Source Files\soh\Enhancements</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\Enhancements\debugconsole.cpp">
-      <Filter>Source Files\soh\Enhancements</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\Enhancements\gameconsole.c">
-      <Filter>Source Files\soh\Enhancements</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\GbiWrap.cpp">
-      <Filter>Source Files\soh</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\gu_pc.c">
-      <Filter>Source Files\soh</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Arms_Hook\z_arms_hook.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Arrow_Fire\z_arrow_fire.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Arrow_Ice\z_arrow_ice.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Arrow_Light\z_arrow_light.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Bdan_Objects\z_bg_bdan_objects.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Bdan_Switch\z_bg_bdan_switch.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Bom_Guard\z_bg_bom_guard.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Bombwall\z_bg_bombwall.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Bowl_Wall\z_bg_bowl_wall.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Breakwall\z_bg_breakwall.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ddan_Jd\z_bg_ddan_jd.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ddan_Kd\z_bg_ddan_kd.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Dodoago\z_bg_dodoago.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Dy_Yoseizo\z_bg_dy_yoseizo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ganon_Otyuka\z_bg_ganon_otyuka.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Gate_Shutter\z_bg_gate_shutter.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Gjyo_Bridge\z_bg_gjyo_bridge.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Darkmeiro\z_bg_gnd_darkmeiro.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Firemeiro\z_bg_gnd_firemeiro.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Iceblock\z_bg_gnd_iceblock.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Nisekabe\z_bg_gnd_nisekabe.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Soulmeiro\z_bg_gnd_soulmeiro.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka\z_bg_haka.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Gate\z_bg_haka_gate.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Huta\z_bg_haka_huta.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Megane\z_bg_haka_megane.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_MeganeBG\z_bg_haka_meganebg.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Sgami\z_bg_haka_sgami.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Ship\z_bg_haka_ship.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Trap\z_bg_haka_trap.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Tubo\z_bg_haka_tubo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Water\z_bg_haka_water.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Zou\z_bg_haka_zou.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Heavy_Block\z_bg_heavy_block.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Curtain\z_bg_hidan_curtain.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Dalm\z_bg_hidan_dalm.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Firewall\z_bg_hidan_firewall.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Fslift\z_bg_hidan_fslift.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Fwbig\z_bg_hidan_fwbig.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Hamstep\z_bg_hidan_hamstep.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Hrock\z_bg_hidan_hrock.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Kousi\z_bg_hidan_kousi.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Kowarerukabe\z_bg_hidan_kowarerukabe.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Rock\z_bg_hidan_rock.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Rsekizou\z_bg_hidan_rsekizou.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Sekizou\z_bg_hidan_sekizou.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Sima\z_bg_hidan_sima.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Syoku\z_bg_hidan_syoku.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Objects\z_bg_ice_objects.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Shelter\z_bg_ice_shelter.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Shutter\z_bg_ice_shutter.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Turara\z_bg_ice_turara.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ingate\z_bg_ingate.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_1flift\z_bg_jya_1flift.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Amishutter\z_bg_jya_amishutter.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Bigmirror\z_bg_jya_bigmirror.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Block\z_bg_jya_block.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Bombchuiwa\z_bg_jya_bombchuiwa.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Bombiwa\z_bg_jya_bombiwa.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Cobra\z_bg_jya_cobra.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Goroiwa\z_bg_jya_goroiwa.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Haheniron\z_bg_jya_haheniron.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Ironobj\z_bg_jya_ironobj.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Kanaami\z_bg_jya_kanaami.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Lift\z_bg_jya_lift.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Megami\z_bg_jya_megami.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Zurerukabe\z_bg_jya_zurerukabe.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Menkuri_Eye\z_bg_menkuri_eye.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Menkuri_Kaiten\z_bg_menkuri_kaiten.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Menkuri_Nisekabe\z_bg_menkuri_nisekabe.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Bwall\z_bg_mizu_bwall.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Movebg\z_bg_mizu_movebg.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Shutter\z_bg_mizu_shutter.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Uzu\z_bg_mizu_uzu.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Water\z_bg_mizu_water.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mjin\z_bg_mjin.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Bigst\z_bg_mori_bigst.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Elevator\z_bg_mori_elevator.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Hashigo\z_bg_mori_hashigo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Hashira4\z_bg_mori_hashira4.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Hineri\z_bg_mori_hineri.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Idomizu\z_bg_mori_idomizu.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Kaitenkabe\z_bg_mori_kaitenkabe.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Rakkatenjo\z_bg_mori_rakkatenjo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Po_Event\z_bg_po_event.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Po_Syokudai\z_bg_po_syokudai.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Pushbox\z_bg_pushbox.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Relay_Objects\z_bg_relay_objects.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot00_Break\z_bg_spot00_break.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot00_Hanebasi\z_bg_spot00_hanebasi.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Fusya\z_bg_spot01_fusya.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Idohashira\z_bg_spot01_idohashira.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Idomizu\z_bg_spot01_idomizu.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Idosoko\z_bg_spot01_idosoko.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Objects2\z_bg_spot01_objects2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot02_Objects\z_bg_spot02_objects.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot03_Taki\z_bg_spot03_taki.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot05_Soko\z_bg_spot05_soko.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot06_Objects\z_bg_spot06_objects.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot07_Taki\z_bg_spot07_taki.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot08_Bakudankabe\z_bg_spot08_bakudankabe.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot08_Iceblock\z_bg_spot08_iceblock.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot09_Obj\z_bg_spot09_obj.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot11_Bakudankabe\z_bg_spot11_bakudankabe.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot11_Oasis\z_bg_spot11_oasis.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot12_Gate\z_bg_spot12_gate.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot12_Saku\z_bg_spot12_saku.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot15_Rrbox\z_bg_spot15_rrbox.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot15_Saku\z_bg_spot15_saku.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot16_Bombstone\z_bg_spot16_bombstone.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot16_Doughnut\z_bg_spot16_doughnut.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot17_Bakudankabe\z_bg_spot17_bakudankabe.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot17_Funen\z_bg_spot17_funen.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Basket\z_bg_spot18_basket.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Futa\z_bg_spot18_futa.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Obj\z_bg_spot18_obj.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Shutter\z_bg_spot18_shutter.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Sst_Floor\z_bg_sst_floor.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Hikari\z_bg_toki_hikari.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd_cutscene_data_1.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd_cutscene_data_2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd_cutscene_data_3.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Treemouth\z_bg_treemouth.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Treemouth\z_bg_treemouth_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Umajump\z_bg_umajump.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Vb_Sima\z_bg_vb_sima.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ydan_Hasi\z_bg_ydan_hasi.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ydan_Maruta\z_bg_ydan_maruta.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Ydan_Sp\z_bg_ydan_sp.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Bg_Zg\z_bg_zg.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Dodongo\z_boss_dodongo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Dodongo\z_boss_dodongo_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Fd\z_boss_fd.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Fd\z_boss_fd_colchk.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Fd2\z_boss_fd2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Fd2\z_boss_fd2_colchk.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Ganon\z_boss_ganon.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Ganon2\z_boss_ganon2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Ganon2\z_boss_ganon2_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Ganondrof\z_boss_ganondrof.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Goma\z_boss_goma.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Mo\z_boss_mo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Mo\z_boss_mo_colchk.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Sst\z_boss_sst.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Sst\z_boss_sst_colchk.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Tw\z_boss_tw.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Boss_Va\z_boss_va.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_6K\z_demo_6k.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Du\z_demo_du.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Du\z_demo_du_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Ec\z_demo_ec.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Effect\z_demo_effect.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Ext\z_demo_ext.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Geff\z_demo_geff.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Gj\z_demo_gj.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Go\z_demo_go.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Gt\z_demo_gt.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Ik\z_demo_ik.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Im\z_demo_im.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Im\z_demo_im_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data1.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data3.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data4.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data5.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data6.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data7.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data8.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Kekkai\z_demo_kekkai.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Sa\z_demo_sa.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Sa\z_demo_sa_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Shd\z_demo_shd.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Demo_Tre_Lgt\z_demo_tre_lgt.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Door_Ana\z_door_ana.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Door_Gerudo\z_door_gerudo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Door_Killer\z_door_killer.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Door_Shutter\z_door_shutter.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Door_Toki\z_door_toki.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Door_Warp1\z_door_warp1.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Efc_Erupc\z_efc_erupc.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Eff_Dust\z_eff_dust.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Elf_Msg\z_elf_msg.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Elf_Msg2\z_elf_msg2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Am\z_en_am.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ani\z_en_ani.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Anubice\z_en_anubice.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Anubice_Fire\z_en_anubice_fire.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Anubice_Tag\z_en_anubice_tag.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Arow_Trap\z_en_arow_trap.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Arrow\z_en_arrow.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Attack_Niw\z_en_attack_niw.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ba\z_en_ba.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bb\z_en_bb.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bdfire\z_en_bdfire.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bigokuta\z_en_bigokuta.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bili\z_en_bili.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bird\z_en_bird.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Blkobj\z_en_blkobj.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bom\z_en_bom.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bom_Bowl_Man\z_en_bom_bowl_man.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bom_Bowl_Pit\z_en_bom_bowl_pit.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bom_Chu\z_en_bom_chu.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bombf\z_en_bombf.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Boom\z_en_boom.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Box\z_en_box.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Brob\z_en_brob.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bubble\z_en_bubble.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Butte\z_en_butte.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bw\z_en_bw.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Bx\z_en_bx.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Changer\z_en_changer.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Clear_Tag\z_en_clear_tag.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Cow\z_en_cow.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Crow\z_en_crow.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Cs\z_en_cs.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Daiku\z_en_daiku.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Daiku_Kakariko\z_en_daiku_kakariko.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dekubaba\z_en_dekubaba.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dekunuts\z_en_dekunuts.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dh\z_en_dh.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dha\z_en_dha.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Diving_Game\z_en_diving_game.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dns\z_en_dns.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dnt_Demo\z_en_dnt_demo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dnt_Jiji\z_en_dnt_jiji.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dnt_Nomal\z_en_dnt_nomal.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dodojr\z_en_dodojr.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dodongo\z_en_dodongo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dog\z_en_dog.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Door\z_en_door.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ds\z_en_ds.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Du\z_en_du.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Dy_Extra\z_en_dy_extra.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Eg\z_en_eg.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Eiyer\z_en_eiyer.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Elf\z_en_elf.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Encount1\z_en_encount1.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Encount2\z_en_encount2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ex_Item\z_en_ex_item.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ex_Ruppy\z_en_ex_ruppy.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Fd\z_en_fd.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Fd_Fire\z_en_fd_fire.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_fHG\z_en_fhg.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Fhg_Fire\z_en_fhg_fire.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Fire_Rock\z_en_fire_rock.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Firefly\z_en_firefly.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Fish\z_en_fish.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Floormas\z_en_floormas.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Fr\z_en_fr.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Fu\z_en_fu.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Fw\z_en_fw.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Fz\z_en_fz.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_G_Switch\z_en_g_switch.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ganon_Mant\z_en_ganon_mant.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ganon_Organ\z_en_ganon_organ.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Gb\z_en_gb.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ge1\z_en_ge1.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ge2\z_en_ge2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ge3\z_en_ge3.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_GeldB\z_en_geldb.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_GirlA\z_en_girla.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Gm\z_en_gm.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Go\z_en_go.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Go2\z_en_go2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Goma\z_en_goma.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Goroiwa\z_en_goroiwa.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Gs\z_en_gs.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Guest\z_en_guest.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Hata\z_en_hata.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Heishi1\z_en_heishi1.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Heishi2\z_en_heishi2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Heishi3\z_en_heishi3.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Heishi4\z_en_heishi4.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Hintnuts\z_en_hintnuts.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Holl\z_en_holl.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Honotrap\z_en_honotrap.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Horse\z_en_horse.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Horse_Game_Check\z_en_horse_game_check.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Horse_Ganon\z_en_horse_ganon.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Horse_Link_Child\z_en_horse_link_child.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Horse_Normal\z_en_horse_normal.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Horse_Zelda\z_en_horse_zelda.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Hs\z_en_hs.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Hs2\z_en_hs2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Hy\z_en_hy.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ice_Hono\z_en_ice_hono.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ik\z_en_ik.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_In\z_en_in.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Insect\z_en_insect.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ishi\z_en_ishi.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_It\z_en_it.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Jj\z_en_jj.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Jj\z_en_jj_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Js\z_en_js.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Jsjutan\z_en_jsjutan.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Kakasi\z_en_kakasi.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Kakasi2\z_en_kakasi2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Kakasi3\z_en_kakasi3.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Kanban\z_en_kanban.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Kanban\z_en_kanban_gfx.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Karebaba\z_en_karebaba.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ko\z_en_ko.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Kusa\z_en_kusa.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Kz\z_en_kz.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Light\z_en_light.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Lightbox\z_en_lightbox.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_M_Fire1\z_en_m_fire1.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_M_Thunder\z_en_m_thunder.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ma1\z_en_ma1.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ma2\z_en_ma2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ma3\z_en_ma3.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Mag\z_en_mag.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Mb\z_en_mb.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Md\z_en_md.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Mk\z_en_mk.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Mm\z_en_mm.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Mm2\z_en_mm2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ms\z_en_ms.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Mu\z_en_mu.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Nb\z_en_nb.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Nb\z_en_nb_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Niw\z_en_niw.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Niw_Girl\z_en_niw_girl.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Niw_Lady\z_en_niw_lady.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Nutsball\z_en_nutsball.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Nwc\z_en_nwc.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ny\z_en_ny.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_OE2\z_en_oe2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Okarina_Effect\z_en_okarina_effect.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Okarina_Tag\z_en_okarina_tag.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Okarina_Tag\z_en_okarina_tag_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Okuta\z_en_okuta.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ossan\z_en_ossan.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Owl\z_en_owl.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Part\z_en_part.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Peehat\z_en_peehat.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Po_Desert\z_en_po_desert.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Po_Field\z_en_po_field.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Po_Relay\z_en_po_relay.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Po_Sisters\z_en_po_sisters.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Poh\z_en_poh.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Pu_box\z_en_pu_box.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Rd\z_en_rd.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Reeba\z_en_reeba.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_River_Sound\z_en_river_sound.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Rl\z_en_rl.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Rr\z_en_rr.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ru1\z_en_ru1.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ru1\z_en_ru1_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ru2\z_en_ru2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ru2\z_en_ru2_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Sa\z_en_sa.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Sb\z_en_sb.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Scene_Change\z_en_scene_change.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Sda\z_en_sda.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Shopnuts\z_en_shopnuts.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Si\z_en_si.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Siofuki\z_en_siofuki.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Skb\z_en_skb.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Skj\z_en_skj.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Skjneedle\z_en_skjneedle.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ssh\z_en_ssh.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_St\z_en_st.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Sth\z_en_sth.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Stream\z_en_stream.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Sw\z_en_sw.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Syateki_Itm\z_en_syateki_itm.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Syateki_Man\z_en_syateki_man.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Syateki_Niw\z_en_syateki_niw.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Ta\z_en_ta.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Takara_Man\z_en_takara_man.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Tana\z_en_tana.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Test\z_en_test.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Tg\z_en_tg.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Tite\z_en_tite.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Tk\z_en_tk.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Torch\z_en_torch.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Torch2\z_en_torch2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Toryo\z_en_toryo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Tp\z_en_tp.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Tr\z_en_tr.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Trap\z_en_trap.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Tubo_Trap\z_en_tubo_trap.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Vali\z_en_vali.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Vase\z_en_vase.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Vb_Ball\z_en_vb_ball.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Viewer\z_en_viewer.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Vm\z_en_vm.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Wall_Tubo\z_en_wall_tubo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Wallmas\z_en_wallmas.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Weather_Tag\z_en_weather_tag.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Weiyer\z_en_weiyer.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Wf\z_en_wf.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Wonder_Item\z_en_wonder_item.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Wonder_Talk\z_en_wonder_talk.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Wonder_Talk2\z_en_wonder_talk2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Wood02\z_en_wood02.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Xc\z_en_xc.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Yabusame_Mark\z_en_yabusame_mark.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Yukabyun\z_en_yukabyun.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Zf\z_en_zf.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1_camera_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Zl2\z_en_zl2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Zl3\z_en_zl3.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Zl4\z_en_zl4.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Zl4\z_en_zl4_cutscene_data.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_En_Zo\z_en_zo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_End_Title\z_end_title.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Fishing\z_fishing.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Item_B_Heart\z_item_b_heart.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Item_Etcetera\z_item_etcetera.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Item_Inbox\z_item_inbox.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Item_Ocarina\z_item_ocarina.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Item_Shield\z_item_shield.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Magic_Dark\z_magic_dark.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Magic_Fire\z_magic_fire.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Magic_Wind\z_magic_wind.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Mir_Ray\z_mir_ray.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Bean\z_obj_bean.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Blockstop\z_obj_blockstop.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Bombiwa\z_obj_bombiwa.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Comb\z_obj_comb.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Dekujr\z_obj_dekujr.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Elevator\z_obj_elevator.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Hamishi\z_obj_hamishi.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Hana\z_obj_hana.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Hsblock\z_obj_hsblock.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Ice_Poly\z_obj_ice_poly.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Kibako\z_obj_kibako.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Kibako2\z_obj_kibako2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Lift\z_obj_lift.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Lightswitch\z_obj_lightswitch.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Makekinsuta\z_obj_makekinsuta.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Makeoshihiki\z_obj_makeoshihiki.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Mure\z_obj_mure.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Mure2\z_obj_mure2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Mure3\z_obj_mure3.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Oshihiki\z_obj_oshihiki.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Roomtimer\z_obj_roomtimer.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Switch\z_obj_switch.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Syokudai\z_obj_syokudai.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Timeblock\z_obj_timeblock.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Tsubo\z_obj_tsubo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Obj_Warp2block\z_obj_warp2block.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Object_Kankyo\z_object_kankyo.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Oceff_Spot\z_oceff_spot.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Oceff_Storm\z_oceff_storm.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe\z_oceff_wipe.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe2\z_oceff_wipe2.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe3\z_oceff_wipe3.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe4\z_oceff_wipe4.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_player_actor\z_player.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\overlays\actors\ovl_Shot_Sun\z_shot_sun.c">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\Enhancements\debugger\debugger.cpp">
-      <Filter>Source Files\soh\Enhancements\debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\Enhancements\debugger\debugSaveEditor.cpp">
-      <Filter>Source Files\soh\Enhancements\debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\util.cpp">
-      <Filter>Source Files\soh</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\Enhancements\debugger\colViewer.cpp">
-      <Filter>Source Files\soh\Enhancements\debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\Enhancements\debugger\ImGuiHelpers.cpp">
-      <Filter>Source Files\soh\Enhancements\debugger</Filter>
-    <ClCompile Include="soh\frame_interpolation.cpp">
-      <Filter>Source Files\soh</Filter>
-    </ClCompile>
-    <ClCompile Include="src\code\z_cheap_proc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="soh\Enhancements\savestates.cpp">
-      <Filter>Source Files\soh\Enhancements</Filter>
-    </ClCompile>
+    <ClInclude Include="soh\frame_interpolation.h" />
+    <ClInclude Include="include\alloca.h" />
+    <ClInclude Include="include\bgm.h" />
+    <ClInclude Include="include\color.h" />
+    <ClInclude Include="include\command_macros_base.h" />
+    <ClInclude Include="include\fp.h" />
+    <ClInclude Include="include\functions.h" />
+    <ClInclude Include="include\global.h" />
+    <ClInclude Include="include\ichain.h" />
+    <ClInclude Include="include\macros.h" />
+    <ClInclude Include="include\math_n64.h" />
+    <ClInclude Include="include\regs.h" />
+    <ClInclude Include="include\segment_symbols.h" />
+    <ClInclude Include="include\sfx.h" />
+    <ClInclude Include="include\stdarg.h" />
+    <ClInclude Include="include\stdbool_n64.h" />
+    <ClInclude Include="include\stddef_n64.h" />
+    <ClInclude Include="include\stdlib_n64.h" />
+    <ClInclude Include="include\ultra64.h" />
+    <ClInclude Include="include\unk.h" />
+    <ClInclude Include="include\variables.h" />
+    <ClInclude Include="include\vt.h" />
+    <ClInclude Include="include\z64.h" />
+    <ClInclude Include="include\z64actor.h" />
+    <ClInclude Include="include\z64animation.h" />
+    <ClInclude Include="include\z64audio.h" />
+    <ClInclude Include="include\z64bgcheck.h" />
+    <ClInclude Include="include\z64camera.h" />
+    <ClInclude Include="include\z64collision_check.h" />
+    <ClInclude Include="include\z64cutscene.h" />
+    <ClInclude Include="include\z64cutscene_commands.h" />
+    <ClInclude Include="include\z64dma.h" />
+    <ClInclude Include="include\z64effect.h" />
+    <ClInclude Include="include\z64environment.h" />
+    <ClInclude Include="include\z64interface.h" />
+    <ClInclude Include="include\z64item.h" />
+    <ClInclude Include="include\z64light.h" />
+    <ClInclude Include="include\z64map_mark.h" />
+    <ClInclude Include="include\z64math.h" />
+    <ClInclude Include="include\z64object.h" />
+    <ClInclude Include="include\z64player.h" />
+    <ClInclude Include="include\z64save.h" />
+    <ClInclude Include="include\z64scene.h" />
+    <ClInclude Include="include\z64transition.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="soh\Enhancements\bootcommands.h" />
+    <ClInclude Include="soh\Enhancements\cvar.h" />
+    <ClInclude Include="soh\Enhancements\debugconsole.h" />
+    <ClInclude Include="soh\Enhancements\debugger\colViewer.h" />
+    <ClInclude Include="soh\Enhancements\savestates.h" />
+    <ClInclude Include="soh\Enhancements\debugger\debugger.h" />
+    <ClInclude Include="soh\Enhancements\debugger\debugSaveEditor.h" />
+    <ClInclude Include="soh\Enhancements\debugger\ImGuiHelpers.h" />
+    <ClInclude Include="soh\gameconsole.h" />
+    <ClInclude Include="soh\OTRAudio.h" />
+    <ClInclude Include="soh\OTRGlobals.h" />
+    <ClInclude Include="soh\util.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Arms_Hook\z_arms_hook.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Arrow_Fire\z_arrow_fire.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Arrow_Ice\z_arrow_ice.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Arrow_Light\z_arrow_light.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Bdan_Objects\z_bg_bdan_objects.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Bdan_Switch\z_bg_bdan_switch.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Bombwall\z_bg_bombwall.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Bom_Guard\z_bg_bom_guard.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Bowl_Wall\z_bg_bowl_wall.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Breakwall\z_bg_breakwall.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ddan_Jd\z_bg_ddan_jd.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ddan_Kd\z_bg_ddan_kd.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Dodoago\z_bg_dodoago.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Dy_Yoseizo\z_bg_dy_yoseizo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ganon_Otyuka\z_bg_ganon_otyuka.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Gate_Shutter\z_bg_gate_shutter.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Gjyo_Bridge\z_bg_gjyo_bridge.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Gnd_Darkmeiro\z_bg_gnd_darkmeiro.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Gnd_Firemeiro\z_bg_gnd_firemeiro.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Gnd_Iceblock\z_bg_gnd_iceblock.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Gnd_Nisekabe\z_bg_gnd_nisekabe.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Gnd_Soulmeiro\z_bg_gnd_soulmeiro.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka\z_bg_haka.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Gate\z_bg_haka_gate.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Huta\z_bg_haka_huta.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_MeganeBG\z_bg_haka_meganebg.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Megane\z_bg_haka_megane.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Sgami\z_bg_haka_sgami.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Ship\z_bg_haka_ship.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Trap\z_bg_haka_trap.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Tubo\z_bg_haka_tubo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Water\z_bg_haka_water.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Zou\z_bg_haka_zou.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Heavy_Block\z_bg_heavy_block.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Curtain\z_bg_hidan_curtain.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Dalm\z_bg_hidan_dalm.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Firewall\z_bg_hidan_firewall.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Fslift\z_bg_hidan_fslift.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Fwbig\z_bg_hidan_fwbig.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Hamstep\z_bg_hidan_hamstep.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Hrock\z_bg_hidan_hrock.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Kousi\z_bg_hidan_kousi.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Kowarerukabe\z_bg_hidan_kowarerukabe.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Rock\z_bg_hidan_rock.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Rsekizou\z_bg_hidan_rsekizou.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Sekizou\z_bg_hidan_sekizou.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Sima\z_bg_hidan_sima.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Syoku\z_bg_hidan_syoku.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ice_Objects\z_bg_ice_objects.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ice_Shelter\z_bg_ice_shelter.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ice_Shutter\z_bg_ice_shutter.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ice_Turara\z_bg_ice_turara.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ingate\z_bg_ingate.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_1flift\z_bg_jya_1flift.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Amishutter\z_bg_jya_amishutter.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Bigmirror\z_bg_jya_bigmirror.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Block\z_bg_jya_block.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Bombchuiwa\z_bg_jya_bombchuiwa.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Bombiwa\z_bg_jya_bombiwa.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Cobra\z_bg_jya_cobra.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Goroiwa\z_bg_jya_goroiwa.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Haheniron\z_bg_jya_haheniron.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Ironobj\z_bg_jya_ironobj.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Kanaami\z_bg_jya_kanaami.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Lift\z_bg_jya_lift.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Megami\z_bg_jya_megami.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Zurerukabe\z_bg_jya_zurerukabe.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Menkuri_Eye\z_bg_menkuri_eye.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Menkuri_Kaiten\z_bg_menkuri_kaiten.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Menkuri_Nisekabe\z_bg_menkuri_nisekabe.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mizu_Bwall\z_bg_mizu_bwall.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mizu_Movebg\z_bg_mizu_movebg.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mizu_Shutter\z_bg_mizu_shutter.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mizu_Uzu\z_bg_mizu_uzu.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mizu_Water\z_bg_mizu_water.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mjin\z_bg_mjin.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Bigst\z_bg_mori_bigst.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Elevator\z_bg_mori_elevator.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Hashigo\z_bg_mori_hashigo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Hashira4\z_bg_mori_hashira4.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Hineri\z_bg_mori_hineri.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Idomizu\z_bg_mori_idomizu.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Kaitenkabe\z_bg_mori_kaitenkabe.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Rakkatenjo\z_bg_mori_rakkatenjo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Po_Event\z_bg_po_event.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Po_Syokudai\z_bg_po_syokudai.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Pushbox\z_bg_pushbox.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Relay_Objects\z_bg_relay_objects.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot00_Break\z_bg_spot00_break.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot00_Hanebasi\z_bg_spot00_hanebasi.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot01_Fusya\z_bg_spot01_fusya.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot01_Idohashira\z_bg_spot01_idohashira.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot01_Idomizu\z_bg_spot01_idomizu.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot01_Idosoko\z_bg_spot01_idosoko.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot01_Objects2\z_bg_spot01_objects2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot02_Objects\z_bg_spot02_objects.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot03_Taki\z_bg_spot03_taki.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot05_Soko\z_bg_spot05_soko.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot06_Objects\z_bg_spot06_objects.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot07_Taki\z_bg_spot07_taki.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot08_Bakudankabe\z_bg_spot08_bakudankabe.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot08_Iceblock\z_bg_spot08_iceblock.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot09_Obj\z_bg_spot09_obj.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot11_Bakudankabe\z_bg_spot11_bakudankabe.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot11_Oasis\z_bg_spot11_oasis.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot12_Gate\z_bg_spot12_gate.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot12_Saku\z_bg_spot12_saku.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot15_Rrbox\z_bg_spot15_rrbox.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot15_Saku\z_bg_spot15_saku.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot16_Bombstone\z_bg_spot16_bombstone.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot16_Doughnut\z_bg_spot16_doughnut.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot17_Bakudankabe\z_bg_spot17_bakudankabe.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot17_Funen\z_bg_spot17_funen.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot18_Basket\z_bg_spot18_basket.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot18_Futa\z_bg_spot18_futa.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot18_Obj\z_bg_spot18_obj.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot18_Shutter\z_bg_spot18_shutter.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Sst_Floor\z_bg_sst_floor.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Toki_Hikari\z_bg_toki_hikari.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Treemouth\z_bg_treemouth.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Umajump\z_bg_umajump.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Vb_Sima\z_bg_vb_sima.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ydan_Hasi\z_bg_ydan_hasi.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ydan_Maruta\z_bg_ydan_maruta.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Ydan_Sp\z_bg_ydan_sp.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Bg_Zg\z_bg_zg.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Dodongo\z_boss_dodongo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Fd2\z_boss_fd2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Fd\z_boss_fd.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Ganon2\z_boss_ganon2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Ganondrof\z_boss_ganondrof.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Ganon\z_boss_ganon.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Goma\z_boss_goma.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Mo\z_boss_mo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Sst\z_boss_sst.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Tw\z_boss_tw.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Boss_Va\z_boss_va.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_6K\z_demo_6k.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Du\z_demo_du.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Ec\z_demo_ec.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Effect\z_demo_effect.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Ext\z_demo_ext.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Geff\z_demo_geff.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Gj\z_demo_gj.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Go\z_demo_go.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Gt\z_demo_gt.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Ik\z_demo_ik.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Im\z_demo_im.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Kekkai\z_demo_kekkai.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Sa\z_demo_sa.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Shd\z_demo_shd.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Demo_Tre_Lgt\z_demo_tre_lgt.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Door_Ana\z_door_ana.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Door_Gerudo\z_door_gerudo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Door_Killer\z_door_killer.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Door_Shutter\z_door_shutter.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Door_Toki\z_door_toki.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Door_Warp1\z_door_warp1.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Efc_Erupc\z_efc_erupc.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Eff_Dust\z_eff_dust.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Elf_Msg2\z_elf_msg2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Elf_Msg\z_elf_msg.h" />
+    <ClInclude Include="src\overlays\actors\ovl_End_Title\z_end_title.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Am\z_en_am.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ani\z_en_ani.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Anubice\z_en_anubice.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Anubice_Fire\z_en_anubice_fire.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Anubice_Tag\z_en_anubice_tag.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Arow_Trap\z_en_arow_trap.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Arrow\z_en_arrow.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Attack_Niw\z_en_attack_niw.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ba\z_en_ba.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bb\z_en_bb.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bdfire\z_en_bdfire.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bigokuta\z_en_bigokuta.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bili\z_en_bili.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bird\z_en_bird.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Blkobj\z_en_blkobj.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bombf\z_en_bombf.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bom\z_en_bom.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bom_Bowl_Man\z_en_bom_bowl_man.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bom_Bowl_Pit\z_en_bom_bowl_pit.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bom_Chu\z_en_bom_chu.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Boom\z_en_boom.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Box\z_en_box.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Brob\z_en_brob.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bubble\z_en_bubble.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Butte\z_en_butte.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bw\z_en_bw.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Bx\z_en_bx.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Changer\z_en_changer.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Clear_Tag\z_en_clear_tag.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Cow\z_en_cow.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Crow\z_en_crow.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Cs\z_en_cs.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Daiku\z_en_daiku.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Daiku_Kakariko\z_en_daiku_kakariko.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dekubaba\z_en_dekubaba.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dekunuts\z_en_dekunuts.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dha\z_en_dha.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dh\z_en_dh.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Diving_Game\z_en_diving_game.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dns\z_en_dns.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dnt_Demo\z_en_dnt_demo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dnt_Jiji\z_en_dnt_jiji.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dnt_Nomal\z_en_dnt_nomal.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dodojr\z_en_dodojr.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dodongo\z_en_dodongo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dog\z_en_dog.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Door\z_en_door.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ds\z_en_ds.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Du\z_en_du.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Dy_Extra\z_en_dy_extra.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Eg\z_en_eg.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Eiyer\z_en_eiyer.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Elf\z_en_elf.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Encount1\z_en_encount1.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Encount2\z_en_encount2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ex_Item\z_en_ex_item.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ex_Ruppy\z_en_ex_ruppy.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Fd\z_en_fd.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Fd_Fire\z_en_fd_fire.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_fHG\z_en_fhg.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Fhg_Fire\z_en_fhg_fire.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Firefly\z_en_firefly.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Fire_Rock\z_en_fire_rock.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Fish\z_en_fish.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Floormas\z_en_floormas.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Fr\z_en_fr.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Fu\z_en_fu.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Fw\z_en_fw.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Fz\z_en_fz.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ganon_Mant\z_en_ganon_mant.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ganon_Organ\z_en_ganon_organ.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Gb\z_en_gb.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ge1\z_en_ge1.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ge2\z_en_ge2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ge3\z_en_ge3.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_GeldB\z_en_geldb.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_GirlA\z_en_girla.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Gm\z_en_gm.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Go2\z_en_go2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Goma\z_en_goma.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Goroiwa\z_en_goroiwa.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Go\z_en_go.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Gs\z_en_gs.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Guest\z_en_guest.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_G_Switch\z_en_g_switch.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Hata\z_en_hata.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Heishi1\z_en_heishi1.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Heishi2\z_en_heishi2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Heishi3\z_en_heishi3.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Heishi4\z_en_heishi4.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Hintnuts\z_en_hintnuts.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Holl\z_en_holl.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Honotrap\z_en_honotrap.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Horse\z_en_horse.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Horse_Game_Check\z_en_horse_game_check.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Horse_Ganon\z_en_horse_ganon.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Horse_Link_Child\z_en_horse_link_child.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Horse_Normal\z_en_horse_normal.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Horse_Zelda\z_en_horse_zelda.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Hs2\z_en_hs2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Hs\z_en_hs.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Hy\z_en_hy.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ice_Hono\z_en_ice_hono.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ik\z_en_ik.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Insect\z_en_insect.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_In\z_en_in.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ishi\z_en_ishi.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_It\z_en_it.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Jj\z_en_jj.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Jsjutan\z_en_jsjutan.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Js\z_en_js.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Kakasi2\z_en_kakasi2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Kakasi3\z_en_kakasi3.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Kakasi\z_en_kakasi.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Kanban\z_en_kanban.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Karebaba\z_en_karebaba.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ko\z_en_ko.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Kusa\z_en_kusa.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Kz\z_en_kz.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Lightbox\z_en_lightbox.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Light\z_en_light.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ma1\z_en_ma1.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ma2\z_en_ma2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ma3\z_en_ma3.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Mag\z_en_mag.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Mb\z_en_mb.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Md\z_en_md.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Mk\z_en_mk.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Mm2\z_en_mm2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Mm\z_en_mm.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ms\z_en_ms.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Mu\z_en_mu.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_M_Fire1\z_en_m_fire1.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_M_Thunder\z_en_m_thunder.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Nb\z_en_nb.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Niw\z_en_niw.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Niw_Girl\z_en_niw_girl.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Niw_Lady\z_en_niw_lady.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Nutsball\z_en_nutsball.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Nwc\z_en_nwc.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ny\z_en_ny.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_OE2\z_en_oe2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Okarina_Effect\z_en_okarina_effect.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Okarina_Tag\z_en_okarina_tag.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Okuta\z_en_okuta.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ossan\z_en_ossan.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Owl\z_en_owl.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Part\z_en_part.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Peehat\z_en_peehat.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Poh\z_en_poh.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Po_Desert\z_en_po_desert.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Po_Field\z_en_po_field.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Po_Relay\z_en_po_relay.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Po_Sisters\z_en_po_sisters.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Pu_box\z_en_pu_box.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Rd\z_en_rd.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Reeba\z_en_reeba.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_River_Sound\z_en_river_sound.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Rl\z_en_rl.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Rr\z_en_rr.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ru1\z_en_ru1.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ru2\z_en_ru2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Sa\z_en_sa.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Sb\z_en_sb.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Scene_Change\z_en_scene_change.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Sda\z_en_sda.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Shopnuts\z_en_shopnuts.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Siofuki\z_en_siofuki.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Si\z_en_si.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Skb\z_en_skb.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Skjneedle\z_en_skjneedle.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Skj\z_en_skj.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ssh\z_en_ssh.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Sth\z_en_sth.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Stream\z_en_stream.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_St\z_en_st.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Sw\z_en_sw.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Syateki_Itm\z_en_syateki_itm.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Syateki_Man\z_en_syateki_man.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Syateki_Niw\z_en_syateki_niw.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Takara_Man\z_en_takara_man.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Tana\z_en_tana.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Ta\z_en_ta.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Test\z_en_test.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Tg\z_en_tg.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Tite\z_en_tite.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Tk\z_en_tk.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Torch2\z_en_torch2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Torch\z_en_torch.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Toryo\z_en_toryo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Tp\z_en_tp.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Trap\z_en_trap.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Tr\z_en_tr.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Tubo_Trap\z_en_tubo_trap.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Vali\z_en_vali.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Vase\z_en_vase.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Vb_Ball\z_en_vb_ball.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Viewer\z_en_viewer.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Vm\z_en_vm.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Wallmas\z_en_wallmas.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Wall_Tubo\z_en_wall_tubo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Weather_Tag\z_en_weather_tag.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Weiyer\z_en_weiyer.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Wf\z_en_wf.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Wonder_Item\z_en_wonder_item.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Wonder_Talk2\z_en_wonder_talk2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Wonder_Talk\z_en_wonder_talk.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Wood02\z_en_wood02.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Xc\z_en_xc.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Yabusame_Mark\z_en_yabusame_mark.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Yukabyun\z_en_yukabyun.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Zf\z_en_zf.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Zl2\z_en_zl2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Zl3\z_en_zl3.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Zl4\z_en_zl4.h" />
+    <ClInclude Include="src\overlays\actors\ovl_En_Zo\z_en_zo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Fishing\z_fishing.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Item_B_Heart\z_item_b_heart.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Item_Etcetera\z_item_etcetera.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Item_Inbox\z_item_inbox.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Item_Ocarina\z_item_ocarina.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Item_Shield\z_item_shield.h" />
+    <ClInclude Include="src\overlays\actors\ovl_kaleido_scope\z_kaleido_scope.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Magic_Dark\z_magic_dark.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Magic_Fire\z_magic_fire.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Magic_Wind\z_magic_wind.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Mir_Ray\z_mir_ray.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Object_Kankyo\z_object_kankyo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Bean\z_obj_bean.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Blockstop\z_obj_blockstop.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Bombiwa\z_obj_bombiwa.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Comb\z_obj_comb.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Dekujr\z_obj_dekujr.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Elevator\z_obj_elevator.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Hamishi\z_obj_hamishi.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Hana\z_obj_hana.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Hsblock\z_obj_hsblock.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Ice_Poly\z_obj_ice_poly.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Kibako2\z_obj_kibako2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Kibako\z_obj_kibako.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Lift\z_obj_lift.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Lightswitch\z_obj_lightswitch.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Makekinsuta\z_obj_makekinsuta.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Makeoshihiki\z_obj_makeoshihiki.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Mure2\z_obj_mure2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Mure3\z_obj_mure3.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Mure\z_obj_mure.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Oshihiki\z_obj_oshihiki.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Roomtimer\z_obj_roomtimer.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Switch\z_obj_switch.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Syokudai\z_obj_syokudai.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Timeblock\z_obj_timeblock.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Tsubo\z_obj_tsubo.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Obj_Warp2block\z_obj_warp2block.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Oceff_Spot\z_oceff_spot.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Oceff_Storm\z_oceff_storm.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Oceff_Wipe2\z_oceff_wipe2.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Oceff_Wipe3\z_oceff_wipe3.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Oceff_Wipe4\z_oceff_wipe4.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Oceff_Wipe\z_oceff_wipe.h" />
+    <ClInclude Include="src\overlays\actors\ovl_Shot_Sun\z_shot_sun.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Blast\z_eff_ss_blast.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Bomb2\z_eff_ss_bomb2.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Bomb\z_eff_ss_bomb.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Bubble\z_eff_ss_bubble.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dead_Db\z_eff_ss_dead_db.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dead_Dd\z_eff_ss_dead_dd.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dead_Ds\z_eff_ss_dead_ds.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dead_Sound\z_eff_ss_dead_sound.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dt_Bubble\z_eff_ss_dt_bubble.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dust\z_eff_ss_dust.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_D_Fire\z_eff_ss_d_fire.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_En_Fire\z_eff_ss_en_fire.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_En_Ice\z_eff_ss_en_ice.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Extra\z_eff_ss_extra.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Fcircle\z_eff_ss_fcircle.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Fhg_Flash\z_eff_ss_fhg_flash.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Fire_Tail\z_eff_ss_fire_tail.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Fire\z_eff_ss_g_fire.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Magma2\z_eff_ss_g_magma2.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Magma\z_eff_ss_g_magma.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Ripple\z_eff_ss_g_ripple.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Spk\z_eff_ss_g_spk.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Splash\z_eff_ss_g_splash.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Hahen\z_eff_ss_hahen.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_HitMark\z_eff_ss_hitmark.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Ice_Piece\z_eff_ss_ice_piece.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Ice_Smoke\z_eff_ss_ice_smoke.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Kakera\z_eff_ss_kakera.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_KiraKira\z_eff_ss_kirakira.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_K_Fire\z_eff_ss_k_fire.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Lightning\z_eff_ss_lightning.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Sibuki2\z_eff_ss_sibuki2.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Sibuki\z_eff_ss_sibuki.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Solder_Srch_Ball\z_eff_ss_solder_srch_ball.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Stick\z_eff_ss_stick.h" />
+    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Stone1\z_eff_ss_stone1.h" />
+    <ClInclude Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_scope.h" />
+    <ClInclude Include="randomizerTypes.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\overlays\actors\ovl_kaleido_scope\z_kaleido_scope.h">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClInclude>
-    <ClInclude Include="include\alloca.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\bgm.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\color.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\command_macros_base.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\fp.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\functions.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\global.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\ichain.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\macros.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\math_n64.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\regs.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\segment_symbols.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\sfx.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\stdarg.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\stdbool_n64.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\stddef_n64.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\ultra64.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\unk.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\variables.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\vt.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64actor.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64animation.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64audio.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64bgcheck.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64camera.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64collision_check.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64cutscene.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64cutscene_commands.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64dma.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64effect.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64environment.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64interface.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64item.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64light.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64map_mark.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64math.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64object.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64player.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64save.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64scene.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\z64transition.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Stone1\z_eff_ss_stone1.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Stick\z_eff_ss_stick.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Solder_Srch_Ball\z_eff_ss_solder_srch_ball.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Sibuki2\z_eff_ss_sibuki2.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Sibuki\z_eff_ss_sibuki.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Lightning\z_eff_ss_lightning.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_KiraKira\z_eff_ss_kirakira.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Kakera\z_eff_ss_kakera.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_K_Fire\z_eff_ss_k_fire.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Ice_Smoke\z_eff_ss_ice_smoke.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Ice_Piece\z_eff_ss_ice_piece.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_HitMark\z_eff_ss_hitmark.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Hahen\z_eff_ss_hahen.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Splash\z_eff_ss_g_splash.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Spk\z_eff_ss_g_spk.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Ripple\z_eff_ss_g_ripple.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Magma2\z_eff_ss_g_magma2.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Magma\z_eff_ss_g_magma.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_G_Fire\z_eff_ss_g_fire.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Fire_Tail\z_eff_ss_fire_tail.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Fhg_Flash\z_eff_ss_fhg_flash.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Fcircle\z_eff_ss_fcircle.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Extra\z_eff_ss_extra.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_En_Ice\z_eff_ss_en_ice.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_En_Fire\z_eff_ss_en_fire.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dust\z_eff_ss_dust.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dt_Bubble\z_eff_ss_dt_bubble.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dead_Sound\z_eff_ss_dead_sound.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dead_Ds\z_eff_ss_dead_ds.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dead_Dd\z_eff_ss_dead_dd.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Dead_Db\z_eff_ss_dead_db.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_D_Fire\z_eff_ss_d_fire.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Bubble\z_eff_ss_bubble.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Bomb2\z_eff_ss_bomb2.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Bomb\z_eff_ss_bomb.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\effects\ovl_Effect_Ss_Blast\z_eff_ss_blast.h">
-      <Filter>Source Files\src\overlays\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="include\stdlib_n64.h">
-      <Filter>Header Files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\OTRGlobals.h">
-      <Filter>Source Files\soh</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_scope.h">
-      <Filter>Source Files\src\overlays\misc\ovl_kaleido_scope</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\gameconsole.h">
-      <Filter>Header Files\soh\Enhancements</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\Enhancements\bootcommands.h">
-      <Filter>Header Files\soh\Enhancements</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\Enhancements\cvar.h">
-      <Filter>Header Files\soh\Enhancements</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\Enhancements\debugconsole.h">
-      <Filter>Header Files\soh\Enhancements</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Arms_Hook\z_arms_hook.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Arrow_Fire\z_arrow_fire.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Arrow_Ice\z_arrow_ice.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Arrow_Light\z_arrow_light.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Bdan_Objects\z_bg_bdan_objects.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Bdan_Switch\z_bg_bdan_switch.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Bom_Guard\z_bg_bom_guard.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Bombwall\z_bg_bombwall.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Bowl_Wall\z_bg_bowl_wall.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Breakwall\z_bg_breakwall.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ddan_Jd\z_bg_ddan_jd.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ddan_Kd\z_bg_ddan_kd.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Dodoago\z_bg_dodoago.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Dy_Yoseizo\z_bg_dy_yoseizo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ganon_Otyuka\z_bg_ganon_otyuka.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Gate_Shutter\z_bg_gate_shutter.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Gjyo_Bridge\z_bg_gjyo_bridge.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Gnd_Darkmeiro\z_bg_gnd_darkmeiro.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Gnd_Firemeiro\z_bg_gnd_firemeiro.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Gnd_Iceblock\z_bg_gnd_iceblock.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Gnd_Nisekabe\z_bg_gnd_nisekabe.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Gnd_Soulmeiro\z_bg_gnd_soulmeiro.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka\z_bg_haka.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Gate\z_bg_haka_gate.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Huta\z_bg_haka_huta.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Megane\z_bg_haka_megane.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_MeganeBG\z_bg_haka_meganebg.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Sgami\z_bg_haka_sgami.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Ship\z_bg_haka_ship.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Trap\z_bg_haka_trap.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Tubo\z_bg_haka_tubo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Water\z_bg_haka_water.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Haka_Zou\z_bg_haka_zou.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Heavy_Block\z_bg_heavy_block.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Curtain\z_bg_hidan_curtain.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Dalm\z_bg_hidan_dalm.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Firewall\z_bg_hidan_firewall.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Fslift\z_bg_hidan_fslift.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Fwbig\z_bg_hidan_fwbig.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Hamstep\z_bg_hidan_hamstep.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Hrock\z_bg_hidan_hrock.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Kousi\z_bg_hidan_kousi.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Kowarerukabe\z_bg_hidan_kowarerukabe.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Rock\z_bg_hidan_rock.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Rsekizou\z_bg_hidan_rsekizou.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Sekizou\z_bg_hidan_sekizou.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Sima\z_bg_hidan_sima.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Hidan_Syoku\z_bg_hidan_syoku.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ice_Objects\z_bg_ice_objects.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ice_Shelter\z_bg_ice_shelter.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ice_Shutter\z_bg_ice_shutter.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ice_Turara\z_bg_ice_turara.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ingate\z_bg_ingate.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_1flift\z_bg_jya_1flift.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Amishutter\z_bg_jya_amishutter.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Bigmirror\z_bg_jya_bigmirror.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Block\z_bg_jya_block.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Bombchuiwa\z_bg_jya_bombchuiwa.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Bombiwa\z_bg_jya_bombiwa.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Cobra\z_bg_jya_cobra.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Goroiwa\z_bg_jya_goroiwa.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Haheniron\z_bg_jya_haheniron.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Ironobj\z_bg_jya_ironobj.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Kanaami\z_bg_jya_kanaami.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Lift\z_bg_jya_lift.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Megami\z_bg_jya_megami.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Jya_Zurerukabe\z_bg_jya_zurerukabe.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Menkuri_Eye\z_bg_menkuri_eye.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Menkuri_Kaiten\z_bg_menkuri_kaiten.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Menkuri_Nisekabe\z_bg_menkuri_nisekabe.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mizu_Bwall\z_bg_mizu_bwall.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mizu_Movebg\z_bg_mizu_movebg.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mizu_Shutter\z_bg_mizu_shutter.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mizu_Uzu\z_bg_mizu_uzu.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mizu_Water\z_bg_mizu_water.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mjin\z_bg_mjin.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Bigst\z_bg_mori_bigst.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Elevator\z_bg_mori_elevator.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Hashigo\z_bg_mori_hashigo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Hashira4\z_bg_mori_hashira4.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Hineri\z_bg_mori_hineri.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Idomizu\z_bg_mori_idomizu.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Kaitenkabe\z_bg_mori_kaitenkabe.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Mori_Rakkatenjo\z_bg_mori_rakkatenjo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Po_Event\z_bg_po_event.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Po_Syokudai\z_bg_po_syokudai.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Pushbox\z_bg_pushbox.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Relay_Objects\z_bg_relay_objects.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot00_Break\z_bg_spot00_break.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot00_Hanebasi\z_bg_spot00_hanebasi.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot01_Fusya\z_bg_spot01_fusya.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot01_Idohashira\z_bg_spot01_idohashira.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot01_Idomizu\z_bg_spot01_idomizu.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot01_Idosoko\z_bg_spot01_idosoko.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot01_Objects2\z_bg_spot01_objects2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot02_Objects\z_bg_spot02_objects.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot03_Taki\z_bg_spot03_taki.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot05_Soko\z_bg_spot05_soko.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot06_Objects\z_bg_spot06_objects.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot07_Taki\z_bg_spot07_taki.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot08_Bakudankabe\z_bg_spot08_bakudankabe.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot08_Iceblock\z_bg_spot08_iceblock.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot09_Obj\z_bg_spot09_obj.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot11_Bakudankabe\z_bg_spot11_bakudankabe.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot11_Oasis\z_bg_spot11_oasis.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot12_Gate\z_bg_spot12_gate.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot12_Saku\z_bg_spot12_saku.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot15_Rrbox\z_bg_spot15_rrbox.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot15_Saku\z_bg_spot15_saku.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot16_Bombstone\z_bg_spot16_bombstone.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot16_Doughnut\z_bg_spot16_doughnut.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot17_Bakudankabe\z_bg_spot17_bakudankabe.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot17_Funen\z_bg_spot17_funen.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot18_Basket\z_bg_spot18_basket.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot18_Futa\z_bg_spot18_futa.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot18_Obj\z_bg_spot18_obj.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Spot18_Shutter\z_bg_spot18_shutter.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Sst_Floor\z_bg_sst_floor.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Toki_Hikari\z_bg_toki_hikari.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Treemouth\z_bg_treemouth.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Umajump\z_bg_umajump.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Vb_Sima\z_bg_vb_sima.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ydan_Hasi\z_bg_ydan_hasi.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ydan_Maruta\z_bg_ydan_maruta.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Ydan_Sp\z_bg_ydan_sp.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Bg_Zg\z_bg_zg.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Dodongo\z_boss_dodongo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Fd\z_boss_fd.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Fd2\z_boss_fd2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Ganon\z_boss_ganon.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Ganon2\z_boss_ganon2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Ganondrof\z_boss_ganondrof.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Goma\z_boss_goma.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Mo\z_boss_mo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Sst\z_boss_sst.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Tw\z_boss_tw.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Boss_Va\z_boss_va.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_6K\z_demo_6k.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Du\z_demo_du.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Ec\z_demo_ec.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Effect\z_demo_effect.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Ext\z_demo_ext.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Geff\z_demo_geff.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Gj\z_demo_gj.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Go\z_demo_go.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Gt\z_demo_gt.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Ik\z_demo_ik.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Im\z_demo_im.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Kekkai\z_demo_kekkai.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Sa\z_demo_sa.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Shd\z_demo_shd.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Demo_Tre_Lgt\z_demo_tre_lgt.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Door_Ana\z_door_ana.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Door_Gerudo\z_door_gerudo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Door_Killer\z_door_killer.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Door_Shutter\z_door_shutter.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Door_Toki\z_door_toki.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Door_Warp1\z_door_warp1.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Efc_Erupc\z_efc_erupc.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Eff_Dust\z_eff_dust.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Elf_Msg\z_elf_msg.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Elf_Msg2\z_elf_msg2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Am\z_en_am.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ani\z_en_ani.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Anubice\z_en_anubice.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Anubice_Fire\z_en_anubice_fire.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Anubice_Tag\z_en_anubice_tag.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Arow_Trap\z_en_arow_trap.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Arrow\z_en_arrow.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Attack_Niw\z_en_attack_niw.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ba\z_en_ba.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bb\z_en_bb.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bdfire\z_en_bdfire.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bigokuta\z_en_bigokuta.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bili\z_en_bili.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bird\z_en_bird.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Blkobj\z_en_blkobj.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bom\z_en_bom.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bom_Bowl_Man\z_en_bom_bowl_man.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bom_Bowl_Pit\z_en_bom_bowl_pit.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bom_Chu\z_en_bom_chu.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bombf\z_en_bombf.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Boom\z_en_boom.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Box\z_en_box.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Brob\z_en_brob.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bubble\z_en_bubble.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Butte\z_en_butte.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bw\z_en_bw.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Bx\z_en_bx.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Changer\z_en_changer.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Clear_Tag\z_en_clear_tag.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Cow\z_en_cow.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Crow\z_en_crow.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Cs\z_en_cs.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Daiku\z_en_daiku.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Daiku_Kakariko\z_en_daiku_kakariko.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dekubaba\z_en_dekubaba.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dekunuts\z_en_dekunuts.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dh\z_en_dh.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dha\z_en_dha.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Diving_Game\z_en_diving_game.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dns\z_en_dns.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dnt_Demo\z_en_dnt_demo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dnt_Jiji\z_en_dnt_jiji.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dnt_Nomal\z_en_dnt_nomal.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dodojr\z_en_dodojr.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dodongo\z_en_dodongo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dog\z_en_dog.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Door\z_en_door.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ds\z_en_ds.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Du\z_en_du.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Dy_Extra\z_en_dy_extra.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Eg\z_en_eg.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Eiyer\z_en_eiyer.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Elf\z_en_elf.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Encount1\z_en_encount1.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Encount2\z_en_encount2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ex_Item\z_en_ex_item.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ex_Ruppy\z_en_ex_ruppy.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Fd\z_en_fd.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Fd_Fire\z_en_fd_fire.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_fHG\z_en_fhg.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Fhg_Fire\z_en_fhg_fire.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Fire_Rock\z_en_fire_rock.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Firefly\z_en_firefly.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Fish\z_en_fish.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Floormas\z_en_floormas.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Fr\z_en_fr.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Fu\z_en_fu.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Fw\z_en_fw.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Fz\z_en_fz.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_G_Switch\z_en_g_switch.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ganon_Mant\z_en_ganon_mant.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ganon_Organ\z_en_ganon_organ.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Gb\z_en_gb.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ge1\z_en_ge1.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ge2\z_en_ge2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ge3\z_en_ge3.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_GeldB\z_en_geldb.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_GirlA\z_en_girla.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Gm\z_en_gm.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Go\z_en_go.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Go2\z_en_go2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Goma\z_en_goma.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Goroiwa\z_en_goroiwa.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Gs\z_en_gs.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Guest\z_en_guest.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Hata\z_en_hata.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Heishi1\z_en_heishi1.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Heishi2\z_en_heishi2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Heishi3\z_en_heishi3.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Heishi4\z_en_heishi4.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Hintnuts\z_en_hintnuts.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Holl\z_en_holl.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Honotrap\z_en_honotrap.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Horse\z_en_horse.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Horse_Game_Check\z_en_horse_game_check.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Horse_Ganon\z_en_horse_ganon.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Horse_Link_Child\z_en_horse_link_child.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Horse_Normal\z_en_horse_normal.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Horse_Zelda\z_en_horse_zelda.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Hs\z_en_hs.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Hs2\z_en_hs2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Hy\z_en_hy.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ice_Hono\z_en_ice_hono.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ik\z_en_ik.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_In\z_en_in.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Insect\z_en_insect.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ishi\z_en_ishi.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_It\z_en_it.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Jj\z_en_jj.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Js\z_en_js.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Jsjutan\z_en_jsjutan.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Kakasi\z_en_kakasi.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Kakasi2\z_en_kakasi2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Kakasi3\z_en_kakasi3.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Kanban\z_en_kanban.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Karebaba\z_en_karebaba.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ko\z_en_ko.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Kusa\z_en_kusa.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Kz\z_en_kz.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Light\z_en_light.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Lightbox\z_en_lightbox.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_M_Fire1\z_en_m_fire1.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_M_Thunder\z_en_m_thunder.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ma1\z_en_ma1.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ma2\z_en_ma2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ma3\z_en_ma3.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Mag\z_en_mag.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Mb\z_en_mb.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Md\z_en_md.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Mk\z_en_mk.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Mm\z_en_mm.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Mm2\z_en_mm2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ms\z_en_ms.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Mu\z_en_mu.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Nb\z_en_nb.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Niw\z_en_niw.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Niw_Girl\z_en_niw_girl.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Niw_Lady\z_en_niw_lady.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Nutsball\z_en_nutsball.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Nwc\z_en_nwc.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ny\z_en_ny.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_OE2\z_en_oe2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Okarina_Effect\z_en_okarina_effect.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Okarina_Tag\z_en_okarina_tag.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Okuta\z_en_okuta.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ossan\z_en_ossan.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Owl\z_en_owl.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Part\z_en_part.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Peehat\z_en_peehat.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Po_Desert\z_en_po_desert.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Po_Field\z_en_po_field.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Po_Relay\z_en_po_relay.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Po_Sisters\z_en_po_sisters.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Poh\z_en_poh.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Pu_box\z_en_pu_box.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Rd\z_en_rd.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Reeba\z_en_reeba.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_River_Sound\z_en_river_sound.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Rl\z_en_rl.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Rr\z_en_rr.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ru1\z_en_ru1.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ru2\z_en_ru2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Sa\z_en_sa.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Sb\z_en_sb.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Scene_Change\z_en_scene_change.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Sda\z_en_sda.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Shopnuts\z_en_shopnuts.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Si\z_en_si.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Siofuki\z_en_siofuki.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Skb\z_en_skb.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Skj\z_en_skj.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Skjneedle\z_en_skjneedle.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ssh\z_en_ssh.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_St\z_en_st.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Sth\z_en_sth.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Stream\z_en_stream.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Sw\z_en_sw.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Syateki_Itm\z_en_syateki_itm.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Syateki_Man\z_en_syateki_man.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Syateki_Niw\z_en_syateki_niw.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Ta\z_en_ta.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Takara_Man\z_en_takara_man.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Tana\z_en_tana.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Test\z_en_test.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Tg\z_en_tg.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Tite\z_en_tite.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Tk\z_en_tk.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Torch\z_en_torch.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Torch2\z_en_torch2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Toryo\z_en_toryo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Tp\z_en_tp.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Tr\z_en_tr.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Trap\z_en_trap.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Tubo_Trap\z_en_tubo_trap.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Vali\z_en_vali.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Vase\z_en_vase.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Vb_Ball\z_en_vb_ball.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Viewer\z_en_viewer.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Vm\z_en_vm.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Wall_Tubo\z_en_wall_tubo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Wallmas\z_en_wallmas.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Weather_Tag\z_en_weather_tag.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Weiyer\z_en_weiyer.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Wf\z_en_wf.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Wonder_Item\z_en_wonder_item.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Wonder_Talk\z_en_wonder_talk.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Wonder_Talk2\z_en_wonder_talk2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Wood02\z_en_wood02.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Xc\z_en_xc.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Yabusame_Mark\z_en_yabusame_mark.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Yukabyun\z_en_yukabyun.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Zf\z_en_zf.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Zl2\z_en_zl2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Zl3\z_en_zl3.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Zl4\z_en_zl4.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_En_Zo\z_en_zo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_End_Title\z_end_title.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Fishing\z_fishing.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Item_B_Heart\z_item_b_heart.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Item_Etcetera\z_item_etcetera.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Item_Inbox\z_item_inbox.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Item_Ocarina\z_item_ocarina.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Item_Shield\z_item_shield.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Magic_Dark\z_magic_dark.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Magic_Fire\z_magic_fire.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Magic_Wind\z_magic_wind.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Mir_Ray\z_mir_ray.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Bean\z_obj_bean.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Blockstop\z_obj_blockstop.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Bombiwa\z_obj_bombiwa.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Comb\z_obj_comb.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Dekujr\z_obj_dekujr.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Elevator\z_obj_elevator.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Hamishi\z_obj_hamishi.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Hana\z_obj_hana.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Hsblock\z_obj_hsblock.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Ice_Poly\z_obj_ice_poly.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Kibako\z_obj_kibako.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Kibako2\z_obj_kibako2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Lift\z_obj_lift.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Lightswitch\z_obj_lightswitch.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Makekinsuta\z_obj_makekinsuta.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Makeoshihiki\z_obj_makeoshihiki.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Mure\z_obj_mure.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Mure2\z_obj_mure2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Mure3\z_obj_mure3.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Oshihiki\z_obj_oshihiki.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Roomtimer\z_obj_roomtimer.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Switch\z_obj_switch.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Syokudai\z_obj_syokudai.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Timeblock\z_obj_timeblock.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Tsubo\z_obj_tsubo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Obj_Warp2block\z_obj_warp2block.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Object_Kankyo\z_object_kankyo.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Oceff_Spot\z_oceff_spot.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Oceff_Storm\z_oceff_storm.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Oceff_Wipe\z_oceff_wipe.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Oceff_Wipe2\z_oceff_wipe2.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Oceff_Wipe3\z_oceff_wipe3.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Oceff_Wipe4\z_oceff_wipe4.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\overlays\actors\ovl_Shot_Sun\z_shot_sun.h">
-      <Filter>Source Files\src\overlays\actors</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\Enhancements\debugger\debugger.h">
-      <Filter>Header Files\soh\Enhancements\debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\Enhancements\debugger\debugSaveEditor.h">
-      <Filter>Header Files\soh\Enhancements\debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\util.h">
-      <Filter>Header Files\soh</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\Enhancements\debugger\colViewer.h">
-      <Filter>Header Files\soh\Enhancements\debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\Enhancements\debugger\ImGuiHelpers.h">
-      <Filter>Header Files\soh\Enhancements\debugger</Filter>
-    <ClInclude Include="soh\frame_interpolation.h">
-      <Filter>Header Files\soh</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\Enhancements\savestates.h">
-      <Filter>Source Files\soh\Enhancements</Filter>
-    </ClInclude>
-    <ClInclude Include="soh\OTRAudio.h">
-      <Filter>Source Files\soh</Filter>
-    </ClInclude>
+    <ResourceCompile Include="Resource.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="include\macro.inc">
-      <Filter>Header Files\include</Filter>
-    </None>
+    <Image Include="SHIPOFHARKINIAN.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Resource.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="SHIPOFHARKINIAN.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
+    <None Include="include\macro.inc" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer.cpp b/soh/soh/Enhancements/randomizer.cpp
index 10370daa28a..33fa3ab8ca3 100644
--- a/soh/soh/Enhancements/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer.cpp
@@ -507,25 +507,38 @@ std::unordered_map<std::string, RandomizerGet> SpoilerfileGetNameToEnum = {
     {"Light Medallion", LIGHT_MEDALLION}
 };
 
-void Randomizer::PopulateItemLocations(std::string spoilerFileName) {
+void Randomizer::LoadItemLocations() {
+    for(auto itemLocation : gSaveContext.itemLocations) {
+        this->itemLocations[itemLocation.check] = itemLocation.get;
+    }
+}
+
+void Randomizer::ParseItemLocations(std::string spoilerFileName) {
     // todo pull this in from cvar or something
     std::ifstream spoilerFileStream("spoiler.json");
-    if (!spoilerFileStream) return;
+    if (!spoilerFileStream)
+        return;
     json spoilerFileJson;
     spoilerFileStream >> spoilerFileJson;
     json locationsJson = spoilerFileJson["locations"];
-    for(auto it = locationsJson.begin(); it != locationsJson.end(); ++it) {
-        if(it->is_structured()) {
+    int index = 0;
+    for (auto it = locationsJson.begin(); it != locationsJson.end(); ++it) {
+        if (it->is_structured()) {
             json itemJson = *it;
-            for(auto itemit = itemJson.begin(); itemit != itemJson.end(); ++itemit) {
-                //todo handle prices
-                if(itemit.key() == "item") {
-                    this->itemLocations[SpoilerfileCheckNameToEnum[it.key()]] = SpoilerfileGetNameToEnum[itemit.value()];
+            for (auto itemit = itemJson.begin(); itemit != itemJson.end(); ++itemit) {
+                // todo handle prices
+                if (itemit.key() == "item") {
+
+                    gSaveContext.itemLocations[index].check = SpoilerfileCheckNameToEnum[it.key()];
+                    gSaveContext.itemLocations[index].get = SpoilerfileGetNameToEnum[itemit.value()];
                 }
             }
         } else {
-            this->itemLocations[SpoilerfileCheckNameToEnum[it.key()]] = SpoilerfileGetNameToEnum[it.value()];
+            gSaveContext.itemLocations[index].check = SpoilerfileCheckNameToEnum[it.key()];
+            gSaveContext.itemLocations[index].get = SpoilerfileGetNameToEnum[it.value()];
         }
+
+        index++;
     }
 }
 
diff --git a/soh/soh/Enhancements/randomizer.h b/soh/soh/Enhancements/randomizer.h
index 5e564622bce..07bc65e54a1 100644
--- a/soh/soh/Enhancements/randomizer.h
+++ b/soh/soh/Enhancements/randomizer.h
@@ -5,503 +5,7 @@
 #include <string>
 #include "../../include/ultra64.h"
 #include "../../include/z64item.h"
-
-typedef enum {
-    LINKS_POCKET,
-    QUEEN_GOHMA,
-    KING_DODONGO,
-    BARINADE,
-    PHANTOM_GANON,
-    VOLVAGIA,
-    MORPHA,
-    BONGO_BONGO,
-    TWINROVA,
-    SONG_FROM_IMPA,
-    SONG_FROM_MALON,
-    SONG_FROM_SARIA,
-    SONG_FROM_ROYAL_FAMILYS_TOMB,
-    SONG_FROM_OCARINA_OF_TIME,
-    SONG_FROM_WINDMILL,
-    SHEIK_IN_FOREST,
-    SHEIK_IN_CRATER,
-    SHEIK_IN_ICE_CAVERN,
-    SHEIK_AT_COLOSSUS,
-    SHEIK_IN_KAKARIKO,
-    SHEIK_AT_TEMPLE,
-    KF_MIDOS_TOP_LEFT_CHEST,
-    KF_MIDOS_TOP_RIGHT_CHEST,
-    KF_MIDOS_BOTTOM_LEFT_CHEST,
-    KF_MIDOS_BOTTOM_RIGHT_CHEST,
-    KF_KOKIRI_SWORD_CHEST,
-    KF_STORMS_GROTTO_CHEST,
-    LW_OCARINA_MEMORY_GAME,
-    LW_TARGET_IN_WOODS,
-    LW_NEAR_SHORTCUTS_GROTTO_CHEST,
-    DEKU_THEATER_SKULL_MASK,
-    DEKU_THEATER_MASK_OF_TRUTH,
-    LW_SKULL_KID,
-    LW_DEKU_SCRUB_NEAR_BRIDGE,
-    LW_DEKU_SCRUB_GROTTO_FRONT,
-    SFM_WOLFOS_GROTTO_CHEST,
-    HF_NEAR_MARKET_GROTTO_CHEST,
-    HF_TEKTITE_GROTTO_FREESTANDING_POH,
-    HF_SOUTHEAST_GROTTO_CHEST,
-    HF_OPEN_GROTTO_CHEST,
-    HF_DEKU_SCRUB_GROTTO,
-    MARKET_SHOOTING_GALLERY_REWARD,
-    MARKET_BOMBCHU_BOWLING_FIRST_PRIZE,
-    MARKET_BOMBCHU_BOWLING_SECOND_PRIZE,
-    MARKET_LOST_DOG,
-    MARKET_TREASURE_CHEST_GAME_REWARD,
-    MARKET_10_BIG_POES,
-    TOT_LIGHT_ARROWS_CUTSCENE,
-    HC_GREAT_FAIRY_REWARD,
-    LLR_TALONS_CHICKENS,
-    LLR_FREESTANDING_POH,
-    KAK_ANJU_AS_CHILD,
-    KAK_ANJU_AS_ADULT,
-    KAK_IMPAS_HOUSE_FREESTANDING_POH,
-    KAK_WINDMILL_FREESTANDING_POH,
-    KAK_MAN_ON_ROOF,
-    KAK_OPEN_GROTTO_CHEST,
-    KAK_REDEAD_GROTTO_CHEST,
-    KAK_SHOOTING_GALLERY_REWARD,
-    KAK_10_GOLD_SKULLTULA_REWARD,
-    KAK_20_GOLD_SKULLTULA_REWARD,
-    KAK_30_GOLD_SKULLTULA_REWARD,
-    KAK_40_GOLD_SKULLTULA_REWARD,
-    KAK_50_GOLD_SKULLTULA_REWARD,
-    GRAVEYARD_SHIELD_GRAVE_CHEST,
-    GRAVEYARD_HEART_PIECE_GRAVE_CHEST,
-    GRAVEYARD_ROYAL_FAMILYS_TOMB_CHEST,
-    GRAVEYARD_FREESTANDING_POH,
-    GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR,
-    GRAVEYARD_HOOKSHOT_CHEST,
-    GRAVEYARD_DAMPE_RACE_FREESTANDING_POH,
-    DMT_FREESTANDING_POH,
-    DMT_CHEST,
-    DMT_STORMS_GROTTO_CHEST,
-    DMT_GREAT_FAIRY_REWARD,
-    DMT_BIGGORON,
-    GC_DARUNIAS_JOY,
-    GC_POT_FREESTANDING_POH,
-    GC_ROLLING_GORON_AS_CHILD,
-    GC_ROLLING_GORON_AS_ADULT,
-    GC_MAZE_LEFT_CHEST,
-    GC_MAZE_RIGHT_CHEST,
-    GC_MAZE_CENTER_CHEST,
-    DMC_VOLCANO_FREESTANDING_POH,
-    DMC_WALL_FREESTANDING_POH,
-    DMC_UPPER_GROTTO_CHEST,
-    DMC_GREAT_FAIRY_REWARD,
-    ZR_OPEN_GROTTO_CHEST,
-    ZR_FROGS_IN_THE_RAIN,
-    ZR_FROGS_OCARINA_GAME,
-    ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH,
-    ZR_NEAR_DOMAIN_FREESTANDING_POH,
-    ZD_DIVING_MINIGAME,
-    ZD_CHEST,
-    ZD_KING_ZORA_THAWED,
-    ZF_GREAT_FAIRY_REWARD,
-    ZF_ICEBERG_FREESTANDING_POH,
-    ZF_BOTTOM_FREESTANDING_POH,
-    LH_UNDERWATER_ITEM,
-    LH_CHILD_FISHING,
-    LH_ADULT_FISHING,
-    LH_LAB_DIVE,
-    LH_FREESTANDING_POH,
-    LH_SUN,
-    GV_CRATE_FREESTANDING_POH,
-    GV_WATERFALL_FREESTANDING_POH,
-    GV_CHEST,
-    GF_CHEST,
-    GF_HBA_1000_POINTS,
-    GF_HBA_1500_POINTS,
-    WASTELAND_CHEST,
-    COLOSSUS_GREAT_FAIRY_REWARD,
-    COLOSSUS_FREESTANDING_POH,
-    OGC_GREAT_FAIRY_REWARD,
-    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_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_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_BARINADE_HEART,
-    BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST,
-    BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST,
-    BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST,
-    BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST,
-    BOTTOM_OF_THE_WELL_FREESTANDING_KEY,
-    BOTTOM_OF_THE_WELL_COMPASS_CHEST,
-    BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST,
-    BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST,
-    BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST,
-    BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST,
-    BOTTOM_OF_THE_WELL_MAP_CHEST,
-    BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST,
-    BOTTOM_OF_THE_WELL_INVISIBLE_CHEST,
-    BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST,
-    FOREST_TEMPLE_FIRST_ROOM_CHEST,
-    FOREST_TEMPLE_FIRST_STALFOS_CHEST,
-    FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST,
-    FOREST_TEMPLE_MAP_CHEST,
-    FOREST_TEMPLE_WELL_CHEST,
-    FOREST_TEMPLE_EYE_SWITCH_CHEST,
-    FOREST_TEMPLE_BOSS_KEY_CHEST,
-    FOREST_TEMPLE_FLOORMASTER_CHEST,
-    FOREST_TEMPLE_RED_POE_CHEST,
-    FOREST_TEMPLE_BOW_CHEST,
-    FOREST_TEMPLE_BLUE_POE_CHEST,
-    FOREST_TEMPLE_FALLING_CEILING_ROOM_CHEST,
-    FOREST_TEMPLE_BASEMENT_CHEST,
-    FOREST_TEMPLE_PHANTOM_GANON_HEART,
-    FIRE_TEMPLE_NEAR_BOSS_CHEST,
-    FIRE_TEMPLE_FLARE_DANCER_CHEST,
-    FIRE_TEMPLE_BOSS_KEY_CHEST,
-    FIRE_TEMPLE_BIG_LAVA_ROOM_LOWER_OPEN_DOOR_CHEST,
-    FIRE_TEMPLE_BIG_LAVA_ROOM_BLOCKED_DOOR_CHEST,
-    FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST,
-    FIRE_TEMPLE_BOULDER_MAZE_SIDE_ROOM_CHEST,
-    FIRE_TEMPLE_MAP_CHEST,
-    FIRE_TEMPLE_BOULDER_MAZE_SHORTCUT_CHEST,
-    FIRE_TEMPLE_BOULDER_MAZE_UPPER_CHEST,
-    FIRE_TEMPLE_SCARECROW_CHEST,
-    FIRE_TEMPLE_COMPASS_CHEST,
-    FIRE_TEMPLE_MEGATON_HAMMER_CHEST,
-    FIRE_TEMPLE_HIGHEST_GORON_CHEST,
-    FIRE_TEMPLE_VOLVAGIA_HEART,
-    WATER_TEMPLE_COMPASS_CHEST,
-    WATER_TEMPLE_MAP_CHEST,
-    WATER_TEMPLE_CRACKED_WALL_CHEST,
-    WATER_TEMPLE_TORCHES_CHEST,
-    WATER_TEMPLE_BOSS_KEY_CHEST,
-    WATER_TEMPLE_CENTRAL_PILLAR_CHEST,
-    WATER_TEMPLE_CENTRAL_BOW_TARGET_CHEST,
-    WATER_TEMPLE_LONGSHOT_CHEST,
-    WATER_TEMPLE_RIVER_CHEST,
-    WATER_TEMPLE_DRAGON_CHEST,
-    WATER_TEMPLE_MORPHA_HEART,
-    SHADOW_TEMPLE_MAP_CHEST,
-    SHADOW_TEMPLE_HOVER_BOOTS_CHEST,
-    SHADOW_TEMPLE_COMPASS_CHEST,
-    SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST,
-    SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST,
-    SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST,
-    SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST,
-    SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST,
-    SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST,
-    SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST,
-    SHADOW_TEMPLE_FREESTANDING_KEY,
-    SHADOW_TEMPLE_WIND_HINT_CHEST,
-    SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST,
-    SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST,
-    SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST,
-    SHADOW_TEMPLE_BOSS_KEY_CHEST,
-    SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST,
-    SHADOW_TEMPLE_BONGO_BONGO_HEART,
-    SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST,
-    SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST,
-    SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST,
-    SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST,
-    SPIRIT_TEMPLE_MAP_CHEST,
-    SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST,
-    SPIRIT_TEMPLE_SILVER_GAUNTLETS_CHEST,
-    SPIRIT_TEMPLE_COMPASS_CHEST,
-    SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST,
-    SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST,
-    SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST,
-    SPIRIT_TEMPLE_STATUE_ROOM_NORTHEAST_CHEST,
-    SPIRIT_TEMPLE_STATUE_ROOM_HAND_CHEST,
-    SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST,
-    SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST,
-    SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST,
-    SPIRIT_TEMPLE_MIRROR_SHIELD_CHEST,
-    SPIRIT_TEMPLE_BOSS_KEY_CHEST,
-    SPIRIT_TEMPLE_TOPMOST_CHEST,
-    SPIRIT_TEMPLE_TWINROVA_HEART,
-    ICE_CAVERN_MAP_CHEST,
-    ICE_CAVERN_COMPASS_CHEST,
-    ICE_CAVERN_FREESTANDING_POH,
-    ICE_CAVERN_IRON_BOOTS_CHEST,
-    GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST,
-    GERUDO_TRAINING_GROUND_LOBBY_RIGHT_CHEST,
-    GERUDO_TRAINING_GROUND_STALFOS_CHEST,
-    GERUDO_TRAINING_GROUND_BEFORE_HEAVY_BLOCK_CHEST,
-    GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FIRST_CHEST,
-    GERUDO_TRAINING_GROUND_HEAVY_BLOCK_SECOND_CHEST,
-    GERUDO_TRAINING_GROUND_HEAVY_BLOCK_THIRD_CHEST,
-    GERUDO_TRAINING_GROUND_HEAVY_BLOCK_FOURTH_CHEST,
-    GERUDO_TRAINING_GROUND_EYE_STATUE_CHEST,
-    GERUDO_TRAINING_GROUND_NEAR_SCARECROW_CHEST,
-    GERUDO_TRAINING_GROUND_HAMMER_ROOM_CLEAR_CHEST,
-    GERUDO_TRAINING_GROUND_HAMMER_ROOM_SWITCH_CHEST,
-    GERUDO_TRAINING_GROUND_FREESTANDING_KEY,
-    GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST,
-    GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST,
-    GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST,
-    GERUDO_TRAINING_GROUND_BEAMOS_CHEST,
-    GERUDO_TRAINING_GROUND_HIDDEN_CEILING_CHEST,
-    GERUDO_TRAINING_GROUND_MAZE_PATH_FIRST_CHEST,
-    GERUDO_TRAINING_GROUND_MAZE_PATH_SECOND_CHEST,
-    GERUDO_TRAINING_GROUND_MAZE_PATH_THIRD_CHEST,
-    GERUDO_TRAINING_GROUND_MAZE_PATH_FINAL_CHEST,
-    GANONS_CASTLE_FOREST_TRIAL_CHEST,
-    GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST,
-    GANONS_CASTLE_WATER_TRIAL_RIGHT_CHEST,
-    GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST,
-    GANONS_CASTLE_SHADOW_TRIAL_GOLDEN_GAUNTLETS_CHEST,
-    GANONS_CASTLE_LIGHT_TRIAL_FIRST_LEFT_CHEST,
-    GANONS_CASTLE_LIGHT_TRIAL_SECOND_LEFT_CHEST,
-    GANONS_CASTLE_LIGHT_TRIAL_THIRD_LEFT_CHEST,
-    GANONS_CASTLE_LIGHT_TRIAL_FIRST_RIGHT_CHEST,
-    GANONS_CASTLE_LIGHT_TRIAL_SECOND_RIGHT_CHEST,
-    GANONS_CASTLE_LIGHT_TRIAL_THIRD_RIGHT_CHEST,
-    GANONS_CASTLE_LIGHT_TRIAL_INVISIBLE_ENEMIES_CHEST,
-    GANONS_CASTLE_LIGHT_TRIAL_LULLABY_CHEST,
-    GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST,
-    GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST,
-    GANONS_TOWER_BOSS_KEY_CHEST,
-    UNKNOWN_CHECK
-} RandomizerCheck;
-
-// based on https://github.com/TestRunnerSRL/OoT-Randomizer/blob/e337d7f603b91a6bacb618fb32cc7fd70ed9ffca/ItemList.py
-typedef enum {
-    UNKNOWN_GET = 0,
-    BOMBS_5,
-    DEKU_NUTS_5,
-    BOMBCHUS_10,
-    BOOMERANG,
-    DEKU_STICK_1,
-    LENS_OF_TRUTH,
-    MEGATON_HAMMER,
-    COJIRO,
-    BOTTLE,
-    BOTTLE_WITH_MILK,
-    RUTOS_LETTER,
-    DELIVER_LETTER,
-    SELL_BIG_POE,
-    MAGIC_BEAN,
-    SKULL_MASK,
-    SPOOKY_MASK,
-    KEATON_MASK,
-    BUNNY_HOOD,
-    MASK_OF_TRUTH,
-    POCKET_EGG,
-    POCKET_CUCCO,
-    ODD_MUSHROOM,
-    ODD_POTION,
-    POACHERS_SAW,
-    BROKEN_SWORD,
-    PRESCRIPTION,
-    EYEBALL_FROG,
-    EYEDROPS,
-    CLAIM_CHECK,
-    KOKIRI_SWORD,
-    GIANTS_KNIFE,
-    DEKU_SHIELD,
-    HYLIAN_SHIELD,
-    MIRROR_SHIELD,
-    GORON_TUNIC,
-    ZORA_TUNIC,
-    IRON_BOOTS,
-    HOVER_BOOTS,
-    STONE_OF_AGONY,
-    GERUDO_MEMBERSHIP_CARD,
-    HEART_CONTAINER,
-    PIECE_OF_HEART,
-    BOSS_KEY,
-    COMPASS,
-    MAP,
-    SMALL_KEY,
-    WEIRD_EGG,
-    RECOVERY_HEART,
-    ARROWS_5,
-    ARROWS_10,
-    ARROWS_30,
-    RUPEE_1,
-    RUPEES_5,
-    RUPEES_20,
-    MILK,
-    GORON_MASK,
-    ZORA_MASK,
-    GERUDO_MASK,
-    RUPEES_50,
-    RUPEES_200,
-    BIGGORON_SWORD,
-    FIRE_ARROWS,
-    ICE_ARROWS,
-    LIGHT_ARROWS,
-    GOLD_SKULLTULA_TOKEN,
-    DINS_FIRE,
-    NAYRUS_LOVE,
-    FARORES_WIND,
-    DEKU_NUTS_10,
-    BOMBS_10,
-    BOMBS_20,
-    DEKU_SEEDS_30,
-    BOMBCHUS_5,
-    BOMBCHUS_20,
-    RUPEE_TREASURE_CHEST_GAME,
-    PIECE_OF_HEART_TREASURE_CHEST_GAME,
-    ICE_TRAP,
-    PROGRESSIVE_HOOKSHOT,
-    PROGRESSIVE_STRENGTH_UPGRADE,
-    BOMB_BAG,
-    BOW,
-    SLINGSHOT,
-    PROGRESSIVE_WALLET,
-    PROGRESSIVE_SCALE,
-    DEKU_NUT_CAPACITY,
-    DEKU_STICK_CAPACITY,
-    BOMBCHUS,
-    MAGIC_METER,
-    OCARINA,
-    BOTTLE_WITH_RED_POTION,
-    BOTTLE_WITH_GREEN_POTION,
-    BOTTLE_WITH_BLUE_POTION,
-    BOTTLE_WITH_FAIRY,
-    BOTTLE_WITH_FISH,
-    BOTTLE_WITH_BLUE_FIRE,
-    BOTTLE_WITH_BUGS,
-    BOTTLE_WITH_BIG_POE,
-    BOTTLE_WITH_POE,
-    BOSS_KEY_FOREST_TEMPLE,
-    BOSS_KEY_FIRE_TEMPLE,
-    BOSS_KEY_WATER_TEMPLE,
-    BOSS_KEY_SPIRIT_TEMPLE,
-    BOSS_KEY_SHADOW_TEMPLE,
-    BOSS_KEY_GANONS_CASTLE,
-    COMPASS_DEKU_TREE,
-    COMPASS_DODONGOS_CAVERN,
-    COMPASS_JABU_JABUS_BELLY,
-    COMPASS_FOREST_TEMPLE,
-    COMPASS_FIRE_TEMPLE,
-    COMPASS_WATER_TEMPLE,
-    COMPASS_SPIRIT_TEMPLE,
-    COMPASS_SHADOW_TEMPLE,
-    COMPASS_BOTTOM_OF_THE_WELL,
-    COMPASS_ICE_CAVERN,
-    MAP_DEKU_TREE,
-    MAP_DODONGOS_CAVERN,
-    MAP_JABU_JABUS_BELLY,
-    MAP_FOREST_TEMPLE,
-    MAP_FIRE_TEMPLE,
-    MAP_WATER_TEMPLE,
-    MAP_SPIRIT_TEMPLE,
-    MAP_SHADOW_TEMPLE,
-    MAP_BOTTOM_OF_THE_WELL,
-    MAP_ICE_CAVERN,
-    SMALL_KEY_FOREST_TEMPLE,
-    SMALL_KEY_FIRE_TEMPLE,
-    SMALL_KEY_WATER_TEMPLE,
-    SMALL_KEY_SPIRIT_TEMPLE,
-    SMALL_KEY_SHADOW_TEMPLE,
-    SMALL_KEY_BOTTOM_OF_THE_WELL,
-    SMALL_KEY_GERUDO_TRAINING_GROUND,
-    SMALL_KEY_THIEVES_HIDEOUT,
-    SMALL_KEY_GANONS_CASTLE,
-    DOUBLE_DEFENSE,
-    MAGIC_BEAN_PACK,
-    TRIFORCE_PIECE,
-    ZELDAS_LETTER,
-    TIME_TRAVEL,
-    SCARECROW_SONG,
-    TRIFORCE,
-    SMALL_KEY_RING_FOREST_TEMPLE,
-    SMALL_KEY_RING_FIRE_TEMPLE,
-    SMALL_KEY_RING_WATER_TEMPLE,
-    SMALL_KEY_RING_SPIRIT_TEMPLE,
-    SMALL_KEY_RING_SHADOW_TEMPLE,
-    SMALL_KEY_RING_BOTTOM_OF_THE_WELL,
-    SMALL_KEY_RING_GERUDO_TRAINING_GROUND,
-    SMALL_KEY_RING_THIEVES_HIDEOUT,
-    SMALL_KEY_RING_GANONS_CASTLE,
-    WATER_TEMPLE_CLEAR,
-    FOREST_TRIAL_CLEAR,
-    FIRE_TRIAL_CLEAR,
-    WATER_TRIAL_CLEAR,
-    SHADOW_TRIAL_CLEAR,
-    SPIRIT_TRIAL_CLEAR,
-    LIGHT_TRIAL_CLEAR,
-    DEKU_STICK_DROP,
-    DEKU_NUT_DROP,
-    BLUE_FIRE,
-    FAIRY,
-    FISH,
-    BUGS,
-    BIG_POE,
-    BOMBCHU_DROP,
-    ARROWS_CONSUMABLE_REFILL,
-    BOMBS_CONSUMABLE_REFILL,
-    DEKU_SEEDS_CONSUMABLE_REFILL,
-    DEKU_STICKS_CONSUMABLE_REFILL,
-    DEKU_NUTS_CONSUMABLE_REFILL,
-    RUPEES_CONSUMABLE_REFILL,
-    MINUET_OF_FOREST,
-    BOLERO_OF_FIRE,
-    SERENADE_OF_WATER,
-    REQUIEM_OF_SPIRIT,
-    NOCTURNE_OF_SHADOW,
-    PRELUDE_OF_LIGHT,
-    ZELDAS_LULLABY,
-    EPONAS_SONG,
-    SARIAS_SONG,
-    SUNS_SONG,
-    SONG_OF_TIME,
-    SONG_OF_STORMS,
-    BUY_DEKU_NUT_5,
-    BUY_ARROWS_30,
-    BUY_ARROWS_50,
-    BUY_BOMBS_5_FOR_25_RUPEES,
-    BUY_DEKU_NUT_10,
-    BUY_DEKU_STICK_1,
-    BUY_BOMBS_10,
-    BUY_FISH,
-    BUY_RED_POTION_FOR_30_RUPEES,
-    BUY_GREEN_POTION,
-    BUY_BLUE_POTION,
-    BUY_HYLIAN_SHIELD,
-    BUY_DEKU_SHIELD,
-    BUY_GORON_TUNIC,
-    BUY_ZORA_TUNIC,
-    BUY_HEART,
-    BUY_BOMBCHU_10,
-    BUY_BOMBCHU_20,
-    BUY_BOMBCHU_5,
-    BUY_DEKU_SEEDS_30,
-    SOLD_OUT,
-    BUY_BLUE_FIRE,
-    BUY_BOTTLE_BUG,
-    BUY_POE,
-    BUY_FAIRYS_SPIRIT,
-    BUY_ARROWS_10,
-    BUY_BOMBS_20,
-    BUY_BOMBS_30,
-    BUY_BOMBS_5_FOR_35_RUPEES,
-    BUY_RED_POTION_FOR_40_RUPEES,
-    BUY_RED_POTION_FOR_50_RUPEES,
-    KOKIRI_EMERALD,
-    GORON_RUBY,
-    ZORA_SAPPHIRE,
-    FOREST_MEDALLION,
-    FIRE_MEDALLION,
-    WATER_MEDALLION,
-    SPIRIT_MEDALLION,
-    SHADOW_MEDALLION,
-    LIGHT_MEDALLION
-} RandomizerGet;
+#include <randomizerTypes.h>
 
 class Randomizer {
   private:
@@ -514,7 +18,8 @@ class Randomizer {
     Randomizer();
     ~Randomizer();
 
-    void PopulateItemLocations(std::string spoilerfilename);
+    void LoadItemLocations();
+    void ParseItemLocations(std::string spoilerfilename);
     GetItemID GetItemFromActor(s16 actorId, GetItemID ogItemId);
     GetItemID GetItemFromSceneAndParams(s16 sceneNum, s16 actorParams, GetItemID ogItemId);
 };
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index f6f2dbd3653..b69985ddb34 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -996,8 +996,12 @@ extern "C" int Controller_ShouldRumble(size_t i) {
     return 0;
 }
 
-extern "C" void PopulateItemLocations(const char* spoilerfilename) {
-    OTRGlobals::Instance->gRandomizer->PopulateItemLocations(spoilerfilename);
+extern "C" void LoadItemLocations() {
+    return OTRGlobals::Instance->gRandomizer->LoadItemLocations();
+}
+
+extern "C" void ParseItemLocations(const char* spoilerfilename) {
+    return OTRGlobals::Instance->gRandomizer->ParseItemLocations(spoilerfilename);
 }
 
 extern "C" GetItemID GetItemFromActor(s16 actorId, GetItemID ogItemId) {
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index 756366d79dd..04bc85bb5af 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -74,7 +74,7 @@ int AudioPlayer_GetDesiredBuffered(void);
 void AudioPlayer_Play(const uint8_t* buf, uint32_t len);
 void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples);
 int Controller_ShouldRumble(size_t i);
-void PopulateItemLocations(const char* spoilerfilename);
+void ParseItemLocations(const char* spoilerfilename);
 GetItemID GetItemFromActor(s16 actorId, GetItemID ogItemId);
 GetItemID GetItemFromSceneAndParams(s16 sceneNum, s16 actorParams, GetItemID ogItemId);
 #endif
diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c
index a774636f7b7..993358ae0c2 100644
--- a/soh/src/code/z_sram.c
+++ b/soh/src/code/z_sram.c
@@ -308,7 +308,10 @@ void Sram_OpenSave(SramContext* sramCtx) {
     i = gSramSlotOffsets[gSaveContext.fileNum];
     osSyncPrintf("ぽいんと＝%x(%d)\n", i, gSaveContext.fileNum); // "Point="
 
+    SaveContext tempContext;
+
     memcpy(&gSaveContext, sramCtx->readBuff + i, sizeof(Save));
+    memcpy(&tempContext, sramCtx->readBuff + i, sizeof(SaveContext));
 
     osSyncPrintf(VT_FGCOL(YELLOW));
     osSyncPrintf("SCENE_DATA_ID = %d   SceneNo = %d\n", gSaveContext.savedSceneNum,
@@ -443,6 +446,8 @@ void Sram_OpenSave(SramContext* sramCtx) {
         }
     }
 
+    memcpy(&gSaveContext.itemLocations, &tempContext.itemLocations, sizeof(tempContext.itemLocations));
+
     gSaveContext.magicLevel = 0;
 }
 
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 2f7e9da2b2a..2ef73332445 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -1458,6 +1458,7 @@ void FileChoose_LoadGame(GameState* thisx) {
         Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
         gSaveContext.fileNum = this->buttonIndex;
         Sram_OpenSave(&this->sramCtx);
+        LoadItemLocations();
         gSaveContext.gameMode = 0;
         SET_NEXT_GAMESTATE(&this->state, Select_Init, SelectContext);
         this->state.running = false;
@@ -1465,6 +1466,7 @@ void FileChoose_LoadGame(GameState* thisx) {
         Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
         gSaveContext.fileNum = this->buttonIndex;
         Sram_OpenSave(&this->sramCtx);
+        LoadItemLocations();
         gSaveContext.gameMode = 0;
         SET_NEXT_GAMESTATE(&this->state, Gameplay_Init, GlobalContext);
         this->state.running = false;
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
index a893cf4f9a2..82f5c4b17b1 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
@@ -448,11 +448,10 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
                             }
 
                             dayTime = ((void)0, gSaveContext.dayTime);
-                            Sram_InitSave(this, &this->sramCtx);
 
-                            // todo: load spoilerfile data
+                            ParseItemLocations("blarg");
 
-                            PopulateItemLocations("blarg");
+                            Sram_InitSave(this, &this->sramCtx);
 
                             // todo: fill link's pocket here