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

func_8005D4B4 func_8005D4C8 ok

This commit is contained in:
mzxrules 2020-03-31 13:13:03 -04:00
parent 7335564f79
commit 2ea19f0401
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +0,0 @@
glabel func_8005D4B4
/* AD4654 8005D4B4 AFA40000 */ sw $a0, ($sp)
/* AD4658 8005D4B8 94AE0002 */ lhu $t6, 2($a1)
/* AD465C 8005D4BC 35CF0001 */ ori $t7, $t6, 1
/* AD4660 8005D4C0 03E00008 */ jr $ra
/* AD4664 8005D4C4 A4AF0002 */ sh $t7, 2($a1)
/* AD4668 8005D4C8 AFA40000 */ sw $a0, ($sp)
/* AD466C 8005D4CC 94AE0002 */ lhu $t6, 2($a1)
/* AD4670 8005D4D0 31CFFFFE */ andi $t7, $t6, 0xfffe
/* AD4674 8005D4D4 03E00008 */ jr $ra
/* AD4678 8005D4D8 A4AF0002 */ sh $t7, 2($a1)

10
src/code/z_collision_check.c
View File

@ -968,7 +968,15 @@ void func_8005D40C(GlobalContext* globalCtx, CollisionCheckContext* check) {
}
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D4B4.s")
//unconfirmed args
void func_8005D4B4(GlobalContext* globalCtx, CollisionCheckContext* check) {
check->unk2 |= 1;
}
//unconfirmed args
void func_8005D4C8(GlobalContext* globalCtx, CollisionCheckContext* check) {
check->unk2 &= ~1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D4DC.s")