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

22 files changed, 158 insertions, 158 deletions

diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c
index 68c51e7e2..4acd8b4b8 100644
--- a/src/code/code_80097A00.c
+++ b/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[] = {
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index b3d0cdbd8..f8253699d 100644
--- a/src/code/z_actor.c
+++ b/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;
diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c
index cc9932d90..62c52acbd 100644
--- a/src/code/z_debug_display.c
+++ b/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
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index f5b730a0e..33cc69b97 100644
--- a/src/code/z_demo.c
+++ b/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 "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 "scenes/misc/hakaana_ouke/hakaana_ouke_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 "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 "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h"
 
 u16 D_8011E1C0 = 0;
 u16 D_8011E1C4 = 0;
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index b3e2d2a8d..0b541ec17 100644
--- a/src/code/z_draw.c
+++ b/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);
diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c
index fabc53e4d..89cbe5d7e 100644
--- a/src/code/z_eff_blure.c
+++ b/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;
diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c
index ae38df8de..29a9e677c 100644
--- a/src/code/z_eff_shield_particle.c
+++ b/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),
diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c
index 8e1ea4325..ad147c428 100644
--- a/src/code/z_eff_spark.c
+++ b/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) {
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index 53cae48d7..e7243473b 100644
--- a/src/code/z_en_a_keep.c
+++ b/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
 
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index f1fa31fca..862b7c7ea 100644
--- a/src/code/z_en_item00.c
+++ b/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
diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c
index 1fd6cabe2..4057d71d1 100644
--- a/src/code/z_fbdemo_circle.c
+++ b/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(),
diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c
index 22cbf6c18..fe7068f26 100644
--- a/src/code/z_fbdemo_triforce.c
+++ b/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;
diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c
index 2acb83606..6a4d09447 100644
--- a/src/code/z_fbdemo_wipe1.c
+++ b/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(),
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 72a21b76d..45b7b5854 100644
--- a/src/code/z_kankyo.c
+++ b/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,
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c
index 67b3a9103..0614d6fc5 100644
--- a/src/code/z_lifemeter.c
+++ b/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 },
diff --git a/src/code/z_lights.c b/src/code/z_lights.c
index 18967a89d..3767e19da 100644
--- a/src/code/z_lights.c
+++ 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
 
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index e14e1a870..cd826c6e5 100644
--- a/src/code/z_map_exp.c
+++ b/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;
 
diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c
index 1cc055a03..a267f7e56 100644
--- a/src/code/z_map_mark.c
+++ b/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;
diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c
index e29883ae5..23bef7df9 100644
--- a/src/code/z_message_PAL.c
+++ b/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 },
 };
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 9e4ba5d4b..4ec18010d 100644
--- a/src/code/z_parameter.c
+++ b/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
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 9b04c8a58..118df8d66 100644
--- a/src/code/z_player_lib.c
+++ b/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;
diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c
index e6d9b4992..1477c6d5f 100644
--- a/src/code/z_scene_table.c
+++ b/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 "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/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 "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"