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 8fc74c0672f72b91ae4068e73228fc46fe9465d4.

* split z64path.h and z64skin.h functions

* z64face_reaction.h

* cleanup overlay global references

* trim padding

* bss

21 files changed, 74 insertions, 18 deletions

diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c
index 5a85d03eb..3bd75ed5c 100644
--- a/src/code/fault_gc.c
+++ b/src/code/fault_gc.c
@@ -40,7 +40,7 @@
  * DPad-Up may be pressed to enable sending fault pages over osSyncPrintf as well as displaying them on-screen.
  * DPad-Down disables sending fault pages over osSyncPrintf.
  */
-#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-eu-mq-dbg:144 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160" \
+#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-eu-mq-dbg:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160" \
                                "gc-us-mq:160 ique-cn:160"
 
 #include "global.h"
@@ -48,6 +48,7 @@
 #include "fault.h"
 #include "stack.h"
 #include "terminal.h"
+#include "z64thread.h"
 
 void Fault_Init(void);
 void Fault_SetOsSyncPrintfEnabled(u32 enabled);
diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c
index 720307c0a..373c20ef9 100644
--- a/src/code/fault_n64.c
+++ b/src/code/fault_n64.c
@@ -5,6 +5,7 @@
 #include "libc64/os_malloc.h"
 #include "stack.h"
 #include "terminal.h"
+#include "z64thread.h"
 
 #pragma increment_block_number "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
 
diff --git a/src/code/graph.c b/src/code/graph.c
index 046e04d37..c77ef7108 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "fault.h"
+#include "sys_ucode.h"
 #include "terminal.h"
 #include "ucode_disas.h"
 #include "versions.h"
diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c
index 59d7a41cf..b90d5df7b 100644
--- a/src/code/irqmgr.c
+++ b/src/code/irqmgr.c
@@ -35,6 +35,7 @@
 #include "global.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64thread.h"
 
 vu32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE;
 volatile OSTime sIrqMgrResetTime = 0;
diff --git a/src/code/main.c b/src/code/main.c
index 73d9f796a..00fb9c896 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -22,9 +22,10 @@ extern struct IrqMgr gIrqMgr;
 #include "cic6105.h"
 #include "n64dd.h"
 #endif
+#include "z64thread.h"
 
 #pragma increment_block_number "gc-eu:144 gc-eu-mq:144 gc-jp:144 gc-jp-ce:144 gc-jp-mq:144 gc-us:144 gc-us-mq:144" \
-                               "ique-cn:160 ntsc-1.0:137 ntsc-1.1:137 ntsc-1.2:137 pal-1.0:135 pal-1.1:135"
+                               "ique-cn:160 ntsc-1.0:139 ntsc-1.1:139 ntsc-1.2:139 pal-1.0:137 pal-1.1:137"
 
 extern u8 _buffersSegmentEnd[];
 
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index 740f15b29..9e6d1ae14 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -31,6 +31,7 @@
 #include "libu64/debug.h"
 #include "libu64/padsetup.h"
 #include "macros.h"
+#include "padmgr.h"
 #include "fault.h"
 #include "terminal.h"
 #include "line_numbers.h"
diff --git a/src/code/sched.c b/src/code/sched.c
index b22f38b40..3c4199aef 100644
--- a/src/code/sched.c
+++ b/src/code/sched.c
@@ -42,6 +42,7 @@
 #include "global.h"
 #include "fault.h"
 #include "versions.h"
+#include "z64thread.h"
 
 #define RSP_DONE_MSG 667
 #define RDP_DONE_MSG 668
diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c
index 9e56d4088..081a29276 100644
--- a/src/code/sys_matrix.c
+++ b/src/code/sys_matrix.c
@@ -1,7 +1,14 @@
-#include "global.h"
+#include "libc64/math64.h"
+#include "gfx.h"
 #if DEBUG_FEATURES
 #include "fault.h"
 #endif
+#include "macros.h"
+#include "sys_matrix.h"
+#include "ultra64.h"
+#include "z_lib.h"
+#include "z64game.h"
+#include "z64skin_matrix.h"
 
 // clang-format off
 Mtx gIdentityMtx = gdSPDefMtx(
@@ -19,9 +26,6 @@ MtxF gIdentityMtxF = {
 };
 // clang-format on
 
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "pal-1.1:128"
-
 MtxF* sMatrixStack;   // "Matrix_stack"
 MtxF* sCurrentMatrix; // "Matrix_now"
 
diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c
index 2be2566e8..3e4ad8cbf 100644
--- a/src/code/sys_ucode.c
+++ b/src/code/sys_ucode.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;
 u64* sDefaultGSPUCodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart;
diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c
index ecfc7d7ac..0684dcd5d 100644
--- a/src/code/ucode_disas.c
+++ b/src/code/ucode_disas.c
@@ -1,5 +1,10 @@
-#include "global.h"
 #include "ucode_disas.h"
+#include "ultra64.h"
+#include "ultra64/gs2dex.h"
+#include "libu64/mtxuty-cvt.h"
+#include "segmented_address.h"
+
+#include "macros.h"
 
 #if DEBUG_FEATURES
 
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index d8e1c2ae9..b6a5c4956 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1,13 +1,30 @@
-#include "global.h"
+#include "libc64/math64.h"
 #include "fault.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
 #include "quake.h"
 #include "rand.h"
+#include "regs.h"
+#include "rumble.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_math.h"
+#include "sys_matrix.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z_lib.h"
+#include "zelda_arena.h"
+#include "z64effect.h"
+#include "z64light.h"
 #include "z64horse.h"
+#include "z64play.h"
+#include "z64skin_matrix.h"
+
+#include "global.h"
 
 #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h"
 #include "overlays/actors/ovl_En_Part/z_en_part.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "assets/objects/object_bdoor/object_bdoor.h"
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 2f768f35f..dce9b5b08 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -3640,7 +3640,7 @@ s32 Camera_KeepOn3(Camera* camera) {
 }
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ique-cn:128 ntsc-1.0:138 ntsc-1.1:138 ntsc-1.2:138 pal-1.0:136 pal-1.1:136"
+                               "ique-cn:128 ntsc-1.0:140 ntsc-1.1:140 ntsc-1.2:140 pal-1.0:138 pal-1.1:138"
 
 s32 Camera_KeepOn4(Camera* camera) {
     static Vec3f D_8015BD50;
diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c
index 9864944b1..ea6313a76 100644
--- a/src/code/z_face_reaction.c
+++ b/src/code/z_face_reaction.c
@@ -1,4 +1,6 @@
-#include "global.h"
+#include "ultra64.h"
+#include "z64face_reaction.h"
+#include "z64player.h"
 
 u16 sMaskReactionSetTextIds[MASK_REACTION_SET_MAX][PLAYER_MASK_MAX] = {
     // MASK_REACTION_SET_CARPENTER_BOSS
@@ -182,7 +184,7 @@ u16 sMaskReactionSetTextIds[MASK_REACTION_SET_MAX][PLAYER_MASK_MAX] = {
     { 0x0000, 0x7104, 0x7105, 0x7107, 0x7105, 0x710C, 0x7105, 0x7107, 0x7107 },
 };
 
-u16 MaskReaction_GetTextId(PlayState* play, u32 maskReactionSet) {
+u16 MaskReaction_GetTextId(struct PlayState* play, u32 maskReactionSet) {
     u8 currentMask = Player_GetMask(play);
 
     return sMaskReactionSetTextIds[maskReactionSet][currentMask];
diff --git a/src/code/z_frame_advance.c b/src/code/z_frame_advance.c
index 486717a50..5c8f685f2 100644
--- a/src/code/z_frame_advance.c
+++ b/src/code/z_frame_advance.c
@@ -3,7 +3,7 @@
 #include "stdbool.h"
 
 #include "controller.h"
-#include "padmgr.h"
+#include "libu64/pad.h"
 #include "macros.h"
 
 void FrameAdvance_Init(FrameAdvanceContext* frameAdvCtx) {
diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c
index 86a97183a..81e299946 100644
--- a/src/code/z_jpeg.c
+++ b/src/code/z_jpeg.c
@@ -1,6 +1,12 @@
 #include "global.h"
+#include "ultra64.h"
+#include "attributes.h"
+#include "jpeg.h"
+#include "sys_ucode.h"
 #include "terminal.h"
 
+#include "macros.h"
+
 #define MARKER_ESCAPE 0x00
 #define MARKER_SOI 0xD8
 #define MARKER_SOF 0xC0
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 012ecdb74..ab0ceaecc 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -1,5 +1,5 @@
-#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \
-                               "ique-cn:208 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:232 pal-1.1:232"
+#pragma increment_block_number "gc-eu:228 gc-eu-mq:228 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \
+                               "ique-cn:208 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:236 pal-1.1:236"
 
 #include "global.h"
 #include "ultra64.h"
diff --git a/src/code/z_nulltask.c b/src/code/z_nulltask.c
index 1f7dae689..42ba3d86f 100644
--- a/src/code/z_nulltask.c
+++ b/src/code/z_nulltask.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "sched.h"
 
 /**
  * Blocks the current thread until all queued scheduler tasks have completed.
diff --git a/src/code/z_path.c b/src/code/z_path.c
index 7afe07aab..29b51a8f1 100644
--- a/src/code/z_path.c
+++ b/src/code/z_path.c
@@ -1,6 +1,8 @@
 #include "ultra64.h"
 #include "libc64/math64.h"
 #include "segmented_address.h"
+#include "z64actor.h"
+#include "z64path.h"
 #include "z64play.h"
 
 Path* Path_GetByIndex(PlayState* play, s16 index, s16 max) {
diff --git a/src/code/z_room.c b/src/code/z_room.c
index f03ac7881..4050248b3 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "fault.h"
+#include "sys_ucode.h"
 #include "terminal.h"
 #include "versions.h"
 #include "line_numbers.h"
diff --git a/src/code/z_skin.c b/src/code/z_skin.c
index 4ba0f6cb4..508943cdd 100644
--- a/src/code/z_skin.c
+++ b/src/code/z_skin.c
@@ -1,4 +1,10 @@
-#include "global.h"
+#include "gfx.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64math.h"
+#include "z64play.h"
+#include "z64skin.h"
+#include "z64skin_matrix.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "pal-1.1:128"
diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c
index 55633bc87..8a175ed15 100644
--- a/src/code/z_skin_awb.c
+++ b/src/code/z_skin_awb.c
@@ -1,5 +1,10 @@
-#include "global.h"
 #include "overlays/actors/ovl_En_fHG/z_en_fhg.h"
+#include "segmented_address.h"
+#include "zelda_arena.h"
+#include "z64actor.h"
+#include "z64play.h"
+#include "z64skin.h"
+#include "z64skin_matrix.h"
 
 /**
  * Initialises the Vtx buffers used for limb at index `limbIndex`