diff --git a/soh/soh.vcxproj.filters b/soh/soh.vcxproj.filters
index b6af70eb9..10ac7845c 100644
--- a/soh/soh.vcxproj.filters
+++ b/soh/soh.vcxproj.filters
@@ -1,710 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <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" />
+    <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>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\boot\assert.c">
@@ -2809,6 +2186,7 @@
     </ClCompile>
     <ClCompile Include="soh\Enhancements\debugger\ImGuiHelpers.cpp">
       <Filter>Source Files\soh\Enhancements\debugger</Filter>
+    </ClCompile>
     <ClCompile Include="soh\frame_interpolation.cpp">
       <Filter>Source Files\soh</Filter>
     </ClCompile>
@@ -4373,6 +3751,7 @@
     </ClInclude>
     <ClInclude Include="soh\Enhancements\debugger\ImGuiHelpers.h">
       <Filter>Header Files\soh\Enhancements\debugger</Filter>
+    </ClInclude>
     <ClInclude Include="soh\frame_interpolation.h">
       <Filter>Header Files\soh</Filter>
     </ClInclude>
@@ -4384,9 +3763,18 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <Image Include="SHIPOFHARKINIAN.ico" />
+    <None Include="include\macro.inc">
+      <Filter>Header Files\include</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="include\macro.inc" />
+    <ResourceCompile Include="Resource.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="SHIPOFHARKINIAN.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
 </Project>
\ No newline at end of file