diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-09-10 12:16:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-10 15:16:56 -0300 |
| commit | b9ea1c19ab8c8f273cf8cddfc372dcb47106f1f3 (patch) | |
| tree | 4d9ded0ea8ad29fc42b6bf3e7d599a14333314ef /src/overlays/actors | |
| parent | 19da273ca0d4a1b1e2f44a3fee0983a97c7558a0 (diff) | |
Remove assets from automatic includes (#1683)
Diffstat (limited to 'src/overlays/actors')
551 files changed, 692 insertions, 692 deletions
diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 422cf4908..abe369f5c 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -5,8 +5,8 @@ */ #include "z_arms_hook.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_link_child/object_link_child.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_link_child/object_link_child.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 0b8a8ed0b..ec307aec5 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -19,7 +19,7 @@ void ArrowFire_Draw(Actor* thisx, PlayState* play); void FireArrow_ChargeAndWait(ArrowFire* this, PlayState* play); void FireArrow_Fly(ArrowFire* this, PlayState* play); -#include "overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c" +#include "assets/overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c" ActorInit Arrow_Fire_InitVars = { /**/ ACTOR_ARROW_FIRE, diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 4b3d7507a..6de91b421 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -19,7 +19,7 @@ void ArrowIce_Draw(Actor* thisx, PlayState* play); void ArrowIce_Charge(ArrowIce* this, PlayState* play); void ArrowIce_Fly(ArrowIce* this, PlayState* play); -#include "overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c" +#include "assets/overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c" static s32 sBssPad; diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index bd67099b4..059d03288 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -19,7 +19,7 @@ void ArrowLight_Draw(Actor* thisx, PlayState* play); void ArrowLight_Charge(ArrowLight* this, PlayState* play); void ArrowLight_Fly(ArrowLight* this, PlayState* play); -#include "overlays/ovl_Arrow_Light/ovl_Arrow_Light.c" +#include "assets/overlays/ovl_Arrow_Light/ovl_Arrow_Light.c" ActorInit Arrow_Light_InitVars = { /**/ ACTOR_ARROW_LIGHT, diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c index 73de1eea4..7805715e6 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c @@ -5,7 +5,7 @@ */ #include "z_bg_astr_bombwall.h" -#include "objects/object_astr_obj/object_astr_obj.h" +#include "assets/objects/object_astr_obj/object_astr_obj.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c index 6faedcdd0..75146d65f 100644 --- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c @@ -5,7 +5,7 @@ */ #include "z_bg_botihasira.h" -#include "objects/object_botihasira/object_botihasira.h" +#include "assets/objects/object_botihasira/object_botihasira.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index 99fe17298..1a40b492b 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -5,15 +5,15 @@ */ #include "z_bg_breakwall.h" -#include "objects/object_omoya_obj/object_omoya_obj.h" -#include "objects/object_yukimura_obj/object_yukimura_obj.h" -#include "objects/object_keikoku_obj/object_keikoku_obj.h" -#include "objects/object_posthouse_obj/object_posthouse_obj.h" -#include "objects/object_kumo30/object_kumo30.h" -#include "objects/object_mnk/object_mnk.h" -#include "objects/object_ikninside_obj/object_ikninside_obj.h" -#include "objects/object_kaizoku_obj/object_kaizoku_obj.h" -#include "objects/object_spot11_obj/object_spot11_obj.h" +#include "assets/objects/object_omoya_obj/object_omoya_obj.h" +#include "assets/objects/object_yukimura_obj/object_yukimura_obj.h" +#include "assets/objects/object_keikoku_obj/object_keikoku_obj.h" +#include "assets/objects/object_posthouse_obj/object_posthouse_obj.h" +#include "assets/objects/object_kumo30/object_kumo30.h" +#include "assets/objects/object_mnk/object_mnk.h" +#include "assets/objects/object_ikninside_obj/object_ikninside_obj.h" +#include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" +#include "assets/objects/object_spot11_obj/object_spot11_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c index 6151d55a4..dd76f8edf 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c @@ -5,7 +5,7 @@ */ #include "z_bg_ctower_gear.h" -#include "objects/object_ctower_rot/object_ctower_rot.h" +#include "assets/objects/object_ctower_rot/object_ctower_rot.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c index b797e5a27..421f8cc79 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c @@ -5,7 +5,7 @@ */ #include "z_bg_ctower_rot.h" -#include "objects/object_ctower_rot/object_ctower_rot.h" +#include "assets/objects/object_ctower_rot/object_ctower_rot.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c index e9eedb53c..fec339aaa 100644 --- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c @@ -6,7 +6,7 @@ #include "z_bg_danpei_movebg.h" -#include "objects/object_d_lift/object_d_lift.h" +#include "assets/objects/object_d_lift/object_d_lift.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index 4926f620a..6096b0a89 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -5,7 +5,7 @@ */ #include "z_bg_dblue_balance.h" -#include "objects/object_dblue_object/object_dblue_object.h" +#include "assets/objects/object_dblue_object/object_dblue_object.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c index 5e935b068..6ec3d14e2 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c @@ -5,7 +5,7 @@ */ #include "z_bg_dblue_elevator.h" -#include "objects/object_dblue_object/object_dblue_object.h" +#include "assets/objects/object_dblue_object/object_dblue_object.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c index ef30535fd..9a6a53984 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c @@ -5,7 +5,7 @@ */ #include "z_bg_dblue_movebg.h" -#include "objects/object_dblue_object/object_dblue_object.h" +#include "assets/objects/object_dblue_object/object_dblue_object.h" #include "overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index 02b7a7e67..eb64ab70a 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -5,7 +5,7 @@ */ #include "z_bg_dblue_waterfall.h" -#include "objects/object_dblue_object/object_dblue_object.h" +#include "assets/objects/object_dblue_object/object_dblue_object.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h index 4aaf67e77..6fd5750f0 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h @@ -3,7 +3,7 @@ #include "global.h" #include "overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h" -#include "objects/object_dy_obj/object_dy_obj.h" +#include "assets/objects/object_dy_obj/object_dy_obj.h" struct BgDyYoseizo; diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c index 4750cc9d3..3d40d3a35 100644 --- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c @@ -5,7 +5,7 @@ */ #include "z_bg_f40_block.h" -#include "objects/object_f40_obj/object_f40_obj.h" +#include "assets/objects/object_f40_obj/object_f40_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c index aeeb63cc2..ea49075e7 100644 --- a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c +++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c @@ -5,7 +5,7 @@ */ #include "z_bg_f40_flift.h" -#include "objects/object_f40_obj/object_f40_obj.h" +#include "assets/objects/object_f40_obj/object_f40_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c index 20043c309..97d1b4de0 100644 --- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c @@ -6,7 +6,7 @@ #include "prevent_bss_reordering.h" #include "z_bg_f40_switch.h" #include "z64rumble.h" -#include "objects/object_f40_switch/object_f40_switch.h" +#include "assets/objects/object_f40_switch/object_f40_switch.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c index e018fee7f..9f8bfa800 100644 --- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c @@ -5,7 +5,7 @@ */ #include "z_bg_f40_swlift.h" -#include "objects/object_f40_obj/object_f40_obj.h" +#include "assets/objects/object_f40_obj/object_f40_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c index a2dbe2ca2..01aa6a2d7 100644 --- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c @@ -5,7 +5,7 @@ */ #include "z_bg_fire_wall.h" -#include "objects/object_fwall/object_fwall.h" +#include "assets/objects/object_fwall/object_fwall.h" #include "overlays/actors/ovl_En_Encount4/z_en_encount4.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c index 7c2cfa1dc..b7afb2d71 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c @@ -5,7 +5,7 @@ */ #include "z_bg_fu_kaiten.h" -#include "objects/object_fu_kaiten/object_fu_kaiten.h" +#include "assets/objects/object_fu_kaiten/object_fu_kaiten.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c index 942486729..cfc0b974f 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c @@ -5,7 +5,7 @@ */ #include "z_bg_fu_mizu.h" -#include "objects/object_fu_kaiten/object_fu_kaiten.h" +#include "assets/objects/object_fu_kaiten/object_fu_kaiten.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c index 727ea89ea..33b8d96f8 100644 --- a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c +++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c @@ -5,7 +5,7 @@ */ #include "z_bg_goron_oyu.h" -#include "objects/object_oyu/object_oyu.h" +#include "assets/objects/object_oyu/object_oyu.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c index 8680a57aa..d429816ad 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c @@ -5,7 +5,7 @@ */ #include "z_bg_haka_bombwall.h" -#include "objects/object_haka_obj/object_haka_obj.h" +#include "assets/objects/object_haka_obj/object_haka_obj.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c index 8f7c3c306..2cff62a5c 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c +++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c @@ -5,7 +5,7 @@ */ #include "z_bg_haka_curtain.h" -#include "objects/object_haka_obj/object_haka_obj.h" +#include "assets/objects/object_haka_obj/object_haka_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c index ae861d4a1..58d179458 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c @@ -5,7 +5,7 @@ */ #include "z_bg_haka_tomb.h" -#include "objects/object_haka_obj/object_haka_obj.h" +#include "assets/objects/object_haka_obj/object_haka_obj.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c index 3fe51a592..362382df6 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c @@ -5,7 +5,7 @@ */ #include "z_bg_hakugin_bombwall.h" -#include "objects/object_hakugin_obj/object_hakugin_obj.h" +#include "assets/objects/object_hakugin_obj/object_hakugin_obj.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 1bcd27cec..b2a3f2891 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -5,7 +5,7 @@ */ #include "z_bg_hakugin_elvpole.h" -#include "objects/object_hakugin_obj/object_hakugin_obj.h" +#include "assets/objects/object_hakugin_obj/object_hakugin_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c index fb1bfb074..800611942 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c @@ -7,7 +7,7 @@ #include "z_bg_hakugin_post.h" #include "z64quake.h" #include "z64rumble.h" -#include "objects/object_hakugin_obj/object_hakugin_obj.h" +#include "assets/objects/object_hakugin_obj/object_hakugin_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c index 7bc5ce060..bef5143f6 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c @@ -7,7 +7,7 @@ #include "prevent_bss_reordering.h" #include "z_bg_hakugin_switch.h" #include "z64rumble.h" -#include "objects/object_goronswitch/object_goronswitch.h" +#include "assets/objects/object_goronswitch/object_goronswitch.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c index 878ffd974..9c4ce8f63 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c @@ -5,7 +5,7 @@ */ #include "z_bg_icefloe.h" -#include "objects/object_icefloe/object_icefloe.h" +#include "assets/objects/object_icefloe/object_icefloe.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c index 82242ecb0..0f3ba2771 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -5,7 +5,7 @@ */ #include "z_bg_icicle.h" -#include "objects/object_icicle/object_icicle.h" +#include "assets/objects/object_icicle/object_icicle.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c index 2a626961d..6528b4bff 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c @@ -5,7 +5,7 @@ */ #include "z_bg_ikana_block.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c index 11ad57001..b4148cbc5 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c @@ -5,7 +5,7 @@ */ #include "z_bg_ikana_bombwall.h" -#include "objects/object_ikana_obj/object_ikana_obj.h" +#include "assets/objects/object_ikana_obj/object_ikana_obj.h" #define FLAGS (ACTOR_FLAG_10000000) diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c index ba362e0ba..78a3ff46c 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c @@ -10,7 +10,7 @@ */ #include "z_bg_ikana_mirror.h" -#include "objects/object_ikana_obj/object_ikana_obj.h" +#include "assets/objects/object_ikana_obj/object_ikana_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c index 2533c9d22..cb63d897f 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c @@ -5,7 +5,7 @@ */ #include "z_bg_ikana_ray.h" -#include "objects/object_ikana_obj/object_ikana_obj.h" +#include "assets/objects/object_ikana_obj/object_ikana_obj.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index 3be27fd63..57d158ffd 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h" #include "overlays/actors/ovl_En_Torch2/z_en_torch2.h" #include "overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h" -#include "objects/object_ikana_obj/object_ikana_obj.h" +#include "assets/objects/object_ikana_obj/object_ikana_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c index f45d8782c..ec1a9d9fb 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c @@ -6,7 +6,7 @@ #include "z_bg_ikana_shutter.h" #include "z64quake.h" -#include "objects/object_ikana_obj/object_ikana_obj.h" +#include "assets/objects/object_ikana_obj/object_ikana_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c index 26352b4fc..0222694f0 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c @@ -7,7 +7,7 @@ #include "z_bg_iknin_susceil.h" #include "z64quake.h" #include "z64rumble.h" -#include "objects/object_ikninside_obj/object_ikninside_obj.h" +#include "assets/objects/object_ikninside_obj/object_ikninside_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c index ddb24e5e7..dfa8e9484 100644 --- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c @@ -5,7 +5,7 @@ */ #include "z_bg_ikninside.h" -#include "objects/object_ikninside_obj/object_ikninside_obj.h" +#include "assets/objects/object_ikninside_obj/object_ikninside_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c index 54c77f8e0..e17d640a4 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c @@ -5,7 +5,7 @@ */ #include "z_bg_iknv_doukutu.h" -#include "objects/object_iknv_obj/object_iknv_obj.h" +#include "assets/objects/object_iknv_obj/object_iknv_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c index b3198fe1d..61c9c07ee 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c @@ -5,7 +5,7 @@ */ #include "z_bg_iknv_obj.h" -#include "objects/object_iknv_obj/object_iknv_obj.h" +#include "assets/objects/object_iknv_obj/object_iknv_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index c22c6cb77..8831a4e70 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -5,7 +5,7 @@ */ #include "z_bg_ingate.h" -#include "objects/object_sichitai_obj/object_sichitai_obj.h" +#include "assets/objects/object_sichitai_obj/object_sichitai_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c index b70a1486e..810835805 100644 --- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c @@ -5,7 +5,7 @@ */ #include "z_bg_inibs_movebg.h" -#include "objects/object_inibs_object/object_inibs_object.h" +#include "assets/objects/object_inibs_object/object_inibs_object.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c index 45dc34371..424c1ff36 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c @@ -5,7 +5,7 @@ */ #include "z_bg_keikoku_saku.h" -#include "objects/object_keikoku_obj/object_keikoku_obj.h" +#include "assets/objects/object_keikoku_obj/object_keikoku_obj.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c index 34dab5fa7..4eefa9110 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c @@ -5,7 +5,7 @@ */ #include "z_bg_keikoku_spr.h" -#include "objects/object_keikoku_obj/object_keikoku_obj.h" +#include "assets/objects/object_keikoku_obj/object_keikoku_obj.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c index 7e7b6c214..430ff4a61 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c @@ -4,7 +4,7 @@ * Description: Ocean Spider House - Bombable Wall */ #include "z_bg_kin2_bombwall.h" -#include "objects/object_kin2_obj/object_kin2_obj.h" +#include "assets/objects/object_kin2_obj/object_kin2_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_10000000) diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c index 7d152e664..d51752cd0 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c @@ -5,7 +5,7 @@ */ #include "z_bg_kin2_fence.h" -#include "objects/object_kin2_obj/object_kin2_obj.h" +#include "assets/objects/object_kin2_obj/object_kin2_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c index ffed97ba5..52982797a 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c @@ -5,7 +5,7 @@ */ #include "z_bg_kin2_shelf.h" -#include "objects/object_kin2_obj/object_kin2_obj.h" +#include "assets/objects/object_kin2_obj/object_kin2_obj.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c index 3514b59f6..c4c6aaa66 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -5,7 +5,7 @@ */ #include "z_bg_ladder.h" -#include "objects/object_ladder/object_ladder.h" +#include "assets/objects/object_ladder/object_ladder.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h index 0e6568611..6a05f7062 100644 --- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h @@ -2,7 +2,7 @@ #define Z_BG_LAST_BWALL_H #include "global.h" -#include "objects/object_last_obj/object_last_obj.h" +#include "assets/objects/object_last_obj/object_last_obj.h" struct BgLastBwall; diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c index eaf93b740..df944f7d1 100644 --- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c @@ -5,7 +5,7 @@ */ #include "z_bg_lbfshot.h" -#include "objects/object_lbfshot/object_lbfshot.h" +#include "assets/objects/object_lbfshot/object_lbfshot.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c index 5d6f5b291..d80675364 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -1,5 +1,5 @@ #include "z_bg_lotus.h" -#include "objects/object_lotus/object_lotus.h" +#include "assets/objects/object_lotus/object_lotus.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c index 026bf6f48..de965b120 100644 --- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c +++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c @@ -5,7 +5,7 @@ */ #include "z_bg_market_step.h" -#include "objects/object_market_obj/object_market_obj.h" +#include "assets/objects/object_market_obj/object_market_obj.h" #define FLAGS (ACTOR_FLAG_20 | ACTOR_FLAG_10000000) diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c index ef60c2de2..094490d4f 100644 --- a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c +++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c @@ -5,7 +5,7 @@ */ #include "z_bg_mbar_chair.h" -#include "objects/object_mbar_obj/object_mbar_obj.h" +#include "assets/objects/object_mbar_obj/object_mbar_obj.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c index fd39e2fc9..fbb9efdfe 100644 --- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c @@ -5,8 +5,8 @@ */ #include "z_bg_numa_hana.h" -#include "objects/object_numa_obj/object_numa_obj.h" -#include "objects/object_syokudai/object_syokudai.h" +#include "assets/objects/object_numa_obj/object_numa_obj.h" +#include "assets/objects/object_syokudai/object_syokudai.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_400) diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c index 4954f52a0..086562e63 100644 --- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c @@ -5,7 +5,7 @@ */ #include "z_bg_open_shutter.h" -#include "objects/object_open_obj/object_open_obj.h" +#include "assets/objects/object_open_obj/object_open_obj.h" #include "z64quake.h" #include "z64rumble.h" diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c index c8d340d47..6c55a115c 100644 --- a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c +++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c @@ -5,7 +5,7 @@ * into a Deku Scrub. */ #include "z_bg_open_spot.h" -#include "objects/object_open_obj/object_open_obj.h" +#include "assets/objects/object_open_obj/object_open_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c index e57334605..9972446f2 100644 --- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c @@ -13,7 +13,7 @@ #include "z_bg_sinkai_kabe.h" #include "overlays/actors/ovl_En_Ot/z_en_ot.h" -#include "objects/object_sinkai_kabe/object_sinkai_kabe.h" +#include "assets/objects/object_sinkai_kabe/object_sinkai_kabe.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c index 44735fa67..d00c82d8b 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -5,7 +5,7 @@ */ #include "z_bg_spdweb.h" -#include "objects/object_spdweb/object_spdweb.h" +#include "assets/objects/object_spdweb/object_spdweb.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c index 7fdb6d9b2..ab13e740c 100644 --- a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c @@ -5,7 +5,7 @@ */ #include "z_bg_spout_fire.h" -#include "objects/object_fwall/object_fwall.h" +#include "assets/objects/object_fwall/object_fwall.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c index 73673f741..534c4c127 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -5,7 +5,7 @@ */ #include "z_bg_tobira01.h" -#include "objects/object_spot11_obj/object_spot11_obj.h" +#include "assets/objects/object_spot11_obj/object_spot11_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c index 43a7a3ff1..6a003d6f8 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -10,7 +10,7 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "overlays/actors/ovl_En_Tanron5/z_en_tanron5.h" #include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.h b/src/overlays/actors/ovl_Boss_02/z_boss_02.h index 69016407e..38a0064d3 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.h +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.h @@ -2,7 +2,7 @@ #define Z_BOSS_02_H #include "global.h" -#include "objects/object_boss02/object_boss02.h" +#include "assets/objects/object_boss02/object_boss02.h" struct Boss02; diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index 3c3f1d207..3b50ce2da 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -54,8 +54,8 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h" #include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_water_effect/object_water_effect.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_water_effect/object_water_effect.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.h b/src/overlays/actors/ovl_Boss_03/z_boss_03.h index 236606369..cb99a36ae 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.h +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.h @@ -2,7 +2,7 @@ #define Z_BOSS_03_H #include "global.h" -#include "objects/object_boss03/object_boss03.h" +#include "assets/objects/object_boss03/object_boss03.h" struct Boss03; diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.h b/src/overlays/actors/ovl_Boss_04/z_boss_04.h index 97c296b84..eb69d0be4 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.h +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.h @@ -2,7 +2,7 @@ #define Z_BOSS_04_H #include "global.h" -#include "objects/object_boss04/object_boss04.h" +#include "assets/objects/object_boss04/object_boss04.h" struct Boss04; diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c index f25a9d0cb..654162653 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -8,8 +8,8 @@ #include "z_boss_06.h" #include "z64shrink_window.h" #include "overlays/actors/ovl_En_Knight/z_en_knight.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_knight/object_knight.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_knight/object_knight.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c index 0acfac39c..2b513018c 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c @@ -18,7 +18,7 @@ #include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h" #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h index cbb96bb35..ddf5c7dc5 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h @@ -2,7 +2,7 @@ #define Z_BOSS_HAKUGIN_H #include "global.h" -#include "objects/object_boss_hakugin/object_boss_hakugin.h" +#include "assets/objects/object_boss_hakugin/object_boss_hakugin.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" struct BossHakugin; diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 9130b4856..f06703df7 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -5,8 +5,8 @@ */ #include "z_demo_effect.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_efc_tw/object_efc_tw.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_efc_tw/object_efc_tw.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index f83cdfa08..7654718f8 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -5,8 +5,8 @@ */ #include "z_demo_kankyo.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_bubble/object_bubble.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_bubble/object_bubble.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h index 692b0b84a..07cacc747 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h @@ -2,7 +2,7 @@ #define Z_DEMO_MOONEND_H #include "global.h" -#include "objects/object_moonend/object_moonend.h" +#include "assets/objects/object_moonend/object_moonend.h" struct DemoMoonend; diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c index 5f25137f5..4a856333d 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c @@ -5,7 +5,7 @@ */ #include "z_demo_syoten.h" -#include "objects/object_syoten/object_syoten.h" +#include "assets/objects/object_syoten/object_syoten.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index e9b7e0fab..192318d22 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -6,7 +6,7 @@ #include "z_demo_tre_lgt.h" #include "overlays/actors/ovl_En_Box/z_en_box.h" -#include "objects/object_box/object_box.h" +#include "assets/objects/object_box/object_box.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h index 733d656ea..15368bc97 100644 --- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h @@ -2,7 +2,7 @@ #define Z_DM_AH_H #include "global.h" -#include "objects/object_ah/object_ah.h" +#include "assets/objects/object_ah/object_ah.h" struct DmAh; diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.h b/src/overlays/actors/ovl_Dm_Al/z_dm_al.h index 084af062b..622257568 100644 --- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.h +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.h @@ -2,7 +2,7 @@ #define Z_DM_AL_H #include "global.h" -#include "objects/object_al/object_al.h" +#include "assets/objects/object_al/object_al.h" struct DmAl; diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.c b/src/overlays/actors/ovl_Dm_An/z_dm_an.c index 43077f309..954b52025 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.c +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.c @@ -5,8 +5,8 @@ */ #include "z_dm_an.h" -#include "objects/object_an4/object_an4.h" -#include "objects/object_msmo/object_msmo.h" +#include "assets/objects/object_an4/object_an4.h" +#include "assets/objects/object_msmo/object_msmo.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.h b/src/overlays/actors/ovl_Dm_An/z_dm_an.h index 7ead44b26..f83833908 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.h +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.h @@ -2,7 +2,7 @@ #define Z_DM_AN_H #include "global.h" -#include "objects/object_an1/object_an1.h" +#include "assets/objects/object_an1/object_an1.h" struct DmAn; diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h index fa2e85639..245d17261 100644 --- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h @@ -2,7 +2,7 @@ #define Z_DM_BAL_H #include "global.h" -#include "objects/object_bal/object_bal.h" +#include "assets/objects/object_bal/object_bal.h" struct DmBal; diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c index 4705107fe..a9ed5434b 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -5,8 +5,8 @@ */ #include "z_dm_char00.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_delf/object_delf.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_delf/object_delf.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h index 05c53dc8f..c499eac16 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h @@ -2,7 +2,7 @@ #define Z_DM_CHAR00_H #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" struct DmChar00; diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c index 530f63014..8c382212a 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -5,7 +5,7 @@ */ #include "z_dm_char01.h" -#include "objects/object_mtoride/object_mtoride.h" +#include "assets/objects/object_mtoride/object_mtoride.h" #include "overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_2000000) @@ -33,7 +33,7 @@ s16 D_80AAAE22; s16 D_80AAAE24; s16 D_80AAAE26; -#include "overlays/ovl_Dm_Char01/ovl_Dm_Char01.c" +#include "assets/overlays/ovl_Dm_Char01/ovl_Dm_Char01.c" ActorInit Dm_Char01_InitVars = { /**/ ACTOR_DM_CHAR01, diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c index 1165f3433..34130a23c 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -5,7 +5,7 @@ */ #include "z_dm_char02.h" -#include "objects/object_stk2/object_stk2.h" +#include "assets/objects/object_stk2/object_stk2.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c index 9a56d0d62..408218cdd 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -5,7 +5,7 @@ */ #include "z_dm_char03.h" -#include "objects/object_osn/object_osn.h" +#include "assets/objects/object_osn/object_osn.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c index 11c1652e1..c7cf571cd 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c @@ -5,7 +5,7 @@ */ #include "z_dm_char04.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h index 52e196da9..e001c000e 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h @@ -2,7 +2,7 @@ #define Z_DM_CHAR04_H #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" struct DmChar04; diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c index 37cfa2ad1..8c36d980f 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -5,7 +5,7 @@ */ #include "z_dm_char05.h" -#include "objects/object_dmask/object_dmask.h" +#include "assets/objects/object_dmask/object_dmask.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c index a21f06e5d..82bc8a213 100644 --- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c @@ -5,7 +5,7 @@ */ #include "z_dm_char07.h" -#include "objects/object_milkbar/object_milkbar.h" +#include "assets/objects/object_milkbar/object_milkbar.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c index e868f9bc0..84e7a45a9 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -5,7 +5,7 @@ */ #include "z_dm_char08.h" -#include "objects/object_kamejima/object_kamejima.h" +#include "assets/objects/object_kamejima/object_kamejima.h" #define FLAGS (ACTOR_FLAG_2000000) @@ -48,7 +48,7 @@ ActorInit Dm_Char08_InitVars = { /**/ DmChar08_Draw, }; -#include "overlays/ovl_Dm_Char08/ovl_Dm_Char08.c" +#include "assets/overlays/ovl_Dm_Char08/ovl_Dm_Char08.c" typedef enum { /* 0 */ TURTLE_ANIM_IDLE, diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h index 2d1f6c2ab..675874520 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h @@ -2,7 +2,7 @@ #define Z_DM_CHAR09_H #include "global.h" -#include "objects/object_bee/object_bee.h" +#include "assets/objects/object_bee/object_bee.h" #define DMCHAR09_GET_PATH_INDEX(thisx) (((thisx)->params >> 4) & 0xF) #define DMCHAR09_GET_100(thisx) ((thisx)->params & 0x100) diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c index cebfc624a..d2bb20986 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c @@ -5,8 +5,8 @@ */ #include "z_dm_gm.h" -#include "objects/object_an4/object_an4.h" -#include "objects/object_msmo/object_msmo.h" +#include "assets/objects/object_an4/object_an4.h" +#include "assets/objects/object_msmo/object_msmo.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h index c04c66a34..b18e9ed95 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h @@ -2,7 +2,7 @@ #define Z_DM_GM_H #include "global.h" -#include "objects/object_an1/object_an1.h" +#include "assets/objects/object_an1/object_an1.h" struct DmGm; diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c index 91b1e1d82..ba3e529af 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -5,7 +5,7 @@ */ #include "z_dm_hina.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h index 560f1b259..c3cfe7431 100644 --- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h @@ -2,7 +2,7 @@ #define Z_DM_NB_H #include "global.h" -#include "objects/object_nb/object_nb.h" +#include "assets/objects/object_nb/object_nb.h" struct DmNb; diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c index 6aa2e7bae..c7f28f991 100644 --- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c @@ -5,7 +5,7 @@ */ #include "z_dm_opstage.h" -#include "objects/object_keikoku_demo/object_keikoku_demo.h" +#include "assets/objects/object_keikoku_demo/object_keikoku_demo.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c index 1a4824bdf..3ffa7d9fd 100644 --- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c @@ -5,7 +5,7 @@ */ #include "z_dm_sa.h" -#include "objects/object_stk/object_stk.h" +#include "assets/objects/object_stk/object_stk.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c index 833905ba0..feedab4bf 100644 --- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c @@ -5,7 +5,7 @@ */ #include "z_dm_statue.h" -#include "objects/object_smtower/object_smtower.h" +#include "assets/objects/object_smtower/object_smtower.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_CAN_PRESS_SWITCH) diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c index 4de1ad020..ff89937be 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -9,8 +9,8 @@ */ #include "z_dm_stk.h" -#include "objects/object_stk2/object_stk2.h" -#include "objects/object_stk3/object_stk3.h" +#include "assets/objects/object_stk2/object_stk2.h" +#include "assets/objects/object_stk3/object_stk3.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h index 0b723019a..5a7e513cd 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h @@ -2,7 +2,7 @@ #define Z_DM_STK_H #include "global.h" -#include "objects/object_stk/object_stk.h" +#include "assets/objects/object_stk/object_stk.h" struct DmStk; diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c index ff64bdef2..97a2df754 100644 --- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c @@ -5,7 +5,7 @@ */ #include "z_dm_tsg.h" -#include "objects/object_open_obj/object_open_obj.h" +#include "assets/objects/object_open_obj/object_open_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h index cae6ce74e..a2bb5f2a5 100644 --- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h @@ -2,7 +2,7 @@ #define Z_DM_ZL_H #include "global.h" -#include "objects/object_zl4/object_zl4.h" +#include "assets/objects/object_zl4/object_zl4.h" struct DmZl; diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 832666690..6f73c4f97 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -5,7 +5,7 @@ */ #include "z_door_ana.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS (ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index cea151dd6..f47f2a7fa 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -7,18 +7,18 @@ #include "z_door_shutter.h" #include "z64quake.h" #include "z64rumble.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_bdoor/object_bdoor.h" -#include "objects/object_numa_obj/object_numa_obj.h" -#include "objects/object_hakugin_obj/object_hakugin_obj.h" -#include "objects/object_dblue_object/object_dblue_object.h" -#include "objects/object_ikana_obj/object_ikana_obj.h" -#include "objects/object_redead_obj/object_redead_obj.h" -#include "objects/object_ikninside_obj/object_ikninside_obj.h" -#include "objects/object_random_obj/object_random_obj.h" -#include "objects/object_kinsta1_obj/object_kinsta1_obj.h" -#include "objects/object_kaizoku_obj/object_kaizoku_obj.h" -#include "objects/object_last_obj/object_last_obj.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_bdoor/object_bdoor.h" +#include "assets/objects/object_numa_obj/object_numa_obj.h" +#include "assets/objects/object_hakugin_obj/object_hakugin_obj.h" +#include "assets/objects/object_dblue_object/object_dblue_object.h" +#include "assets/objects/object_ikana_obj/object_ikana_obj.h" +#include "assets/objects/object_redead_obj/object_redead_obj.h" +#include "assets/objects/object_ikninside_obj/object_ikninside_obj.h" +#include "assets/objects/object_random_obj/object_random_obj.h" +#include "assets/objects/object_kinsta1_obj/object_kinsta1_obj.h" +#include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" +#include "assets/objects/object_last_obj/object_last_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c index b2037e138..0cb63d662 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -5,12 +5,12 @@ */ #include "z_door_spiral.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#include "objects/object_numa_obj/object_numa_obj.h" -#include "objects/object_hakugin_obj/object_hakugin_obj.h" -#include "objects/object_ikana_obj/object_ikana_obj.h" -#include "objects/object_ikninside_obj/object_ikninside_obj.h" -#include "objects/object_danpei_object/object_danpei_object.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/object_numa_obj/object_numa_obj.h" +#include "assets/objects/object_hakugin_obj/object_hakugin_obj.h" +#include "assets/objects/object_ikana_obj/object_ikana_obj.h" +#include "assets/objects/object_ikninside_obj/object_ikninside_obj.h" +#include "assets/objects/object_danpei_object/object_danpei_object.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 18e019b28..67558c26e 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -5,7 +5,7 @@ */ #include "z_door_warp1.h" -#include "objects/object_warp1/object_warp1.h" +#include "assets/objects/object_warp1/object_warp1.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.h b/src/overlays/actors/ovl_Eff_Change/z_eff_change.h index c109519ae..28790a47c 100644 --- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.h +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.h @@ -2,7 +2,7 @@ #define Z_EFF_CHANGE_H #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define EFFCHANGE_GET_COLORS(thisx) ((thisx)->params & 7) diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index aa274f83c..d8baf0938 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -5,7 +5,7 @@ */ #include "z_eff_dust.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "libc64/malloc.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c index e4d8df0bb..4cc9c90a8 100644 --- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c @@ -5,7 +5,7 @@ */ #include "prevent_bss_reordering.h" #include "z_eff_kamejima_wave.h" -#include "objects/object_kamejima/object_kamejima.h" +#include "assets/objects/object_kamejima/object_kamejima.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c index 8acaddf9b..343b7dcb9 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -5,7 +5,7 @@ */ #include "z_eff_lastday.h" -#include "objects/object_lastday/object_lastday.h" +#include "assets/objects/object_lastday/object_lastday.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c index cf4e978e0..9123f21ee 100644 --- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c @@ -5,7 +5,7 @@ */ #include "z_eff_stk.h" -#include "objects/object_stk2/object_stk2.h" +#include "assets/objects/object_stk2/object_stk2.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c index 6d54c1eec..6ecb50aff 100644 --- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c @@ -5,7 +5,7 @@ */ #include "z_eff_zoraband.h" -#include "objects/object_zoraband/object_zoraband.h" +#include "assets/objects/object_zoraband/object_zoraband.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.c b/src/overlays/actors/ovl_En_Ah/z_en_ah.c index 172987101..c9ccb1dff 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.c +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -5,7 +5,7 @@ */ #include "z_en_ah.h" -#include "objects/object_ah/object_ah.h" +#include "assets/objects/object_ah/object_ah.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.h b/src/overlays/actors/ovl_En_Ah/z_en_ah.h index 2f2d8f34c..bcaf957f0 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.h +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.h @@ -2,7 +2,7 @@ #define Z_EN_AH_H #include "global.h" -#include "objects/object_ah/object_ah.h" +#include "assets/objects/object_ah/object_ah.h" struct EnAh; diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c index 6ab339204..64b1d39c2 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -5,7 +5,7 @@ */ #include "z_en_akindonuts.h" -#include "objects/object_dnt/object_dnt.h" +#include "assets/objects/object_dnt/object_dnt.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h index 09df4fca3..82a3443fd 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h @@ -2,7 +2,7 @@ #define Z_EN_AKINDONUTS_H #include "global.h" -#include "objects/object_dnt/object_dnt.h" +#include "assets/objects/object_dnt/object_dnt.h" struct EnAkindonuts; diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.h b/src/overlays/actors/ovl_En_Al/z_en_al.h index eac688036..b6d142db9 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.h +++ b/src/overlays/actors/ovl_En_Al/z_en_al.h @@ -2,7 +2,7 @@ #define Z_EN_AL_H #include "global.h" -#include "objects/object_al/object_al.h" +#include "assets/objects/object_al/object_al.h" struct EnAl; diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h index 4bc52d26a..cb7372599 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.h +++ b/src/overlays/actors/ovl_En_Am/z_en_am.h @@ -2,7 +2,7 @@ #define Z_EN_AM_H #include "global.h" -#include "objects/object_am/object_am.h" +#include "assets/objects/object_am/object_am.h" struct EnAm; diff --git a/src/overlays/actors/ovl_En_And/z_en_and.h b/src/overlays/actors/ovl_En_And/z_en_and.h index 6b5a0bb7d..4c250b656 100644 --- a/src/overlays/actors/ovl_En_And/z_en_and.h +++ b/src/overlays/actors/ovl_En_And/z_en_and.h @@ -2,7 +2,7 @@ #define Z_EN_AND_H #include "global.h" -#include "objects/object_and/object_and.h" +#include "assets/objects/object_and/object_and.h" struct EnAnd; diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.h b/src/overlays/actors/ovl_En_Ani/z_en_ani.h index fb091a64a..77ff23c30 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.h +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.h @@ -2,7 +2,7 @@ #define Z_EN_ANI_H #include "global.h" -#include "objects/object_ani/object_ani.h" +#include "assets/objects/object_ani/object_ani.h" struct EnAni; diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h index 51f4c29b8..6b1ad7a42 100644 --- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h @@ -2,7 +2,7 @@ #define Z_EN_AOB_01_H #include "global.h" -#include "objects/object_aob/object_aob.h" +#include "assets/objects/object_aob/object_aob.h" struct EnAob01; diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 4a7a5a428..2d812305f 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -7,7 +7,7 @@ #include "z_en_arrow.h" #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" #include "overlays/effects/ovl_Effect_Ss_Sbn/z_eff_ss_sbn.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h index 3aaf4e4c8..50631dbe8 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h @@ -2,7 +2,7 @@ #define Z_EN_ARROW_H #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" struct EnArrow; diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h index f49778d9a..78e21a721 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h @@ -2,7 +2,7 @@ #define Z_EN_ATTACK_NIW_H #include "global.h" -#include "objects/object_niw/object_niw.h" +#include "assets/objects/object_niw/object_niw.h" struct EnAttackNiw; diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.h b/src/overlays/actors/ovl_En_Az/z_en_az.h index 286dc853a..81e3e6810 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.h +++ b/src/overlays/actors/ovl_En_Az/z_en_az.h @@ -2,7 +2,7 @@ #define Z_EN_AZ_H #include "global.h" -#include "objects/object_az/object_az.h" +#include "assets/objects/object_az/object_az.h" struct EnAz; diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.h b/src/overlays/actors/ovl_En_Baba/z_en_baba.h index ce4ce670c..1412963f7 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.h +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.h @@ -3,7 +3,7 @@ #include "global.h" #include "overlays/actors/ovl_En_Sob1/z_en_sob1.h" -#include "objects/object_bba/object_bba.h" +#include "assets/objects/object_bba/object_bba.h" struct EnBaba; diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index d60290b02..108b388f2 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -6,7 +6,7 @@ #include "z_en_baguo.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY) diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h index 132095bd1..37ec97239 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h @@ -2,7 +2,7 @@ #define Z_EN_BAGUO_H #include "global.h" -#include "objects/object_gmo/object_gmo.h" +#include "assets/objects/object_gmo/object_gmo.h" struct EnBaguo; diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c index 05b4cfb56..f963a1959 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -5,7 +5,7 @@ */ #include "z_en_baisen.h" -#include "objects/object_bai/object_bai.h" +#include "assets/objects/object_bai/object_bai.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h index c44573930..feac85932 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h @@ -2,7 +2,7 @@ #define Z_EN_BAISEN_H #include "global.h" -#include "objects/object_bai/object_bai.h" +#include "assets/objects/object_bai/object_bai.h" struct EnBaisen; diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.h b/src/overlays/actors/ovl_En_Bal/z_en_bal.h index b8c6a9f49..b2c685b3a 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.h +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.h @@ -3,7 +3,7 @@ #include "global.h" #include "z64snap.h" -#include "objects/object_bal/object_bal.h" +#include "assets/objects/object_bal/object_bal.h" #define TINGLE_GET_MAP_ID(thisx) ((thisx)->params & 0xFF) diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c index d1d31161a..47cf4f4f2 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -6,7 +6,7 @@ #include "z_en_bat.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/object_bat/object_bat.h" +#include "assets/objects/object_bat/object_bat.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_4000) diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 9b8624892..a626ee343 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -6,7 +6,7 @@ #include "z_en_bb.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_200) diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.h b/src/overlays/actors/ovl_En_Bb/z_en_bb.h index 468ca1e38..252d300d9 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.h +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h @@ -2,7 +2,7 @@ #define Z_EN_BB_H #include "global.h" -#include "objects/object_bb/object_bb.h" +#include "assets/objects/object_bb/object_bb.h" #define EN_BB_ATTACK_RANGE(thisx) (((thisx)->params >> 8) & 0xFF) diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c index 1a8c4ae1c..35cbac26d 100644 --- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c @@ -13,7 +13,7 @@ */ #include "z_en_bba_01.h" -#include "objects/object_bba/object_bba.h" +#include "assets/objects/object_bba/object_bba.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index db7a05738..f12ec9813 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -6,7 +6,7 @@ #include "z_en_bbfall.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_200) diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h index e65b1a8d2..61a4853b1 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h @@ -2,7 +2,7 @@ #define Z_EN_BBFALL_H #include "global.h" -#include "objects/object_bb/object_bb.h" +#include "assets/objects/object_bb/object_bb.h" #include "overlays/actors/ovl_En_Bb/z_en_bb.h" struct EnBbfall; diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.h b/src/overlays/actors/ovl_En_Bh/z_en_bh.h index 9876182f0..03e599ca6 100644 --- a/src/overlays/actors/ovl_En_Bh/z_en_bh.h +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.h @@ -2,7 +2,7 @@ #define Z_EN_BH_H #include "global.h" -#include "objects/object_bh/object_bh.h" +#include "assets/objects/object_bh/object_bh.h" struct EnBh; diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c index 15231aae4..45ad9bbf1 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -8,7 +8,7 @@ #include "z64quake.h" #include "z64rumble.h" #include "overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_400) diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h index eeb97566e..9df639f9d 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h @@ -2,7 +2,7 @@ #define Z_EN_BIGPAMET_H #include "global.h" -#include "objects/object_tl/object_tl.h" +#include "assets/objects/object_tl/object_tl.h" struct EnBigpamet; diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index 14032e592..4aceec00e 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -6,8 +6,8 @@ #include "z_en_bigpo.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/object_bigpo/object_bigpo.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_bigpo/object_bigpo.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_200 | ACTOR_FLAG_IGNORE_QUAKE) diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h index 7e3f8c7a8..b9f2a5145 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h @@ -2,7 +2,7 @@ #define Z_EN_BIGPO_H #include "global.h" -#include "objects/object_bigpo/object_bigpo.h" +#include "assets/objects/object_bigpo/object_bigpo.h" struct EnBigpo; diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index 878b4c885..49329e21d 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -9,8 +9,8 @@ #include "z64rumble.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/object_bigslime/object_bigslime.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_bigslime/object_bigslime.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_200) @@ -130,22 +130,22 @@ void EnBigslime_DrawShatteringEffects(EnBigslime* this, PlayState* play); // Reference data: used to store the original vertices static Vtx sBigslimeStaticVtx[BIGSLIME_NUM_VTX] = { -#include "overlays/ovl_En_Bigslime/sBigslimeStaticVtx.vtx.inc" +#include "assets/overlays/ovl_En_Bigslime/sBigslimeStaticVtx.vtx.inc" }; // Dynamic data: used to draw the real shape and has 2 states static Vtx sBigslimeDynamicVtx[2][BIGSLIME_NUM_VTX] = { { -#include "overlays/ovl_En_Bigslime/sBigslimeDynamicState0Vtx.vtx.inc" +#include "assets/overlays/ovl_En_Bigslime/sBigslimeDynamicState0Vtx.vtx.inc" }, { -#include "overlays/ovl_En_Bigslime/sBigslimeDynamicState1Vtx.vtx.inc" +#include "assets/overlays/ovl_En_Bigslime/sBigslimeDynamicState1Vtx.vtx.inc" }, }; // Target data: used to define the shape the dynamic vertices morph to static Vtx sBigslimeTargetVtx[BIGSLIME_NUM_VTX] = { -#include "overlays/ovl_En_Bigslime/sBigslimeTargetVtx.vtx.inc" +#include "assets/overlays/ovl_En_Bigslime/sBigslimeTargetVtx.vtx.inc" }; /* diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h index 84c346a1c..f8a3063f7 100644 --- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h @@ -3,7 +3,7 @@ #include "global.h" #include "overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h" -#include "objects/object_bji/object_bji.h" +#include "assets/objects/object_bji/object_bji.h" struct EnBji01; diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h index 696b6a17c..aa140afe4 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h @@ -2,7 +2,7 @@ #define Z_EN_BJT_H #include "global.h" -#include "objects/object_bjt/object_bjt.h" +#include "assets/objects/object_bjt/object_bjt.h" struct EnBjt; diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 87ddad48f..10beea1eb 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -7,7 +7,7 @@ #include "z_en_bom.h" #include "z64rumble.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) @@ -611,7 +611,7 @@ static Vec3f D_80872EEC = { -750.0f, 0.0f, 0.0f }; static Vec3f D_80872EF8 = { -800.0f, 0.0f, 0.0f }; static Vec3f D_80872F04 = { 0.0f, 0.0f, 0.0f }; -#include "overlays/ovl_En_Bom/ovl_En_Bom.c" +#include "assets/overlays/ovl_En_Bom/ovl_En_Bom.c" void EnBom_Draw(Actor* thisx, PlayState* play) { s32 pad; diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 5dc2bfed1..332b59265 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -5,7 +5,7 @@ */ #include "z_en_bom_bowl_man.h" -#include "objects/object_cs/object_cs.h" +#include "assets/objects/object_cs/object_cs.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) @@ -718,7 +718,7 @@ s32 EnBomBowlMan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, V return false; } -#include "overlays/ovl_En_Bom_Bowl_Man/ovl_En_Bom_Bowl_Man.c" +#include "assets/overlays/ovl_En_Bom_Bowl_Man/ovl_En_Bom_Bowl_Man.c" TexturePtr D_809C6200[] = { gEnBomBowlMan_D_809C61E0, gEnBomBowlMan_D_809C61F0, gEnBomBowlMan_D_809C61F0, diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h index 76f4d191e..9c7b3b93e 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h @@ -2,7 +2,7 @@ #define Z_EN_BOM_BOWL_MAN_H #include "global.h" -#include "objects/object_cs/object_cs.h" +#include "assets/objects/object_cs/object_cs.h" struct EnBomBowlMan; diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 5a4251bf4..53e6e5b68 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -6,7 +6,7 @@ #include "z_en_bom_chu.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c index 42fed0286..3cab1ac5e 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -7,7 +7,7 @@ #include "z_en_bombal.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/object_fusen/object_fusen.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c index d60dae8fa..73da972dc 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -118,7 +118,7 @@ static u8 sAnimationModes[ENBOMBERS_ANIM_MAX] = { ANIMMODE_LOOP, // ENBOMBERS_ANIM_16 }; -#include "overlays/ovl_En_Bombers/ovl_En_Bombers.c" +#include "assets/overlays/ovl_En_Bombers/ovl_En_Bombers.c" Gfx* D_80C04818[] = { ovl_En_Bombers_DL_12C8, ovl_En_Bombers_DL_12D8, ovl_En_Bombers_DL_12D8, diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h index 500fff573..83055d5bf 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h @@ -2,7 +2,7 @@ #define Z_EN_BOMBERS_H #include "global.h" -#include "objects/object_cs/object_cs.h" +#include "assets/objects/object_cs/object_cs.h" struct EnBombers; diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h index f02c5eccb..438ee827f 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h @@ -2,7 +2,7 @@ #define Z_EN_BOMBERS2_H #include "global.h" -#include "objects/object_cs/object_cs.h" +#include "assets/objects/object_cs/object_cs.h" struct EnBombers2; diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 2f4e22c51..c29e4d8e1 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -7,7 +7,7 @@ #include "z_en_bombf.h" #include "z64rumble.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/object_bombf/object_bombf.h" +#include "assets/objects/object_bombf/object_bombf.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c index 93675f358..5677a911b 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -1145,7 +1145,7 @@ s32 EnBomjima_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 return false; } -#include "overlays/ovl_En_Bomjima/ovl_En_Bomjima.c" +#include "assets/overlays/ovl_En_Bomjima/ovl_En_Bomjima.c" void EnBomjima_Draw(Actor* thisx, PlayState* play) { static Gfx* D_80C00B28[] = { diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h index b8f6175f4..0ebbd596c 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h @@ -2,7 +2,7 @@ #define Z_EN_BOMJIMA_H #include "global.h" -#include "objects/object_cs/object_cs.h" +#include "assets/objects/object_cs/object_cs.h" #include "overlays/actors/ovl_En_Bombal/z_en_bombal.h" struct EnBomjima; diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c index 6e3c89ea9..bc85f4ebc 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -962,7 +962,7 @@ s32 EnBomjimb_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 return false; } -#include "overlays/ovl_En_Bomjimb/ovl_En_Bomjimb.c" +#include "assets/overlays/ovl_En_Bomjimb/ovl_En_Bomjimb.c" void EnBomjimb_Draw(Actor* thisx, PlayState* play) { static Gfx* D_80C03260[] = { diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h index 9e2bb9cc5..5c5feab91 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h @@ -2,7 +2,7 @@ #define Z_EN_BOMJIMB_H #include "global.h" -#include "objects/object_cs/object_cs.h" +#include "assets/objects/object_cs/object_cs.h" struct EnBomjimb; diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 2f542739a..784cdb48b 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -5,7 +5,7 @@ */ #include "z_en_boom.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 689671ceb..cb3f68ed8 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -5,8 +5,8 @@ */ #include "z_en_box.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_box/object_box.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_box/object_box.h" #include "overlays/actors/ovl_En_Elforg/z_en_elforg.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h index 75d9f09c9..647e17606 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.h +++ b/src/overlays/actors/ovl_En_Box/z_en_box.h @@ -2,7 +2,7 @@ #define Z_EN_BOX_H #include "global.h" -#include "objects/object_box/object_box.h" +#include "assets/objects/object_box/object_box.h" struct EnBox; struct struct_80867BDC_a0; diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index b9a07c6d4..65371a04f 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -13,7 +13,7 @@ #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h index 3eebdfd1e..05a911a89 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h @@ -2,7 +2,7 @@ #define Z_EN_BSB_H #include "global.h" -#include "objects/object_bsb/object_bsb.h" +#include "assets/objects/object_bsb/object_bsb.h" struct EnBsb; diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h index 86e2358b4..852a37b9d 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h @@ -2,7 +2,7 @@ #define Z_EN_BUBBLE_H #include "global.h" -#include "objects/object_bubble/object_bubble.h" +#include "assets/objects/object_bubble/object_bubble.h" struct EnBubble; diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 29743c178..4e9041b1b 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -6,8 +6,8 @@ #include "z_en_butte.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h index 39c24a533..733300530 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.h +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h @@ -2,7 +2,7 @@ #define Z_EN_BUTTE_H #include "global.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" struct EnButte; diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.c b/src/overlays/actors/ovl_En_Cha/z_en_cha.c index d5652fa2e..95cb0f668 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -5,7 +5,7 @@ */ #include "z_en_cha.h" -#include "objects/object_cha/object_cha.h" +#include "assets/objects/object_cha/object_cha.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 89a54d594..625f8df0b 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -5,7 +5,7 @@ */ #include "z_en_clear_tag.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) @@ -108,7 +108,7 @@ static TexturePtr sWaterSplashTextures[] = { NULL, }; -#include "overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.c" +#include "assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.c" /** * Creates a debris effect. diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c index 02111823c..4d7a164fc 100644 --- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c @@ -5,7 +5,7 @@ */ #include "z_en_cne_01.h" -#include "objects/object_cne/object_cne.h" +#include "assets/objects/object_cne/object_cne.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c index 4e0af45ff..948ad9d41 100644 --- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c @@ -7,7 +7,7 @@ #include "z_en_col_man.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_100000) diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/src/overlays/actors/ovl_En_Cow/z_en_cow.h index b4a88a6fc..afbc84a6d 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.h +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.h @@ -2,7 +2,7 @@ #define Z_EN_COW_H #include "global.h" -#include "objects/object_cow/object_cow.h" +#include "assets/objects/object_cow/object_cow.h" #define EN_COW_TYPE(thisx) ((thisx)->params & 0xF) diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.h b/src/overlays/actors/ovl_En_Crow/z_en_crow.h index fca2cc0b0..0d40199cb 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.h +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h @@ -2,7 +2,7 @@ #define Z_EN_CROW_H #include "global.h" -#include "objects/object_crow/object_crow.h" +#include "assets/objects/object_crow/object_crow.h" typedef enum { /* 0 */ GUAY_TYPE_NORMAL, diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.h b/src/overlays/actors/ovl_En_Dai/z_en_dai.h index dd91dac24..bfcf12e27 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.h +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.h @@ -2,7 +2,7 @@ #define Z_EN_DAI_H #include "global.h" -#include "objects/object_dai/object_dai.h" +#include "assets/objects/object_dai/object_dai.h" struct EnDai; diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h index 60275bbfa..d723d9d45 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h @@ -2,7 +2,7 @@ #define Z_EN_DAIKU_H #include "global.h" -#include "objects/object_daiku/object_daiku.h" +#include "assets/objects/object_daiku/object_daiku.h" struct EnDaiku; diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c index 1dfa4edb0..f76afbfad 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -6,8 +6,8 @@ #include "z_en_daiku2.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/object_daiku/object_daiku.h" -#include "objects/object_bombiwa/object_bombiwa.h" +#include "assets/objects/object_daiku/object_daiku.h" +#include "assets/objects/object_bombiwa/object_bombiwa.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h index a462d854f..a5d077cc0 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h @@ -2,7 +2,7 @@ #define Z_EN_DAIKU2_H #include "global.h" -#include "objects/object_daiku/object_daiku.h" +#include "assets/objects/object_daiku/object_daiku.h" struct EnDaiku2; diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c index 35959a579..98741f4c2 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -7,7 +7,7 @@ #include "z_en_death.h" #include "z64rumble.h" #include "overlays/actors/ovl_Arrow_Light/z_arrow_light.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_IGNORE_QUAKE) diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.h b/src/overlays/actors/ovl_En_Death/z_en_death.h index ea33ea2ad..60d745d39 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.h +++ b/src/overlays/actors/ovl_En_Death/z_en_death.h @@ -3,7 +3,7 @@ #include "global.h" #include "overlays/actors/ovl_En_Minideath/z_en_minideath.h" -#include "objects/object_death/object_death.h" +#include "assets/objects/object_death/object_death.h" struct EnDeath; diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index d7e15abc2..f19df5282 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -7,7 +7,7 @@ #include "z_en_dekubaba.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_400) diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h index b29dbe8db..4dd6dfebe 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h @@ -2,7 +2,7 @@ #define Z_EN_DEKUBABA_H #include "global.h" -#include "objects/object_dekubaba/object_dekubaba.h" +#include "assets/objects/object_dekubaba/object_dekubaba.h" struct EnDekubaba; diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h index 9580cb3e6..45e9f1da1 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h @@ -2,7 +2,7 @@ #define Z_EN_DEKUNUTS_H #include "global.h" -#include "objects/object_dekunuts/object_dekunuts.h" +#include "assets/objects/object_dekunuts/object_dekunuts.h" struct EnDekunuts; diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h index 8c1a576f5..79bdd5a95 100644 --- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h @@ -2,7 +2,7 @@ #define Z_EN_DEMO_HEISHI_H #include "global.h" -#include "objects/object_sdn/object_sdn.h" +#include "assets/objects/object_sdn/object_sdn.h" struct EnDemoheishi; diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.h b/src/overlays/actors/ovl_En_Dg/z_en_dg.h index e36342706..f3707172d 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.h +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.h @@ -2,7 +2,7 @@ #define Z_EN_DG_H #include "global.h" -#include "objects/object_dog/object_dog.h" +#include "assets/objects/object_dog/object_dog.h" typedef enum { /* 0 */ DOG_COLOR_DEFAULT, // ends up just being treated as beige diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h index 36c6c42d4..0d7d5bf96 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h @@ -2,7 +2,7 @@ #define Z_EN_DINOFOS_H #include "global.h" -#include "objects/object_dinofos/object_dinofos.h" +#include "assets/objects/object_dinofos/object_dinofos.h" struct EnDinofos; diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c index 99b1336ca..b779f960a 100644 --- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c @@ -5,8 +5,8 @@ */ #include "z_en_dnb.h" -#include "objects/object_hanareyama_obj/object_hanareyama_obj.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_hanareyama_obj/object_hanareyama_obj.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_REACT_TO_LENS) diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h index 135fdd480..a2c70b4fb 100644 --- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h @@ -2,7 +2,7 @@ #define Z_EN_DNH_H #include "global.h" -#include "objects/object_tro/object_tro.h" +#include "assets/objects/object_tro/object_tro.h" struct EnDnh; diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h index 8b0900ae7..3ebf7505a 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h @@ -2,9 +2,9 @@ #define Z_EN_DNK_H #include "global.h" -#include "objects/object_dnk/object_dnk.h" -#include "objects/object_hintnuts/object_hintnuts.h" -#include "objects/object_dekunuts/object_dekunuts.h" +#include "assets/objects/object_dnk/object_dnk.h" +#include "assets/objects/object_hintnuts/object_hintnuts.h" +#include "assets/objects/object_dekunuts/object_dekunuts.h" struct EnDnk; diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c index f994e4d09..32d9ecef9 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -10,7 +10,7 @@ #include "z_en_dno.h" #include "overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.h b/src/overlays/actors/ovl_En_Dno/z_en_dno.h index b2e7f750f..19bae77be 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.h +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.h @@ -2,7 +2,7 @@ #define Z_EN_DNO_H #include "global.h" -#include "objects/object_dnj/object_dnj.h" +#include "assets/objects/object_dnj/object_dnj.h" struct EnDno; diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h index 0be2d1f3c..e2c21956a 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h @@ -2,7 +2,7 @@ #define Z_EN_DNP_H #include "global.h" -#include "objects/object_dnq/object_dnq.h" +#include "assets/objects/object_dnq/object_dnq.h" struct EnDnp; diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h index 661c06060..9e9c7f88b 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h @@ -2,7 +2,7 @@ #define Z_EN_DNQ_H #include "global.h" -#include "objects/object_dno/object_dno.h" +#include "assets/objects/object_dno/object_dno.h" #include "z64snap.h" struct EnDnq; diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h index d585d62b2..9f684f511 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h @@ -2,7 +2,7 @@ #define Z_EN_DNS_H #include "global.h" -#include "objects/object_dns/object_dns.h" +#include "assets/objects/object_dns/object_dns.h" struct EnDns; diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h index 33e580539..9fbb73d86 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h @@ -2,7 +2,7 @@ #define Z_EN_DODONGO_H #include "global.h" -#include "objects/object_dodongo/object_dodongo.h" +#include "assets/objects/object_dodongo/object_dodongo.h" struct EnDodongo; diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 3f6389cae..5e2025722 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -8,19 +8,19 @@ #include "assert.h" -#include "objects/object_kinsta2_obj/object_kinsta2_obj.h" -#include "objects/object_dor01/object_dor01.h" -#include "objects/object_dor02/object_dor02.h" -#include "objects/object_dor03/object_dor03.h" -#include "objects/object_dor04/object_dor04.h" -#include "objects/object_wdor01/object_wdor01.h" -#include "objects/object_wdor02/object_wdor02.h" -#include "objects/object_wdor03/object_wdor03.h" -#include "objects/object_wdor04/object_wdor04.h" -#include "objects/object_wdor05/object_wdor05.h" -#include "objects/object_numa_obj/object_numa_obj.h" -#include "objects/object_kaizoku_obj/object_kaizoku_obj.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/object_kinsta2_obj/object_kinsta2_obj.h" +#include "assets/objects/object_dor01/object_dor01.h" +#include "assets/objects/object_dor02/object_dor02.h" +#include "assets/objects/object_dor03/object_dor03.h" +#include "assets/objects/object_dor04/object_dor04.h" +#include "assets/objects/object_wdor01/object_wdor01.h" +#include "assets/objects/object_wdor02/object_wdor02.h" +#include "assets/objects/object_wdor03/object_wdor03.h" +#include "assets/objects/object_wdor04/object_wdor04.h" +#include "assets/objects/object_wdor05/object_wdor05.h" +#include "assets/objects/object_numa_obj/object_numa_obj.h" +#include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h index 9133cf484..c0797cba8 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.h +++ b/src/overlays/actors/ovl_En_Door/z_en_door.h @@ -3,7 +3,7 @@ #include "global.h" #include "z64door.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" /** * Actor Parameters diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c index 97435527a..0fea78156 100644 --- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c @@ -5,7 +5,7 @@ */ #include "z_en_door_etc.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h index fa0979389..7d3416b94 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h @@ -2,7 +2,7 @@ #define Z_EN_DRAGON_H #include "global.h" -#include "objects/object_utubo/object_utubo.h" +#include "assets/objects/object_utubo/object_utubo.h" #define EN_DRAGON_GET_PYTHON_INDEX(thisx) (((thisx)->params >> 7) & 0x1F) diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.h b/src/overlays/actors/ovl_En_Drs/z_en_drs.h index 3c9803bf5..cd8d7df79 100644 --- a/src/overlays/actors/ovl_En_Drs/z_en_drs.h +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.h @@ -2,8 +2,8 @@ #define Z_EN_DRS_H #include "global.h" -#include "objects/object_drs/object_drs.h" -#include "objects/object_msmo/object_msmo.h" +#include "assets/objects/object_drs/object_drs.h" +#include "assets/objects/object_msmo/object_msmo.h" struct EnDrs; diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h index 363f4e4d5..b07dcd4e5 100644 --- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h @@ -2,7 +2,7 @@ #define Z_EN_DS2N_H #include "global.h" -#include "objects/object_ds2n/object_ds2n.h" +#include "assets/objects/object_ds2n/object_ds2n.h" struct EnDs2n; diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c index b0a6ba053..3f6e21266 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.c +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c @@ -9,7 +9,7 @@ #include "z_en_dt.h" -#include "objects/object_dt/object_dt.h" +#include "assets/objects/object_dt/object_dt.h" #include "overlays/actors/ovl_En_Baisen/z_en_baisen.h" #include "overlays/actors/ovl_En_Muto/z_en_muto.h" diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.h b/src/overlays/actors/ovl_En_Dt/z_en_dt.h index 03aaad14e..97ab4cca2 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.h +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.h @@ -2,7 +2,7 @@ #define Z_EN_DT_H #include "global.h" -#include "objects/object_dt/object_dt.h" +#include "assets/objects/object_dt/object_dt.h" #define EN_DT_CUTSCENE_COUNT 11 diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index 2d81ef052..d350ab685 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -5,7 +5,7 @@ */ #include "z_en_dy_extra.h" -#include "objects/object_dy_obj/object_dy_obj.h" +#include "assets/objects/object_dy_obj/object_dy_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c index 9c012b9cd..f57687c00 100644 --- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c @@ -5,7 +5,7 @@ */ #include "z_en_egblock.h" -#include "objects/object_eg/object_eg.h" +#include "assets/objects/object_eg/object_eg.h" #define FLAGS (ACTOR_FLAG_CANT_LOCK_ON) diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c index fd5a76e8d..fd86ca869 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -8,8 +8,8 @@ #include "z64olib.h" -#include "objects/object_eg/object_eg.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_eg/object_eg.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_En_Estone/z_en_estone.h" diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.h b/src/overlays/actors/ovl_En_Egol/z_en_egol.h index 66c828922..6198362dc 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.h +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.h @@ -2,7 +2,7 @@ #define Z_EN_EGOL_H #include "global.h" -#include "objects/object_eg/object_eg.h" +#include "assets/objects/object_eg/object_eg.h" struct EnEgol; diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h index dbc1e191d..a6c5df973 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h @@ -2,7 +2,7 @@ #define Z_EN_ELF_H #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" struct EnElf; diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c index 1cc1f4bcf..bca65089d 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -6,7 +6,7 @@ #include "z_en_elfbub.h" #include "overlays/actors/ovl_En_Elforg/z_en_elforg.h" -#include "objects/object_bubble/object_bubble.h" +#include "assets/objects/object_bubble/object_bubble.h" #define FLAGS (ACTOR_FLAG_TARGETABLE) diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h index f4da3cd5e..d52465a8d 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h @@ -3,7 +3,7 @@ #include "global.h" #include "overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define STRAY_FAIRY_TYPE(thisx) ((thisx)->params & 0xF) #define STRAY_FAIRY_GET_NON_DUNGEON_AREA(thisx) (((thisx)->params & 0x1C0) >> 6) diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index f114b1cd9..b8a42e85a 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -6,8 +6,8 @@ #include "z_en_encount2.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/object_fusen/object_fusen.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_fusen/object_fusen.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c index 909a004fa..5950ae6b9 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c @@ -5,7 +5,7 @@ */ #include "z_en_encount3.h" -#include "objects/object_big_fwall/object_big_fwall.h" +#include "assets/objects/object_big_fwall/object_big_fwall.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_CANT_LOCK_ON) diff --git a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h index 21f5266e7..6ef8317a9 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h +++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h @@ -2,7 +2,7 @@ #define Z_EN_ENDING_HERO_H #include "global.h" -#include "objects/object_dt/object_dt.h" +#include "assets/objects/object_dt/object_dt.h" struct EnEndingHero; diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h index 4f18b8e22..92ca38152 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h +++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h @@ -2,7 +2,7 @@ #define Z_EN_ENDING_HERO2_H #include "global.h" -#include "objects/object_bai/object_bai.h" +#include "assets/objects/object_bai/object_bai.h" struct EnEndingHero2; diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h index 21aaa079e..43051b94e 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h +++ b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h @@ -2,7 +2,7 @@ #define Z_EN_ENDING_HERO3_H #include "global.h" -#include "objects/object_toryo/object_toryo.h" +#include "assets/objects/object_toryo/object_toryo.h" struct EnEndingHero3; diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h index e52b41124..18092b961 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h +++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h @@ -2,7 +2,7 @@ #define Z_EN_ENDING_HERO4_H #include "global.h" -#include "objects/object_sdn/object_sdn.h" +#include "assets/objects/object_sdn/object_sdn.h" struct EnEndingHero4; diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h index fec2d112a..968e3fce7 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h +++ b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h @@ -2,7 +2,7 @@ #define Z_EN_ENDING_HERO5_H #include "global.h" -#include "objects/object_daiku/object_daiku.h" +#include "assets/objects/object_daiku/object_daiku.h" struct EnEndingHero5; diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h index 3ec5698e0..f04b839f8 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h +++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h @@ -2,11 +2,11 @@ #define Z_EN_ENDING_HERO6_H #include "global.h" -#include "objects/object_dt/object_dt.h" -#include "objects/object_daiku/object_daiku.h" -#include "objects/object_bai/object_bai.h" -#include "objects/object_toryo/object_toryo.h" -#include "objects/object_sdn/object_sdn.h" +#include "assets/objects/object_dt/object_dt.h" +#include "assets/objects/object_daiku/object_daiku.h" +#include "assets/objects/object_bai/object_bai.h" +#include "assets/objects/object_toryo/object_toryo.h" +#include "assets/objects/object_sdn/object_sdn.h" struct EnEndingHero6; diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/src/overlays/actors/ovl_En_Estone/z_en_estone.c index 44658a09c..a313eb2e0 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -5,8 +5,8 @@ */ #include "z_en_estone.h" -#include "objects/object_eg/object_eg.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_eg/object_eg.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c index 18cb40250..16327d78d 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -17,10 +17,10 @@ #include "z_en_fall.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/object_fall/object_fall.h" -#include "objects/object_fall2/object_fall2.h" -#include "objects/object_lodmoon/object_lodmoon.h" -#include "objects/object_moonston/object_moonston.h" +#include "assets/objects/object_fall/object_fall.h" +#include "assets/objects/object_fall2/object_fall2.h" +#include "assets/objects/object_lodmoon/object_lodmoon.h" +#include "assets/objects/object_moonston/object_moonston.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index 6fb0a5c12..da38f6e2b 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -7,7 +7,7 @@ #include "z_en_famos.h" #include "z64rumble.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY) diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.h b/src/overlays/actors/ovl_En_Famos/z_en_famos.h index 955b4b31f..4badb9afb 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.h +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.h @@ -2,7 +2,7 @@ #define Z_EN_FAMOS_H #include "global.h" -#include "objects/object_famos/object_famos.h" +#include "assets/objects/object_famos/object_famos.h" struct EnFamos; diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c index 251d0f7bb..575ac9a4a 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -5,7 +5,7 @@ */ #include "z_en_fg.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_200 | ACTOR_FLAG_4000) diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.h b/src/overlays/actors/ovl_En_Fg/z_en_fg.h index 42d4936ee..259fda9eb 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.h +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.h @@ -2,7 +2,7 @@ #define Z_EN_FG_H #include "global.h" -#include "objects/object_fr/object_fr.h" +#include "assets/objects/object_fr/object_fr.h" struct EnFg; diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h index 6174c2e87..67f328bc0 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h @@ -2,7 +2,7 @@ #define Z_EN_FIREFLY_H #include "global.h" -#include "objects/object_firefly/object_firefly.h" +#include "assets/objects/object_firefly/object_firefly.h" struct EnFirefly; diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h index e0837779d..7650e3a02 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.h +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h @@ -2,7 +2,7 @@ #define Z_EN_FISH_H #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" struct EnFish; diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c index ac5d01cfc..c5d8d3336 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -7,7 +7,7 @@ #include "overlays/actors/ovl_En_Fish/z_en_fish.h" #include "overlays/actors/ovl_En_Mushi2/z_en_mushi2.h" #include "z_en_fish2.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h index 16485d8b5..4fd91afd0 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h @@ -2,7 +2,7 @@ #define Z_EN_FISH2_H #include "global.h" -#include "objects/object_fb/object_fb.h" +#include "assets/objects/object_fb/object_fb.h" struct EnFish2; diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c index 6138a75ee..633f90782 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -7,7 +7,7 @@ #include "z_en_fishing.h" #include "z64rumble.h" #include "z64shrink_window.h" -#include "objects/object_fish/object_fish.h" +#include "assets/objects/object_fish/object_fish.h" #include "overlays/actors/ovl_En_Kanban/z_en_kanban.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h index ac9b1954e..75039924f 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h @@ -2,7 +2,7 @@ #define Z_EN_FLOORMAS_H #include "global.h" -#include "objects/object_wallmaster/object_wallmaster.h" +#include "assets/objects/object_wallmaster/object_wallmaster.h" struct EnFloormas; diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index 8728bcbc5..ff10043f0 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -5,7 +5,7 @@ */ #include "z_en_fsn.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h index c1ba92cf6..4465ecb94 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h @@ -3,7 +3,7 @@ #include "global.h" #include "overlays/actors/ovl_En_GirlA/z_en_girla.h" -#include "objects/object_fsn/object_fsn.h" +#include "assets/objects/object_fsn/object_fsn.h" #define ENFSN_IS_BACKROOM(thisx) ((thisx)->params & 1) #define ENFSN_IS_SHOP(thisx) (!((thisx)->params & 1)) diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index f67484c6c..4b85aa104 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h" #include "overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS \ (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_2000000 | ACTOR_FLAG_CANT_LOCK_ON) diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h index 70a0aa312..d920676d7 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.h +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h @@ -2,7 +2,7 @@ #define Z_EN_FU_H #include "global.h" -#include "objects/object_mu/object_mu.h" +#include "assets/objects/object_mu/object_mu.h" #include "overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h" struct EnFu; diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c index 088cde75e..402b350af 100644 --- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/actors/ovl_En_Fu/z_en_fu.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/object_fu_mato/object_fu_mato.h" +#include "assets/objects/object_fu_mato/object_fu_mato.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c index 20128aaf2..e92a45f34 100644 --- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c @@ -7,7 +7,7 @@ #include "z_en_fu_mato.h" #include "overlays/actors/ovl_En_Fu/z_en_fu.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/object_fu_mato/object_fu_mato.h" +#include "assets/objects/object_fu_mato/object_fu_mato.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 0fc40b57c..72c45c278 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -6,8 +6,8 @@ #include "z_en_fz.h" #include "overlays/actors/ovl_En_Wiz/z_en_wiz.h" -#include "objects/object_fz/object_fz.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_fz/object_fz.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c index cf302d752..9303e683e 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -5,7 +5,7 @@ */ #include "z_en_gakufu.h" -#include "interface/parameter_static/parameter_static.h" +#include "assets/interface/parameter_static/parameter_static.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_2000000) @@ -96,7 +96,7 @@ TexturePtr sOcarinaBtnWallTextures[] = { gOcarinaATex, gOcarinaCDownTex, gOcarinaCRightTex, gOcarinaCLeftTex, gOcarinaCUpTex, }; -#include "overlays/ovl_En_Gakufu/ovl_En_Gakufu.c" +#include "assets/overlays/ovl_En_Gakufu/ovl_En_Gakufu.c" void EnGakufu_ProcessNotes(EnGakufu* this) { OcarinaStaff* playbackStaff; diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c index a251ef000..c46c42987 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -5,7 +5,7 @@ */ #include "z_en_gamelupy.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h index 63532b93f..60d5b6d75 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h @@ -2,7 +2,7 @@ #define Z_EN_GB2_H #include "global.h" -#include "objects/object_ps/object_ps.h" +#include "assets/objects/object_ps/object_ps.h" struct EnGb2; diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h index f1684315b..ef7e66c90 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h @@ -3,7 +3,7 @@ #include "global.h" #include "z64snap.h" -#include "objects/object_ge1/object_ge1.h" +#include "assets/objects/object_ge1/object_ge1.h" #define GERUDO_WHITE_GET_TYPE(thisx) (((thisx)->params) & 0xF) #define GERUDO_WHITE_GET_PATH_INDEX(thisx) ((((thisx)->params) & 0xFC00) >> 10) diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h index ee0d99d00..1e74d7de7 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h @@ -3,7 +3,7 @@ #include "global.h" #include "z64snap.h" -#include "objects/object_gla/object_gla.h" +#include "assets/objects/object_gla/object_gla.h" struct EnGe2; diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h index f2611e408..0921e748a 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h @@ -3,7 +3,7 @@ #include "global.h" #include "z64snap.h" -#include "objects/object_geldb/object_geldb.h" +#include "assets/objects/object_geldb/object_geldb.h" struct EnGe3; diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c index a7d23bc70..87fbd5a6d 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -7,9 +7,9 @@ #include "z_en_geg.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/object_taisou/object_taisou.h" -#include "objects/object_hakugin_demo/object_hakugin_demo.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_taisou/object_taisou.h" +#include "assets/objects/object_hakugin_demo/object_hakugin_demo.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.h b/src/overlays/actors/ovl_En_Geg/z_en_geg.h index 5d2990a09..fc0bad68b 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.h +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.h @@ -2,7 +2,7 @@ #define Z_EN_GEG_H #include "global.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" +#include "assets/objects/object_oF1d_map/object_oF1d_map.h" struct EnGeg; diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.c b/src/overlays/actors/ovl_En_Gg/z_en_gg.c index 808f5464f..3064ee265 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -5,7 +5,7 @@ */ #include "z_en_gg.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_REACT_TO_LENS) diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.h b/src/overlays/actors/ovl_En_Gg/z_en_gg.h index f6a2d5bf7..4944a5550 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.h +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.h @@ -2,7 +2,7 @@ #define Z_EN_GG_H #include "global.h" -#include "objects/object_gg/object_gg.h" +#include "assets/objects/object_gg/object_gg.h" struct EnGg; struct EnGgStruct; diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h index 8ac96df3b..f0f14a238 100644 --- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h @@ -2,7 +2,7 @@ #define Z_EN_GG2_H #include "global.h" -#include "objects/object_gg/object_gg.h" +#include "assets/objects/object_gg/object_gg.h" struct EnGg2; diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.h b/src/overlays/actors/ovl_En_Giant/z_en_giant.h index 5842a62da..d3e66d1fd 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.h +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.h @@ -2,7 +2,7 @@ #define Z_EN_GIANT_H #include "global.h" -#include "objects/object_giant/object_giant.h" +#include "assets/objects/object_giant/object_giant.h" #define GIANT_TYPE(thisx) ((thisx)->params & 0xF) diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h index f22f63c8b..6630803b4 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h @@ -2,7 +2,7 @@ #define Z_EN_GINKO_MAN_H #include "global.h" -#include "objects/object_boj/object_boj.h" +#include "assets/objects/object_boj/object_boj.h" struct EnGinkoMan; diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.h b/src/overlays/actors/ovl_En_Gk/z_en_gk.h index d61c9574d..35ac189d5 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.h +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.h @@ -2,7 +2,7 @@ #define Z_EN_GK_H #include "global.h" -#include "objects/object_gk/object_gk.h" +#include "assets/objects/object_gk/object_gk.h" struct EnGk; diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h index 438480353..8c584331d 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h @@ -2,7 +2,7 @@ #define Z_EN_GM_H #include "global.h" -#include "objects/object_in2/object_in2.h" +#include "assets/objects/object_in2/object_in2.h" struct EnGm; diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 985cef84b..e2b60c6ca 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -15,9 +15,9 @@ #include "z_en_go.h" #include "z64quake.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/object_hakugin_demo/object_hakugin_demo.h" -#include "objects/object_taisou/object_taisou.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_hakugin_demo/object_hakugin_demo.h" +#include "assets/objects/object_taisou/object_taisou.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h index ee9e0b85f..29a74c90e 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.h +++ b/src/overlays/actors/ovl_En_Go/z_en_go.h @@ -2,7 +2,7 @@ #define Z_EN_GO_H #include "global.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" +#include "assets/objects/object_oF1d_map/object_oF1d_map.h" struct EnGo; diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index c28bca080..2b89d603c 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -6,8 +6,8 @@ #include "z_en_goroiwa.h" #include "z64quake.h" -#include "objects/object_goroiwa/object_goroiwa.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_goroiwa/object_goroiwa.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_80000000) diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c index 2276920fc..4ce8983ce 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -6,7 +6,7 @@ #include "z_en_grasshopper.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h index a07091dd8..0d4a05666 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h @@ -2,7 +2,7 @@ #define Z_EN_GRASSHOPPER_H #include "global.h" -#include "objects/object_grasshopper/object_grasshopper.h" +#include "assets/objects/object_grasshopper/object_grasshopper.h" #define DRAGONFLY_GET_TYPE(thisx) ((thisx)->params) diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index e7919e45c..5543894fd 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -8,8 +8,8 @@ #include "z64voice.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "objects/object_gs/object_gs.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_gs/object_gs.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h index e07e70eaf..d79179caa 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h @@ -2,7 +2,7 @@ #define Z_EN_GUARD_NUTS_H #include "global.h" -#include "objects/object_dnk/object_dnk.h" +#include "assets/objects/object_dnk/object_dnk.h" struct EnGuardNuts; diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h index 4913d4124..f3174e1c6 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h @@ -2,7 +2,7 @@ #define Z_EN_GURUGURU_H #include "global.h" -#include "objects/object_fu/object_fu.h" +#include "assets/objects/object_fu/object_fu.h" struct EnGuruguru; diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c index 8489f897d..9b1dff3f2 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -25,8 +25,8 @@ #include "z_en_hakurock.h" #include "overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_boss_hakugin/object_boss_hakugin.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_boss_hakugin/object_boss_hakugin.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c index faaae0db9..b8514e4dc 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -5,7 +5,7 @@ */ #include "z_en_hanabi.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index 5ca1e2013..fdec846e9 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -5,7 +5,7 @@ */ #include "z_en_hata.h" -#include "objects/object_hata/object_hata.h" +#include "assets/objects/object_hata/object_hata.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.h b/src/overlays/actors/ovl_En_Hata/z_en_hata.h index 60e3edba8..e34b7b8b0 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.h +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.h @@ -2,7 +2,7 @@ #define Z_EN_HATA_H #include "global.h" -#include "objects/object_hata/object_hata.h" +#include "assets/objects/object_hata/object_hata.h" struct EnHata; diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h index 4d886cb3c..a4d24f8f2 100644 --- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h @@ -2,7 +2,7 @@ #define Z_EN_HEISHI_H #include "global.h" -#include "objects/object_sdn/object_sdn.h" +#include "assets/objects/object_sdn/object_sdn.h" struct EnHeishi; diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.h b/src/overlays/actors/ovl_En_Hg/z_en_hg.h index b79269e9b..b9436d076 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.h +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.h @@ -2,7 +2,7 @@ #define Z_EN_HG_H #include "global.h" -#include "objects/object_harfgibud/object_harfgibud.h" +#include "assets/objects/object_harfgibud/object_harfgibud.h" struct EnHg; diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h index da7b7c40e..643b76eb4 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h @@ -2,7 +2,7 @@ #define Z_EN_HGO_H #include "global.h" -#include "objects/object_harfgibud/object_harfgibud.h" +#include "assets/objects/object_harfgibud/object_harfgibud.h" struct EnHgo; diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h index 517ade964..feb524b70 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h @@ -2,7 +2,7 @@ #define Z_EN_HIDDEN_NUTS_H #include "global.h" -#include "objects/object_hintnuts/object_hintnuts.h" +#include "assets/objects/object_hintnuts/object_hintnuts.h" struct EnHiddenNuts; diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h index d29dd7fbf..f8f7d322e 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h @@ -2,7 +2,7 @@ #define Z_EN_HINT_SKB_H #include "global.h" -#include "objects/object_skb/object_skb.h" +#include "assets/objects/object_skb/object_skb.h" struct EnHintSkb; diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 21769341b..ca3b99bc7 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -69,7 +69,7 @@ ActorInit En_Holl_InitVars = { /**/ EnHoll_Draw, }; -#include "overlays/ovl_En_Holl/ovl_En_Holl.c" +#include "assets/overlays/ovl_En_Holl/ovl_En_Holl.c" static EnHoll* sInstancePlayingSound = NULL; diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 351203449..1c43117e6 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -11,7 +11,7 @@ #include "overlays/actors/ovl_En_In/z_en_in.h" #include "overlays/actors/ovl_Obj_Um/z_obj_um.h" #include "overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h" -#include "objects/object_horse_link_child/object_horse_link_child.h" +#include "assets/objects/object_horse_link_child/object_horse_link_child.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h index 8213bed6a..1fdbc973c 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h @@ -3,8 +3,8 @@ #include "global.h" #include "z64skin.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_ha/object_ha.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_ha/object_ha.h" struct EnHorse; struct EnIn; diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 48c918c94..24bd1a94a 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -6,7 +6,7 @@ #include "z_en_horse_game_check.h" #include "z64horse.h" -#include "objects/object_horse_game_check/object_horse_game_check.h" +#include "assets/objects/object_horse_game_check/object_horse_game_check.h" #include "debug.h" #define FLAGS (ACTOR_FLAG_10) @@ -49,7 +49,7 @@ ActorInit En_Horse_Game_Check_InitVars = { /**/ EnHorseGameCheck_Draw, }; -#include "overlays/ovl_En_Horse_Game_Check/ovl_En_Horse_Game_Check.c" +#include "assets/overlays/ovl_En_Horse_Game_Check/ovl_En_Horse_Game_Check.c" s32 func_808F8AA0(EnHorseGameCheck* this, PlayState* play) { s32 pad[3]; diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index bae6978eb..20e0d9385 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -7,7 +7,7 @@ #include "z_en_horse_link_child.h" #include "z64horse.h" -#include "objects/object_horse_link_child/object_horse_link_child.h" +#include "assets/objects/object_horse_link_child/object_horse_link_child.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h index de87fa97a..c40842ebc 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.h +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h @@ -2,7 +2,7 @@ #define Z_EN_HS_H #include "global.h" -#include "objects/object_hs/object_hs.h" +#include "assets/objects/object_hs/object_hs.h" struct EnHs; diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.h b/src/overlays/actors/ovl_En_Ig/z_en_ig.h index f1dda67db..0c16bebb1 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.h +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.h @@ -2,7 +2,7 @@ #define Z_EN_IG_H #include "global.h" -#include "objects/object_dai/object_dai.h" +#include "assets/objects/object_dai/object_dai.h" struct EnIg; diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h index 55bc0eb68..e5c250bc5 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h @@ -2,7 +2,7 @@ #define Z_EN_IK_H #include "global.h" -#include "objects/object_ik/object_ik.h" +#include "assets/objects/object_ik/object_ik.h" struct EnIk; diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h index 4fd2985f1..48c6a17ea 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h @@ -2,7 +2,7 @@ #define Z_EN_INSECT_H #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" struct EnInsect; diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index b2dfa1352..8c79cb440 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -7,9 +7,9 @@ #include "z_en_ishi.h" #include "z64quake.h" #include "z64rumble.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_ishi/object_ishi.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_ishi/object_ishi.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_800000) diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.h b/src/overlays/actors/ovl_En_Ja/z_en_ja.h index fdd87d85d..636bbe2b8 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.h +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.h @@ -2,7 +2,7 @@ #define Z_EN_JA_H #include "global.h" -#include "objects/object_boj/object_boj.h" +#include "assets/objects/object_boj/object_boj.h" struct EnJa; diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c index b055e9165..4f67ea874 100644 --- a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c +++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c @@ -5,7 +5,7 @@ */ #include "z_en_jc_mato.h" -#include "objects/object_tru/object_tru.h" +#include "assets/objects/object_tru/object_tru.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_4000) diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.h b/src/overlays/actors/ovl_En_Jg/z_en_jg.h index b5dd61614..d364b543e 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.h +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.h @@ -2,7 +2,7 @@ #define Z_EN_JG_H #include "global.h" -#include "objects/object_jg/object_jg.h" +#include "assets/objects/object_jg/object_jg.h" #define EN_JG_IS_IN_GORON_SHRINE(thisx) ((thisx)->params & 0x1) #define EN_JG_GET_PATH_INDEX(thisx) (((thisx)->params & 0xFC00) >> 10) diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h index 0d7ebd625..449795250 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h @@ -2,7 +2,7 @@ #define Z_EN_JGAME_TSN_H #include "global.h" -#include "objects/object_tsn/object_tsn.h" +#include "assets/objects/object_tsn/object_tsn.h" struct EnJgameTsn; diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.h b/src/overlays/actors/ovl_En_Js/z_en_js.h index f673a97d6..8c3948bcd 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.h +++ b/src/overlays/actors/ovl_En_Js/z_en_js.h @@ -2,7 +2,7 @@ #define Z_EN_JS_H #include "global.h" -#include "objects/object_ob/object_ob.h" +#include "assets/objects/object_ob/object_ob.h" #define ENJS_GET_TYPE(thisx) ((thisx)->params & 0xF) #define ENJS_GET_PATH_INDEX(thisx) (((thisx)->params & 0xFC00) >> 10) diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h index 15562ee2e..c46592a93 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h @@ -3,7 +3,7 @@ #include "global.h" #include "z64snap.h" -#include "objects/object_kz/object_kz.h" +#include "assets/objects/object_kz/object_kz.h" struct EnKaizoku; diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 87ae08456..4d1800188 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -9,7 +9,7 @@ #include "z64olib.h" -#include "objects/object_ka/object_ka.h" +#include "assets/objects/object_ka/object_ka.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.h b/src/overlays/actors/ovl_En_Kame/z_en_kame.h index 2ca2f4047..b4d407dce 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.h +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.h @@ -2,7 +2,7 @@ #define Z_EN_KAME_H #include "global.h" -#include "objects/object_tl/object_tl.h" +#include "assets/objects/object_tl/object_tl.h" struct EnKame; diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 7dcac46ec..76404ba33 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -5,8 +5,8 @@ */ #include "z_en_kanban.h" -#include "objects/object_kanban/object_kanban.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_kanban/object_kanban.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) @@ -918,7 +918,7 @@ static f32 sCutAngles[] = { /* */ 0.00f * M_PIf, }; -#include "overlays/ovl_En_Kanban/ovl_En_Kanban.c" +#include "assets/overlays/ovl_En_Kanban/ovl_En_Kanban.c" void EnKanban_Draw(Actor* thisx, PlayState* play) { EnKanban* this = THIS; diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 3648b0d0c..34cfb174b 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -7,7 +7,7 @@ #include "z_en_karebaba.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY) diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h index f0edcdd0b..75b09c902 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h @@ -2,7 +2,7 @@ #define Z_EN_KAREBABA_H #include "global.h" -#include "objects/object_dekubaba/object_dekubaba.h" +#include "assets/objects/object_dekubaba/object_dekubaba.h" struct EnKarebaba; diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h index 9a7a5cdf0..75694b6f6 100644 --- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h @@ -2,7 +2,7 @@ #define Z_EN_KBT_H #include "global.h" -#include "objects/object_kbt/object_kbt.h" +#include "assets/objects/object_kbt/object_kbt.h" struct EnKbt; diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h index 2efd79af4..9c00267ff 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h @@ -2,7 +2,7 @@ #define Z_EN_KENDO_JS_H #include "global.h" -#include "objects/object_js/object_js.h" +#include "assets/objects/object_js/object_js.h" struct EnKendoJs; diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c index 198786306..2b5ad5a42 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -5,7 +5,7 @@ */ #include "z_en_kgy.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h index c8055e086..9bc0dc60f 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h @@ -2,7 +2,7 @@ #define Z_EN_KGY_H #include "global.h" -#include "objects/object_kgy/object_kgy.h" +#include "assets/objects/object_kgy/object_kgy.h" #include "overlays/actors/ovl_En_Kbt/z_en_kbt.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h index 99ee4a55b..ea83f8e04 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h @@ -2,7 +2,7 @@ #define Z_EN_KITAN_H #include "global.h" -#include "objects/object_kitan/object_kitan.h" +#include "assets/objects/object_kitan/object_kitan.h" #define ENKITAN_GET_COLLECT_FLAG(thisx) (((thisx)->params & 0xFE00) >> 9) diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.c b/src/overlays/actors/ovl_En_Knight/z_en_knight.c index e5230ecf6..f073927f2 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.c +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -9,8 +9,8 @@ #include "z64shrink_window.h" #include "overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h" #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_knight/object_knight.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_knight/object_knight.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.h b/src/overlays/actors/ovl_En_Knight/z_en_knight.h index faf0aff97..e6215d19f 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.h +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.h @@ -3,7 +3,7 @@ #include "assert.h" #include "global.h" -#include "objects/object_knight/object_knight.h" +#include "assets/objects/object_knight/object_knight.h" static_assert((u32)IGOS_LIMB_MAX == (u32)KNIGHT_LIMB_MAX, "The skeletons for Igos du Ikana and his aides must match in structure"); diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c index 697cefd00..96a09c2e9 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c @@ -7,7 +7,7 @@ */ #include "z_en_kujiya.h" -#include "objects/object_kujiya/object_kujiya.h" +#include "assets/objects/object_kujiya/object_kujiya.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_CANT_LOCK_ON) diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index cfb33d774..02ee8b4b7 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -5,9 +5,9 @@ */ #include "z_en_kusa.h" -#include "objects/object_kusa/object_kusa.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/object_kusa/object_kusa.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_800000) diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index 16e60b118..e9a0b1bce 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -5,8 +5,8 @@ */ #include "z_en_kusa2.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_800000) diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h index 2ee5897bd..ef3f97c69 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h @@ -2,7 +2,7 @@ #define Z_EN_LIFT_NUTS_H #include "global.h" -#include "objects/object_dnt/object_dnt.h" +#include "assets/objects/object_dnt/object_dnt.h" struct EnLiftNuts; diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index b6d9a5d53..7690bf7b8 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -5,7 +5,7 @@ */ #include "z_en_light.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h index 6f600f1e8..a68f6583d 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h @@ -2,7 +2,7 @@ #define Z_EN_LOOK_NUTS_H #include "global.h" -#include "objects/object_dnk/object_dnk.h" +#include "assets/objects/object_dnk/object_dnk.h" struct EnLookNuts; diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 8c08ac6a4..deb55fe4f 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -7,7 +7,7 @@ #include "z_en_m_thunder.h" #include "z64rumble.h" #include "overlays/actors/ovl_Eff_Dust/z_eff_dust.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h index dfedd3330..c6d64a0de 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h @@ -2,7 +2,7 @@ #define Z_EN_MA4_H #include "global.h" -#include "objects/object_ma1/object_ma1.h" +#include "assets/objects/object_ma1/object_ma1.h" struct EnMa4; diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h index 208e41270..7f8669920 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h @@ -2,7 +2,7 @@ #define Z_EN_MA_YTO_H #include "global.h" -#include "objects/object_ma2/object_ma2.h" +#include "assets/objects/object_ma2/object_ma2.h" struct EnMaYto; diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h index 65e7a0eb6..5863c41de 100644 --- a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h +++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h @@ -2,7 +2,7 @@ #define Z_EN_MA_YTS_H #include "global.h" -#include "objects/object_ma1/object_ma1.h" +#include "assets/objects/object_ma1/object_ma1.h" struct EnMaYts; diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 450d07f1c..12ed58cc4 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -8,7 +8,7 @@ #include "gfxalloc.h" -#include "objects/object_mag/object_mag.h" +#include "assets/objects/object_mag/object_mag.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c index 73378cd39..07b9e4ea7 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -6,7 +6,7 @@ #include "z_en_maruta.h" #include "overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h" -#include "objects/object_maruta/object_maruta.h" +#include "assets/objects/object_maruta/object_maruta.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c index 2d4411e45..36250c0ab 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -6,7 +6,7 @@ #include "z_en_minideath.h" #include "overlays/actors/ovl_En_Death/z_en_death.h" -#include "objects/object_death/object_death.h" +#include "assets/objects/object_death/object_death.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index 32ca10a70..9f39250f6 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -5,7 +5,7 @@ */ #include "z_en_minifrog.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h index a2752c830..9bce059e9 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h @@ -2,7 +2,7 @@ #define Z_EN_MINIFROG_H #include "global.h" -#include "objects/object_fr/object_fr.h" +#include "assets/objects/object_fr/object_fr.h" struct EnMinifrog; diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h index 245b32b88..18d897a35 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.h +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h @@ -2,7 +2,7 @@ #define Z_EN_MK_H #include "global.h" -#include "objects/object_mk/object_mk.h" +#include "assets/objects/object_mk/object_mk.h" struct EnMk; diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index b0f0c063e..0a29cd04a 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -5,7 +5,7 @@ */ #include "z_en_mkk.h" -#include "objects/object_mkk/object_mkk.h" +#include "assets/objects/object_mkk/object_mkk.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY) diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 1a6822745..09a0193be 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -5,7 +5,7 @@ */ #include "z_en_mm.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 1a4198d2c..448107f23 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -30,7 +30,7 @@ ActorInit En_Mm2_InitVars = { /**/ EnMm2_Draw, }; -#include "overlays/ovl_En_Mm2/ovl_En_Mm2.c" +#include "assets/overlays/ovl_En_Mm2/ovl_En_Mm2.c" void EnMm2_Init(Actor* thisx, PlayState* play) { EnMm2* this = THIS; diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index 189ecbc02..42543e985 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -85,7 +85,7 @@ static AnimationInfo sAnimationInfo[ENMM3_ANIM_MAX] = { { &object_mm_Anim_00DA50, 1.0f, 0.0f, 10.0f, ANIMMODE_ONCE, -10.0f }, // ENMM3_ANIM_7 }; -#include "overlays/ovl_En_Mm3/ovl_En_Mm3.c" +#include "assets/overlays/ovl_En_Mm3/ovl_En_Mm3.c" Vec3f D_80A704F0 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h index 5e0e8e70e..305a3ac76 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h @@ -2,7 +2,7 @@ #define Z_EN_MM3_H #include "global.h" -#include "objects/object_mm/object_mm.h" +#include "assets/objects/object_mm/object_mm.h" struct EnMm3; diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h index 42a23f99c..dc1d665a1 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h @@ -2,7 +2,7 @@ #define Z_EN_MNK_H #include "global.h" -#include "objects/object_mnk/object_mnk.h" +#include "assets/objects/object_mnk/object_mnk.h" #include "z64snap.h" struct EnMnk; diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/src/overlays/actors/ovl_En_Ms/z_en_ms.h index 7081ea4f6..4f6cb2b1a 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.h +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.h @@ -2,7 +2,7 @@ #define Z_EN_MS_H #include "global.h" -#include "objects/object_ms/object_ms.h" +#include "assets/objects/object_ms/object_ms.h" struct EnMs; diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h index 48cb62155..f90b10721 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h @@ -2,7 +2,7 @@ #define Z_EN_MUSHI2_H #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" struct EnMushi2; diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.h b/src/overlays/actors/ovl_En_Muto/z_en_muto.h index ac6573bb6..b026e8d8f 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.h +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.h @@ -2,7 +2,7 @@ #define Z_EN_MUTO_H #include "global.h" -#include "objects/object_toryo/object_toryo.h" +#include "assets/objects/object_toryo/object_toryo.h" struct EnMuto; diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index b454431f7..25ac8d2ad 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -5,7 +5,7 @@ */ #include "z_en_nb.h" -#include "objects/object_nb/object_nb.h" +#include "assets/objects/object_nb/object_nb.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.h b/src/overlays/actors/ovl_En_Nb/z_en_nb.h index 2bc134b3d..4ea425ab0 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.h +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.h @@ -2,7 +2,7 @@ #define Z_EN_NB_H #include "global.h" -#include "objects/object_nb/object_nb.h" +#include "assets/objects/object_nb/object_nb.h" struct EnNb; diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index b691664c4..0091443aa 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -5,7 +5,7 @@ */ #include "z_en_neo_reeba.h" -#include "objects/object_rb/object_rb.h" +#include "assets/objects/object_rb/object_rb.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_200) diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h index 1be3d2c4a..840376bf6 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h @@ -2,7 +2,7 @@ #define Z_EN_NEO_REEBA_H #include "global.h" -#include "objects/object_rb/object_rb.h" +#include "assets/objects/object_rb/object_rb.h" #define EN_NEO_REEBA_IS_LARGE(thisx) ((thisx)->params & 0x8000) diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.h b/src/overlays/actors/ovl_En_Niw/z_en_niw.h index b23de5b1d..139f56c5d 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.h +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h @@ -2,7 +2,7 @@ #define Z_EN_NIW_H #include "global.h" -#include "objects/object_niw/object_niw.h" +#include "assets/objects/object_niw/object_niw.h" struct EnNiw; diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c index 36ad353f3..b54e2c394 100644 --- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c @@ -5,7 +5,7 @@ */ #include "z_en_nnh.h" -#include "objects/object_nnh/object_nnh.h" +#include "assets/objects/object_nnh/object_nnh.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 0b6f947f2..f296acbb5 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -6,7 +6,7 @@ #include "z_en_nutsball.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index d155b07e4..85195147b 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -9,7 +9,7 @@ #include "z_en_nwc.h" #include "overlays/actors/ovl_En_Niw/z_en_niw.h" -#include "objects/object_nwc/object_nwc.h" +#include "assets/objects/object_nwc/object_nwc.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h index 9ce3ab60e..62f32cbb8 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h @@ -2,7 +2,7 @@ #define Z_EN_NWC_H #include "global.h" -#include "objects/object_niw/object_niw.h" +#include "assets/objects/object_niw/object_niw.h" #include "overlays/actors/ovl_En_Hs/z_en_hs.h" // grog diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h index 3f6b66cd7..8e6873608 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h @@ -2,7 +2,7 @@ #define Z_EN_OKUTA_H #include "global.h" -#include "objects/object_okuta/object_okuta.h" +#include "assets/objects/object_okuta/object_okuta.h" struct EnOkuta; diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.c b/src/overlays/actors/ovl_En_Osk/z_en_osk.c index 460823a66..da30eaafb 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.c +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -5,7 +5,7 @@ */ #include "z_en_osk.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.h b/src/overlays/actors/ovl_En_Osk/z_en_osk.h index c97d5189a..119de1c66 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.h +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.h @@ -2,7 +2,7 @@ #define Z_EN_OSK_H #include "global.h" -#include "objects/object_ikn_demo/object_ikn_demo.h" +#include "assets/objects/object_ikn_demo/object_ikn_demo.h" struct EnOsk; diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c index f36cf6c5a..56e59d7b9 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -5,7 +5,7 @@ */ #include "z_en_osn.h" -#include "objects/object_osn/object_osn.h" +#include "assets/objects/object_osn/object_osn.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index bbe894f4f..6cb49b64d 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -5,7 +5,7 @@ */ #include "z_en_ossan.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h index 4c298cfc2..1ac01466a 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -3,8 +3,8 @@ #include "global.h" #include "overlays/actors/ovl_En_GirlA/z_en_girla.h" -#include "objects/object_ani/object_ani.h" -#include "objects/object_fsn/object_fsn.h" +#include "assets/objects/object_ani/object_ani.h" +#include "assets/objects/object_fsn/object_fsn.h" // Note: adding 1 to FSN_LIMB_MAX due to bug in the skeleton, see bug in object_fsn.xml #define ENOSSAN_LIMB_MAX MAX((s32)FSN_LIMB_MAX + 1, (s32)ANI_LIMB_MAX) diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c index ed200e197..adead0e12 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -5,7 +5,7 @@ */ #include "z_en_ot.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.h b/src/overlays/actors/ovl_En_Ot/z_en_ot.h index 53fd00c1e..69a54536f 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.h +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.h @@ -2,7 +2,7 @@ #define Z_EN_OT_H #include "global.h" -#include "objects/object_ot/object_ot.h" +#include "assets/objects/object_ot/object_ot.h" struct EnOt; diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h index e1521de2d..6aec024ce 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h @@ -2,7 +2,7 @@ #define Z_EN_OWL_H #include "global.h" -#include "objects/object_owl/object_owl.h" +#include "assets/objects/object_owl/object_owl.h" struct EnOwl; diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h index cde9449c8..1630f79f5 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h @@ -2,7 +2,7 @@ #define Z_EN_PAMERA_H #include "global.h" -#include "objects/object_pamera/object_pamera.h" +#include "assets/objects/object_pamera/object_pamera.h" struct EnPamera; diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h index ac0a0b3f5..5d6a17ad8 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h @@ -2,7 +2,7 @@ #define Z_EN_PAMETFROG_H #include "global.h" -#include "objects/object_bigslime/object_bigslime.h" +#include "assets/objects/object_bigslime/object_bigslime.h" struct EnPametfrog; diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.c b/src/overlays/actors/ovl_En_Paper/z_en_paper.c index 3d739c2a0..cfbec5ddb 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.c +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -11,7 +11,7 @@ #include "z_en_paper.h" #include "su_mtx.h" -#include "objects/object_bal/object_bal.h" +#include "assets/objects/object_bal/object_bal.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_100000 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h index 416c0e303..1366a8d63 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h @@ -2,7 +2,7 @@ #define Z_EN_PEEHAT_H #include "global.h" -#include "objects/object_ph/object_ph.h" +#include "assets/objects/object_ph/object_ph.h" struct EnPeehat; diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c index 60873dd47..9163cada9 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -6,7 +6,7 @@ #include "z_en_pm.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" -#include "objects/object_mm/object_mm.h" +#include "assets/objects/object_mm/object_mm.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h index 55d751839..7033d838b 100644 --- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h @@ -2,7 +2,7 @@ #define Z_EN_PO_COMPOSER_H #include "global.h" -#include "objects/object_po_composer/object_po_composer.h" +#include "assets/objects/object_po_composer/object_po_composer.h" #define POE_COMPOSER_IS_FLAT(thisx) ((thisx)->params & 0x8000) #define POE_COMPOSER_4000(thisx) ((thisx)->params & 0x4000) diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h index 506f046d0..b42795d80 100644 --- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h @@ -2,7 +2,7 @@ #define Z_EN_PO_FUSEN_H #include "global.h" -#include "objects/object_po_fusen/object_po_fusen.h" +#include "assets/objects/object_po_fusen/object_po_fusen.h" struct EnPoFusen; diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index c4add250d..5a4abba35 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -6,7 +6,7 @@ #include "z_en_po_sisters.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS \ (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_4000) diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h index 510a67f36..884a85fe3 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h @@ -2,7 +2,7 @@ #define Z_EN_PO_SISTERS_H #include "global.h" -#include "objects/object_po_sisters/object_po_sisters.h" +#include "assets/objects/object_po_sisters/object_po_sisters.h" struct EnPoSisters; diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h index 7c3e47eed..2b02b61f2 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h @@ -2,7 +2,7 @@ #define Z_EN_POH_H #include "global.h" -#include "objects/object_po/object_po.h" +#include "assets/objects/object_po/object_po.h" struct EnPoh; diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c index d51ca9f42..45e33fc00 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -6,7 +6,7 @@ #include "z_en_pp.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY) diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.h b/src/overlays/actors/ovl_En_Pp/z_en_pp.h index 50ac30e51..30050783d 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.h +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.h @@ -2,7 +2,7 @@ #define Z_EN_PP_H #include "global.h" -#include "objects/object_pp/object_pp.h" +#include "assets/objects/object_pp/object_pp.h" struct EnPp; diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.h b/src/overlays/actors/ovl_En_Pr/z_en_pr.h index 7770504ad..737e169b2 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.h +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.h @@ -2,7 +2,7 @@ #define Z_EN_PR_H #include "global.h" -#include "objects/object_pr/object_pr.h" +#include "assets/objects/object_pr/object_pr.h" struct EnPr; diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h index 04640eb77..0b96ec088 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h @@ -2,7 +2,7 @@ #define Z_EN_PR2_H #include "global.h" -#include "objects/object_pr/object_pr.h" +#include "assets/objects/object_pr/object_pr.h" struct EnPr2; diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.h b/src/overlays/actors/ovl_En_Prz/z_en_prz.h index 2676c75b5..ec8df1eb5 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.h +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.h @@ -2,7 +2,7 @@ #define Z_EN_PRZ_H #include "global.h" -#include "objects/object_pr/object_pr.h" +#include "assets/objects/object_pr/object_pr.h" struct EnPrz; diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.h b/src/overlays/actors/ovl_En_Pst/z_en_pst.h index eecd1a8e7..26666f005 100644 --- a/src/overlays/actors/ovl_En_Pst/z_en_pst.h +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.h @@ -2,7 +2,7 @@ #define Z_EN_PST_H #include "global.h" -#include "objects/object_pst/object_pst.h" +#include "assets/objects/object_pst/object_pst.h" typedef enum { /* 0 */ POSTBOX_SOUTH_UPPER_CLOCKTOWN, diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h index a3d9afee5..2ccc39cdc 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h @@ -2,7 +2,7 @@ #define Z_EN_RACEDOG_H #include "global.h" -#include "objects/object_dog/object_dog.h" +#include "assets/objects/object_dog/object_dog.h" #define ENRACEDOG_GET_INDEX(thisx) (((thisx)->params & 0x3E0) >> 5) #define ENRACEDOG_GET_PATH_INDEX(thisx) (((thisx)->params & 0xFC00) >> 10) diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.h b/src/overlays/actors/ovl_En_Raf/z_en_raf.h index 3a157ff04..f8203764a 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.h +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.h @@ -2,7 +2,7 @@ #define Z_EN_RAF_H #include "global.h" -#include "objects/object_raf/object_raf.h" +#include "assets/objects/object_raf/object_raf.h" #define CARNIVOROUS_LILY_GET_TYPE(thisx) (((thisx)->params >> 12) & 0xF) #define CARNIVOROUS_LILY_GET_REVIVE_TIMER(thisx) (((thisx)->params >> 7) & 0x1F) diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h index b30928b0e..b24a0cd94 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h @@ -2,7 +2,7 @@ #define Z_EN_RAIL_SKB_H #include "global.h" -#include "objects/object_skb/object_skb.h" +#include "assets/objects/object_skb/object_skb.h" #include "overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h" struct EnRailSkb; diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h index 271206a10..661a1cad7 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h @@ -2,7 +2,7 @@ #define Z_EN_RAILGIBUD_H #include "global.h" -#include "objects/object_rd/object_rd.h" +#include "assets/objects/object_rd/object_rd.h" struct EnRailgibud; diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index acefb8057..5656e6be9 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -5,7 +5,7 @@ */ #include "z_en_rat.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_200) diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.h b/src/overlays/actors/ovl_En_Rat/z_en_rat.h index 28c880a92..8809f829c 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.h +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.h @@ -2,7 +2,7 @@ #define Z_EN_RAT_H #include "global.h" -#include "objects/object_rat/object_rat.h" +#include "assets/objects/object_rat/object_rat.h" #define EN_RAT_IS_OVERWORLD_TYPE(thisx) ((thisx)->params & 0x8000) #define EN_RAT_GET_TYPE(thisx) ((thisx)->params) diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 5cedc705b..c20cacb28 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -24,7 +24,7 @@ #include "z_en_rd.h" #include "z64rumble.h" -#include "objects/object_rd/object_rd.h" +#include "assets/objects/object_rd/object_rd.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_400) diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h index c4d32ce47..08510f736 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h @@ -2,7 +2,7 @@ #define Z_EN_RD_H #include "global.h" -#include "objects/object_rd/object_rd.h" +#include "assets/objects/object_rd/object_rd.h" struct EnRd; diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h index 9c070594c..e4713ea8c 100644 --- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h @@ -2,7 +2,7 @@ #define Z_EN_RECEPGIRL_H #include "global.h" -#include "objects/object_bg/object_bg.h" +#include "assets/objects/object_bg/object_bg.h" struct EnRecepgirl; diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c index f2a4d3647..638ff7103 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -5,7 +5,7 @@ */ #include "prevent_bss_reordering.h" #include "z_en_rg.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_80000000) diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.h b/src/overlays/actors/ovl_En_Rg/z_en_rg.h index a6a1304cf..fc2a040d6 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.h +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.h @@ -2,7 +2,7 @@ #define Z_EN_RG_H #include "global.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" +#include "assets/objects/object_oF1d_map/object_oF1d_map.h" struct EnRg; diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index f5bd09def..f8b36bd83 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -7,7 +7,7 @@ #include "z_en_rr.h" #include "z64rumble.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/object_rr/object_rr.h" +#include "assets/objects/object_rr/object_rr.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_400) diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c index e51f6f659..45bf7883d 100644 --- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c @@ -5,7 +5,7 @@ */ #include "z_en_rsn.h" -#include "objects/object_rsn/object_rsn.h" +#include "assets/objects/object_rsn/object_rsn.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.h b/src/overlays/actors/ovl_En_Ru/z_en_ru.h index 83f7d8426..61b3a711d 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.h +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.h @@ -2,7 +2,7 @@ #define Z_EN_RU_H #include "global.h" -#include "objects/object_ru2/object_ru2.h" +#include "assets/objects/object_ru2/object_ru2.h" #define RU_GET_PATH_INDEX(thisx) ((thisx->params & 0x7E00) >> 9) diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c index f9b64095a..01861eb70 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -5,7 +5,7 @@ */ #include "z_en_ruppecrow.h" -#include "objects/object_crow/object_crow.h" +#include "assets/objects/object_crow/object_crow.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_4000) diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h index 61a97f815..e6132cb51 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h @@ -2,7 +2,7 @@ #define Z_EN_RUPPECROW_H #include "global.h" -#include "objects/object_crow/object_crow.h" +#include "assets/objects/object_crow/object_crow.h" #define ENRUPPECROW_GET_PATH_INDEX(thisx) (((thisx)->params & 0xFC00) >> 0xA) diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c index ad71bddee..73e17d52b 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c @@ -34,7 +34,7 @@ Week Event Flags: #include "z_en_s_goro.h" #include "overlays/actors/ovl_En_Gk/z_en_gk.h" // Goron Elder's Son #include "overlays/actors/ovl_En_Jg/z_en_jg.h" // Goron Elder -#include "objects/object_taisou/object_taisou.h" +#include "assets/objects/object_taisou/object_taisou.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) #define THIS ((EnSGoro*)thisx) diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h index 5de57c67a..5004ea060 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h @@ -2,7 +2,7 @@ #define Z_EN_S_GORO_H #include "global.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" +#include "assets/objects/object_oF1d_map/object_oF1d_map.h" #define EN_S_GORO_GET_MAIN_TYPE(thisx) ((thisx)->params & 0xF) #define EN_S_GORO_GET_SWITCH_FLAG(thisx) (((thisx)->params & 0x7F0) >> 4) diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.h b/src/overlays/actors/ovl_En_Sb/z_en_sb.h index eb2d104d6..48879d2bf 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.h +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h @@ -2,7 +2,7 @@ #define Z_EN_SB_H #include "global.h" -#include "objects/object_sb/object_sb.h" +#include "assets/objects/object_sb/object_sb.h" struct EnSb; diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c index 62e04e5ab..361f74ade 100644 --- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c @@ -5,7 +5,7 @@ */ #include "z_en_sc_ruppe.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c index d0282d488..241374f48 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -5,7 +5,7 @@ */ #include "z_en_scopecoin.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h index 523d28804..a37aa2d05 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h @@ -2,7 +2,7 @@ #define Z_EN_SCOPECROW_H #include "global.h" -#include "objects/object_crow/object_crow.h" +#include "assets/objects/object_crow/object_crow.h" struct EnScopecrow; diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c index 389b73480..c333d883d 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -5,7 +5,7 @@ */ #include "z_en_scopenuts.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h index b85f559eb..8c0470463 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h @@ -2,7 +2,7 @@ #define Z_EN_SCOPENUTS_H #include "global.h" -#include "objects/object_dnt/object_dnt.h" +#include "assets/objects/object_dnt/object_dnt.h" struct EnScopenuts; diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index 94e237074..d7d9fa185 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -70,7 +70,7 @@ Vec3f D_80947B10[] = { static s32 sPad = 0; -#include "overlays/ovl_En_Sda/ovl_En_Sda.c" +#include "assets/overlays/ovl_En_Sda/ovl_En_Sda.c" void EnSda_Init(Actor* thisx, PlayState* play) { } diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c index 0fe07d766..b02a76f4f 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -5,11 +5,11 @@ */ #include "z_en_sekihi.h" -#include "objects/object_sekihil/object_sekihil.h" -#include "objects/object_sekihig/object_sekihig.h" -#include "objects/object_sekihin/object_sekihin.h" -#include "objects/object_sekihiz/object_sekihiz.h" -#include "objects/object_zog/object_zog.h" +#include "assets/objects/object_sekihil/object_sekihil.h" +#include "assets/objects/object_sekihig/object_sekihig.h" +#include "assets/objects/object_sekihin/object_sekihin.h" +#include "assets/objects/object_sekihiz/object_sekihiz.h" +#include "assets/objects/object_zog/object_zog.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h index b20dd5d33..8d090a24b 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h @@ -2,7 +2,7 @@ #define Z_EN_SELLNUTS_H #include "global.h" -#include "objects/object_dnt/object_dnt.h" +#include "assets/objects/object_dnt/object_dnt.h" struct EnSellnuts; diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.h b/src/overlays/actors/ovl_En_Shn/z_en_shn.h index 96fb05b24..a227bc95e 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.h +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.h @@ -2,7 +2,7 @@ #define Z_EN_SHN_H #include "global.h" -#include "objects/object_shn/object_shn.h" +#include "assets/objects/object_shn/object_shn.h" struct EnShn; diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h index 4a50bfc37..3aed6041a 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h @@ -2,7 +2,7 @@ #define Z_EN_SKB_H #include "global.h" -#include "objects/object_skb/object_skb.h" +#include "assets/objects/object_skb/object_skb.h" struct EnSkb; diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.h b/src/overlays/actors/ovl_En_Slime/z_en_slime.h index 38723dbcb..b25932f69 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.h +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.h @@ -2,8 +2,8 @@ #define Z_EN_SLIME_H #include "global.h" -#include "objects/object_slime/object_slime.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_slime/object_slime.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" struct EnSlime; diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h index 2533c2595..26b89518d 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h @@ -2,7 +2,7 @@ #define Z_EN_SNOWMAN_H #include "global.h" -#include "objects/object_snowman/object_snowman.h" +#include "assets/objects/object_snowman/object_snowman.h" #define EN_SNOWMAN_GET_TYPE(thisx) ((thisx)->params) #define EN_SNOWMAN_GET_ATTACK_RANGE(thisx) (((thisx)->params >> 8) & 0xFF) diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c index c82fdd77b..f0c30cf2d 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -5,7 +5,7 @@ */ #include "z_en_snowwd.h" -#include "objects/object_snowwd/object_snowwd.h" +#include "assets/objects/object_snowwd/object_snowwd.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index b1da3c067..c940a6610 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -5,9 +5,9 @@ */ #include "z_en_sob1.h" -#include "objects/object_mastergolon/object_mastergolon.h" -#include "objects/object_masterzoora/object_masterzoora.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_mastergolon/object_mastergolon.h" +#include "assets/objects/object_masterzoora/object_masterzoora.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h index 0d23aaf7c..ccfcf39ca 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h @@ -3,9 +3,9 @@ #include "global.h" #include "overlays/actors/ovl_En_GirlA/z_en_girla.h" -#include "objects/object_rsn/object_rsn.h" -#include "objects/object_zo/object_zo.h" -#include "objects/object_oF1d_map/object_oF1d_map.h" +#include "assets/objects/object_rsn/object_rsn.h" +#include "assets/objects/object_zo/object_zo.h" +#include "assets/objects/object_oF1d_map/object_oF1d_map.h" #define ENSOB1_LIMB_MAX MAX(MAX((s32)ZORA_LIMB_MAX, (s32)BOMB_SHOPKEEPER_LIMB_MAX), (s32)GORON_LIMB_MAX) diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 0e429da99..1e691a80a 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -5,7 +5,7 @@ */ #include "z_en_ssh.h" -#include "objects/object_st/object_st.h" +#include "assets/objects/object_st/object_st.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h index b587a01e9..8309dda77 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h @@ -2,7 +2,7 @@ #define Z_EN_SSH_H #include "global.h" -#include "objects/object_ssh/object_ssh.h" +#include "assets/objects/object_ssh/object_ssh.h" #include "overlays/actors/ovl_En_Si/z_en_si.h" #include "overlays/actors/ovl_En_Sth/z_en_sth.h" diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 5bd4464fc..34da1ce75 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -6,7 +6,7 @@ #include "z_en_st.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS \ (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_4000 | \ diff --git a/src/overlays/actors/ovl_En_St/z_en_st.h b/src/overlays/actors/ovl_En_St/z_en_st.h index 1c8b4059f..03f5eb311 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.h +++ b/src/overlays/actors/ovl_En_St/z_en_st.h @@ -2,7 +2,7 @@ #define Z_EN_ST_H #include "global.h" -#include "objects/object_st/object_st.h" +#include "assets/objects/object_st/object_st.h" struct EnSt; diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 21697d092..de9584419 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -39,7 +39,7 @@ ActorInit En_Sth_InitVars = { /**/ NULL, }; -#include "overlays/ovl_En_Sth/ovl_En_Sth.c" +#include "assets/overlays/ovl_En_Sth/ovl_En_Sth.c" static ColliderCylinderInit sCylinderInit = { { diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.h b/src/overlays/actors/ovl_En_Sth/z_en_sth.h index 059ae8c76..c04434e8a 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.h +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.h @@ -3,9 +3,9 @@ #include "global.h" #include "overlays/actors/ovl_En_Si/z_en_si.h" -#include "objects/object_sth/object_sth.h" -#include "objects/object_ahg/object_ahg.h" -#include "objects/object_mask_truth/object_mask_truth.h" +#include "assets/objects/object_sth/object_sth.h" +#include "assets/objects/object_ahg/object_ahg.h" +#include "assets/objects/object_mask_truth/object_mask_truth.h" struct EnSth; diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c index 3fc031889..5b22b6175 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c @@ -30,7 +30,7 @@ ActorInit En_Sth2_InitVars = { /**/ NULL, }; -#include "overlays/ovl_En_Sth2/ovl_En_Sth2.c" +#include "assets/overlays/ovl_En_Sth2/ovl_En_Sth2.c" void EnSth2_Init(Actor* thisx, PlayState* play) { EnSth2* this = THIS; diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h index 9375532b4..f3b916fe9 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h @@ -2,7 +2,7 @@ #define Z_EN_STH2_H #include "global.h" -#include "objects/object_sth/object_sth.h" +#include "assets/objects/object_sth/object_sth.h" struct EnSth2; diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h index b27d18638..cd00a6aee 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h @@ -2,7 +2,7 @@ #define Z_EN_STOP_HEISHI_H #include "global.h" -#include "objects/object_sdn/object_sdn.h" +#include "assets/objects/object_sdn/object_sdn.h" struct EnStopheishi; diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index db69575bc..76a95dcd0 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -5,7 +5,7 @@ */ #include "z_en_stream.h" -#include "objects/object_stream/object_stream.h" +#include "assets/objects/object_stream/object_stream.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h index 7a9913073..bfb87a2cf 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h @@ -2,7 +2,7 @@ #define Z_EN_SUTTARI_H #include "global.h" -#include "objects/object_boj/object_boj.h" +#include "assets/objects/object_boj/object_boj.h" #include "overlays/actors/ovl_En_Fsn/z_en_fsn.h" struct EnSuttari; diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h index 7fd75f9cd..92b276aca 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h @@ -2,7 +2,7 @@ #define Z_EN_SW_H #include "global.h" -#include "objects/object_st/object_st.h" +#include "assets/objects/object_st/object_st.h" struct EnSw; diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h index fd9a679d8..3f79faaac 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h @@ -2,7 +2,7 @@ #define Z_EN_SYATEKI_CROW_H #include "global.h" -#include "objects/object_crow/object_crow.h" +#include "assets/objects/object_crow/object_crow.h" #define SG_GUAY_GET_WAIT_MOD(thisx) ((thisx)->params & 0xF) #define SG_GUAY_GET_SPEED_MOD(thisx) (((thisx)->params & 0xF0) >> 4) diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h index 2a103aa98..d803e1959 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h @@ -2,7 +2,7 @@ #define Z_EN_SYATEKI_DEKUNUTS_H #include "global.h" -#include "objects/object_dekunuts/object_dekunuts.h" +#include "assets/objects/object_dekunuts/object_dekunuts.h" #define SG_DEKU_GET_TYPE(thisx) ((thisx)->params & 0xF) #define SG_DEKU_GET_INDEX(thisx) (((thisx)->params & 0xF0) >> 4) diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h index 2f6fe13f5..abd665fd2 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h @@ -2,7 +2,7 @@ #define Z_EN_SYATEKI_MAN_H #include "global.h" -#include "objects/object_shn/object_shn.h" +#include "assets/objects/object_shn/object_shn.h" #include "overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h" struct EnSyatekiMan; diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h index 72be15406..3574f7ca1 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h @@ -2,7 +2,7 @@ #define Z_EN_SYATEKI_OKUTA_H #include "global.h" -#include "objects/object_okuta/object_okuta.h" +#include "assets/objects/object_okuta/object_okuta.h" typedef enum { /* 0 */ SG_OCTO_TYPE_NONE, diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h index 06057d6b4..f91638e6b 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h @@ -2,7 +2,7 @@ #define Z_EN_SYATEKI_WF_H #include "global.h" -#include "objects/object_wf/object_wf.h" +#include "assets/objects/object_wf/object_wf.h" #define SG_WOLFOS_GET_POINT_TO_HOWL(thisx) (((thisx)->params & 0xF0) >> 4) #define SG_WOLFOS_GET_INDEX(thisx) (((thisx)->params & 0xFF00) >> 8) diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.c b/src/overlays/actors/ovl_En_Tab/z_en_tab.c index 858a15a14..67bf41189 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.c +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -5,8 +5,8 @@ */ #include "z_en_tab.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_tab/object_tab.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_tab/object_tab.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h index 3124097de..66fdc6f56 100644 --- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h @@ -2,7 +2,7 @@ #define Z_EN_TAKARAYA_H #include "global.h" -#include "objects/object_bg/object_bg.h" +#include "assets/objects/object_bg/object_bg.h" struct EnTakaraya; diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h index ccb141112..ba77610bd 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h @@ -2,7 +2,7 @@ #define Z_EN_TALK_GIBUD_H #include "global.h" -#include "objects/object_rd/object_rd.h" +#include "assets/objects/object_rd/object_rd.h" #define EN_TALK_GIBUD_REQUESTED_ITEM_INDEX(thisx) ((thisx)->params & 0xF) #define EN_TALK_GIBUD_GET_SWITCH_FLAG(thisx) (((thisx)->params & 0xFF0) >> 4) diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c index 89b4bda5c..a08e6a706 100644 --- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c @@ -32,7 +32,7 @@ ActorInit En_Tanron1_InitVars = { static s32 sPad = 0; -#include "overlays/ovl_En_Tanron1/ovl_En_Tanron1.c" +#include "assets/overlays/ovl_En_Tanron1/ovl_En_Tanron1.c" void EnTanron1_Init(Actor* thisx, PlayState* play) { EnTanron1* this = THIS; diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c index 808a89adf..24cd267b3 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -7,8 +7,8 @@ #include "prevent_bss_reordering.h" #include "z_en_tanron2.h" #include "overlays/actors/ovl_Boss_04/z_boss_04.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_boss04/object_boss04.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_boss04/object_boss04.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c index 80d12217a..f5b74739e 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -6,7 +6,7 @@ #include "z_en_tanron3.h" #include "overlays/actors/ovl_Boss_03/z_boss_03.h" -#include "objects/object_boss03/object_boss03.h" +#include "assets/objects/object_boss03/object_boss03.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h index 8859de6a4..8c26f1650 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h @@ -2,7 +2,7 @@ #define Z_EN_TANRON3_H #include "global.h" -#include "objects/object_boss03/object_boss03.h" +#include "assets/objects/object_boss03/object_boss03.h" struct EnTanron3; diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c index 59070ede4..609f348b7 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -21,8 +21,8 @@ */ #include "z_en_tanron5.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_boss02/object_boss02.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_boss02/object_boss02.h" #include "overlays/actors/ovl_Boss_02/z_boss_02.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index 4bef57063..6c7492031 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -5,7 +5,7 @@ */ #include "z_en_test.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c index bedbb3d08..d60c5b5fe 100644 --- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c @@ -5,12 +5,12 @@ */ #include "z_en_test2.h" -#include "objects/object_dekucity_ana_obj/object_dekucity_ana_obj.h" -#include "objects/object_sichitai_obj/object_sichitai_obj.h" -#include "objects/object_yukimura_obj/object_yukimura_obj.h" -#include "objects/object_hakugin_obj/object_hakugin_obj.h" -#include "objects/object_meganeana_obj/object_meganeana_obj.h" -#include "objects/object_haka_obj/object_haka_obj.h" +#include "assets/objects/object_dekucity_ana_obj/object_dekucity_ana_obj.h" +#include "assets/objects/object_sichitai_obj/object_sichitai_obj.h" +#include "assets/objects/object_yukimura_obj/object_yukimura_obj.h" +#include "assets/objects/object_hakugin_obj/object_hakugin_obj.h" +#include "assets/objects/object_meganeana_obj/object_meganeana_obj.h" +#include "assets/objects/object_haka_obj/object_haka_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_REACT_TO_LENS) diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index 5eadc10fb..3c36634e8 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -8,10 +8,10 @@ #include "z64malloc.h" -#include "objects/object_test3/object_test3.h" +#include "assets/objects/object_test3/object_test3.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_mask_ki_tan/object_mask_ki_tan.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_mask_ki_tan/object_mask_ki_tan.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_CAN_PRESS_SWITCH) diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c index b608e02cc..ef083e16f 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -10,7 +10,7 @@ #include "z64malloc.h" #include "z64quake.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_200000 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index b96b8d8b7..b656921d1 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -6,7 +6,7 @@ #include "prevent_bss_reordering.h" #include "z_en_test7.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_100000 | ACTOR_FLAG_200000 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 702bb8dbf..34257a6b3 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -5,7 +5,7 @@ */ #include "z_en_tg.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.h b/src/overlays/actors/ovl_En_Tg/z_en_tg.h index ca67624c1..9c0da4f26 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.h +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h @@ -2,7 +2,7 @@ #define Z_EN_TG_H #include "global.h" -#include "objects/object_mu/object_mu.h" +#include "assets/objects/object_mu/object_mu.h" struct EnTg; diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h index bbe354848..fb79f8037 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h @@ -2,7 +2,7 @@ #define Z_EN_THIEFBIRD_H #include "global.h" -#include "objects/object_thiefbird/object_thiefbird.h" +#include "assets/objects/object_thiefbird/object_thiefbird.h" struct EnThiefbird; diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h index a4902744a..69577c708 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h @@ -2,7 +2,7 @@ #define Z_EN_TITE_H #include "global.h" -#include "objects/object_tite/object_tite.h" +#include "assets/objects/object_tite/object_tite.h" struct EnTite; diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h index b6d2b12a0..302d7674a 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -2,7 +2,7 @@ #define Z_EN_TK_H #include "global.h" -#include "objects/object_tk/object_tk.h" +#include "assets/objects/object_tk/object_tk.h" struct EnTk; diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 0c7edc55c..a6b9a9d32 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -5,7 +5,7 @@ */ #include "z_en_torch2.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.h b/src/overlays/actors/ovl_En_Toto/z_en_toto.h index 11578cd23..0ee203aa7 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.h +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.h @@ -2,7 +2,7 @@ #define Z_EN_TOTO_H #include "global.h" -#include "objects/object_zm/object_zm.h" +#include "assets/objects/object_zm/object_zm.h" struct EnToto; diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index 4458991ea..66d261f58 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -5,8 +5,8 @@ */ #include "z_en_trt.h" -#include "objects/object_trt/object_trt.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_trt/object_trt.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c index fe9ac500a..65cf4f2e3 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -5,7 +5,7 @@ */ #include "z_en_trt2.h" -#include "objects/object_trt/object_trt.h" +#include "assets/objects/object_trt/object_trt.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.c b/src/overlays/actors/ovl_En_Tru/z_en_tru.c index 243b0744a..15774c9af 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -5,7 +5,7 @@ */ #include "z_en_tru.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) @@ -130,7 +130,7 @@ ActorInit En_Tru_InitVars = { /**/ EnTru_Draw, }; -#include "overlays/ovl_En_Tru/ovl_En_Tru.c" +#include "assets/overlays/ovl_En_Tru/ovl_En_Tru.c" static Vec3f D_80A8B250 = { 0.0f, 0.02f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.h b/src/overlays/actors/ovl_En_Tru/z_en_tru.h index b420624ce..59b6d0112 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.h +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.h @@ -2,7 +2,7 @@ #define Z_EN_TRU_H #include "global.h" -#include "objects/object_tru/object_tru.h" +#include "assets/objects/object_tru/object_tru.h" struct EnTru; diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h index d25d54a24..d4c9f9446 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h @@ -2,7 +2,7 @@ #define Z_EN_TRU_MT_H #include "global.h" -#include "objects/object_tru/object_tru.h" +#include "assets/objects/object_tru/object_tru.h" struct EnTruMt; diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c index 438257575..12aaa8e39 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -6,7 +6,7 @@ #include "z_en_tsn.h" #include "z64snap.h" -#include "objects/object_tsn/object_tsn.h" +#include "assets/objects/object_tsn/object_tsn.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 9a65105b6..fdd4dc820 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -5,7 +5,7 @@ */ #include "z_en_tubo_trap.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.c b/src/overlays/actors/ovl_En_Twig/z_en_twig.c index 54d717ba9..d9eb2a629 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.c +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -4,7 +4,7 @@ * Description: Beaver Race Ring */ #include "z_en_twig.h" -#include "objects/object_twig/object_twig.h" +#include "assets/objects/object_twig/object_twig.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 469568c83..a9d8a38ec 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -6,8 +6,8 @@ #include "z_en_vm.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_vm/object_vm.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_vm/object_vm.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_400) diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 4300fd1ab..b10487b07 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_400) diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h index 383d6d4ca..89b4e1569 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h @@ -2,7 +2,7 @@ #define Z_EN_WALLMAS_H #include "global.h" -#include "objects/object_wallmaster/object_wallmaster.h" +#include "assets/objects/object_wallmaster/object_wallmaster.h" #define WALLMASTER_GET_TYPE(thisx) ((thisx)->params) #define WALLMASTER_GET_SWITCH_FLAG(thisx) (((thisx)->params >> 8) & 0xFF) diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c index 188180499..0e48e16ab 100644 --- a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c +++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c @@ -5,7 +5,7 @@ */ #include "z_en_warp_uzu.h" -#include "objects/object_warp_uzu/object_warp_uzu.h" +#include "assets/objects/object_warp_uzu/object_warp_uzu.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index b22bdc5de..ec591a3e1 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -6,7 +6,7 @@ */ #include "z_en_warp_tag.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_10 | ACTOR_FLAG_2000000 | ACTOR_FLAG_CANT_LOCK_ON) diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c index 2f15d0840..b8af3e17a 100644 --- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c @@ -14,8 +14,8 @@ #include "z_en_water_effect.h" #include "overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h" -#include "objects/object_water_effect/object_water_effect.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_water_effect/object_water_effect.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h index 1d479fc77..810b4cc6c 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h @@ -2,7 +2,7 @@ #define Z_EN_WDHAND_H #include "global.h" -#include "objects/object_wdhand/object_wdhand.h" +#include "assets/objects/object_wdhand/object_wdhand.h" struct EnWdhand; diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h index 6e9db0be1..74ab13786 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h @@ -2,7 +2,7 @@ #define Z_EN_WF_H #include "global.h" -#include "objects/object_wf/object_wf.h" +#include "assets/objects/object_wf/object_wf.h" struct EnWf; diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c index adc043d39..6c38bde41 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -5,7 +5,7 @@ */ #include "z_en_wiz.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h" diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h index ea17a254d..e7d729e7a 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h @@ -2,7 +2,7 @@ #define Z_EN_WIZ_H #include "global.h" -#include "objects/object_wiz/object_wiz.h" +#include "assets/objects/object_wiz/object_wiz.h" #define EN_WIZ_GET_SWITCH_FLAG(thisx) ((thisx)->params & 0x7F) #define EN_WIZ_GET_TYPE(thisx) (((thisx)->params >> 8) & 0xFF) diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c index 134dbeb51..a5c5f2c76 100644 --- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c @@ -5,7 +5,7 @@ */ #include "z_en_wiz_brock.h" -#include "objects/object_wiz/object_wiz.h" +#include "assets/objects/object_wiz/object_wiz.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_CANT_LOCK_ON) diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c index 29d2a4a3e..7a62fe244 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -6,7 +6,7 @@ #include "z_en_wiz_fire.h" #include "overlays/actors/ovl_En_Wiz/z_en_wiz.h" -#include "objects/object_wiz/object_wiz.h" +#include "assets/objects/object_wiz/object_wiz.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_CANT_LOCK_ON) diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 9b35d6e7c..3c14684fc 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -6,7 +6,7 @@ #include "prevent_bss_reordering.h" #include "z_en_wood02.h" -#include "objects/object_wood02/object_wood02.h" +#include "assets/objects/object_wood02/object_wood02.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c index c003f0cc2..50761af63 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -5,7 +5,7 @@ */ #include "z_en_yb.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.h b/src/overlays/actors/ovl_En_Yb/z_en_yb.h index 4728ef44e..83608a5c1 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.h +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.h @@ -2,7 +2,7 @@ #define Z_EN_YB_H #include "global.h" -#include "objects/object_yb/object_yb.h" +#include "assets/objects/object_yb/object_yb.h" struct EnYb; diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index ab9e0f9ef..e8ffaab40 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -5,7 +5,7 @@ */ #include "z_en_zl4.h" -#include "objects/object_stk/object_stk.h" +#include "assets/objects/object_stk/object_stk.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/src/overlays/actors/ovl_En_Zo/z_en_zo.h index db620def0..ddbef2cf0 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.h +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.h @@ -2,7 +2,7 @@ #define Z_EN_ZO_H #include "global.h" -#include "objects/object_zo/object_zo.h" +#include "assets/objects/object_zo/object_zo.h" struct EnZo; diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c index 9482385f9..bb398b8a6 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -5,7 +5,7 @@ */ #include "z_en_zob.h" -#include "objects/object_zob/object_zob.h" +#include "assets/objects/object_zob/object_zob.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c index 46a160da8..62728ba17 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -5,7 +5,7 @@ */ #include "z_en_zog.h" -#include "objects/object_zog/object_zog.h" +#include "assets/objects/object_zog/object_zog.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c index ca502b27f..36b00032d 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -5,7 +5,7 @@ */ #include "z_en_zoraegg.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h index a74c5a4c8..2c3787968 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h @@ -2,7 +2,7 @@ #define Z_EN_ZORAEGG_H #include "global.h" -#include "objects/object_zoraegg/object_zoraegg.h" +#include "assets/objects/object_zoraegg/object_zoraegg.h" struct EnZoraegg; diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.h b/src/overlays/actors/ovl_En_Zos/z_en_zos.h index f761a9bc5..878bc6fa2 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.h +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.h @@ -2,7 +2,7 @@ #define Z_EN_ZOS_H #include "global.h" -#include "objects/object_zos/object_zos.h" +#include "assets/objects/object_zos/object_zos.h" struct EnZos; diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c index 9bbd3c817..0d385b471 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -6,7 +6,7 @@ #include "z_en_zot.h" #include "z64snap.h" -#include "objects/object_zo/object_zo.h" +#include "assets/objects/object_zo/object_zo.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.h b/src/overlays/actors/ovl_En_Zov/z_en_zov.h index c228cab16..7c7aa01a3 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.h +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.h @@ -3,7 +3,7 @@ #include "global.h" #include "z64snap.h" -#include "objects/object_zov/object_zov.h" +#include "assets/objects/object_zov/object_zov.h" struct EnZov; diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c index 3ccbf9259..e85d498a8 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -5,7 +5,7 @@ */ #include "z_en_zow.h" -#include "objects/object_zo/object_zo.h" +#include "assets/objects/object_zo/object_zo.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index 9a86b8277..c7427913f 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -5,7 +5,7 @@ */ #include "z_item_b_heart.h" -#include "objects/object_gi_hearts/object_gi_hearts.h" +#include "assets/objects/object_gi_hearts/object_gi_hearts.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 0dbebc240..e0357ce64 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -6,7 +6,7 @@ */ #include "z_mir_ray.h" -#include "objects/object_mir_ray/object_mir_ray.h" +#include "assets/objects/object_mir_ray/object_mir_ray.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c index 4346a2506..e861389f5 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -5,7 +5,7 @@ */ #include "z_mir_ray3.h" -#include "objects/object_mir_ray/object_mir_ray.h" +#include "assets/objects/object_mir_ray/object_mir_ray.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c index 2ff64cb2c..b2d5bff7d 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -5,7 +5,7 @@ */ #include "z_obj_aqua.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c index 47489bd78..872b50cd1 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -5,7 +5,7 @@ */ #include "z_obj_armos.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_CAN_PRESS_SWITCH) diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h index af3b31338..0f0d5e6bc 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h @@ -2,7 +2,7 @@ #define Z_OBJ_ARMOS_H #include "global.h" -#include "objects/object_am/object_am.h" +#include "assets/objects/object_am/object_am.h" struct ObjArmos; diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index f46710fb2..be9b1e1ee 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -5,8 +5,8 @@ */ #include "z_obj_bean.h" -#include "objects/object_mamenoki/object_mamenoki.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_mamenoki/object_mamenoki.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_400000) diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c index 2a3e7d3fa..20324a2ec 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -5,7 +5,7 @@ */ #include "z_obj_bell.h" -#include "objects/object_f52_obj/object_f52_obj.h" +#include "assets/objects/object_f52_obj/object_f52_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c index f9fedda43..7d081c392 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -7,7 +7,7 @@ #include "z_obj_bigicicle.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "objects/object_bigicicle/object_bigicicle.h" +#include "assets/objects/object_bigicicle/object_bigicicle.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c index c701706a8..625ded811 100644 --- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c @@ -5,7 +5,7 @@ */ #include "z_obj_boat.h" -#include "objects/object_kaizoku_obj/object_kaizoku_obj.h" +#include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 0c454d1df..8159637b6 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -5,7 +5,7 @@ */ #include "z_obj_bombiwa.h" -#include "objects/object_bombiwa/object_bombiwa.h" +#include "assets/objects/object_bombiwa/object_bombiwa.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c index f346ad98b..d847f2288 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -1,7 +1,7 @@ #include "z_obj_boyo.h" #include "overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/object_boyo/object_boyo.h" +#include "assets/objects/object_boyo/object_boyo.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c index 1d95de83e..522b24521 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -10,9 +10,9 @@ */ #include "z_obj_chan.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_obj_chan/object_obj_chan.h" -#include "objects/object_tsubo/object_tsubo.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_obj_chan/object_obj_chan.h" +#include "assets/objects/object_tsubo/object_tsubo.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c index 40d7d3c2a..c4011982f 100644 --- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c @@ -6,7 +6,7 @@ #include "z_obj_chikuwa.h" #include "z64quake.h" -#include "objects/object_d_lift/object_d_lift.h" +#include "assets/objects/object_d_lift/object_d_lift.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 67bd2fd2d..419aa371c 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -5,7 +5,7 @@ */ #include "z_obj_comb.h" -#include "objects/object_comb/object_comb.h" +#include "assets/objects/object_comb/object_comb.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h index 986a85769..d873c0c63 100644 --- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h @@ -2,7 +2,7 @@ #define Z_OBJ_DANPEILIFT_H #include "global.h" -#include "objects/object_obj_danpeilift/object_obj_danpeilift.h" +#include "assets/objects/object_obj_danpeilift/object_obj_danpeilift.h" struct ObjDanpeilift; diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c index 9c6df1ca5..03be64af4 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -6,7 +6,7 @@ #include "z_obj_dhouse.h" #include "z64quake.h" -#include "objects/object_dhouse/object_dhouse.h" +#include "assets/objects/object_dhouse/object_dhouse.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_400000) diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c index bc3fd4d1f..cfa29a035 100644 --- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c @@ -5,7 +5,7 @@ */ #include "z_obj_dinner.h" -#include "objects/object_obj_dinner/object_obj_dinner.h" +#include "assets/objects/object_obj_dinner/object_obj_dinner.h" #define FLAGS (ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c index 8edc51347..8045a2409 100644 --- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c @@ -5,7 +5,7 @@ */ #include "z_obj_driftice.h" -#include "objects/object_driftice/object_driftice.h" +#include "assets/objects/object_driftice/object_driftice.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c index ec8b5e60f..6bf05792d 100644 --- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c @@ -5,7 +5,7 @@ */ #include "z_obj_ending.h" -#include "objects/object_ending_obj/object_ending_obj.h" +#include "assets/objects/object_ending_obj/object_ending_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c index 4326d7077..55ef173c8 100644 --- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -5,7 +5,7 @@ */ #include "z_obj_entotu.h" -#include "objects/object_f53_obj/object_f53_obj.h" +#include "assets/objects/object_f53_obj/object_f53_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) @@ -28,7 +28,7 @@ ActorInit Obj_Entotu_InitVars = { /**/ ObjEntotu_Draw, }; -#include "overlays/ovl_Obj_Entotu/ovl_Obj_Entotu.c" +#include "assets/overlays/ovl_Obj_Entotu/ovl_Obj_Entotu.c" s32 func_80A34700(s16 minutes) { s32 ret = 0; diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h index 6c8734c85..fafc4fd52 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h @@ -2,7 +2,7 @@ #define Z_OBJ_ETCETERA_H #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define DEKU_FLOWER_TYPE(thisx) (((thisx)->params & 0xFF80) >> 7) #define DEKU_FLOWER_PARAMS(type) (((type) << 7) & 0xFF80) diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c index 3df716985..e4a0286e5 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -5,7 +5,7 @@ */ #include "z_obj_fireshield.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c index a794c8cd0..1fa986f5e 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -4,7 +4,7 @@ * Description: Breakable Pot With Grass */ #include "z_obj_flowerpot.h" -#include "objects/object_flowerpot/object_flowerpot.h" +#include "assets/objects/object_flowerpot/object_flowerpot.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c index a8f368773..e3dbcdabb 100644 --- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c @@ -5,7 +5,7 @@ */ #include "z_obj_funen.h" -#include "objects/object_funen/object_funen.h" +#include "assets/objects/object_funen/object_funen.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c index 47648a585..da8e2afdf 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -5,7 +5,7 @@ */ #include "z_obj_ghaka.h" -#include "objects/object_ghaka/object_ghaka.h" +#include "assets/objects/object_ghaka/object_ghaka.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c index 1cf210772..8e8bae47b 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -8,7 +8,7 @@ #include "z_obj_grass.h" #include "overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) @@ -24,7 +24,7 @@ f32 sNearestGrassGroupsDist[OBJ_GRASS_NEAREST_GROUP_MAX]; ObjGrassElement* sNearestGrassElements[OBJ_GRASS_NEAREST_ELEM_MAX]; f32 sNearestGrassElementsDistSq[OBJ_GRASS_NEAREST_ELEM_MAX]; -#include "overlays/ovl_Obj_Grass/ovl_Obj_Grass.c" +#include "assets/overlays/ovl_Obj_Grass/ovl_Obj_Grass.c" ActorInit Obj_Grass_InitVars = { /**/ ACTOR_OBJ_GRASS, diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c index 51846d51d..9a01514f9 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c @@ -5,8 +5,8 @@ */ #include "z_obj_grass_carry.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_Obj_Grass/z_obj_grass.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_800000) diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c index 3c3a2d8bc..e389ffbc2 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -5,7 +5,7 @@ */ #include "z_obj_hakaisi.h" -#include "objects/object_hakaisi/object_hakaisi.h" +#include "assets/objects/object_hakaisi/object_hakaisi.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index c49308414..1a2abd0d2 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -5,7 +5,7 @@ */ #include "z_obj_hamishi.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index d0be9cc36..28909fa79 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -5,7 +5,7 @@ */ #include "z_obj_hana.h" -#include "objects/object_hana/object_hana.h" +#include "assets/objects/object_hana/object_hana.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c index cb256ffc2..07c71c7fd 100644 --- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c @@ -5,7 +5,7 @@ */ #include "z_obj_hgdoor.h" -#include "objects/object_hgdoor/object_hgdoor.h" +#include "assets/objects/object_hgdoor/object_hgdoor.h" #define FLAGS (ACTOR_FLAG_100000) diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c index 55ed25d87..cc47cbdfc 100644 --- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c @@ -5,7 +5,7 @@ */ #include "z_obj_hsstump.h" -#include "objects/object_hsstump/object_hsstump.h" +#include "assets/objects/object_hsstump/object_hsstump.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 5d4036cfd..fd3c6be0d 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -5,7 +5,7 @@ */ #include "z_obj_hsblock.h" -#include "objects/object_d_hsblock/object_d_hsblock.h" +#include "assets/objects/object_d_hsblock/object_d_hsblock.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c index 071270739..ebeffcdc2 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -7,7 +7,7 @@ #include "z_obj_hugebombiwa.h" #include "z64quake.h" #include "z64rumble.h" -#include "objects/object_bombiwa/object_bombiwa.h" +#include "assets/objects/object_bombiwa/object_bombiwa.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c index e603aa563..417288d14 100644 --- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c @@ -5,7 +5,7 @@ */ #include "z_obj_hunsui.h" -#include "objects/object_hunsui/object_hunsui.h" +#include "assets/objects/object_hunsui/object_hunsui.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index b67e9b779..d8b46a7de 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -6,7 +6,7 @@ #include "z_obj_ice_poly.h" #include "overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c index 439ac4754..4d67d953b 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -5,7 +5,7 @@ */ #include "z_obj_iceblock.h" -#include "objects/object_ice_block/object_ice_block.h" +#include "assets/objects/object_ice_block/object_ice_block.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c index 77a8d739d..be77a6956 100644 --- a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c @@ -5,7 +5,7 @@ */ #include "z_obj_jg_gakki.h" -#include "objects/object_jg/object_jg.h" +#include "assets/objects/object_jg/object_jg.h" #define FLAGS (ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c index bd88548e2..7ded5ec38 100644 --- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c @@ -5,8 +5,8 @@ */ #include "z_obj_jgame_light.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 (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c index 7f57c73c8..5cf705091 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -5,7 +5,7 @@ */ #include "z_obj_kendo_kanban.h" -#include "objects/object_dora/object_dora.h" +#include "assets/objects/object_dora/object_dora.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c index dc51156e5..e2a1db184 100644 --- a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c @@ -5,7 +5,7 @@ */ #include "z_obj_kepn_koya.h" -#include "objects/object_kepn_koya/object_kepn_koya.h" +#include "assets/objects/object_kepn_koya/object_kepn_koya.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 96e7a2c5a..2d8ba5931 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -5,8 +5,8 @@ */ #include "z_obj_kibako.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#include "objects/object_kibako/object_kibako.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/object_kibako/object_kibako.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_CAN_PRESS_SWITCH) diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index e6a2f595e..132dc8192 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -5,7 +5,7 @@ */ #include "z_obj_kibako2.h" -#include "objects/object_kibako2/object_kibako2.h" +#include "assets/objects/object_kibako2/object_kibako2.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c index 7b76546eb..9003a88b0 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -5,7 +5,7 @@ */ #include "z_obj_kinoko.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c index da9650cb8..d3bfbc764 100644 --- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c @@ -5,7 +5,7 @@ */ #include "z_obj_kzsaku.h" -#include "objects/object_kzsaku/object_kzsaku.h" +#include "assets/objects/object_kzsaku/object_kzsaku.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 4a939bd6b..7f3640095 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -6,7 +6,7 @@ #include "z_obj_lift.h" #include "z64quake.h" -#include "objects/object_d_lift/object_d_lift.h" +#include "assets/objects/object_d_lift/object_d_lift.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c index b1f302dc4..5bfc80110 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -6,7 +6,7 @@ #include "z_obj_lightblock.h" #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" -#include "objects/object_lightblock/object_lightblock.h" +#include "assets/objects/object_lightblock/object_lightblock.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 0ad689847..f364d6536 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -5,7 +5,7 @@ */ #include "z_obj_lightswitch.h" -#include "objects/object_lightswitch/object_lightswitch.h" +#include "assets/objects/object_lightswitch/object_lightswitch.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c index efe0c5fe3..28b825222 100644 --- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c @@ -5,7 +5,7 @@ */ #include "z_obj_lupygamelift.h" -#include "objects/object_raillift/object_raillift.h" +#include "assets/objects/object_raillift/object_raillift.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c index a52fa9654..f1114870e 100644 --- a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c @@ -5,7 +5,7 @@ */ #include "z_obj_milk_bin.h" -#include "objects/object_obj_milk_bin/object_obj_milk_bin.h" +#include "assets/objects/object_obj_milk_bin/object_obj_milk_bin.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c index a15459003..ec4100d91 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -6,7 +6,7 @@ #include "z_obj_mine.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" -#include "objects/object_ny/object_ny.h" +#include "assets/objects/object_ny/object_ny.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c index e7452cc9d..b6aaf2815 100644 --- a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c @@ -5,7 +5,7 @@ */ #include "z_obj_moon_stone.h" -#include "objects/object_gi_reserve00/object_gi_reserve00.h" +#include "assets/objects/object_gi_reserve00/object_gi_reserve00.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_100000) diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index 421c4aa5c..a23ba8678 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -5,7 +5,7 @@ */ #include "z_obj_nozoki.h" -#include "objects/object_secom_obj/object_secom_obj.h" +#include "assets/objects/object_secom_obj/object_secom_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c index 6ca02f903..de7605756 100644 --- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c @@ -5,7 +5,7 @@ */ #include "z_obj_ocarinalift.h" -#include "objects/object_raillift/object_raillift.h" +#include "assets/objects/object_raillift/object_raillift.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 9fe6b8235..313e613f2 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -6,7 +6,7 @@ #include "z_obj_oshihiki.h" #include "overlays/actors/ovl_Obj_Switch/z_obj_switch.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c index 07672c352..9df32c7c5 100644 --- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c @@ -5,8 +5,8 @@ */ #include "z_obj_purify.h" -#include "objects/object_numa_obj/object_numa_obj.h" -#include "objects/object_dekucity_obj/object_dekucity_obj.h" +#include "assets/objects/object_numa_obj/object_numa_obj.h" +#include "assets/objects/object_dekucity_obj/object_dekucity_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c index d82f14d08..1986611f1 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -5,8 +5,8 @@ */ #include "z_obj_pzlblock.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#include "objects/object_secom_obj/object_secom_obj.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/object_secom_obj/object_secom_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_CAN_PRESS_SWITCH) diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c index 91e5370e8..68a8f5314 100644 --- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c @@ -5,7 +5,7 @@ */ #include "z_obj_raillift.h" -#include "objects/object_raillift/object_raillift.h" +#include "assets/objects/object_raillift/object_raillift.h" #include "overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c index dbf04b3be..156a5d0e3 100644 --- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c @@ -5,7 +5,7 @@ */ #include "z_obj_rotlift.h" -#include "objects/object_rotlift/object_rotlift.h" +#include "assets/objects/object_rotlift/object_rotlift.h" #include "overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c index 4ac6ce4b7..3a91489fb 100644 --- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c @@ -5,7 +5,7 @@ */ #include "z_obj_shutter.h" -#include "objects/object_f53_obj/object_f53_obj.h" +#include "assets/objects/object_f53_obj/object_f53_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c index d9a7b831f..62be89c8b 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -5,7 +5,7 @@ */ #include "z_obj_skateblock.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c index 73650e42c..9db27fcd6 100644 --- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -5,7 +5,7 @@ */ #include "z_obj_smork.h" -#include "objects/object_f53_obj/object_f53_obj.h" +#include "assets/objects/object_f53_obj/object_f53_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) @@ -28,7 +28,7 @@ ActorInit Obj_Smork_InitVars = { /**/ ObjSmork_Draw, }; -#include "overlays/ovl_Obj_Smork/ovl_Obj_Smork.c" +#include "assets/overlays/ovl_Obj_Smork/ovl_Obj_Smork.c" u8 func_80A3D680(s16 arg0) { u8 ret = 0; diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c index 7bc89c3b5..8eb52d403 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -5,8 +5,8 @@ */ #include "z_obj_snowball.h" -#include "objects/object_goroiwa/object_goroiwa.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_goroiwa/object_goroiwa.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c index 15e0f4534..3af81b608 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -5,7 +5,7 @@ */ #include "z_obj_snowball2.h" -#include "objects/object_goroiwa/object_goroiwa.h" +#include "assets/objects/object_goroiwa/object_goroiwa.h" #define FLAGS (ACTOR_FLAG_800000) diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c index ce1804e1a..f48ab22d6 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -5,7 +5,7 @@ */ #include "z_obj_spidertent.h" -#include "objects/object_spidertent/object_spidertent.h" +#include "assets/objects/object_spidertent/object_spidertent.h" #define FLAGS (ACTOR_FLAG_10000000) diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c index 6fa827bf1..d160682df 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -6,7 +6,7 @@ #include "z_obj_spinyroll.h" #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" -#include "objects/object_spinyroll/object_spinyroll.h" +#include "assets/objects/object_spinyroll/object_spinyroll.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index a34d8e6a8..78ba24bc7 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -7,7 +7,7 @@ #include "z_obj_switch.h" #include "z64rumble.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index d780ba3da..a771cb015 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -5,9 +5,9 @@ */ #include "z_obj_syokudai.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#include "objects/object_syokudai/object_syokudai.h" +#include "assets/objects/object_syokudai/object_syokudai.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_400) diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c index 3218c3050..067790f1a 100644 --- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c @@ -25,7 +25,7 @@ */ #include "z_obj_takaraya_wall.h" -#include "objects/object_takaraya_objects/object_takaraya_objects.h" +#include "assets/objects/object_takaraya_objects/object_takaraya_objects.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index b03e5bacb..436b06a5d 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -8,8 +8,8 @@ #include "overlays/actors/ovl_En_Sw/z_en_sw.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h" -#include "objects/object_taru/object_taru.h" -#include "objects/object_kibako2/object_kibako2.h" +#include "assets/objects/object_taru/object_taru.h" +#include "assets/objects/object_kibako2/object_kibako2.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c index b15eae065..2a16f5cfe 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -5,7 +5,7 @@ */ #include "z_obj_toge.h" -#include "objects/object_trap/object_trap.h" +#include "assets/objects/object_trap/object_trap.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c index 3da768fd9..b4eda1694 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c @@ -7,7 +7,7 @@ #include "z_obj_tokei_step.h" #include "z64quake.h" #include "z64rumble.h" -#include "objects/object_tokei_step/object_tokei_step.h" +#include "assets/objects/object_tokei_step/object_tokei_step.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_400000) diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c index 5f45b8e17..0a8f3171d 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c @@ -5,7 +5,7 @@ */ #include "z_obj_tokei_tobira.h" -#include "objects/object_tokei_tobira/object_tokei_tobira.h" +#include "assets/objects/object_tokei_tobira/object_tokei_tobira.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c index 02e0977f5..91cc14708 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c @@ -5,7 +5,7 @@ */ #include "z_obj_tokei_turret.h" -#include "objects/object_tokei_turret/object_tokei_turret.h" +#include "assets/objects/object_tokei_turret/object_tokei_turret.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 2abb3ead8..7f1be93d7 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -30,7 +30,7 @@ */ #include "z_obj_tokeidai.h" -#include "objects/object_obj_tokeidai/object_obj_tokeidai.h" +#include "assets/objects/object_obj_tokeidai/object_obj_tokeidai.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c index 8e3685dfc..24a746f86 100644 --- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -5,7 +5,7 @@ */ #include "z_obj_toudai.h" -#include "objects/object_f53_obj/object_f53_obj.h" +#include "assets/objects/object_f53_obj/object_f53_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c index 158880f5f..0fb6bd197 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -5,7 +5,7 @@ */ #include "z_obj_tree.h" -#include "objects/object_tree/object_tree.h" +#include "assets/objects/object_tree/object_tree.h" #define FLAGS (ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 3bf31dba9..6af4b9f5d 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -6,9 +6,9 @@ #include "z_obj_tsubo.h" #include "overlays/actors/ovl_En_Sw/z_en_sw.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#include "objects/object_tsubo/object_tsubo.h" -#include "objects/object_racetsubo/object_racetsubo.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/object_tsubo/object_tsubo.h" +#include "assets/objects/object_racetsubo/object_racetsubo.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_800000 | ACTOR_FLAG_CAN_PRESS_SWITCH) diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c index 1c68d972f..36c210976 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -8,7 +8,7 @@ #include "z64horse.h" #include "overlays/actors/ovl_En_In/z_en_in.h" #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.h b/src/overlays/actors/ovl_Obj_Um/z_obj_um.h index 0c6a7178e..5d889b7e0 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.h +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.h @@ -2,7 +2,7 @@ #define Z_OBJ_UM_H #include "global.h" -#include "objects/object_um/object_um.h" +#include "assets/objects/object_um/object_um.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" struct ObjUm; diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c index c22358416..f4f2f4ab3 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -5,7 +5,7 @@ */ #include "z_obj_usiyane.h" -#include "objects/object_obj_usiyane/object_obj_usiyane.h" +#include "assets/objects/object_obj_usiyane/object_obj_usiyane.h" #define FLAGS (ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c index 81cd33221..29b193597 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -5,7 +5,7 @@ */ #include "z_obj_visiblock.h" -#include "objects/object_visiblock/object_visiblock.h" +#include "assets/objects/object_visiblock/object_visiblock.h" #define FLAGS (ACTOR_FLAG_REACT_TO_LENS) diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c index 20d172b3e..7a5c90632 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -5,7 +5,7 @@ */ #include "z_obj_vspinyroll.h" -#include "objects/object_spinyroll/object_spinyroll.h" +#include "assets/objects/object_spinyroll/object_spinyroll.h" #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c index e139763f2..b8bf1b523 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -5,8 +5,8 @@ */ #include "z_obj_warpstone.h" -#include "objects/object_sek/object_sek.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_sek/object_sek.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c index 4ffd66c76..e61bf7a03 100644 --- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c @@ -5,7 +5,7 @@ */ #include "z_obj_wind.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c index 8866416c4..764b821b8 100644 --- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c @@ -5,7 +5,7 @@ */ #include "z_obj_y2lift.h" -#include "objects/object_kaizoku_obj/object_kaizoku_obj.h" +#include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c index 1a7408ea1..f3a378749 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -5,7 +5,7 @@ */ #include "z_obj_y2shutter.h" -#include "objects/object_kaizoku_obj/object_kaizoku_obj.h" +#include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c index 509ce32fc..d289c13c4 100644 --- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c @@ -5,7 +5,7 @@ */ #include "z_obj_yado.h" -#include "objects/object_yado_obj/object_yado_obj.h" +#include "assets/objects/object_yado_obj/object_yado_obj.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c index a40d7d514..84c8a54ff 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -5,7 +5,7 @@ */ #include "z_obj_yasi.h" -#include "objects/object_obj_yasi/object_obj_yasi.h" +#include "assets/objects/object_obj_yasi/object_obj_yasi.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index b5c60f60b..208bc7944 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -5,7 +5,7 @@ */ #include "z_object_kankyo.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_2000000) diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c index 0bf8d89d0..1d42dbc44 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c @@ -27,7 +27,7 @@ ActorInit Oceff_Wipe6_InitVars = { /**/ OceffWipe6_Draw, }; -#include "overlays/ovl_Oceff_Wipe6/ovl_Oceff_Wipe6.c" +#include "assets/overlays/ovl_Oceff_Wipe6/ovl_Oceff_Wipe6.c" void OceffWipe6_Init(Actor* thisx, PlayState* play) { OceffWipe6* this = THIS; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 5d4c76260..d3913b4de 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -39,13 +39,13 @@ #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" #include "overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_link_boy/object_link_boy.h" -#include "objects/object_link_goron/object_link_goron.h" -#include "objects/object_link_zora/object_link_zora.h" -#include "objects/object_link_nuts/object_link_nuts.h" -#include "objects/object_link_child/object_link_child.h" +#include "assets/objects/object_link_boy/object_link_boy.h" +#include "assets/objects/object_link_goron/object_link_goron.h" +#include "assets/objects/object_link_zora/object_link_zora.h" +#include "assets/objects/object_link_nuts/object_link_nuts.h" +#include "assets/objects/object_link_child/object_link_child.h" #define THIS ((Player*)thisx) |