mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-28 19:25:27 +00:00
Code Issues Projects Releases Wiki Activity

[includes] z_collision_check.c (#2252)

Browse source 
* [includes] z_collision_check.c

* bss
This commit is contained in:
Dragorn421 2024-10-07 11:16:04 +02:00 committed by GitHub
parent 1d0e243806
commit 93f22fcc42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/code/z_collision_check.c
View file

@ -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 "terminal.h"
#include "versions.h" #include "versions.h"
#include "z64collision_check.h"
#include "z64effect.h"
#include "z64frame_advance.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 "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" \ #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.0:200 pal-1.1:200" "ntsc-1.2:104 pal-1.0:104 pal-1.1:104"
typedef s32 (*ColChkResetFunc)(PlayState*, Collider*); typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*); typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);

1
src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
View file

@ -5,6 +5,7 @@
*/ */
#include "z_eff_ss_hitmark.h" #include "z_eff_ss_hitmark.h"
#include "global.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_keep/gameplay_keep.h"
#define rTexIndex regs[0] #define rTexIndex regs[0]

2
src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
View file

@ -2,7 +2,7 @@
#define Z_EFF_SS_HITMARK_H #define Z_EFF_SS_HITMARK_H
#include "ultra64.h" #include "ultra64.h"
#include "global.h" #include "z64math.h"
typedef struct EffectSsHitMarkInitParams { typedef struct EffectSsHitMarkInitParams {
/* 0x00 */ s32 type; /* 0x00 */ s32 type;