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/effects | |
| parent | 19da273ca0d4a1b1e2f44a3fee0983a97c7558a0 (diff) | |
Remove assets from automatic includes (#1683)
Diffstat (limited to 'src/overlays/effects')
31 files changed, 31 insertions, 31 deletions
diff --git a/src/overlays/effects/ovl_Effect_En_Ice_Block/z_eff_en_ice_block.c b/src/overlays/effects/ovl_Effect_En_Ice_Block/z_eff_en_ice_block.c index 14db958dd..03764cc6e 100644 --- a/src/overlays/effects/ovl_Effect_En_Ice_Block/z_eff_en_ice_block.c +++ b/src/overlays/effects/ovl_Effect_En_Ice_Block/z_eff_en_ice_block.c @@ -6,7 +6,7 @@ */ #include "z_eff_en_ice_block.h" -#include "objects/object_ice_block/object_ice_block.h" +#include "assets/objects/object_ice_block/object_ice_block.h" #define PARAMS ((EffectEnIceBlockInitParams*)initParamsx) diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index b1472e55d..bd976d951 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_blast.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] #define rPrimColorG regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index c9565b968..5c65001c2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_bomb2.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] #define rTexIndex regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index 90c142829..c544c528a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_bubble.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] #define rVecAdjX regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index e7dc1eb8d..8ad5e6dc3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_d_fire.h" -#include "objects/object_dodongo/object_dodongo.h" +#include "assets/objects/object_dodongo/object_dodongo.h" #define rScale regs[0] #define rTexIndex regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index 556903ca1..bfa238d15 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_dead_db.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] #define rTexIndex regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index c9fa170df..10f6a9ad0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_dead_dd.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] #define rPrimColorR regs[2] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index 10aabf150..5504cc51d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_dead_ds.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] #define rTimer regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c index 60743c687..f1c2343f7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_dt_bubble.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] #define rPrimColorG regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index 22580fd81..91218e75e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_dust.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] #define rPrimColorG regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index d4dbbd4db..143af64e0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_en_fire.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScaleMax regs[0] #define rScale regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index dd0c9e263..b4620f865 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_en_ice.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rLifespan regs[0] #define rYaw regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index 8a511d130..acf4ed5e0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -6,7 +6,7 @@ */ #include "z_eff_ss_extra.h" -#include "objects/object_yabusame_point/object_yabusame_point.h" +#include "assets/objects/object_yabusame_point/object_yabusame_point.h" #define PARAMS ((EffectSsExtraInitParams*)initParamsx) diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index b4bb6479c..1d054c7ed 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -50,7 +50,7 @@ u32 EffectSsFhgFlash_Init(PlayState* play, u32 index, EffectSs* this, void* init return 1; } -#include "overlays/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash.c" +#include "assets/overlays/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash.c" void EffectSsFhgFlash_Draw(PlayState* play, u32 index, EffectSs* this) { s32 pad; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index 442b779ac..290e20461 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_fire_tail.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] #define rLifespan regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c index b41f35756..b96baed29 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_g_fire.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define PARAMS ((EffectSsGFireInitParams*)initParamsx) diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 597379229..7bc85d91d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_g_ripple.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rWaterBoxNum regs[0] #define rRadius regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index e80c02a11..50a3d0b4d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_g_spk.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] #define rPrimColorG regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c index d40174727..cd99ccdf4 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_g_splash.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" //! @bug the reuse of regs[11] means that EffectSs_DrawGEffect will treat the type as an object bank index // this ends up having no effect because the texture provided does not use segment 6 diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c index 521b6db54..ce7debca4 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_hahen.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPitch regs[0] #define rYaw regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.c index b290c05e4..122ffbb16 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_hitmark.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rTexIndex regs[0] #define rType regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index 29a35cf34..715036d88 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_ice_piece.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rLifespan regs[0] #define rYaw regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index ffd8c300a..c61eb071e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_ice_smoke.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rAlpha regs[0] #define rScale regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index 7b44feee8..9f0ff73a5 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_k_fire.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rAlpha regs[0] #define rScroll regs[2] diff --git a/src/overlays/effects/ovl_Effect_Ss_Kirakira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_Kirakira/z_eff_ss_kirakira.c index 4e8f11f5c..44e0ce714 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kirakira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kirakira/z_eff_ss_kirakira.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_kirakira.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rRotSpeed regs[0] #define rYaw regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index bc3020ed9..6b6a378a1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_lightning.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] #define rPrimColorG regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Sbn/z_eff_ss_sbn.c b/src/overlays/effects/ovl_Effect_Ss_Sbn/z_eff_ss_sbn.c index 8c7957a5c..4b4712128 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sbn/z_eff_ss_sbn.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sbn/z_eff_ss_sbn.c @@ -8,7 +8,7 @@ */ #include "z_eff_ss_sbn.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScrollStep regs[0] #define rScroll regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index 011e96104..26d5d45ef 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_sibuki.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] #define rPrimColorG regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index 773984c80..fa2e2849c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_solder_srch_ball.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rFlags regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index f3de09474..a4a5b4c20 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_stick.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define rObjectSlot regs[0] #define rYaw regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c index 1856ba6ac..e46f4203f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_stone1.h" -#include "objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/gameplay_keep/gameplay_keep.h" #define PARAMS ((EffectSsStone1InitParams*)initParamsx) |
