Reduce overlay dependencies on global.h (6) (#2468)

* add some headers, split some of z64.h * MtxClear -> IdentityMtx * more misc cleanups * move D_80116280 to header, fix build issue * remove z64.h * Revert "MtxClear -> IdentityMtx" This reverts commit 8fc74c0672. * split z64path.h and z64skin.h functions * z64face_reaction.h * cleanup overlay global references * trim padding * bss
2025-08-21 14:31:17 +00:00 · 2025-02-13 18:15:14 -05:00 · 2025-02-13 18:15:14 -05:00 · 4639914583
commit 4639914583
parent 494aecc9fc
116 changed files with 419 additions and 297 deletions
--- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
@ -16,8 +16,6 @@
 #include "z_lib.h"
 #include "z64play.h"

-#include "z64.h"
-
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)

 void ArrowFire_Init(Actor* thisx, PlayState* play);
--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
@ -16,8 +16,6 @@
 #include "z_lib.h"
 #include "z64play.h"

-#include "z64.h"
-
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)

 void ArrowIce_Init(Actor* thisx, PlayState* play);
--- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
@ -16,8 +16,6 @@
 #include "z_lib.h"
 #include "z64play.h"

-#include "z64.h"
-
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)

 void ArrowLight_Init(Actor* thisx, PlayState* play);
--- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
@ -28,8 +28,6 @@
 #include "z64player.h"
 #include "z64skin_matrix.h"

-#include "global.h"
-
 #include "assets/objects/object_sst/object_sst.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"

--- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
+++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
@ -22,8 +22,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_demo_6k/object_demo_6k.h"
 #include "assets/objects/object_gnd_magic/object_gnd_magic.h"
--- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
+++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
@ -5,8 +5,16 @@
 */

 #include "z_elf_msg.h"
-#include "global.h"
+
+#include "libu64/debug.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "regs.h"
 #include "terminal.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"

 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
--- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c
+++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c
@ -13,10 +13,9 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"

-#include "global.h"
-
 #include "assets/objects/object_ani/object_ani.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@ -5,7 +5,21 @@
 */

 #include "z_en_arrow.h"
-#include "global.h"
+
+#include "libc64/qrand.h"
+#include "libu64/debug.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_math.h"
+#include "sys_math3d.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"

 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
--- 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
@ -19,8 +19,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "z64.h"
-
 #include "assets/objects/object_niw/object_niw.h"

 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
--- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
+++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
@ -16,8 +16,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_bigokuta/object_bigokuta.h"

 #define FLAGS                                                                                 \
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c
+++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c
@ -5,7 +5,16 @@
 */

 #include "z_en_boom.h"
-#include "global.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"

 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
--- a/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.c
@ -1,6 +1,23 @@
 #include "z_en_box.h"
-#include "global.h"
 #include "overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_math3d.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64audio.h"
+#include "z64curve.h"
+#include "z64effect.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_box/object_box.h"

 #define FLAGS 0
--- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c
+++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c
@ -23,8 +23,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_bw/object_bw.h"

--- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c
+++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c
@ -4,15 +4,14 @@
 #include "libc64/qrand.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
-#include "segmented_address.h"s
+#include "segmented_address.h"
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_cs/object_cs.h"
 #include "assets/objects/object_link_child/object_link_child.h"

--- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
+++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
@ -14,8 +14,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_daiku/object_daiku.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
--- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
+++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
@ -14,11 +14,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_daiku/object_daiku.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
--- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c
+++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c
@ -23,8 +23,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_dh/object_dh.h"

 #define FLAGS                                                                                 \
--- 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,11 +19,10 @@
 #include "z_lib.h"
 #include "z64audio.h"
 #include "z64effect.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_zo/object_zo.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
--- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c
+++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c
@ -12,8 +12,6 @@
 #include "z_lib.h"
 #include "z64play.h"

-#include "global.h"
-
 #include "assets/objects/object_dog/object_dog.h"

 #define FLAGS 0
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.c
@ -5,7 +5,17 @@
 */

 #include "z_en_door.h"
-#include "global.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
--- a/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/src/overlays/actors/ovl_En_Du/z_en_du.c
@ -8,12 +8,11 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64audio.h"
+#include "z64face_reaction.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_du/object_du.h"
 #include "assets/scenes/overworld/spot18/spot18_scene.h"

--- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
+++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
@ -11,8 +11,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_ei/object_ei.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@ -5,9 +5,18 @@
 */

 #include "z_en_fish.h"
-#include "global.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sfx.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "assets/objects/gameplay_keep/gameplay_keep.h"

 #define FLAGS 0

--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
@ -12,12 +12,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_fu/object_fu.h"
 #include "assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h"

--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@ -14,12 +14,11 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64horse.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_ge1/object_ge1.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@ -14,11 +14,10 @@
 #include "versions.h"
 #include "z_lib.h"
 #include "z64audio.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_oF1d_map/object_oF1d_map.h"

--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
@ -20,8 +20,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_gs/object_gs.h"

--- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
+++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
@ -16,11 +16,10 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_sd/object_sd.h"
 #include "assets/objects/object_link_child/object_link_child.h"

--- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
+++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
@ -3,11 +3,10 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "terminal.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_sd/object_sd.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c
@ -29,8 +29,6 @@
 #include "z64player.h"
 #include "z64skin_matrix.h"

-#include "global.h"
-
 #include "assets/objects/object_horse/object_horse.h"
 #include "assets/objects/object_hni/object_hni.h"
 #include "assets/scenes/overworld/spot09/spot09_scene.h"
--- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
+++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
@ -17,8 +17,6 @@
 #include "z64player.h"
 #include "z64skin.h"

-#include "global.h"
-
 #include "assets/objects/object_horse_ganon/object_horse_ganon.h"

 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
--- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
+++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
@ -4,18 +4,23 @@
 * Description: Young Epona
 */

-#include "global.h"
+#include "z_en_horse_link_child.h"
+
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "rand.h"
 #include "regs.h"
+#include "segmented_address.h"
 #include "sfx.h"
+#include "sys_math3d.h"
+#include "z_lib.h"
 #include "z64actor.h"
 #include "z64horse.h"
 #include "z64player.h"
 #include "z64play.h"
-#include "z_en_horse_link_child.h"
+#include "z64skin.h"
+
 #include "assets/objects/object_horse_link_child/object_horse_link_child.h"

 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
--- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
+++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
@ -20,8 +20,6 @@
 #include "z64skin.h"
 #include "z64skin_matrix.h"

-#include "global.h"
-
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_horse_normal/object_horse_normal.h"

--- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
+++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
@ -16,8 +16,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_horse_zelda/object_horse_zelda.h"

 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
--- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
+++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
@ -11,10 +11,9 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"

-#include "global.h"
-
 #include "assets/objects/object_hs/object_hs.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c
+++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c
@ -16,11 +16,10 @@
 #include "versions.h"
 #include "z_lib.h"
 #include "z64audio.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_aob/object_aob.h"
 #include "assets/objects/object_ahg/object_ahg.h"
 #include "assets/objects/object_bob/object_bob.h"
--- a/src/overlays/actors/ovl_En_In/z_en_in.c
+++ b/src/overlays/actors/ovl_En_In/z_en_in.c
@ -13,11 +13,10 @@
 #include "versions.h"
 #include "z_lib.h"
 #include "z64audio.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_in/object_in.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
@ -5,10 +5,25 @@
 */

 #include "z_en_kanban.h"
-#include "global.h"
+
+#include "libc64/math64.h"
+#include "libc64/qrand.h"
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "rand.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "terminal.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_kanban/object_kanban.h"
-#include "terminal.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.inc.c
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.inc.c
@ -1,4 +1,4 @@
-#include "z_en_kanban.h"
+#include "ultra64.h"

 static u16 sShadowTexFlags[] = {
    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x100,
--- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@ -14,6 +14,7 @@
 #include "terminal.h"
 #include "versions.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

--- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@ -7,6 +7,7 @@
 #include "z_en_kz.h"

 #include "libc64/math64.h"
+#include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
@ -14,11 +15,10 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_kz/object_kz.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@ -13,12 +13,11 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64audio.h"
+#include "z64face_reaction.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_ma1/object_ma1.h"

 #define FLAGS                                                                                  \
--- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
+++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
@ -8,12 +8,11 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64audio.h"
+#include "z64face_reaction.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_ma2/object_ma2.h"

 #define FLAGS                                                                                  \
--- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
+++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
@ -18,8 +18,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_ma2/object_ma2.h"

 #define FLAGS                                                                                  \
--- a/src/overlays/actors/ovl_En_Md/z_en_md.c
+++ b/src/overlays/actors/ovl_En_Md/z_en_md.c
@ -14,6 +14,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
--- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c
+++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c
@ -11,11 +11,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_mk/object_mk.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
--- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c
+++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c
@ -14,11 +14,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_mm/object_mm.h"
 #include "assets/objects/object_link_child/object_link_child.h"

--- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c
+++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c
@ -9,10 +9,9 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
+#include "z64face_reaction.h"
 #include "z64play.h"

-#include "global.h"
-
 #include "assets/objects/object_ms/object_ms.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c
+++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c
@ -10,10 +10,9 @@
 #include "gfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"

-#include "global.h"
-
 #include "assets/objects/object_mu/object_mu.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c
@ -18,11 +18,10 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_nb/object_nb.h"

 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
--- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
+++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
@ -11,11 +11,10 @@
 #include "terminal.h"
 #include "versions.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_ane/object_ane.h"
 #include "assets/objects/object_os_anime/object_os_anime.h"

--- 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
@ -22,8 +22,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_po_sisters/object_po_sisters.h"

--- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c
+++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c
@ -19,8 +19,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_poh/object_poh.h"
 #include "assets/objects/object_po_composer/object_po_composer.h"

--- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c
+++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c
@ -20,8 +20,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_rd/object_rd.h"

 #define FLAGS                                                                                 \
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
@ -20,11 +20,10 @@
 #include "versions.h"
 #include "z_lib.h"
 #include "z64effect.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_ru1/object_ru1.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES)
--- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@ -7,11 +7,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_sa/object_sa.h"
 #include "assets/scenes/overworld/spot04/spot04_scene.h"
 #include "assets/scenes/overworld/spot05/spot05_scene.h"
--- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@ -13,13 +13,12 @@
 #include "z_lib.h"
 #include "z64audio.h"
 #include "z64debug_display.h"
+#include "z64face_reaction.h"
 #include "z64ocarina.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_skj/object_skj.h"

 #define FLAGS                                                                                 \
--- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
+++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
@ -6,11 +6,10 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64effect.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_ssh/object_ssh.h"

 #define FLAGS                                                                                 \
--- 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
@ -19,7 +19,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "z64.h"
 #include "assets/objects/object_niw/object_niw.h"

 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
--- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c
@ -20,11 +20,10 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "z64audio.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_ta/object_ta.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c
+++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c
@ -8,10 +8,9 @@

 #include "gfx.h"
 #include "sys_matrix.h"
+#include "z64face_reaction.h"
 #include "z64play.h"

-#include "global.h"
-
 #include "assets/objects/object_mu/object_mu.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@ -16,10 +16,9 @@
 #include "sys_matrix.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"

-#include "global.h"
-
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_tk/object_tk.h"

--- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
+++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
@ -22,8 +22,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_torch2/object_torch2.h"

 #define FLAGS                                                                                 \
--- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
+++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
@ -11,11 +11,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_toryo/object_toryo.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c
+++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c
@ -17,8 +17,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_ei/object_ei.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
--- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c
+++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c
@ -22,8 +22,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_zf/object_zf.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
--- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
+++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
@ -26,8 +26,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "assets/objects/object_zl2/object_zl2.h"
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@ -17,11 +17,10 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64audio.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_zl4/object_zl4.h"
 #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h"

--- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c
+++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c
@ -13,11 +13,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #include "assets/objects/object_zo/object_zo.h"

 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
--- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
+++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
@ -23,8 +23,6 @@
 #include "z64player.h"
 #include "z64skin.h"

-#include "global.h"
-
 #include "assets/objects/object_fhg/object_fhg.h"

 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
--- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
+++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
@ -5,8 +5,10 @@
 */

 #include "z_obj_makekinsuta.h"
-#include "global.h"
+
 #include "terminal.h"
+#include "z64play.h"
+#include "z64player.h"

 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

--- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
+++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
@ -12,8 +12,6 @@
 #include "z64play.h"
 #include "z64player.h"

-#include "global.h"
-
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)

 void OceffStorm_Init(Actor* thisx, PlayState* play);