From 9a39fb2f84b9c0a01faa93b36f890e04bd6ff27d Mon Sep 17 00:00:00 2001 From: fig02 Date: Mon, 28 Apr 2025 10:06:02 -0400 Subject: [PATCH] z64 - e --- include/{z64effect.h => effect.h} | 4 ++-- include/{z64environment.h => environment.h} | 4 ++-- include/file_select_state.h | 2 +- include/z64play.h | 2 +- include/z64scene.h | 2 +- src/code/z_actor.c | 2 +- src/code/z_collision_check.c | 2 +- src/code/z_common_data.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_effect.c | 2 +- src/code/z_effect_soft_sprite.c | 2 +- src/code/z_effect_soft_sprite_dlftbls.c | 2 +- src/code/z_effect_soft_sprite_old_init.c | 2 +- src/code/z_en_item00.c | 2 +- src/code/z_kankyo.c | 2 +- src/code/z_play.c | 2 +- src/code/z_player_lib.c | 2 +- src/code/z_vr_box.c | 2 +- src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 2 +- src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 2 +- src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 2 +- src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c | 2 +- src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c | 2 +- src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c | 2 +- src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c | 2 +- src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 2 +- src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 2 +- src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c | 2 +- src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 2 +- src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c | 2 +- .../ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c | 2 +- src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c | 2 +- src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 2 +- src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c | 2 +- .../actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 2 +- src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c | 2 +- .../actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c | 2 +- .../actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c | 2 +- .../actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c | 2 +- .../ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c | 2 +- .../ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c | 2 +- src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 2 +- .../actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c | 2 +- .../ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c | 2 +- src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 2 +- src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 2 +- src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c | 2 +- src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c | 2 +- src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 2 +- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 2 +- src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c | 2 +- src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 2 +- src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c | 2 +- src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c | 4 ++-- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 2 +- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 2 +- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 2 +- src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 2 +- src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 2 +- src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c | 2 +- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 2 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 2 +- src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 2 +- src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 2 +- src/overlays/actors/ovl_Door_Killer/z_door_killer.c | 2 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 2 +- src/overlays/actors/ovl_En_Anubice/z_en_anubice.c | 2 +- src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c | 2 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 2 +- src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c | 2 +- src/overlays/actors/ovl_En_Ba/z_en_ba.c | 2 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 2 +- src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c | 2 +- src/overlays/actors/ovl_En_Bili/z_en_bili.c | 2 +- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 2 +- src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 2 +- src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 2 +- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 2 +- src/overlays/actors/ovl_En_Boom/z_en_boom.c | 2 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 2 +- src/overlays/actors/ovl_En_Brob/z_en_brob.c | 2 +- src/overlays/actors/ovl_En_Bubble/z_en_bubble.c | 2 +- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 2 +- src/overlays/actors/ovl_En_Bx/z_en_bx.c | 2 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 2 +- src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c | 2 +- src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c | 2 +- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 2 +- src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c | 2 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 2 +- src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 2 +- src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 2 +- src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c | 2 +- src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c | 2 +- src/overlays/actors/ovl_En_Door/z_en_door.c | 2 +- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 2 +- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 2 +- src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 2 +- src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 2 +- src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 2 +- src/overlays/actors/ovl_En_Firefly/z_en_firefly.c | 2 +- src/overlays/actors/ovl_En_Floormas/z_en_floormas.c | 2 +- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 2 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 2 +- src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c | 2 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 2 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 2 +- src/overlays/actors/ovl_En_Goma/z_en_goma.c | 2 +- src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c | 2 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 2 +- src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c | 2 +- src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c | 2 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 2 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 2 +- src/overlays/actors/ovl_En_Insect/z_en_insect.c | 2 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 2 +- src/overlays/actors/ovl_En_Kanban/z_en_kanban.c | 2 +- src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c | 2 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 2 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 2 +- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 2 +- src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c | 2 +- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 2 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 2 +- src/overlays/actors/ovl_En_Part/z_en_part.c | 2 +- src/overlays/actors/ovl_En_Peehat/z_en_peehat.c | 2 +- src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c | 2 +- src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c | 2 +- src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c | 2 +- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 2 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 2 +- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 2 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 2 +- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 2 +- src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c | 2 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 2 +- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 2 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 2 +- src/overlays/actors/ovl_En_St/z_en_st.c | 2 +- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 2 +- src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c | 2 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 2 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 2 +- src/overlays/actors/ovl_En_Torch2/z_en_torch2.c | 2 +- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 2 +- src/overlays/actors/ovl_En_Tr/z_en_tr.c | 2 +- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 2 +- src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 2 +- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 2 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 2 +- src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 2 +- src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c | 2 +- src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c | 2 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 2 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 +- src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 2 +- src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c | 2 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 2 +- src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c | 2 +- src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c | 2 +- src/overlays/actors/ovl_Item_Shield/z_item_shield.c | 2 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 2 +- src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 2 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 2 +- src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 2 +- src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 2 +- src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c | 2 +- src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 2 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 2 +- src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c | 2 +- src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 2 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 2 +- src/overlays/actors/ovl_player_actor/z_player.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c | 2 +- src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 2 +- .../effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c | 2 +- .../effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c | 2 +- src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c | 2 +- src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c | 2 +- .../effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c | 2 +- .../effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c | 2 +- src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c | 2 +- src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c | 2 +- .../effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c | 2 +- .../effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c | 2 +- src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c | 2 +- .../effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c | 2 +- src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c | 2 +- .../effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c | 2 +- .../effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c | 2 +- src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c | 2 +- .../effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c | 2 +- .../effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c | 2 +- .../z_eff_ss_solder_srch_ball.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c | 2 +- src/overlays/gamestates/ovl_file_choose/z_file_choose.c | 2 +- src/overlays/gamestates/ovl_title/z_title.c | 2 +- 218 files changed, 221 insertions(+), 221 deletions(-) rename include/{z64effect.h => effect.h} (99%) rename include/{z64environment.h => environment.h} (99%) diff --git a/include/z64effect.h b/include/effect.h similarity index 99% rename from include/z64effect.h rename to include/effect.h index 0c07cc5124..87b9b6f8c7 100644 --- a/include/z64effect.h +++ b/include/effect.h @@ -1,5 +1,5 @@ -#ifndef Z64EFFECT_H -#define Z64EFFECT_H +#ifndef EFFECT_H +#define EFFECT_H #include "color.h" #include "romfile.h" diff --git a/include/z64environment.h b/include/environment.h similarity index 99% rename from include/z64environment.h rename to include/environment.h index 54a28563fc..f5c46acb55 100644 --- a/include/z64environment.h +++ b/include/environment.h @@ -1,5 +1,5 @@ -#ifndef _Z64ENVIRONMENT_H_ -#define _Z64ENVIRONMENT_H_ +#ifndef ENVIRONMENT_H_ +#define ENVIRONMENT_H_ #include "z64math.h" #include "z64light.h" diff --git a/include/file_select_state.h b/include/file_select_state.h index 0a831caa0f..522f5c16f7 100644 --- a/include/file_select_state.h +++ b/include/file_select_state.h @@ -2,7 +2,7 @@ #define FILE_SELECT_STATE_H #include "ultra64.h" -#include "z64environment.h" +#include "environment.h" #include "z64game.h" #include "z64message.h" #include "z64skybox.h" diff --git a/include/z64play.h b/include/z64play.h index 75f0f4d96a..cb4995983c 100644 --- a/include/z64play.h +++ b/include/z64play.h @@ -9,7 +9,7 @@ #include "bgcheck.h" #include "camera.h" #include "cutscene.h" -#include "z64environment.h" +#include "environment.h" #include "z64frame_advance.h" #include "z64game.h" #include "z64game_over.h" diff --git a/include/z64scene.h b/include/z64scene.h index 77f38a1765..67f6e266c5 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -4,7 +4,7 @@ #include "avoid_ub.h" #include "ultra64.h" #include "bgcheck.h" -#include "z64environment.h" +#include "environment.h" #include "z64light.h" #include "z64math.h" #include "z64path.h" diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 3f02b17c0b..fda3f845f9 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -21,7 +21,7 @@ #include "zelda_arena.h" #include "actor.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64light.h" #include "z64horse.h" #include "z64play.h" diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 8df3367602..60a19d4c81 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -8,7 +8,7 @@ #include "translation.h" #include "versions.h" #include "collision_check.h" -#include "z64effect.h" +#include "effect.h" #include "z64frame_advance.h" #include "zelda_arena.h" #include "z64play.h" diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 97cb44a4f0..fbd7cb346e 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -3,7 +3,7 @@ #include "sequence.h" #include "versions.h" #include "z_locale.h" -#include "z64environment.h" +#include "environment.h" #include "z64save.h" #include "z64transition.h" diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 614cfa5b5b..ddea5351c5 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -6,7 +6,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64skin_matrix.h" #include "z64.h" // required for gameplay keep, the header doesnt include any external dependencies diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index 865bd8ec93..ed87d8a024 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -5,7 +5,7 @@ #include "printf.h" #include "terminal.h" #include "translation.h" -#include "z64effect.h" +#include "effect.h" #include "z64light.h" #include "z64play.h" #include "z64skin_matrix.h" diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index 57ce3d9ba1..67e1aa0529 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -5,7 +5,7 @@ #include "printf.h" #include "sys_matrix.h" #include "translation.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" diff --git a/src/code/z_effect.c b/src/code/z_effect.c index c0a39cc4bd..a56fb67673 100644 --- a/src/code/z_effect.c +++ b/src/code/z_effect.c @@ -1,7 +1,7 @@ #include "gfx.h" #include "printf.h" #include "translation.h" -#include "z64effect.h" +#include "effect.h" #include "z64frame_advance.h" #include "z64play.h" diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 061b6d70da..eaa1471dba 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -6,7 +6,7 @@ #include "translation.h" #include "zelda_arena.h" #include "z64frame_advance.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info" diff --git a/src/code/z_effect_soft_sprite_dlftbls.c b/src/code/z_effect_soft_sprite_dlftbls.c index 7c9e228f63..7a5f7e4e49 100644 --- a/src/code/z_effect_soft_sprite_dlftbls.c +++ b/src/code/z_effect_soft_sprite_dlftbls.c @@ -1,5 +1,5 @@ #include "segment_symbols.h" -#include "z64effect.h" +#include "effect.h" // Linker symbol declarations (used in the table below) #define DEFINE_EFFECT_SS(name, _1) DECLARE_OVERLAY_SEGMENT(name) diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 1654ab3d0d..593f955dda 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -7,7 +7,7 @@ #include "segmented_address.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64skin_matrix.h" diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 9622e9071c..ebca801905 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "draw.h" -#include "z64effect.h" +#include "effect.h" #include "z64item.h" #include "z64play.h" #include "z64player.h" diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 962d56ce65..226d40d2b1 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -27,7 +27,7 @@ #include "audio.h" #include "cutscene.h" #include "z64frame_advance.h" -#include "z64environment.h" +#include "environment.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/code/z_play.c b/src/code/z_play.c index 1f247d6c10..30e4a2b29a 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -39,7 +39,7 @@ #include "audio.h" #include "cutscene_flags.h" #include "debug_display.h" -#include "z64effect.h" +#include "effect.h" #include "z64frame_advance.h" #include "z64light.h" #include "z64play.h" diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index ba1e967f1d..7b680a708f 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -7,7 +7,7 @@ #include "versions.h" #include "z_lib.h" #include "draw.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index 2fa2122acf..26d05efc5c 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -5,7 +5,7 @@ #include "segment_symbols.h" #include "terminal.h" #include "ultra64.h" -#include "z64environment.h" +#include "environment.h" #include "z64game.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index e0c0e1c4fd..5ae9ff06e2 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -18,7 +18,7 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_bowl/object_bowl.h" diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 3764381c19..fdc7377f69 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -18,7 +18,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 1df0e5b730..f8fa42033c 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -17,7 +17,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index 8b026839f7..be680c60ab 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -12,7 +12,7 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 889d4f9551..261694d6ca 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index 63ef8e5153..711f526f63 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index f11973a86f..768743b8fb 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -9,7 +9,7 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index cf34101f56..631d3adba5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64skin_matrix.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index df7c95b0e9..275455ce84 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 8064cae2d4..8e252275a4 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -12,7 +12,7 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 90aeee4b87..73cb5e31f1 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -22,7 +22,7 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 885967c2bb..0b0d25c8cd 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 7663c13aa0..a57af1062d 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -16,7 +16,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index 6bfd39e4e5..48f5197a2b 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -11,7 +11,7 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 102e2e3ba5..9c4199179f 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 8fb200aca5..7194c81181 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -11,7 +11,7 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 73108e43d0..16e4c58690 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -11,7 +11,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index 5a01066a3c..64312e9b99 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "terminal.h" #include "translation.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index b9350da300..5f80eddfd3 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -12,7 +12,7 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_jya_iron/object_jya_iron.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index cb326593a7..f3f696b848 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -14,7 +14,7 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_jya_iron/object_jya_iron.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index a72f245e22..4df97aab23 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -17,7 +17,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index eda5a530eb..7b5883c1fa 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index e43acd7a1d..5a3e82d7ae 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -16,7 +16,7 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 795df90151..04ae3fd68e 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 7c6c943aa7..d395b70639 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index aa8d28b960..ed66648f24 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -12,7 +12,7 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index f86d76a2fc..96cff036c3 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_spot11_obj/object_spot11_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index b3c2498ed3..d30f21cb5d 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -18,7 +18,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "cutscene_flags.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 759d2184e3..19e64d98f5 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 03f7b4514b..7b7151a107 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_spot17_obj/object_spot17_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index af5d10c286..4eb0597404 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -12,7 +12,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 5a544c3015..d4c2cb0bec 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "versions.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c index 679519f1be..01d94f0f55 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_fd/object_fd.h" diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 0034cfb4ca..b693cbf419 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -16,7 +16,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index bfc700c6dc..084c58ec93 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -16,7 +16,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index c66883ddd8..78fa31b33e 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -25,7 +25,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 0ca8e3c843..af980a4ddb 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -21,7 +21,7 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index e2742e3bef..64b7b9d238 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -19,7 +19,7 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 848707f002..12b611d494 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -26,7 +26,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64light.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index bfd115b535..bafb38c3e8 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -25,8 +25,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" -#include "z64environment.h" +#include "effect.h" +#include "environment.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 00184fba7d..831005bea3 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -28,7 +28,7 @@ #include "terminal.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 89ba5fab34..5c5c444797 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -23,7 +23,7 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 714d2bc2d7..dcd9ea7af5 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -22,7 +22,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 9dcef95cfe..d568b3f26a 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -18,7 +18,7 @@ #include "terminal.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64light.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index a4fba78e7b..dea8d49eac 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -12,7 +12,7 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" 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 2f43c93143..9d44284c64 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -19,7 +19,7 @@ #include "curve.h" #include "draw.h" #include "cutscene_flags.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index bb363d6f72..e79695b228 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -21,7 +21,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "draw.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 937f56fcea..d314fa2f01 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -15,7 +15,7 @@ #include "translation.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64frame_advance.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index af3ddeb000..9cdb3d3a13 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -8,7 +8,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_ik/object_ik.h" diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 929d3ec4ac..d52ab4faa8 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -16,7 +16,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 15d92cb18a..e0f8d254a1 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -13,7 +13,7 @@ #include "segmented_address.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 3f7649ea7e..a5fb179a0f 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -16,7 +16,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index 5c03ab9632..92b6383fd4 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -19,7 +19,7 @@ #include "terminal.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 480940dc44..8975d75ad4 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 9000417a23..8cb0be6c90 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -17,7 +17,7 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index 4a3a32663a..9ef25d23ac 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index a149d3c63d..92a32938e3 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -15,7 +15,7 @@ #include "sys_math.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 18dad81519..7a1d07a9af 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -17,7 +17,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index f5dfcc0843..ff745e94a4 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -13,7 +13,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 82f7b62796..9af56b8751 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -17,7 +17,7 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_bl/object_bl.h" 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 31acad8cec..9fa11a71dd 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 1bbc6bbb7c..8722a4815f 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 @@ -10,7 +10,7 @@ #include "segmented_address.h" #include "sfx.h" #include "terminal.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" 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 7ce476d4ef..fdab797a48 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 @@ -11,7 +11,7 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 ed1d7eed79..e4448fbf5f 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 b9dcbacb76..6569395bce 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 38595070a3..150f2d9f72 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -14,7 +14,7 @@ #include "z_lib.h" #include "audio.h" #include "curve.h" -#include "z64effect.h" +#include "effect.h" #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index 436f4740c5..10560f7613 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -11,7 +11,7 @@ #include "gfx_setupdl.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_brob/object_brob.h" diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 79860d7f7f..4c22361cea 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -8,7 +8,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_bubble/object_bubble.h" diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 0aad9cccae..7502380f3c 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -19,7 +19,7 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index 51896cbb7d..7b418a6895 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 3ce86ff9d3..471e64af3f 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -7,7 +7,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 df9b566f87..f91fa326c6 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -9,7 +9,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index cf498eb726..bf80a93100 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -12,7 +12,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_dekunuts/object_dekunuts.h" diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index a91067eb5f..69d163ceae 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -19,7 +19,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index b969b9a5c8..97b98e422b 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -19,7 +19,7 @@ #include "terminal.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index c690638570..fc36b3b651 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -14,7 +14,7 @@ #include "terminal.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 442c0a3569..1074b3cea0 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -22,7 +22,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index f5d3f0b9dd..749fdb1128 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -23,7 +23,7 @@ #include "terminal.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index 1d967ed5fa..5d2ad62ed9 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 5d013911eb..53de2d7b2e 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -12,7 +12,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 9f5bd8723e..6624a4e0f3 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -13,7 +13,7 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index d60d91c222..b734018cbe 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -7,7 +7,7 @@ #include "sfx.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 4a27d2e0e4..b68636a884 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -20,7 +20,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64light.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 8cd6e5c4a1..828a0b2d04 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -12,7 +12,7 @@ #include "terminal.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 2fdf9525d7..7caaaf6747 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -21,7 +21,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index b66bda7bdd..d4191a212e 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -12,7 +12,7 @@ #include "terminal.h" #include "z_lib.h" #include "debug_display.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index e674ee9bf5..36a6592034 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -17,7 +17,7 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index a9d9036e9f..db1e377047 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 670bac51df..7a910156eb 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -16,7 +16,7 @@ #include "z_lib.h" #include "audio.h" #include "debug_display.h" -#include "z64effect.h" +#include "effect.h" #include "z64light.h" #include "z64ocarina.h" #include "z64play.h" 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 6ded127aef..3549f7d1ab 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -9,7 +9,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_fz/object_fz.h" diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 292e519479..e3ecb1635b 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -23,7 +23,7 @@ #include "z_lib.h" #include "audio.h" #include "debug_display.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index cae8d14bf1..37482c8996 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64horse.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 7b6e46bff3..7571381b0c 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -18,7 +18,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 82175795bd..9cba6f9fdf 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -18,7 +18,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 10ba10d18d..8264d7adc6 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -18,7 +18,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 4e590217f0..26139c2de6 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 44606f0226..4528a69195 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -19,7 +19,7 @@ #include "terminal.h" #include "z_lib.h" #include "debug_display.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 5f884f8997..a4caaf784e 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -17,7 +17,7 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 1dfce7e249..17faa872f1 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -24,7 +24,7 @@ #include "versions.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64horse.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 5614fa1986..317fe6f563 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -22,7 +22,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index bc3640c4ac..8b961ff84d 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -16,7 +16,7 @@ #include "sys_math3d.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" 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 bcf59dfbe7..9523394ac4 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -22,7 +22,7 @@ #include "terminal.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64item.h" #include "z64play.h" 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 844a7ee2a8..b6338f65df 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -19,7 +19,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" 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 be3b0eacb5..49fd1b1394 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" 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 aa955365dd..3f17f979e8 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -17,7 +17,7 @@ #include "terminal.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 485052002e..59409ba189 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -18,7 +18,7 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 6be5e39db0..d9dfa727f4 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -23,7 +23,7 @@ #include "terminal.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" 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 3511a3c45d..2281a6d56a 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -11,7 +11,7 @@ #include "gfx_setupdl.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index d7f4537512..e96b8b767e 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -11,7 +11,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_ny/object_ny.h" diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index b7063e0f00..c92b17ad30 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -8,7 +8,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index c10a8edcb4..1bd4d9b160 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 2246b3df16..6036586708 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -12,7 +12,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 30218e20e5..9c907617ea 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64light.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 983dbf0d71..6e42c85b04 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -17,7 +17,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64light.h" #include "z64play.h" #include "z64player.h" 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 a713b80eed..f593d6e35b 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 @@ -18,7 +18,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64light.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index fceb18ef7c..60320cb63a 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64light.h" #include "z64play.h" #include "z64player.h" 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 af9ed8f112..81ad4f5e3c 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -16,7 +16,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 1feea85289..a2467d47c9 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -20,7 +20,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "debug_display.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 b4e136a75a..b822d98780 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -19,7 +19,7 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 85ef778479..fb30127af2 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -22,7 +22,7 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 152f5ea753..da5678e328 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -14,7 +14,7 @@ #include "terminal.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_sb/object_sb.h" diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 3b71880a6b..e50c00aa93 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 52e521df9c..9585b46846 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -16,7 +16,7 @@ #include "sys_math.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 1fdcbab056..396e12f6a6 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -16,7 +16,7 @@ #include "debug_display.h" #include "z64face_reaction.h" #include "z64ocarina.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" 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 43a59dce46..95ef442344 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -6,7 +6,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64face_reaction.h" #include "z64play.h" #include "z64player.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 7f8bf6497a..2a018160ef 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 8e10154c10..a608a42fe1 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -10,7 +10,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 970ebb32d3..2c24a02291 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -16,7 +16,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" 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 c036791dbb..0ef7970a3a 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -16,7 +16,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 3435b040fc..757867655a 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -19,7 +19,7 @@ #include "terminal.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 9518c66647..0387e09e3e 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -18,7 +18,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index a1ce22995c..985cd60c04 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -18,7 +18,7 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 3f2672cde4..fbf7429db6 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -13,7 +13,7 @@ #include "sys_math.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 848e6701b0..8b36bac23a 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -8,7 +8,7 @@ #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_trap/object_trap.h" 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 31ae178197..083272255f 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 @@ -14,7 +14,7 @@ #include "terminal.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index 011b004b68..0b18eda08f 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_vali/object_vali.h" 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 2ee230d9bd..6fa677d39e 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -17,7 +17,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index bb9bc7a023..4782187eb4 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -17,7 +17,7 @@ #include "terminal.h" #include "z_lib.h" #include "debug_display.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 abb91c80b9..58de267e48 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 2e19328961..96709c8385 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index 3f049b21e9..483062c6f4 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -22,7 +22,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 10cad07257..f90f09f1c5 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -22,7 +22,7 @@ #include "translation.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" #include "z64skin_matrix.h" diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index f824f062fa..418a5c864d 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -14,7 +14,7 @@ #include "z_lib.h" #include "audio.h" #include "debug_display.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 22d454fb61..39b6c688b0 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_yukabyun/object_yukabyun.h" diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 0831a414b4..20d15852fb 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -19,7 +19,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "audio.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 9147fca96a..3a327bb31b 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -11,7 +11,7 @@ #include "printf.h" #include "rand.h" #include "draw.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 7c9a0f14dc..3aea385cf8 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -10,7 +10,7 @@ #include "segmented_address.h" #include "sfx.h" #include "draw.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index 2f281a17d2..09814def6a 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64item.h" #include "z64play.h" #include "z64player.h" 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 e274c5d286..33f5135690 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -20,7 +20,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "cutscene_flags.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64save.h" 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 c6d7b1da3f..208e0e9d01 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -13,7 +13,7 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_bombiwa/object_bombiwa.h" 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 d3affc90a9..de4dcbe5f2 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" 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 39d6de7d65..6800a6179b 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" 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 71ff43d277..31b654a19c 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 @@ -13,7 +13,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 e417659024..0edca3ec4b 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 d81ec6f0c9..905b4f1505 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_kibako2/object_kibako2.h" 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 0a5866d1d1..7e50f25ab6 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_d_lift/object_d_lift.h" 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 52d71f3d7f..0c48b6c3e5 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -18,7 +18,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_lightswitch/object_lightswitch.h" 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 d5171ad128..3d9e359963 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64item.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 7a38b72139..d9dcc9c612 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -16,7 +16,7 @@ #include "terminal.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64environment.h" +#include "environment.h" #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 7f7d01fb5f..cccdf92916 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -44,7 +44,7 @@ #include "zelda_arena.h" #include "audio.h" #include "debug.h" -#include "z64effect.h" +#include "effect.h" #include "z64lifemeter.h" #include "z64ocarina.h" #include "z64play.h" 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 9ff1bd5a96..a16b3c732d 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 @@ -11,7 +11,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index 2ab88a16b1..d2612f9c8b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -13,7 +13,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 4ec61bc8ea..74cf72c9bb 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 @@ -11,7 +11,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 f23d0a9aab..ff1b613398 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 @@ -12,7 +12,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 c32349e1fa..e3c78e6b22 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 @@ -9,7 +9,7 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "segmented_address.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 e8b904a4b6..b834af4ae0 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 @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sfx.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 9343e7a549..d4311156f9 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 @@ -10,7 +10,7 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "printf.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 4d649d4be4..62f9b1648d 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 @@ -9,7 +9,7 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c index f0b3c8fce4..efd8e1210a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c @@ -7,7 +7,7 @@ #include "z_eff_ss_dead_sound.h" #include "printf.h" #include "sfx.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #define rSfxId regs[10] 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 2f5901ca2e..69a7858eb6 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 @@ -12,7 +12,7 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 899e9f2a2d..6820568dca 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 @@ -12,7 +12,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 56dc375337..e82555c62b 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 @@ -11,7 +11,7 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 17af3ac9eb..3a6dc0a4aa 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 @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 c5cee8db21..475d74ba24 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 @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_yabusame_point/object_yabusame_point.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index 9f00f52e30..cd4ca3277b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 60cad10d01..0678a62e05 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 @@ -14,7 +14,7 @@ #include "rand.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64skin.h" 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 de4ae887bb..fe810885aa 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 @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 05e4a3d8bf..acd876aac8 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 @@ -7,7 +7,7 @@ #include "z_eff_ss_g_fire.h" #include "segmented_address.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c index 9610917043..f3d96d744f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c @@ -8,7 +8,7 @@ #include "libc64/qrand.h" #include "segmented_address.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index 316f65258a..40d19802a3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" 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 2c83108d35..9ff312e88c 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 @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 a5472c29fa..64fcf75662 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 @@ -11,7 +11,7 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 3baab32db9..f6a55402c8 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 @@ -7,7 +7,7 @@ #include "z_eff_ss_g_splash.h" #include "segmented_address.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 e084b5f1f6..d461cbb25e 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 @@ -11,7 +11,7 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 9be42db8d9..b034eb88b2 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 @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 9ce9885de3..dcf2197d0a 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 @@ -11,7 +11,7 @@ #include "rand.h" #include "sys_math.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 1445e61d02..c12ee6ed11 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 @@ -12,7 +12,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/object_fz/object_fz.h" 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 12d9c5a5eb..98f81a0fc1 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 @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "rand.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index fda08ca8b8..2d692449a0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -14,7 +14,7 @@ #include "printf.h" #include "sys_matrix.h" #include "versions.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 f7c22aaa19..b13af237b5 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 @@ -13,7 +13,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 f44ac38496..b84a82c73a 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 @@ -12,7 +12,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" 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 1dadd7f069..eed03336b8 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 @@ -13,7 +13,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c index 8566be1623..dc05d823bf 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 b324f66b6c..a1c13566e9 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 @@ -7,7 +7,7 @@ #include "z_eff_ss_solder_srch_ball.h" #include "bgcheck.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" 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 520f8af02a..294e4b43d8 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 @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" 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 5ecd83add1..3b8b28655a 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 @@ -12,7 +12,7 @@ #include "regs.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64effect.h" +#include "effect.h" #include "z64play.h" #include "z64skin_matrix.h" diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 2e8ed7475a..bf2eea367f 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -25,7 +25,7 @@ #include "versions.h" #include "z_lib.h" #include "audio.h" -#include "z64environment.h" +#include "environment.h" #include "z64play.h" #include "z64save.h" #include "z64skybox.h" diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 9d9b20db34..75a8ec40f2 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -26,7 +26,7 @@ #include "title_setup_state.h" #include "versions.h" #include "actor.h" -#include "z64environment.h" +#include "environment.h" #include "z64save.h" #include "assets/textures/nintendo_rogo_static/nintendo_rogo_static.h"