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

func_8005BB8C func_8005BBB0 func_8005BBD4 Ok

This commit is contained in:
mzxrules 2020-03-22 20:02:19 -04:00
parent 0e688490de
commit 56185fce9f
4 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
asm/non_matchings/code/z_collision_check/func_8005BB8C.s
View File

@ -1,11 +0,0 @@
glabel func_8005BB8C
/* AD2D2C 8005BB8C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* AD2D30 8005BB90 AFBF0014 */ sw $ra, 0x14($sp)
/* AD2D34 8005BB94 0C016E6C */ jal func_8005B9B0
/* AD2D38 8005BB98 00000000 */ nop
/* AD2D3C 8005BB9C 8FBF0014 */ lw $ra, 0x14($sp)
/* AD2D40 8005BBA0 27BD0018 */ addiu $sp, $sp, 0x18
/* AD2D44 8005BBA4 24020001 */ li $v0, 1
/* AD2D48 8005BBA8 03E00008 */ jr $ra
/* AD2D4C 8005BBAC 00000000 */ nop

11
asm/non_matchings/code/z_collision_check/func_8005BBB0.s
View File

@ -1,11 +0,0 @@
glabel func_8005BBB0
/* AD2D50 8005BBB0 27BDFFE8 */ addiu $sp, $sp, -0x18
/* AD2D54 8005BBB4 AFBF0014 */ sw $ra, 0x14($sp)
/* AD2D58 8005BBB8 0C016E7A */ jal func_8005B9E8
/* AD2D5C 8005BBBC 00000000 */ nop
/* AD2D60 8005BBC0 8FBF0014 */ lw $ra, 0x14($sp)
/* AD2D64 8005BBC4 27BD0018 */ addiu $sp, $sp, 0x18
/* AD2D68 8005BBC8 24020001 */ li $v0, 1
/* AD2D6C 8005BBCC 03E00008 */ jr $ra
/* AD2D70 8005BBD0 00000000 */ nop

11
asm/non_matchings/code/z_collision_check/func_8005BBD4.s
View File

@ -1,11 +0,0 @@
glabel func_8005BBD4
/* AD2D74 8005BBD4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* AD2D78 8005BBD8 AFBF0014 */ sw $ra, 0x14($sp)
/* AD2D7C 8005BBDC 0C016E87 */ jal func_8005BA1C
/* AD2D80 8005BBE0 00000000 */ nop
/* AD2D84 8005BBE4 8FBF0014 */ lw $ra, 0x14($sp)
/* AD2D88 8005BBE8 27BD0018 */ addiu $sp, $sp, 0x18
/* AD2D8C 8005BBEC 24020001 */ li $v0, 1
/* AD2D90 8005BBF0 03E00008 */ jr $ra
/* AD2D94 8005BBF4 00000000 */ nop

22
src/code/z_collision_check.c
View File

@ -238,12 +238,26 @@ s32 func_8005BB48(GlobalContext* globalCtx, ColliderJntSphItem* dest, ColliderJn
return 1; return 1;
} }
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BB8C.s") //Set CollisionBody Property
//arg1 could be wrong type
s32 func_8005BB8C(GlobalContext* globalCtx, ColliderJntSphItem* collider) {
func_8005B9B0(globalCtx, &collider->body);
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BBB0.s") //Set CollisionBody Property
//arg1 could be wrong type
s32 func_8005BBB0(GlobalContext* globalCtx, ColliderJntSphItem* collider) {
func_8005B9E8(globalCtx, &collider->body);
return 1;
}
//wrapper for 5BA1C //Set CollisionBody Property
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BBD4.s") //arg1 could be wrong type
s32 func_8005BBD4(GlobalContext* globalCtx, ColliderJntSphItem* collider) {
func_8005BA1C(globalCtx, &collider->body);
return 1;
}
//Initialize ColliderJntSph //Initialize ColliderJntSph
s32 func_8005BBF8(GlobalContext* globalCtx, ColliderJntSph* collision) { s32 func_8005BBF8(GlobalContext* globalCtx, ColliderJntSph* collision) {