From b9ea1c19ab8c8f273cf8cddfc372dcb47106f1f3 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Tue, 10 Sep 2024 12:16:56 -0600 Subject: Remove assets from automatic includes (#1683) --- src/code/sys_initial_check.c | 4 +-- src/code/z_actor.c | 6 ++-- src/code/z_debug_display.c | 2 +- src/code/z_eff_blure.c | 2 +- src/code/z_eff_shield_particle.c | 2 +- src/code/z_eff_spark.c | 2 +- src/code/z_eff_tire_mark.c | 2 +- src/code/z_en_hy_code.c | 10 +++---- src/code/z_en_item00.c | 4 +-- src/code/z_fireobj.c | 2 +- src/code/z_inventory.c | 6 ++-- src/code/z_kankyo.c | 4 +-- src/code/z_lifemeter.c | 2 +- src/code/z_lights.c | 2 +- src/code/z_message.c | 2 +- src/code/z_parameter.c | 8 +++--- src/code/z_play_hireso.c | 4 +-- src/code/z_player_lib.c | 60 ++++++++++++++++++++-------------------- src/code/z_sub_s.c | 2 +- 19 files changed, 63 insertions(+), 63 deletions(-) (limited to 'src/code') diff --git a/src/code/sys_initial_check.c b/src/code/sys_initial_check.c index 59d34aed4..31650c780 100644 --- a/src/code/sys_initial_check.c +++ b/src/code/sys_initial_check.c @@ -14,8 +14,8 @@ #include "fault.h" #include "segment_symbols.h" -#include "misc/locerrmsg/locerrmsg.h" -#include "misc/memerrmsg/memerrmsg.h" +#include "assets/misc/locerrmsg/locerrmsg.h" +#include "assets/misc/memerrmsg/memerrmsg.h" #define LOCERRMSG_WIDTH 208 #define LOCERRMSG_HEIGHT 16 diff --git a/src/code/z_actor.c b/src/code/z_actor.c index fb640f0de..462a81661 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -42,9 +42,9 @@ struct Actor* D_801ED920; // 2 funcs. 1 out of z_actor #include "overlays/actors/ovl_En_Part/z_en_part.h" #include "overlays/actors/ovl_En_Box/z_en_box.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#include "objects/object_bdoor/object_bdoor.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" +#include "assets/objects/object_bdoor/object_bdoor.h" #define ACTOR_AUDIO_FLAG_SFX_ACTOR_POS_1 (1 << 0) #define ACTOR_AUDIO_FLAG_SFX_ACTOR_POS_2 (1 << 1) // identical behavior to ACTOR_AUDIO_FLAG_SFX_ACTOR_POS_1 diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index 63e8e91f6..e2ee3a4d6 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -43,7 +43,7 @@ DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, return sDebugObjectListHead; } -#include "code/debug_display/debug_display.c" +#include "assets/code/debug_display/debug_display.c" DebugDispObjectDrawFunc sDebugObjectDrawFuncTable[] = { DebugDisplay_DrawSpriteI8, DebugDisplay_DrawPolygon }; diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 3aa6e4050..13fe7dbe1 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -7,7 +7,7 @@ #include "z64effect_ss.h" #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) { EffectBlureElement* elem; diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index 64e55c0c7..46a6fa84d 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -5,7 +5,7 @@ #include "vt.h" #include "assets/code/eff_shield_particle/eff_shield_particle.c" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" void EffectShieldParticle_Init(void* thisx, void* initParamsx) { EffectShieldParticle* this = (EffectShieldParticle*)thisx; diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index 1347d6324..4ff2019c6 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -1,7 +1,7 @@ #include "z64eff_spark.h" #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" void EffectSpark_Init(void* thisx, void* initParamsx) { EffectSpark* this = (EffectSpark*)thisx; diff --git a/src/code/z_eff_tire_mark.c b/src/code/z_eff_tire_mark.c index 41e806a6c..f7d6c152b 100644 --- a/src/code/z_eff_tire_mark.c +++ b/src/code/z_eff_tire_mark.c @@ -1,7 +1,7 @@ #include "z64eff_tire_mark.h" #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f32 arg3, s16 angle, CollisionPoly* colPoly, s32 bgId) { diff --git a/src/code/z_en_hy_code.c b/src/code/z_en_hy_code.c index 28ba3734e..562849e65 100644 --- a/src/code/z_en_hy_code.c +++ b/src/code/z_en_hy_code.c @@ -5,11 +5,11 @@ #include "z_en_hy_code.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" -#include "objects/object_aob/object_aob.h" -#include "objects/object_bba/object_bba.h" -#include "objects/object_bji/object_bji.h" -#include "objects/object_boj/object_boj.h" -#include "objects/object_os_anime/object_os_anime.h" +#include "assets/objects/object_aob/object_aob.h" +#include "assets/objects/object_bba/object_bba.h" +#include "assets/objects/object_bji/object_bji.h" +#include "assets/objects/object_boj/object_boj.h" +#include "assets/objects/object_os_anime/object_os_anime.h" static AnimationInfoS sAnimationInfo[ENHY_ANIM_MAX] = { { &gMamamuYanUnusedIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENHY_ANIM_AOB_0 diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 421db8070..2d841a634 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1,7 +1,7 @@ #include "global.h" #include "overlays/actors/ovl_En_Elforg/z_en_elforg.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/object_gi_hearts/object_gi_hearts.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_gi_hearts/object_gi_hearts.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "overlays/actors/ovl_En_Elforg/z_en_elforg.h" diff --git a/src/code/z_fireobj.c b/src/code/z_fireobj.c index dd98ef8ea..3f50a2e68 100644 --- a/src/code/z_fireobj.c +++ b/src/code/z_fireobj.c @@ -1,6 +1,6 @@ #include "z_fireobj.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" ColliderCylinderInit sFireObjCollisionInit = { { diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c index d0b50a5be..f4d821b47 100644 --- a/src/code/z_inventory.c +++ b/src/code/z_inventory.c @@ -9,9 +9,9 @@ #include "z64save.h" #include "z64scene.h" -#include "interface/parameter_static/parameter_static.h" -#include "archives/icon_item_static/icon_item_static_yar.h" -#include "archives/icon_item_24_static/icon_item_24_static_yar.h" +#include "assets/interface/parameter_static/parameter_static.h" +#include "assets/archives/icon_item_static/icon_item_static_yar.h" +#include "assets/archives/icon_item_24_static/icon_item_24_static_yar.h" // Bit Flag array in which gBitFlags[n] is (1 << n) u32 gBitFlags[] = { diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 3a0d12670..16bf28e02 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -66,8 +66,8 @@ Gfx* sSkyboxStarsDList; #include "string.h" #include "sys_cfb.h" -#include "objects/gameplay_keep/gameplay_keep.h" -#include "objects/gameplay_field_keep/gameplay_field_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" // Data f32 sSandstormLerpScale = 0.0f; diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 54ad13dae..67e1e278a 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -5,7 +5,7 @@ #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" -#include "interface/parameter_static/parameter_static.h" +#include "assets/interface/parameter_static/parameter_static.h" s16 sHeartsPrimColors[3][3] = { { 255, 70, 50 }, { 255, 190, 0 }, { 100, 100, 255 } }; s16 sHeartsEnvColors[3][3] = { { 50, 40, 60 }, { 255, 0, 0 }, { 0, 0, 255 } }; diff --git a/src/code/z_lights.c b/src/code/z_lights.c index 81b4e47f3..1a4adeb8d 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -5,7 +5,7 @@ #include "z64.h" #include "functions.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" LightsBuffer sLightsBuffer; diff --git a/src/code/z_message.c b/src/code/z_message.c index 48bf47920..d423e347b 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -13,7 +13,7 @@ #include "z64shrink_window.h" #include "z64save.h" -#include "interface/parameter_static/parameter_static.h" +#include "assets/interface/parameter_static/parameter_static.h" u8 D_801C6A70 = 0; s16 sOcarinaButtonIndexBufPos = 0; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 05c2509d5..dcb3fb1dd 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -9,10 +9,10 @@ #include "z64view.h" #include "z64voice.h" -#include "archives/icon_item_static/icon_item_static_yar.h" -#include "interface/parameter_static/parameter_static.h" -#include "interface/do_action_static/do_action_static.h" -#include "misc/story_static/story_static.h" +#include "assets/archives/icon_item_static/icon_item_static_yar.h" +#include "assets/interface/parameter_static/parameter_static.h" +#include "assets/interface/do_action_static/do_action_static.h" +#include "assets/misc/story_static/story_static.h" #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" #include "overlays/actors/ovl_En_Mm3/z_en_mm3.h" diff --git a/src/code/z_play_hireso.c b/src/code/z_play_hireso.c index 18f9908c5..eb8e4831c 100644 --- a/src/code/z_play_hireso.c +++ b/src/code/z_play_hireso.c @@ -4,8 +4,8 @@ #include "z64bombers_notebook.h" #include "z64malloc.h" -#include "interface/schedule_static/schedule_static.h" -#include "archives/schedule_dma_static/schedule_dma_static_yar.h" +#include "assets/interface/schedule_static/schedule_static.h" +#include "assets/archives/schedule_dma_static/schedule_dma_static_yar.h" #define BOMBERS_NOTEBOOK_ENTRY_SIZE 3 #define BOMBERS_NOTEBOOK_ENTRY_MAX 10 diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index d69854d43..75a9867f6 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -6,40 +6,40 @@ #include "prevent_bss_reordering.h" #include "global.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" // Assets for each player form -#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" // Assets for each mask -#include "objects/object_mask_truth/object_mask_truth.h" -#include "objects/object_mask_kerfay/object_mask_kerfay.h" -#include "objects/object_mask_yofukasi/object_mask_yofukasi.h" -#include "objects/object_mask_rabit/object_mask_rabit.h" -#include "objects/object_mask_ki_tan/object_mask_ki_tan.h" -#include "objects/object_mask_json/object_mask_json.h" -#include "objects/object_mask_romerny/object_mask_romerny.h" -#include "objects/object_mask_zacho/object_mask_zacho.h" -#include "objects/object_mask_posthat/object_mask_posthat.h" -#include "objects/object_mask_meoto/object_mask_meoto.h" -#include "objects/object_mask_bigelf/object_mask_bigelf.h" -#include "objects/object_mask_gibudo/object_mask_gibudo.h" -#include "objects/object_mask_gero/object_mask_gero.h" -#include "objects/object_mask_dancer/object_mask_dancer.h" -#include "objects/object_mask_skj/object_mask_skj.h" -#include "objects/object_mask_stone/object_mask_stone.h" -#include "objects/object_mask_bree/object_mask_bree.h" -#include "objects/object_mask_bakuretu/object_mask_bakuretu.h" -#include "objects/object_mask_bu_san/object_mask_bu_san.h" -#include "objects/object_mask_kyojin/object_mask_kyojin.h" -#include "objects/object_mask_boy/object_mask_boy.h" -#include "objects/object_mask_goron/object_mask_goron.h" -#include "objects/object_mask_zora/object_mask_zora.h" -#include "objects/object_mask_nuts/object_mask_nuts.h" +#include "assets/objects/object_mask_truth/object_mask_truth.h" +#include "assets/objects/object_mask_kerfay/object_mask_kerfay.h" +#include "assets/objects/object_mask_yofukasi/object_mask_yofukasi.h" +#include "assets/objects/object_mask_rabit/object_mask_rabit.h" +#include "assets/objects/object_mask_ki_tan/object_mask_ki_tan.h" +#include "assets/objects/object_mask_json/object_mask_json.h" +#include "assets/objects/object_mask_romerny/object_mask_romerny.h" +#include "assets/objects/object_mask_zacho/object_mask_zacho.h" +#include "assets/objects/object_mask_posthat/object_mask_posthat.h" +#include "assets/objects/object_mask_meoto/object_mask_meoto.h" +#include "assets/objects/object_mask_bigelf/object_mask_bigelf.h" +#include "assets/objects/object_mask_gibudo/object_mask_gibudo.h" +#include "assets/objects/object_mask_gero/object_mask_gero.h" +#include "assets/objects/object_mask_dancer/object_mask_dancer.h" +#include "assets/objects/object_mask_skj/object_mask_skj.h" +#include "assets/objects/object_mask_stone/object_mask_stone.h" +#include "assets/objects/object_mask_bree/object_mask_bree.h" +#include "assets/objects/object_mask_bakuretu/object_mask_bakuretu.h" +#include "assets/objects/object_mask_bu_san/object_mask_bu_san.h" +#include "assets/objects/object_mask_kyojin/object_mask_kyojin.h" +#include "assets/objects/object_mask_boy/object_mask_boy.h" +#include "assets/objects/object_mask_goron/object_mask_goron.h" +#include "assets/objects/object_mask_zora/object_mask_zora.h" +#include "assets/objects/object_mask_nuts/object_mask_nuts.h" // Assets for other actors #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" diff --git a/src/code/z_sub_s.c b/src/code/z_sub_s.c index 1924dc87f..527602545 100644 --- a/src/code/z_sub_s.c +++ b/src/code/z_sub_s.c @@ -8,7 +8,7 @@ s16 sPathDayFlags[] = { 0x40, 0x20, 0x10, 8, 4, 2, 1, 0 }; -#include "code/sub_s/sub_s.c" +#include "assets/code/sub_s/sub_s.c" Vec3f gOneVec3f = { 1.0f, 1.0f, 1.0f }; -- cgit v1.2.3