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/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
 

src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c

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

src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_mori_hashira4.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_Hineri/z_bg_mori_hineri.c

@@ -5,13 +5,13 @@
  */
 
 #include "z_bg_mori_hineri.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
-#include "objects/object_box/object_box.h"
-#include "objects/object_mori_hineri1/object_mori_hineri1.h"
-#include "objects/object_mori_hineri1a/object_mori_hineri1a.h"
-#include "objects/object_mori_hineri2/object_mori_hineri2.h"
-#include "objects/object_mori_hineri2a/object_mori_hineri2a.h"
-#include "objects/object_mori_tex/object_mori_tex.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/object_box/object_box.h"
+#include "assets/objects/object_mori_hineri1/object_mori_hineri1.h"
+#include "assets/objects/object_mori_hineri1a/object_mori_hineri1a.h"
+#include "assets/objects/object_mori_hineri2/object_mori_hineri2.h"
+#include "assets/objects/object_mori_hineri2a/object_mori_hineri2a.h"
+#include "assets/objects/object_mori_tex/object_mori_tex.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_mori_idomizu.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 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c

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

src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_mori_rakkatenjo.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 | ACTOR_FLAG_5)
 

src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c

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

src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c

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

src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c

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

src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

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

src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c

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

src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

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

src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c

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

src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c

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

src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c

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

src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c

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

src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c

@@ -5,8 +5,8 @@
  */
 
 #include "z_bg_spot01_objects2.h"
-#include "objects/object_spot01_matoya/object_spot01_matoya.h"
-#include "objects/object_spot01_matoyab/object_spot01_matoyab.h"
+#include "assets/objects/object_spot01_matoya/object_spot01_matoya.h"
+#include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"
 
 #define FLAGS ACTOR_FLAG_4
 

src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c

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

src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c

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

src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c

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

src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

@@ -5,7 +5,7 @@
  */
 
 #include "z_bg_spot06_objects.h"
-#include "objects/object_spot06_objects/object_spot06_objects.h"
+#include "assets/objects/object_spot06_objects/object_spot06_objects.h"
 
 #define FLAGS ACTOR_FLAG_9
 

src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c

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