From 5d091132a55c7aed1462a220cff846604ef33229 Mon Sep 17 00:00:00 2001 From: mzxrules Date: Mon, 30 Mar 2020 02:08:44 -0400 Subject: [PATCH] func_8005C2BC fake OK --- src/code/z_collision_check.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 6fc1dbe6b4..238e1e9347 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -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) {