z64 - e

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"

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"

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"

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"

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"

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"

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"

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"
 

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

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"

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"
 

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"
 

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"

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)

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"

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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"
 

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"

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"
 

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"
 

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"

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"

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"

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"
 

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"
 

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"
 

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"

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"

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"
 

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"
 

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"

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"

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"

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"
 

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"
 

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"
 

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"
 

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"
 

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"

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"
 

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"
 

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"
 

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"
 

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"

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"
 

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"

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"
 

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"
 

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"

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"

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"

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"

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"
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"
 

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"