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

func_8005CEC4 ok

This commit is contained in:
mzxrules 2020-03-30 21:15:06 -04:00
parent 0da3f5b708
commit 09912fe1e1
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
asm/non_matchings/code/z_collision_check/func_8005CEC4.s
View File

@ -1,13 +0,0 @@
.late_rodata
glabel D_8013ACF4
.float 1.0E38
.text
glabel func_8005CEC4
/* AD4064 8005CEC4 3C018014 */ lui $at, %hi(D_8013ACF4)
/* AD4068 8005CEC8 C424ACF4 */ lwc1 $f4, %lo(D_8013ACF4)($at)
/* AD406C 8005CECC AFA40000 */ sw $a0, ($sp)
/* AD4070 8005CED0 24020001 */ li $v0, 1
/* AD4074 8005CED4 03E00008 */ jr $ra
/* AD4078 8005CED8 E4A4003C */ swc1 $f4, 0x3c($a1)

2
include/z64actor.h
View File

@ -401,7 +401,7 @@ typedef struct {
/* 0x00 */ Vec3f quad[4];
/* 0x30 */ Vec3s max; //bounding box max
/* 0x36 */ Vec3s min; //bounding box min
/* 0x3C */ s32 unk3C;
/* 0x3C */ f32 unk3C;
} ColliderQuadDim;
typedef struct

8
src/code/z_collision_check.c
View File

@ -834,11 +834,17 @@ s32 func_8005CE6C(GlobalContext* globalCtx, ColliderQuadDim* dim) {
return 1;
}
//Destruct ColliderQuadDim
s32 func_8005CEB4(GlobalContext* globalCtx, ColliderQuadDim* dim) {
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CEC4.s")
//Set ColliderQuadDim unk3C
s32 func_8005CEC4(GlobalContext* globalCtx, ColliderQuadDim* dim) {
dim->unk3C = 1.0E38f;
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CEDC.s")