falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

func_8005C2BC fake OK

This commit is contained in:
mzxrules 2020-03-30 02:08:44 -04:00
parent f4f44364f9
commit 5d091132a5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/code/z_collision_check.c
View File

@ -483,12 +483,16 @@ s32 func_8005C234(GlobalContext* globalCtx, ColliderJntSph* collider) {
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C234.s")
#endif // NON_MATCHING
//#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C2BC.s")
extern ColliderCylinderDim D_8011DE6C;
#ifdef NON_MATCHING
//matching, but needs data section imported
s32 func_8005C2BC(GlobalContext* globalCtx, ColliderCylinderDim* dim) {
*dim = D_8011DE6C;
ColliderCylinderDim init = { 0, 0, 0, 0, 0, 0 }; //TODO: this is D_8011DE6C;
*dim = init;
return 1;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C2BC.s")
#endif // NON_MATCHING
s32 func_8005C318(GlobalContext* globalCtx, ColliderCylinderDim* dim)
{