Fix asset file includes to always start with assets/ (#1260)

* Fix asset includes to consistently start with assets/

* Fix header paths in asset xmls to start with assets/

* Remove -Iassets from compiler options

src/code/code_80097A00.c

@@ -1,7 +1,7 @@
 #include "global.h"
-#include "textures/icon_item_static/icon_item_static.h"
-#include "textures/icon_item_24_static/icon_item_24_static.h"
-#include "textures/parameter_static/parameter_static.h"
+#include "assets/textures/icon_item_static/icon_item_static.h"
+#include "assets/textures/icon_item_24_static/icon_item_24_static.h"
+#include "assets/textures/parameter_static/parameter_static.h"
 
 // Bit Flag array in which gBitFlags[n] is literally (1 << n)
 u32 gBitFlags[] = {

src/code/z_actor.c

@@ -3,9 +3,9 @@
 
 #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h"
 #include "overlays/actors/ovl_En_Part/z_en_part.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
-#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
-#include "objects/object_bdoor/object_bdoor.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
+#include "assets/objects/object_bdoor/object_bdoor.h"
 
 static CollisionPoly* sCurCeilingPoly;
 static s32 sCurCeilingBgId;

src/code/z_debug_display.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 typedef struct {
     /* 0x00 */ s16 drawType;  // indicates which draw function to use when displaying the object

src/code/z_demo.c

@@ -1,33 +1,33 @@
 #include "global.h"
 #include "z64camera.h"
 
-#include "scenes/indoors/tokinoma/tokinoma_scene.h"
-#include "scenes/overworld/spot00/spot00_scene.h"
-#include "scenes/overworld/spot01/spot01_scene.h"
-#include "scenes/overworld/spot02/spot02_scene.h"
-#include "scenes/overworld/spot04/spot04_scene.h"
-#include "scenes/overworld/spot05/spot05_scene.h"
-#include "scenes/overworld/spot06/spot06_scene.h"
-#include "scenes/overworld/spot07/spot07_scene.h"
-#include "scenes/overworld/spot08/spot08_scene.h"
-#include "scenes/overworld/spot09/spot09_scene.h"
-#include "scenes/overworld/spot11/spot11_scene.h"
-#include "scenes/overworld/spot12/spot12_scene.h"
-#include "scenes/overworld/spot15/spot15_scene.h"
-#include "scenes/overworld/spot16/spot16_scene.h"
-#include "scenes/overworld/spot17/spot17_scene.h"
-#include "scenes/overworld/spot18/spot18_scene.h"
-#include "scenes/overworld/spot20/spot20_scene.h"
+#include "assets/scenes/indoors/tokinoma/tokinoma_scene.h"
+#include "assets/scenes/overworld/spot00/spot00_scene.h"
+#include "assets/scenes/overworld/spot01/spot01_scene.h"
+#include "assets/scenes/overworld/spot02/spot02_scene.h"
+#include "assets/scenes/overworld/spot04/spot04_scene.h"
+#include "assets/scenes/overworld/spot05/spot05_scene.h"
+#include "assets/scenes/overworld/spot06/spot06_scene.h"
+#include "assets/scenes/overworld/spot07/spot07_scene.h"
+#include "assets/scenes/overworld/spot08/spot08_scene.h"
+#include "assets/scenes/overworld/spot09/spot09_scene.h"
+#include "assets/scenes/overworld/spot11/spot11_scene.h"
+#include "assets/scenes/overworld/spot12/spot12_scene.h"
+#include "assets/scenes/overworld/spot15/spot15_scene.h"
+#include "assets/scenes/overworld/spot16/spot16_scene.h"
+#include "assets/scenes/overworld/spot17/spot17_scene.h"
+#include "assets/scenes/overworld/spot18/spot18_scene.h"
+#include "assets/scenes/overworld/spot20/spot20_scene.h"
 
-#include "scenes/dungeons/bdan/bdan_scene.h"
-#include "scenes/dungeons/ddan/ddan_scene.h"
-#include "scenes/dungeons/ydan/ydan_scene.h"
-#include "scenes/dungeons/ganontika/ganontika_scene.h"
-#include "scenes/dungeons/ganon_tou/ganon_tou_scene.h"
-#include "scenes/dungeons/jyasinboss/jyasinboss_scene.h"
-#include "scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"
+#include "assets/scenes/dungeons/bdan/bdan_scene.h"
+#include "assets/scenes/dungeons/ddan/ddan_scene.h"
+#include "assets/scenes/dungeons/ydan/ydan_scene.h"
+#include "assets/scenes/dungeons/ganontika/ganontika_scene.h"
+#include "assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h"
+#include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h"
+#include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"
 
-#include "scenes/misc/hakaana_ouke/hakaana_ouke_scene.h"
+#include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h"
 
 u16 D_8011E1C0 = 0;
 u16 D_8011E1C4 = 0;

src/code/z_draw.c

@@ -1,82 +1,82 @@
 #include "global.h"
-#include "objects/object_gi_key/object_gi_key.h"
-#include "objects/object_gi_jewel/object_gi_jewel.h"
-#include "objects/object_gi_melody/object_gi_melody.h"
-#include "objects/object_gi_heart/object_gi_heart.h"
-#include "objects/object_gi_compass/object_gi_compass.h"
-#include "objects/object_gi_bosskey/object_gi_bosskey.h"
-#include "objects/object_gi_medal/object_gi_medal.h"
-#include "objects/object_gi_nuts/object_gi_nuts.h"
-#include "objects/object_gi_hearts/object_gi_hearts.h"
-#include "objects/object_gi_arrowcase/object_gi_arrowcase.h"
-#include "objects/object_gi_bombpouch/object_gi_bombpouch.h"
-#include "objects/object_gi_bottle/object_gi_bottle.h"
-#include "objects/object_gi_stick/object_gi_stick.h"
-#include "objects/object_gi_map/object_gi_map.h"
-#include "objects/object_gi_shield_1/object_gi_shield_1.h"
-#include "objects/object_gi_magicpot/object_gi_magicpot.h"
-#include "objects/object_gi_bomb_1/object_gi_bomb_1.h"
-#include "objects/object_gi_purse/object_gi_purse.h"
-#include "objects/object_gi_gerudo/object_gi_gerudo.h"
-#include "objects/object_gi_arrow/object_gi_arrow.h"
-#include "objects/object_gi_bomb_2/object_gi_bomb_2.h"
-#include "objects/object_gi_egg/object_gi_egg.h"
-#include "objects/object_gi_scale/object_gi_scale.h"
-#include "objects/object_gi_shield_2/object_gi_shield_2.h"
-#include "objects/object_gi_hookshot/object_gi_hookshot.h"
-#include "objects/object_gi_ocarina/object_gi_ocarina.h"
-#include "objects/object_gi_milk/object_gi_milk.h"
-#include "objects/object_gi_pachinko/object_gi_pachinko.h"
-#include "objects/object_gi_boomerang/object_gi_boomerang.h"
-#include "objects/object_gi_bow/object_gi_bow.h"
-#include "objects/object_gi_glasses/object_gi_glasses.h"
-#include "objects/object_gi_liquid/object_gi_liquid.h"
-#include "objects/object_gi_shield_3/object_gi_shield_3.h"
-#include "objects/object_gi_letter/object_gi_letter.h"
-#include "objects/object_gi_clothes/object_gi_clothes.h"
-#include "objects/object_gi_bean/object_gi_bean.h"
-#include "objects/object_gi_fish/object_gi_fish.h"
-#include "objects/object_gi_saw/object_gi_saw.h"
-#include "objects/object_gi_hammer/object_gi_hammer.h"
-#include "objects/object_gi_grass/object_gi_grass.h"
-#include "objects/object_gi_longsword/object_gi_longsword.h"
-#include "objects/object_gi_niwatori/object_gi_niwatori.h"
-#include "objects/object_gi_bottle_letter/object_gi_bottle_letter.h"
-#include "objects/object_gi_ocarina_0/object_gi_ocarina_0.h"
-#include "objects/object_gi_boots_2/object_gi_boots_2.h"
-#include "objects/object_gi_seed/object_gi_seed.h"
-#include "objects/object_gi_gloves/object_gi_gloves.h"
-#include "objects/object_gi_coin/object_gi_coin.h"
-#include "objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h"
-#include "objects/object_gi_redead_mask/object_gi_redead_mask.h"
-#include "objects/object_gi_skj_mask/object_gi_skj_mask.h"
-#include "objects/object_gi_rabit_mask/object_gi_rabit_mask.h"
-#include "objects/object_gi_truth_mask/object_gi_truth_mask.h"
-#include "objects/object_gi_eye_lotion/object_gi_eye_lotion.h"
-#include "objects/object_gi_powder/object_gi_powder.h"
-#include "objects/object_gi_mushroom/object_gi_mushroom.h"
-#include "objects/object_gi_ticketstone/object_gi_ticketstone.h"
-#include "objects/object_gi_brokensword/object_gi_brokensword.h"
-#include "objects/object_gi_prescription/object_gi_prescription.h"
-#include "objects/object_gi_bracelet/object_gi_bracelet.h"
-#include "objects/object_gi_soldout/object_gi_soldout.h"
-#include "objects/object_gi_frog/object_gi_frog.h"
-#include "objects/object_gi_golonmask/object_gi_golonmask.h"
-#include "objects/object_gi_zoramask/object_gi_zoramask.h"
-#include "objects/object_gi_gerudomask/object_gi_gerudomask.h"
-#include "objects/object_gi_hoverboots/object_gi_hoverboots.h"
-#include "objects/object_gi_m_arrow/object_gi_m_arrow.h"
-#include "objects/object_gi_sutaru/object_gi_sutaru.h"
-#include "objects/object_gi_goddess/object_gi_goddess.h"
-#include "objects/object_gi_fire/object_gi_fire.h"
-#include "objects/object_gi_insect/object_gi_insect.h"
-#include "objects/object_gi_butterfly/object_gi_butterfly.h"
-#include "objects/object_gi_ghost/object_gi_ghost.h"
-#include "objects/object_gi_soul/object_gi_soul.h"
-#include "objects/object_gi_dekupouch/object_gi_dekupouch.h"
-#include "objects/object_gi_rupy/object_gi_rupy.h"
-#include "objects/object_gi_sword_1/object_gi_sword_1.h"
-#include "objects/object_st/object_st.h"
+#include "assets/objects/object_gi_key/object_gi_key.h"
+#include "assets/objects/object_gi_jewel/object_gi_jewel.h"
+#include "assets/objects/object_gi_melody/object_gi_melody.h"
+#include "assets/objects/object_gi_heart/object_gi_heart.h"
+#include "assets/objects/object_gi_compass/object_gi_compass.h"
+#include "assets/objects/object_gi_bosskey/object_gi_bosskey.h"
+#include "assets/objects/object_gi_medal/object_gi_medal.h"
+#include "assets/objects/object_gi_nuts/object_gi_nuts.h"
+#include "assets/objects/object_gi_hearts/object_gi_hearts.h"
+#include "assets/objects/object_gi_arrowcase/object_gi_arrowcase.h"
+#include "assets/objects/object_gi_bombpouch/object_gi_bombpouch.h"
+#include "assets/objects/object_gi_bottle/object_gi_bottle.h"
+#include "assets/objects/object_gi_stick/object_gi_stick.h"
+#include "assets/objects/object_gi_map/object_gi_map.h"
+#include "assets/objects/object_gi_shield_1/object_gi_shield_1.h"
+#include "assets/objects/object_gi_magicpot/object_gi_magicpot.h"
+#include "assets/objects/object_gi_bomb_1/object_gi_bomb_1.h"
+#include "assets/objects/object_gi_purse/object_gi_purse.h"
+#include "assets/objects/object_gi_gerudo/object_gi_gerudo.h"
+#include "assets/objects/object_gi_arrow/object_gi_arrow.h"
+#include "assets/objects/object_gi_bomb_2/object_gi_bomb_2.h"
+#include "assets/objects/object_gi_egg/object_gi_egg.h"
+#include "assets/objects/object_gi_scale/object_gi_scale.h"
+#include "assets/objects/object_gi_shield_2/object_gi_shield_2.h"
+#include "assets/objects/object_gi_hookshot/object_gi_hookshot.h"
+#include "assets/objects/object_gi_ocarina/object_gi_ocarina.h"
+#include "assets/objects/object_gi_milk/object_gi_milk.h"
+#include "assets/objects/object_gi_pachinko/object_gi_pachinko.h"
+#include "assets/objects/object_gi_boomerang/object_gi_boomerang.h"
+#include "assets/objects/object_gi_bow/object_gi_bow.h"
+#include "assets/objects/object_gi_glasses/object_gi_glasses.h"
+#include "assets/objects/object_gi_liquid/object_gi_liquid.h"
+#include "assets/objects/object_gi_shield_3/object_gi_shield_3.h"
+#include "assets/objects/object_gi_letter/object_gi_letter.h"
+#include "assets/objects/object_gi_clothes/object_gi_clothes.h"
+#include "assets/objects/object_gi_bean/object_gi_bean.h"
+#include "assets/objects/object_gi_fish/object_gi_fish.h"
+#include "assets/objects/object_gi_saw/object_gi_saw.h"
+#include "assets/objects/object_gi_hammer/object_gi_hammer.h"
+#include "assets/objects/object_gi_grass/object_gi_grass.h"
+#include "assets/objects/object_gi_longsword/object_gi_longsword.h"
+#include "assets/objects/object_gi_niwatori/object_gi_niwatori.h"
+#include "assets/objects/object_gi_bottle_letter/object_gi_bottle_letter.h"
+#include "assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h"
+#include "assets/objects/object_gi_boots_2/object_gi_boots_2.h"
+#include "assets/objects/object_gi_seed/object_gi_seed.h"
+#include "assets/objects/object_gi_gloves/object_gi_gloves.h"
+#include "assets/objects/object_gi_coin/object_gi_coin.h"
+#include "assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h"
+#include "assets/objects/object_gi_redead_mask/object_gi_redead_mask.h"
+#include "assets/objects/object_gi_skj_mask/object_gi_skj_mask.h"
+#include "assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h"
+#include "assets/objects/object_gi_truth_mask/object_gi_truth_mask.h"
+#include "assets/objects/object_gi_eye_lotion/object_gi_eye_lotion.h"
+#include "assets/objects/object_gi_powder/object_gi_powder.h"
+#include "assets/objects/object_gi_mushroom/object_gi_mushroom.h"
+#include "assets/objects/object_gi_ticketstone/object_gi_ticketstone.h"
+#include "assets/objects/object_gi_brokensword/object_gi_brokensword.h"
+#include "assets/objects/object_gi_prescription/object_gi_prescription.h"
+#include "assets/objects/object_gi_bracelet/object_gi_bracelet.h"
+#include "assets/objects/object_gi_soldout/object_gi_soldout.h"
+#include "assets/objects/object_gi_frog/object_gi_frog.h"
+#include "assets/objects/object_gi_golonmask/object_gi_golonmask.h"
+#include "assets/objects/object_gi_zoramask/object_gi_zoramask.h"
+#include "assets/objects/object_gi_gerudomask/object_gi_gerudomask.h"
+#include "assets/objects/object_gi_hoverboots/object_gi_hoverboots.h"
+#include "assets/objects/object_gi_m_arrow/object_gi_m_arrow.h"
+#include "assets/objects/object_gi_sutaru/object_gi_sutaru.h"
+#include "assets/objects/object_gi_goddess/object_gi_goddess.h"
+#include "assets/objects/object_gi_fire/object_gi_fire.h"
+#include "assets/objects/object_gi_insect/object_gi_insect.h"
+#include "assets/objects/object_gi_butterfly/object_gi_butterfly.h"
+#include "assets/objects/object_gi_ghost/object_gi_ghost.h"
+#include "assets/objects/object_gi_soul/object_gi_soul.h"
+#include "assets/objects/object_gi_dekupouch/object_gi_dekupouch.h"
+#include "assets/objects/object_gi_rupy/object_gi_rupy.h"
+#include "assets/objects/object_gi_sword_1/object_gi_sword_1.h"
+#include "assets/objects/object_st/object_st.h"
 
 // "Get Item" Model Draw Functions
 void GetItem_DrawMaskOrBombchu(PlayState* play, s16 drawId);

src/code/z_eff_blure.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
     EffectBlureElement* elem;

src/code/z_eff_shield_particle.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "vt.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 static Vtx sVertices[5] = {
     VTX(-32, -32, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF),

src/code/z_eff_spark.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 // original name: "spark"
 void EffectSpark_Init(void* thisx, void* initParamsx) {

src/code/z_en_a_keep.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "vt.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/code/z_en_item00.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
 
 #define FLAGS 0

src/code/z_fbdemo_circle.c

@@ -5,7 +5,7 @@ Gfx sCircleEmptyDList[] = {
     gsSPEndDisplayList(),
 };
 
-#include "code/fbdemo_circle/z_fbdemo_circle.c"
+#include "assets/code/fbdemo_circle/z_fbdemo_circle.c"
 
 Gfx sCircleDList[] = {
     gsDPPipeSync(),

src/code/z_fbdemo_triforce.c

@@ -1,6 +1,6 @@
 #include "global.h"
 
-#include "code/fbdemo_triforce/z_fbdemo_triforce.c"
+#include "assets/code/fbdemo_triforce/z_fbdemo_triforce.c"
 
 void TransitionTriforce_Start(void* thisx) {
     TransitionTriforce* this = (TransitionTriforce*)thisx;

src/code/z_fbdemo_wipe1.c

@@ -1,6 +1,6 @@
 #include "global.h"
 
-#include "code/fbdemo_wipe1/z_fbdemo_wipe1.c"
+#include "assets/code/fbdemo_wipe1/z_fbdemo_wipe1.c"
 
 Gfx sWipeDList[] = {
     gsDPPipeSync(),

src/code/z_kankyo.c

@@ -1,8 +1,8 @@
 #include "global.h"
 #include "ultra64.h"
 #include "vt.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
-#include "objects/gameplay_field_keep/gameplay_field_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
 typedef enum {
     /* 0x00 */ LIGHTNING_BOLT_START,

src/code/z_lifemeter.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "textures/parameter_static/parameter_static.h"
+#include "assets/textures/parameter_static/parameter_static.h"
 
 static s16 sHeartsPrimColors[3][3] = {
     { HEARTS_PRIM_R, HEARTS_PRIM_G, HEARTS_PRIM_B },

src/code/z_lights.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define LIGHTS_BUFFER_SIZE 32
 

src/code/z_map_exp.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "vt.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
-#include "textures/parameter_static/parameter_static.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/textures/parameter_static/parameter_static.h"
 
 MapData* gMapData;
 

src/code/z_map_mark.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "vt.h"
-#include "textures/parameter_static/parameter_static.h"
+#include "assets/textures/parameter_static/parameter_static.h"
 
 typedef struct {
     /* 0x00 */ void* texture;

src/code/z_message_PAL.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "message_data_static.h"
 #include "vt.h"
-#include "textures/parameter_static/parameter_static.h"
+#include "assets/textures/parameter_static/parameter_static.h"
 
 s16 sTextFade = false; // original name: key_off_flag ?
 
@@ -31,7 +31,7 @@ MessageTableEntry sNesMessageEntryTable[] = {
 #define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) \
     { textId, (_SHIFTL(type, 4, 8) | _SHIFTL(yPos, 0, 8)), _message_##textId##_nes },
 #define DEFINE_MESSAGE_FFFC
-#include "text/message_data.h"
+#include "assets/text/message_data.h"
 #undef DEFINE_MESSAGE_FFFC
 #undef DEFINE_MESSAGE
     { 0xFFFF, 0, NULL },
@@ -39,14 +39,14 @@ MessageTableEntry sNesMessageEntryTable[] = {
 
 const char* sGerMessageEntryTable[] = {
 #define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) _message_##textId##_ger,
-#include "text/message_data.h"
+#include "assets/text/message_data.h"
 #undef DEFINE_MESSAGE
     NULL,
 };
 
 const char* sFraMessageEntryTable[] = {
 #define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) _message_##textId##_fra,
-#include "text/message_data.h"
+#include "assets/text/message_data.h"
 #undef DEFINE_MESSAGE
     NULL,
 };
@@ -54,7 +54,7 @@ const char* sFraMessageEntryTable[] = {
 MessageTableEntry sStaffMessageEntryTable[] = {
 #define DEFINE_MESSAGE(textId, type, yPos, staffMessage) \
     { textId, (_SHIFTL(type, 4, 8) | _SHIFTL(yPos, 0, 8)), _message_##textId##_staff },
-#include "text/message_data_staff.h"
+#include "assets/text/message_data_staff.h"
 #undef DEFINE_MESSAGE
     { 0xFFFF, 0, NULL },
 };

src/code/z_parameter.c

@@ -1,8 +1,8 @@
 #include "global.h"
 #include "vt.h"
-#include "textures/parameter_static/parameter_static.h"
-#include "textures/do_action_static/do_action_static.h"
-#include "textures/icon_item_static/icon_item_static.h"
+#include "assets/textures/parameter_static/parameter_static.h"
+#include "assets/textures/do_action_static/do_action_static.h"
+#include "assets/textures/icon_item_static/icon_item_static.h"
 
 // TODO extract this information from the texture definitions themselves
 #define DO_ACTION_TEX_WIDTH 48

src/code/z_player_lib.c

@@ -1,7 +1,7 @@
 #include "global.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
-#include "objects/object_link_boy/object_link_boy.h"
-#include "objects/object_link_child/object_link_child.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/object_link_boy/object_link_boy.h"
+#include "assets/objects/object_link_child/object_link_child.h"
 
 typedef struct {
     /* 0x00 */ u8 flag;

src/code/z_scene_table.c

@@ -1,25 +1,25 @@
 #include "global.h"
 
-#include "scenes/overworld/spot00/spot00_scene.h"
-#include "scenes/overworld/spot00/spot00_room_0.h"
-#include "scenes/overworld/spot01/spot01_scene.h"
-#include "scenes/overworld/spot07/spot07_scene.h"
-#include "scenes/overworld/spot12/spot12_scene.h"
-#include "scenes/overworld/spot16/spot16_scene.h"
-#include "scenes/overworld/spot16/spot16_room_0.h"
-#include "scenes/overworld/spot18/spot18_scene.h"
-#include "scenes/overworld/spot20/spot20_scene.h"
-#include "scenes/overworld/souko/souko_scene.h"
+#include "assets/scenes/overworld/spot00/spot00_scene.h"
+#include "assets/scenes/overworld/spot00/spot00_room_0.h"
+#include "assets/scenes/overworld/spot01/spot01_scene.h"
+#include "assets/scenes/overworld/spot07/spot07_scene.h"
+#include "assets/scenes/overworld/spot12/spot12_scene.h"
+#include "assets/scenes/overworld/spot16/spot16_scene.h"
+#include "assets/scenes/overworld/spot16/spot16_room_0.h"
+#include "assets/scenes/overworld/spot18/spot18_scene.h"
+#include "assets/scenes/overworld/spot20/spot20_scene.h"
+#include "assets/scenes/overworld/souko/souko_scene.h"
 
-#include "scenes/dungeons/men/men_scene.h"
-#include "scenes/dungeons/ddan/ddan_scene.h"
-#include "scenes/dungeons/ydan/ydan_scene.h"
-#include "scenes/dungeons/Bmori1/Bmori1_scene.h"
-#include "scenes/dungeons/MIZUsin/MIZUsin_scene.h"
-#include "scenes/dungeons/gerudoway/gerudoway_scene.h"
-#include "scenes/dungeons/jyasinzou/jyasinzou_scene.h"
-#include "scenes/indoors/miharigoya/miharigoya_scene.h"
-#include "scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"
+#include "assets/scenes/dungeons/men/men_scene.h"
+#include "assets/scenes/dungeons/ddan/ddan_scene.h"
+#include "assets/scenes/dungeons/ydan/ydan_scene.h"
+#include "assets/scenes/dungeons/Bmori1/Bmori1_scene.h"
+#include "assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h"
+#include "assets/scenes/dungeons/gerudoway/gerudoway_scene.h"
+#include "assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h"
+#include "assets/scenes/indoors/miharigoya/miharigoya_scene.h"
+#include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"
 
 #include "overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h"
 

src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

@@ -1,5 +1,5 @@
 #include "z_arms_hook.h"
-#include "objects/object_link_boy/object_link_boy.h"
+#include "assets/objects/object_link_boy/object_link_boy.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c

@@ -18,7 +18,7 @@ void ArrowFire_Charge(ArrowFire* this, PlayState* play);
 void ArrowFire_Fly(ArrowFire* this, PlayState* play);
 void ArrowFire_Hit(ArrowFire* this, PlayState* play);
 
-#include "overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c"
+#include "assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c"
 
 const ActorInit Arrow_Fire_InitVars = {
     ACTOR_ARROW_FIRE,

src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c

@@ -19,7 +19,7 @@ void ArrowIce_Charge(ArrowIce* this, PlayState* play);
 void ArrowIce_Fly(ArrowIce* this, PlayState* play);
 void ArrowIce_Hit(ArrowIce* this, PlayState* play);
 
-#include "overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c"
+#include "assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c"
 
 const ActorInit Arrow_Ice_InitVars = {
     ACTOR_ARROW_ICE,

src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c

@@ -19,7 +19,7 @@ void ArrowLight_Charge(ArrowLight* this, PlayState* play);
 void ArrowLight_Fly(ArrowLight* this, PlayState* play);
 void ArrowLight_Hit(ArrowLight* this, PlayState* play);
 
-#include "overlays/ovl_Arrow_Light/ovl_Arrow_Light.c"
+#include "assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.c"
 
 const ActorInit Arrow_Light_InitVars = {
     ACTOR_ARROW_LIGHT,

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_bdan_objects.h"
-#include "objects/object_bdan_objects/object_bdan_objects.h"
+#include "assets/objects/object_bdan_objects/object_bdan_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_bdan_switch.h"
-#include "objects/object_bdan_objects/object_bdan_objects.h"
+#include "assets/objects/object_bdan_objects/object_bdan_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c

@@ -6,7 +6,7 @@
 
 #include "z_bg_bom_guard.h"
 #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h"
-#include "objects/object_bowl/object_bowl.h"
+#include "assets/objects/object_bowl/object_bowl.h"
 #include "vt.h"
 
 #define FLAGS ACTOR_FLAG_4

src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_bombwall.h"
-#include "objects/gameplay_field_keep/gameplay_field_keep.h"
+#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
 #define FLAGS ACTOR_FLAG_22
 

src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c

@@ -7,7 +7,7 @@
 #include "z_bg_bowl_wall.h"
 #include "overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h"
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
-#include "objects/object_bowl/object_bowl.h"
+#include "assets/objects/object_bowl/object_bowl.h"
 #include "vt.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

@@ -5,9 +5,9 @@
  */
 
 #include "z_bg_breakwall.h"
-#include "scenes/dungeons/ddan/ddan_scene.h"
-#include "objects/object_bwall/object_bwall.h"
-#include "objects/object_kingdodongo/object_kingdodongo.h"
+#include "assets/scenes/dungeons/ddan/ddan_scene.h"
+#include "assets/objects/object_bwall/object_bwall.h"
+#include "assets/objects/object_kingdodongo/object_kingdodongo.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_ddan_jd.h"
-#include "objects/object_ddan_objects/object_ddan_objects.h"
+#include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_ddan_kd.h"
-#include "objects/object_ddan_objects/object_ddan_objects.h"
+#include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c

@@ -6,7 +6,7 @@
 
 #include "z_bg_dodoago.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
-#include "objects/object_ddan_objects/object_ddan_objects.h"
+#include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

@@ -5,11 +5,11 @@
  */
 
 #include "z_bg_dy_yoseizo.h"
-#include "objects/object_dy_obj/object_dy_obj.h"
+#include "assets/objects/object_dy_obj/object_dy_obj.h"
 #include "vt.h"
 #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h"
-#include "scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h"
-#include "scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h"
+#include "assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h"
+#include "assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25)
 

src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

@@ -63,7 +63,7 @@ static Vec3f sSideCenters[] = {
 
 static f32 sSideAngles[] = { M_PI / 2, -M_PI / 2, 0.0f, M_PI };
 
-#include "overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.c"
+#include "assets/overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.c"
 
 void BgGanonOtyuka_Init(Actor* thisx, PlayState* play2) {
     BgGanonOtyuka* this = (BgGanonOtyuka*)thisx;

src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_gate_shutter.h"
-#include "objects/object_spot01_matoyab/object_spot01_matoyab.h"
+#include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"
 #include "vt.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c

@@ -5,8 +5,8 @@
  */
 
 #include "z_bg_gjyo_bridge.h"
-#include "objects/object_gjyo_objects/object_gjyo_objects.h"
-#include "scenes/dungeons/ganon_tou/ganon_tou_scene.h"
+#include "assets/objects/object_gjyo_objects/object_gjyo_objects.h"
+#include "assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_gnd_darkmeiro.h"
-#include "objects/object_demo_kekkai/object_demo_kekkai.h"
+#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_gnd_firemeiro.h"
-#include "objects/object_demo_kekkai/object_demo_kekkai.h"
+#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_gnd_iceblock.h"
-#include "objects/object_demo_kekkai/object_demo_kekkai.h"
+#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_gnd_nisekabe.h"
-#include "objects/object_demo_kekkai/object_demo_kekkai.h"
+#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_gnd_soulmeiro.h"
-#include "objects/object_demo_kekkai/object_demo_kekkai.h"
+#include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 #include "global.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_haka.h"
-#include "objects/object_haka/object_haka.h"
+#include "assets/objects/object_haka/object_haka.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c

@@ -5,8 +5,8 @@
  */
 
 #include "z_bg_haka_gate.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
-#include "objects/object_haka_objects/object_haka_objects.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/object_haka_objects/object_haka_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_haka_huta.h"
-#include "objects/object_hakach_objects/object_hakach_objects.h"
+#include "assets/objects/object_hakach_objects/object_hakach_objects.h"
 #include "overlays/actors/ovl_En_Rd/z_en_rd.h"
 
 #define FLAGS ACTOR_FLAG_4

src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c

@@ -5,8 +5,8 @@
  */
 
 #include "z_bg_haka_megane.h"
-#include "objects/object_hakach_objects/object_hakach_objects.h"
-#include "objects/object_haka_objects/object_haka_objects.h"
+#include "assets/objects/object_hakach_objects/object_hakach_objects.h"
+#include "assets/objects/object_haka_objects/object_haka_objects.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_7)
 

src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_haka_meganebg.h"
-#include "objects/object_haka_objects/object_haka_objects.h"
+#include "assets/objects/object_haka_objects/object_haka_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

@@ -5,8 +5,8 @@
  */
 
 #include "z_bg_haka_sgami.h"
-#include "objects/object_haka_objects/object_haka_objects.h"
-#include "objects/object_ice_objects/object_ice_objects.h"
+#include "assets/objects/object_haka_objects/object_haka_objects.h"
+#include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4)
 

src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_haka_ship.h"
-#include "objects/object_haka_objects/object_haka_objects.h"
+#include "assets/objects/object_haka_objects/object_haka_objects.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_haka_trap.h"
-#include "objects/object_haka_objects/object_haka_objects.h"
+#include "assets/objects/object_haka_objects/object_haka_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c

@@ -5,8 +5,8 @@
  */
 
 #include "z_bg_haka_tubo.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
-#include "objects/object_haka_objects/object_haka_objects.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/object_haka_objects/object_haka_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_haka_water.h"
-#include "objects/object_hakach_objects/object_hakach_objects.h"
+#include "assets/objects/object_hakach_objects/object_hakach_objects.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c

@@ -5,8 +5,8 @@
  */
 
 #include "z_bg_haka_zou.h"
-#include "objects/object_hakach_objects/object_hakach_objects.h"
-#include "objects/object_haka_objects/object_haka_objects.h"
+#include "assets/objects/object_hakach_objects/object_hakach_objects.h"
+#include "assets/objects/object_haka_objects/object_haka_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_heavy_block.h"
-#include "objects/object_heavy_object/object_heavy_object.h"
+#include "assets/objects/object_heavy_object/object_heavy_object.h"
 #include "vt.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_curtain.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_dalm.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_firewall.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_fslift.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c

@@ -6,8 +6,8 @@
  */
 
 #include "z_bg_hidan_fwbig.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_hamstep.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_hrock.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_kousi.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

@@ -5,9 +5,9 @@
  */
 
 #include "z_bg_hidan_kowarerukabe.h"
-#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
+#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_rock.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_rsekizou.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_sekizou.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_sima.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_hidan_syoku.h"
-#include "objects/object_hidan_objects/object_hidan_objects.h"
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_ice_objects.h"
-#include "objects/object_ice_objects/object_ice_objects.h"
+#include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c

@@ -1,5 +1,5 @@
 #include "z_bg_ice_shelter.h"
-#include "objects/object_ice_objects/object_ice_objects.h"
+#include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_ice_shutter.h"
-#include "objects/object_ice_objects/object_ice_objects.h"
+#include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_ice_turara.h"
-#include "objects/object_ice_objects/object_ice_objects.h"
+#include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_ingate.h"
-#include "objects/object_ingate/object_ingate.h"
+#include "assets/objects/object_ingate/object_ingate.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_jya_1flift.h"
-#include "objects/object_jya_obj/object_jya_obj.h"
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_jya_amishutter.h"
-#include "objects/object_jya_obj/object_jya_obj.h"
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_jya_bigmirror.h"
-#include "objects/object_jya_obj/object_jya_obj.h"
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_jya_block.h"
-#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
+#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c

@@ -1,6 +1,6 @@
 #include "z_bg_jya_bombchuiwa.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
-#include "objects/object_jya_obj/object_jya_obj.h"
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 #define FLAGS ACTOR_FLAG_0
 
 void BgJyaBombchuiwa_Init(Actor* thisx, PlayState* play);

src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c

@@ -6,7 +6,7 @@
 
 #include "z_bg_jya_bombiwa.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
-#include "objects/object_jya_obj/object_jya_obj.h"
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 #include "vt.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c

@@ -1,7 +1,7 @@
 #include "z_bg_jya_cobra.h"
 #include "overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h"
 #include "overlays/actors/ovl_Mir_Ray/z_mir_ray.h"
-#include "objects/object_jya_obj/object_jya_obj.h"
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 #include "vt.h"
 
 #define FLAGS ACTOR_FLAG_4
@@ -16,7 +16,7 @@ void func_80896950(BgJyaCobra* this, PlayState* play);
 void func_808969F8(BgJyaCobra* this, PlayState* play);
 void func_80896ABC(BgJyaCobra* this, PlayState* play);
 
-#include "overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c"
+#include "assets/overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c"
 
 const ActorInit Bg_Jya_Cobra_InitVars = {
     ACTOR_BG_JYA_COBRA,

src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c

@@ -6,7 +6,7 @@
  */
 
 #include "z_bg_jya_goroiwa.h"
-#include "objects/object_goroiwa/object_goroiwa.h"
+#include "assets/objects/object_goroiwa/object_goroiwa.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c

@@ -6,7 +6,7 @@
 
 #include "z_bg_jya_haheniron.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
-#include "objects/object_jya_iron/object_jya_iron.h"
+#include "assets/objects/object_jya_iron/object_jya_iron.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_jya_ironobj.h"
-#include "objects/object_jya_iron/object_jya_iron.h"
+#include "assets/objects/object_jya_iron/object_jya_iron.h"
 #include "overlays/actors/ovl_En_Ik/z_en_ik.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_jya_kanaami.h"
-#include "objects/object_jya_obj/object_jya_obj.h"
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_jya_lift.h"
-#include "objects/object_jya_obj/object_jya_obj.h"
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c

@@ -6,7 +6,7 @@
 
 #include "z_bg_jya_megami.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
-#include "objects/object_jya_obj/object_jya_obj.h"
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_jya_zurerukabe.h"
-#include "objects/object_jya_obj/object_jya_obj.h"
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 #include "vt.h"
 
 #define FLAGS ACTOR_FLAG_4

src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_menkuri_eye.h"
-#include "objects/object_menkuri_objects/object_menkuri_objects.h"
+#include "assets/objects/object_menkuri_objects/object_menkuri_objects.h"
 
 #define FLAGS ACTOR_FLAG_5
 

src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_menkuri_kaiten.h"
-#include "objects/object_menkuri_objects/object_menkuri_objects.h"
+#include "assets/objects/object_menkuri_objects/object_menkuri_objects.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_menkuri_nisekabe.h"
-#include "objects/object_menkuri_objects/object_menkuri_objects.h"
+#include "assets/objects/object_menkuri_objects/object_menkuri_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c

@@ -6,7 +6,7 @@
 
 #include "z_bg_mizu_bwall.h"
 #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h"
-#include "objects/object_mizu_objects/object_mizu_objects.h"
+#include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c

@@ -6,7 +6,7 @@
 
 #include "z_bg_mizu_movebg.h"
 #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h"
-#include "objects/object_mizu_objects/object_mizu_objects.h"
+#include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c

@@ -1,5 +1,5 @@
 #include "z_bg_mizu_shutter.h"
-#include "objects/object_mizu_objects/object_mizu_objects.h"
+#include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_mizu_uzu.h"
-#include "objects/object_mizu_objects/object_mizu_objects.h"
+#include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_mizu_water.h"
-#include "objects/object_mizu_objects/object_mizu_objects.h"
+#include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c

@@ -5,14 +5,14 @@
  */
 
 #include "z_bg_mjin.h"
-#include "objects/object_mjin/object_mjin.h"
-#include "objects/object_mjin_wind/object_mjin_wind.h"
-#include "objects/object_mjin_soul/object_mjin_soul.h"
-#include "objects/object_mjin_dark/object_mjin_dark.h"
-#include "objects/object_mjin_ice/object_mjin_ice.h"
-#include "objects/object_mjin_flame/object_mjin_flame.h"
-#include "objects/object_mjin_flash/object_mjin_flash.h"
-#include "objects/object_mjin_oka/object_mjin_oka.h"
+#include "assets/objects/object_mjin/object_mjin.h"
+#include "assets/objects/object_mjin_wind/object_mjin_wind.h"
+#include "assets/objects/object_mjin_soul/object_mjin_soul.h"
+#include "assets/objects/object_mjin_dark/object_mjin_dark.h"
+#include "assets/objects/object_mjin_ice/object_mjin_ice.h"
+#include "assets/objects/object_mjin_flame/object_mjin_flame.h"
+#include "assets/objects/object_mjin_flash/object_mjin_flash.h"
+#include "assets/objects/object_mjin_oka/object_mjin_oka.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_mori_bigst.h"
-#include "objects/object_mori_objects/object_mori_objects.h"
+#include "assets/objects/object_mori_objects/object_mori_objects.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c

@@ -1,5 +1,5 @@
 #include "z_bg_mori_elevator.h"
-#include "objects/object_mori_objects/object_mori_objects.h"
+#include "assets/objects/object_mori_objects/object_mori_objects.h"
 
 #define FLAGS ACTOR_FLAG_4