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

func_8005BB10 Ok

This commit is contained in:
mzxrules 2020-03-22 05:37:35 -04:00
parent e5736d39bd
commit 4996ba969d
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +0,0 @@
glabel func_8005BB10
/* AD2CB0 8005BB10 27BDFFE8 */ addiu $sp, $sp, -0x18
/* AD2CB4 8005BB14 AFBF0014 */ sw $ra, 0x14($sp)
/* AD2CB8 8005BB18 AFA40018 */ sw $a0, 0x18($sp)
/* AD2CBC 8005BB1C 0C016E41 */ jal func_8005B904
/* AD2CC0 8005BB20 AFA5001C */ sw $a1, 0x1c($sp)
/* AD2CC4 8005BB24 8FA5001C */ lw $a1, 0x1c($sp)
/* AD2CC8 8005BB28 8FA40018 */ lw $a0, 0x18($sp)
/* AD2CCC 8005BB2C 0C016E9D */ jal func_8005BA74
/* AD2CD0 8005BB30 24A50028 */ addiu $a1, $a1, 0x28
/* AD2CD4 8005BB34 8FBF0014 */ lw $ra, 0x14($sp)
/* AD2CD8 8005BB38 27BD0018 */ addiu $sp, $sp, 0x18
/* AD2CDC 8005BB3C 24020001 */ li $v0, 1
/* AD2CE0 8005BB40 03E00008 */ jr $ra
/* AD2CE4 8005BB44 00000000 */ nop

2
include/functions.h
View File

@ -672,7 +672,7 @@ void func_8005B9B0(GlobalContext* globalCtx, ColliderBody* body);
void func_8005B9E8(GlobalContext* globalCtx, ColliderBody* body);
// ? func_8005BA1C(?);
// ? func_8005BA30(?);
s32 func_8005BA74(UNK_TYPE, UNK_TYPE);
s32 func_8005BA74(GlobalContext* globalCtx, ColliderJntSphItemDim* item);
// ? func_8005BA84(?);
// ? func_8005BAD8(?);
// ? func_8005BB10(?);

11
src/code/z_collision_check.c
View File

@ -199,11 +199,13 @@ s32 func_8005BA30(GlobalContext* globalCtx, ColliderJntSphItemDim* dim) {
return 1;
}
s32 func_8005BA74(UNK_TYPE arg0, UNK_TYPE arg1)
//Destruct JntSphItemDim
s32 func_8005BA74(GlobalContext* globalCtx, ColliderJntSphItemDim* item)
{
return 1;
}
//SetInit JntSphItemDim
s32 func_8005BA84(GlobalContext* globalCtx, ColliderJntSphItemDim* dest, ColliderJntSphItemDimInit* src);
/*
{
@ -222,7 +224,12 @@ s32 func_8005BAD8(GlobalContext* globalCtx, ColliderJntSphItem* item) {
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BB10.s")
//Destruct JntSphItem
s32 func_8005BB10(GlobalContext* globalCtx, ColliderJntSphItem* item) {
func_8005B904(globalCtx, &item->body);
func_8005BA74(globalCtx, &item->dim);
return 1;
}
//SetInit JntSphItem
s32 func_8005BB48(GlobalContext* globalCtx, ColliderJntSphItem* dest, ColliderJntSphItemInit* src) {