From 93f22fcc42238c451697b4c85cb5b800ed1d73b4 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Mon, 7 Oct 2024 11:16:04 +0200
Subject: [PATCH] [includes] z_collision_check.c (#2252)

* [includes] z_collision_check.c

* bss
---
 src/code/z_collision_check.c                    | 17 +++++++++++++----
 .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c    |  1 +
 .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h    |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 14a12b96b7..41555de22e 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -1,13 +1,22 @@
-#include "global.h"
+#include "gfx.h"
+#include "macros.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_math3d.h"
+#include "sys_matrix.h"
 #include "terminal.h"
 #include "versions.h"
-
+#include "z64collision_check.h"
+#include "z64effect.h"
 #include "z64frame_advance.h"
+#include "zelda_arena.h"
+#include "z64play.h"
 
 #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h"
+#include "z_lib.h"
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:208" \
-                               "pal-1.0:200 pal-1.1:200"
+#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" \
+                               "ntsc-1.2:104 pal-1.0:104 pal-1.1:104"
 
 typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
 typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);
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 8a67d26faf..2e279a5b12 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
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_hitmark.h"
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rTexIndex regs[0]
diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
index 6859910455..591ba5a7d0 100644
--- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
+++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
@@ -2,7 +2,7 @@
 #define Z_EFF_SS_HITMARK_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64math.h"
 
 typedef struct EffectSsHitMarkInitParams {
     /* 0x00 */ s32 type;