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

func_8005CEDC ok

This commit is contained in:
mzxrules 2020-03-30 21:39:42 -04:00
parent 09912fe1e1
commit 1404d7e149
2 changed files with 8 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
asm/non_matchings/code/z_collision_check/func_8005CEDC.s
View File

@ -1,47 +0,0 @@
glabel func_8005CEDC
/* AD407C 8005CEDC C4840018 */ lwc1 $f4, 0x18($a0)
/* AD4080 8005CEE0 C4860024 */ lwc1 $f6, 0x24($a0)
/* AD4084 8005CEE4 3C013F00 */ li $at, 0x3F000000 # 0.000000
/* AD4088 8005CEE8 44810000 */ mtc1 $at, $f0
/* AD408C 8005CEEC 46062200 */ add.s $f8, $f4, $f6
/* AD4090 8005CEF0 C4840028 */ lwc1 $f4, 0x28($a0)
/* AD4094 8005CEF4 C492001C */ lwc1 $f18, 0x1c($a0)
/* AD4098 8005CEF8 46004282 */ mul.s $f10, $f8, $f0
/* AD409C 8005CEFC 46049180 */ add.s $f6, $f18, $f4
/* AD40A0 8005CF00 C492002C */ lwc1 $f18, 0x2c($a0)
/* AD40A4 8005CF04 46003202 */ mul.s $f8, $f6, $f0
/* AD40A8 8005CF08 4600540D */ trunc.w.s $f16, $f10
/* AD40AC 8005CF0C 4600428D */ trunc.w.s $f10, $f8
/* AD40B0 8005CF10 440F8000 */ mfc1 $t7, $f16
/* AD40B4 8005CF14 C4900020 */ lwc1 $f16, 0x20($a0)
/* AD40B8 8005CF18 44195000 */ mfc1 $t9, $f10
/* AD40BC 8005CF1C 46128100 */ add.s $f4, $f16, $f18
/* AD40C0 8005CF20 C490000C */ lwc1 $f16, 0xc($a0)
/* AD40C4 8005CF24 C48A0000 */ lwc1 $f10, ($a0)
/* AD40C8 8005CF28 A48F0030 */ sh $t7, 0x30($a0)
/* AD40CC 8005CF2C 46002182 */ mul.s $f6, $f4, $f0
/* AD40D0 8005CF30 46105480 */ add.s $f18, $f10, $f16
/* AD40D4 8005CF34 C48A0010 */ lwc1 $f10, 0x10($a0)
/* AD40D8 8005CF38 A4990032 */ sh $t9, 0x32($a0)
/* AD40DC 8005CF3C 46009102 */ mul.s $f4, $f18, $f0
/* AD40E0 8005CF40 4600320D */ trunc.w.s $f8, $f6
/* AD40E4 8005CF44 4600218D */ trunc.w.s $f6, $f4
/* AD40E8 8005CF48 44094000 */ mfc1 $t1, $f8
/* AD40EC 8005CF4C C4880004 */ lwc1 $f8, 4($a0)
/* AD40F0 8005CF50 440B3000 */ mfc1 $t3, $f6
/* AD40F4 8005CF54 460A4400 */ add.s $f16, $f8, $f10
/* AD40F8 8005CF58 C4880014 */ lwc1 $f8, 0x14($a0)
/* AD40FC 8005CF5C C4860008 */ lwc1 $f6, 8($a0)
/* AD4100 8005CF60 A4890034 */ sh $t1, 0x34($a0)
/* AD4104 8005CF64 46008482 */ mul.s $f18, $f16, $f0
/* AD4108 8005CF68 46083280 */ add.s $f10, $f6, $f8
/* AD410C 8005CF6C A48B0036 */ sh $t3, 0x36($a0)
/* AD4110 8005CF70 46005402 */ mul.s $f16, $f10, $f0
/* AD4114 8005CF74 4600910D */ trunc.w.s $f4, $f18
/* AD4118 8005CF78 4600848D */ trunc.w.s $f18, $f16
/* AD411C 8005CF7C 440D2000 */ mfc1 $t5, $f4
/* AD4120 8005CF80 440F9000 */ mfc1 $t7, $f18
/* AD4124 8005CF84 A48D0038 */ sh $t5, 0x38($a0)
/* AD4128 8005CF88 03E00008 */ jr $ra
/* AD412C 8005CF8C A48F003A */ sh $t7, 0x3a($a0)

9
src/code/z_collision_check.c
View File

@ -846,7 +846,14 @@ s32 func_8005CEC4(GlobalContext* globalCtx, ColliderQuadDim* dim) {
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CEDC.s")
void func_8005CEDC(ColliderQuadDim* dim) {
dim->max.x = (dim->quad[3].x + dim->quad[2].x) * 0.5f;
dim->max.y = (dim->quad[3].y + dim->quad[2].y) * 0.5f;
dim->max.z = (dim->quad[3].z + dim->quad[2].z) * 0.5f;
dim->min.x = (dim->quad[1].x + dim->quad[0].x) * 0.5f;
dim->min.y = (dim->quad[1].y + dim->quad[0].y) * 0.5f;
dim->min.z = (dim->quad[1].z + dim->quad[0].z) * 0.5f;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CF90.s")