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

minor cleanup to func_8005E9C0

This commit is contained in:
mzxrules 2020-04-02 02:49:31 -04:00
parent ddb1c99bf4
commit 01f5bc92c8
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/code/z_collision_check.c
View File

@ -1139,10 +1139,7 @@ void func_8005E9C0(GlobalContext* globalCtx, CollisionCheckContext* check, Colli
left = (ColliderJntSph*)l;
right = (ColliderJntSph*)r;
if (left->count > 0) {
if (left->list != NULL) {
if (right->count > 0) {
if (right->list != NULL) {
if (left->count > 0 && left->list != NULL && right->count > 0 && right->list != NULL) {
for (lItem = left->list; lItem < left->list + left->count; lItem++) {
if (func_8005DF2C(&lItem->body) != 1) {
for (rItem = right->list; rItem < right->list + right->count; rItem++) {
@ -1176,9 +1173,6 @@ void func_8005E9C0(GlobalContext* globalCtx, CollisionCheckContext* check, Colli
}
}
}
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005EC6C.s")
@ -1270,6 +1264,7 @@ void func_8006139C(GlobalContext* globalCtx, CollisionCheckContext* check) {
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061E8C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061ED4.s")
//func_80061ED4 a1 = ActorDamageChart
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80061EFC.s")