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

func_8005C774 func_8005C798 func_8005C7BC OK

This commit is contained in:
mzxrules 2020-03-30 13:35:31 -04:00
parent b0c48a64d4
commit 8e685979d6
4 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +0,0 @@
glabel func_8005C774
/* AD3914 8005C774 27BDFFE8 */ addiu $sp, $sp, -0x18
/* AD3918 8005C778 AFBF0014 */ sw $ra, 0x14($sp)
/* AD391C 8005C77C 0C016E6C */ jal func_8005B9B0
/* AD3920 8005C780 00000000 */ nop
/* AD3924 8005C784 8FBF0014 */ lw $ra, 0x14($sp)
/* AD3928 8005C788 27BD0018 */ addiu $sp, $sp, 0x18
/* AD392C 8005C78C 24020001 */ li $v0, 1
/* AD3930 8005C790 03E00008 */ jr $ra
/* AD3934 8005C794 00000000 */ nop

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

@ -1,11 +0,0 @@
glabel func_8005C798
/* AD3938 8005C798 27BDFFE8 */ addiu $sp, $sp, -0x18
/* AD393C 8005C79C AFBF0014 */ sw $ra, 0x14($sp)
/* AD3940 8005C7A0 0C016E7A */ jal func_8005B9E8
/* AD3944 8005C7A4 00000000 */ nop
/* AD3948 8005C7A8 8FBF0014 */ lw $ra, 0x14($sp)
/* AD394C 8005C7AC 27BD0018 */ addiu $sp, $sp, 0x18
/* AD3950 8005C7B0 24020001 */ li $v0, 1
/* AD3954 8005C7B4 03E00008 */ jr $ra
/* AD3958 8005C7B8 00000000 */ nop

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

@ -1,11 +0,0 @@
glabel func_8005C7BC
/* AD395C 8005C7BC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* AD3960 8005C7C0 AFBF0014 */ sw $ra, 0x14($sp)
/* AD3964 8005C7C4 0C016E87 */ jal func_8005BA1C
/* AD3968 8005C7C8 00000000 */ nop
/* AD396C 8005C7CC 8FBF0014 */ lw $ra, 0x14($sp)
/* AD3970 8005C7D0 27BD0018 */ addiu $sp, $sp, 0x18
/* AD3974 8005C7D4 24020001 */ li $v0, 1
/* AD3978 8005C7D8 03E00008 */ jr $ra
/* AD397C 8005C7DC 00000000 */ nop

17
src/code/z_collision_check.c
View File

@ -641,11 +641,22 @@ s32 func_8005C730(GlobalContext* globalCtx, ColliderTriItem* dest, ColliderTriIt
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C774.s")
s32 func_8005C774(GlobalContext* globalCtx, ColliderTriItem* item) {
func_8005B9B0(globalCtx, &item->body);
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C798.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C7BC.s")
s32 func_8005C798(GlobalContext* globalCtx, ColliderTriItem* item) {
func_8005B9E8(globalCtx, &item->body);
return 1;
}
s32 func_8005C7BC(GlobalContext* globalCtx, ColliderTriItem* item) {
func_8005BA1C(globalCtx, &item->body);
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C7E0.s")