summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorDragorn421 <Dragorn421@users.noreply.github.com>2024-10-07 11:16:04 +0200
committerGitHub <noreply@github.com>2024-10-07 11:16:04 +0200
commit93f22fcc42238c451697b4c85cb5b800ed1d73b4 (patch)
treebc9d3be86cdfaf1a89778a711958ee5a51bac11d /src/code
parent1d0e243806ffb9e56b1362dba8c82cc2ccb9b823 (diff)
[includes] z_collision_check.c (#2252)
* [includes] z_collision_check.c * bss
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_collision_check.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 14a12b96b..41555de22 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*);