diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 4 | ||||
| -rw-r--r-- | src/code/z_camera.c | 2 | ||||
| -rw-r--r-- | src/code/z_collision_check.c | 2 | ||||
| -rw-r--r-- | src/code/z_effect_soft_sprite_old_init.c | 72 | ||||
| -rw-r--r-- | src/code/z_en_item00.c | 4 | ||||
| -rw-r--r-- | src/code/z_horse.c | 2 | ||||
| -rw-r--r-- | src/code/z_onepointdemo.c | 2 | ||||
| -rw-r--r-- | src/code/z_scene_table.c | 2 | ||||
| -rw-r--r-- | src/code/z_skin_awb.c | 2 |
9 files changed, 46 insertions, 46 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 4fb43be5b..9d84d2a48 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -28,8 +28,8 @@ #include "save.h" #include "skin_matrix.h" -#include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h" -#include "overlays/actors/ovl_En_Part/z_en_part.h" +#include "src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h" +#include "src/overlays/actors/ovl_En_Part/z_en_part.h" #include "assets/objects/gameplay_keep/shadow_circle.h" #include "assets/objects/gameplay_keep/shadow_horse.h" diff --git a/src/code/z_camera.c b/src/code/z_camera.c index fb8b1ccf1..bce305788 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -24,7 +24,7 @@ #include "play_state.h" #include "player.h" #include "save.h" -#include "overlays/actors/ovl_En_Horse/z_en_horse.h" +#include "src/overlays/actors/ovl_En_Horse/z_en_horse.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ique-cn:64 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 791a3fca6..23c1a2286 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -13,7 +13,7 @@ #include "zelda_arena.h" #include "play_state.h" -#include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" +#include "src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" #include "z_lib.h" #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index c6ae48eb2..02ba2968d 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -12,42 +12,42 @@ #include "player.h" #include "skin_matrix.h" -#include "overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h" -#include "overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h" -#include "overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h" -#include "overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h" -#include "overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h" -#include "overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h" -#include "overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h" -#include "overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h" -#include "overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h" -#include "overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h" -#include "overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h" -#include "overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h" -#include "overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h" -#include "overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h" -#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#include "overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h" -#include "overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h" -#include "overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h" -#include "overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h" -#include "overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h" -#include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" -#include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" -#include "overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h" -#include "overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h" -#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h" -#include "overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h" -#include "overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h" -#include "overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h" -#include "overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h" -#include "overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h" -#include "overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h" -#include "overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h" -#include "overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h" -#include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" -#include "overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h" +#include "src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h" +#include "src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h" +#include "src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h" +#include "src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h" +#include "src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h" +#include "src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h" +#include "src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h" +#include "src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h" +#include "src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h" +#include "src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h" +#include "src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h" +#include "src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h" +#include "src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h" +#include "src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h" +#include "src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" +#include "src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h" +#include "src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h" +#include "src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h" +#include "src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h" +#include "src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h" +#include "src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" +#include "src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" +#include "src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h" +#include "src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h" +#include "src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" +#include "src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h" +#include "src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h" +#include "src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h" +#include "src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h" +#include "src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h" +#include "src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h" +#include "src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h" +#include "src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h" +#include "src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h" +#include "src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" +#include "src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h" static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 1fe2d0052..b135a4f63 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1,6 +1,6 @@ #include "z_en_item00.h" -#include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" +#include "src/overlays/actors/ovl_En_Elf/z_en_elf.h" +#include "src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #include "libc64/qrand.h" #include "attributes.h" diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 93eec4bd3..c9cf3b374 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -8,7 +8,7 @@ #include "play_state.h" #include "player.h" #include "save.h" -#include "overlays/actors/ovl_En_Horse/z_en_horse.h" +#include "src/overlays/actors/ovl_En_Horse/z_en_horse.h" /** * Tests if the player horse can be spawned diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 12915e9a8..49460f5a5 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -13,7 +13,7 @@ #include "play_state.h" #include "player.h" #include "save.h" -#include "overlays/actors/ovl_En_Sw/z_en_sw.h" +#include "src/overlays/actors/ovl_En_Sw/z_en_sw.h" static s16 sDisableAttention = false; static s16 sUnused = -1; diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index c9e413649..47fa2e5db 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -39,7 +39,7 @@ #include "assets/scenes/dungeons/men/men_scene.h" #include "assets/scenes/dungeons/ydan/ydan_scene.h" -#include "overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h" +#include "src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h" void Scene_DrawConfigDefault(PlayState* play); void Scene_DrawConfigHyruleField(PlayState* play); diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c index c6ddc1a79..2afdb94af 100644 --- a/src/code/z_skin_awb.c +++ b/src/code/z_skin_awb.c @@ -6,7 +6,7 @@ #include "skin.h" #include "skin_matrix.h" -#include "overlays/actors/ovl_En_fHG/z_en_fhg.h" +#include "src/overlays/actors/ovl_En_fHG/z_en_fhg.h" /** * Initialises the Vtx buffers used for limb at index `limbIndex` |