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

func_8005C7E0 ok, func_8005C810 split

This commit is contained in:
mzxrules 2020-03-30 14:14:51 -04:00
parent 8e685979d6
commit 53a203bfc9
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
asm/non_matchings/code/z_collision_check/func_8005C7E0.s → asm/non_matchings/code/z_collision_check/func_8005C810.s
View File

@ -4,20 +4,7 @@ glabel D_8013A750
.balign 4
.text
glabel func_8005C7E0
/* AD3980 8005C7E0 27BDFFE8 */ addiu $sp, $sp, -0x18
/* AD3984 8005C7E4 AFBF0014 */ sw $ra, 0x14($sp)
/* AD3988 8005C7E8 0C016D97 */ jal func_8005B65C
/* AD398C 8005C7EC AFA5001C */ sw $a1, 0x1c($sp)
/* AD3990 8005C7F0 8FA5001C */ lw $a1, 0x1c($sp)
/* AD3994 8005C7F4 24020001 */ li $v0, 1
/* AD3998 8005C7F8 ACA00018 */ sw $zero, 0x18($a1)
/* AD399C 8005C7FC ACA0001C */ sw $zero, 0x1c($a1)
/* AD39A0 8005C800 8FBF0014 */ lw $ra, 0x14($sp)
/* AD39A4 8005C804 27BD0018 */ addiu $sp, $sp, 0x18
/* AD39A8 8005C808 03E00008 */ jr $ra
/* AD39AC 8005C80C 00000000 */ nop
glabel func_8005C810
/* AD39B0 8005C810 27BDFFD8 */ addiu $sp, $sp, -0x28
/* AD39B4 8005C814 AFBF0024 */ sw $ra, 0x24($sp)
/* AD39B8 8005C818 AFB2001C */ sw $s2, 0x1c($sp)

7
include/z64actor.h
View File

@ -383,6 +383,13 @@ typedef struct {
/* 0x18 */ ColliderTriItemDim dim;
} ColliderTriItemInit;
typedef struct
{
/* 0x00 */ Collider base;
/* 0x18 */ s32 count;
/* 0x1C */ ColliderTriItem* list;
} ColliderTris; //size 0x20
typedef struct
{
/* 0x00 */ Actor* actor;

11
src/code/z_collision_check.c
View File

@ -646,7 +646,6 @@ s32 func_8005C774(GlobalContext* globalCtx, ColliderTriItem* item) {
return 1;
}
s32 func_8005C798(GlobalContext* globalCtx, ColliderTriItem* item) {
func_8005B9E8(globalCtx, &item->body);
return 1;
@ -657,8 +656,16 @@ s32 func_8005C7BC(GlobalContext* globalCtx, ColliderTriItem* item) {
return 1;
}
//Initialize ColliderTris
s32 func_8005C7E0(GlobalContext* globalCtx, ColliderTris* tris) {
func_8005B65C(globalCtx, &tris->base);
tris->count = 0;
tris->list = 0;
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C7E0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C810.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C8C8.s")