Reduce overlay dependencies on global.h (4) (#2456)

* remove more global.h references

* .bss

include/z64game.h

@@ -3,7 +3,7 @@
 // This file is named "game" after game.c for now, this may change later with the system name
 
 #include "ultra64/ultratypes.h"
-#include "padmgr.h"
+#include "libu64/pad.h"
 #include "tha.h"
 
 struct GraphicsContext;

include/z64view.h

@@ -1,6 +1,7 @@
 #ifndef Z64VIEW_H
 #define Z64VIEW_H
 
+#include "macros.h"
 #include "ultra64.h"
 #include "z64math.h"
 

include/z_lib.h

@@ -2,7 +2,7 @@
 #define Z_LIB_H
 
 #include "libc/stddef.h"
-#include "padmgr.h"
+#include "libu64/pad.h"
 #include "z64math.h"
 #include "color.h"
 

src/code/sys_math3d.c

@@ -5,8 +5,8 @@
 #include "macros.h"
 #include "sys_math3d.h"
 
-#pragma increment_block_number "gc-eu:97 gc-eu-mq:97 gc-jp:97 gc-jp-ce:97 gc-jp-mq:97 gc-us:97 gc-us-mq:97 ique-cn:97" \
-                               "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:79 pal-1.0:80 pal-1.1:80"
+#pragma increment_block_number "gc-eu:120 gc-eu-mq:120 gc-jp:120 gc-jp-ce:120 gc-jp-mq:120 gc-us:120 gc-us-mq:120" \
+                               "ique-cn:120 ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96"
 
 s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,
                                       Vec3f* lineAClosestToB, Vec3f* lineBClosestToA);

src/code/z_collision_check.c

@@ -16,7 +16,7 @@
 #include "z_lib.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ique-cn:128 ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96"
+                               "ique-cn:128 ntsc-1.0:104 ntsc-1.1:104 ntsc-1.2:104 pal-1.0:104 pal-1.1:104"
 
 typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
 typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);

src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c

@@ -5,6 +5,18 @@
  */
 
 #include "z_bg_hidan_sima.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "rumble.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h

@@ -2,11 +2,11 @@
 #define Z_BG_HIDAN_SIMA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgHidanSima;
 
-typedef void (*BgHidanSimaActionFunc)(struct BgHidanSima*, PlayState*);
+typedef void (*BgHidanSimaActionFunc)(struct BgHidanSima*, struct PlayState*);
 
 typedef struct BgHidanSima {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c

@@ -5,6 +5,11 @@
  */
 
 #include "z_bg_hidan_syoku.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "z64play.h"
+
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h

@@ -2,11 +2,11 @@
 #define Z_BG_HIDAN_SYOKU_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgHidanSyoku;
 
-typedef void (*BgHidanSyokuActionFunc)(struct BgHidanSyoku*, PlayState*);
+typedef void (*BgHidanSyokuActionFunc)(struct BgHidanSyoku*, struct PlayState*);
 
 typedef struct BgHidanSyoku {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_ice_objects.h"
+
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "rand.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h

@@ -2,11 +2,11 @@
 #define Z_BG_ICE_OBJECTS_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgIceObjects;
 
-typedef void (*BgIceObjectsActionFunc) (struct BgIceObjects*, PlayState*);
+typedef void (*BgIceObjectsActionFunc) (struct BgIceObjects*, struct PlayState*);
 
 typedef struct BgIceObjects {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c

@@ -5,6 +5,17 @@
  */
 
 #include "z_bg_ice_shelter.h"
+
+#include "libc64/qrand.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/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h

@@ -2,11 +2,11 @@
 #define Z_BG_ICE_SHELTER_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgIceShelter;
 
-typedef void (*BgIceShelterActionFunc)(struct BgIceShelter*, PlayState*);
+typedef void (*BgIceShelterActionFunc)(struct BgIceShelter*, struct PlayState*);
 
 typedef enum RedIceType {
     /* 0 */ RED_ICE_LARGE,    // Large red ice block

src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_ice_shutter.h"
+
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h

@@ -2,11 +2,11 @@
 #define Z_BG_ICE_SHUTTER_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgIceShutter;
 
-typedef void (*BgIceShutterActionFunc)(struct BgIceShutter*, PlayState*);
+typedef void (*BgIceShutterActionFunc)(struct BgIceShutter*, struct PlayState*);
 
 typedef struct BgIceShutter {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_bg_ice_turara.h"
+
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "rand.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h

@@ -2,11 +2,11 @@
 #define Z_BG_ICE_TURARA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgIceTurara;
 
-typedef void (*BgIceTuraraActionFunc)(struct BgIceTurara*, PlayState*);
+typedef void (*BgIceTuraraActionFunc)(struct BgIceTurara*, struct PlayState*);
 
 typedef enum BgIceTuraraType {
     /* 0 */ TURARA_STALAGMITE,

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_ingate.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ingate/object_ingate.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h

@@ -2,11 +2,11 @@
 #define Z_BG_INGATE_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgInGate;
 
-typedef void (*BgInGateActionFunc)(struct BgInGate*, PlayState*);
+typedef void (*BgInGateActionFunc)(struct BgInGate*, struct PlayState*);
 
 typedef struct BgInGate {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c

@@ -5,6 +5,12 @@
  */
 
 #include "z_bg_jya_1flift.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED