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

func_8005C6F8 ok

This commit is contained in:
mzxrules 2020-03-30 13:04:31 -04:00
parent ec4118d3b1
commit acebb0145c
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
asm/non_matchings/code/z_collision_check/func_8005C6F8.s
View File

@ -1,16 +0,0 @@
glabel func_8005C6F8
/* AD3898 8005C6F8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* AD389C 8005C6FC AFBF0014 */ sw $ra, 0x14($sp)
/* AD38A0 8005C700 AFA40018 */ sw $a0, 0x18($sp)
/* AD38A4 8005C704 0C016E41 */ jal func_8005B904
/* AD38A8 8005C708 AFA5001C */ sw $a1, 0x1c($sp)
/* AD38AC 8005C70C 8FA5001C */ lw $a1, 0x1c($sp)
/* AD38B0 8005C710 8FA40018 */ lw $a0, 0x18($sp)
/* AD38B4 8005C714 0C01717E */ jal func_8005C5F8
/* AD38B8 8005C718 24A50028 */ addiu $a1, $a1, 0x28
/* AD38BC 8005C71C 8FBF0014 */ lw $ra, 0x14($sp)
/* AD38C0 8005C720 27BD0018 */ addiu $sp, $sp, 0x18
/* AD38C4 8005C724 24020001 */ li $v0, 1
/* AD38C8 8005C728 03E00008 */ jr $ra
/* AD38CC 8005C72C 00000000 */ nop

9
src/code/z_collision_check.c
View File

@ -619,13 +619,20 @@ s32 func_8005C608(GlobalContext* globalCtx, ColliderTriItemDim* dest, ColliderTr
return 1; return 1;
} }
//Initialize ColliderTriItem
s32 func_8005C6C0(GlobalContext* globalCtx, ColliderTriItem* collision) { s32 func_8005C6C0(GlobalContext* globalCtx, ColliderTriItem* collision) {
func_8005B884(globalCtx, &collision->body); func_8005B884(globalCtx, &collision->body);
func_8005C5B0(globalCtx, &collision->dim); func_8005C5B0(globalCtx, &collision->dim);
return 1; return 1;
} }
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C6F8.s") //Destruct ColliderTriItem
s32 func_8005C6F8(GlobalContext* globalCtx, ColliderTriItem* collision) {
func_8005B904(globalCtx, &collision->body);
func_8005C5F8(globalCtx, &collision->dim);
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C730.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C730.s")