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

func_8005C6C0 ok

This commit is contained in:
mzxrules 2020-03-30 12:56:24 -04:00
parent 417dbe2659
commit ec4118d3b1
4 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +0,0 @@
glabel func_8005C6C0
/* AD3860 8005C6C0 27BDFFE8 */ addiu $sp, $sp, -0x18
/* AD3864 8005C6C4 AFBF0014 */ sw $ra, 0x14($sp)
/* AD3868 8005C6C8 AFA40018 */ sw $a0, 0x18($sp)
/* AD386C 8005C6CC 0C016E21 */ jal func_8005B884
/* AD3870 8005C6D0 AFA5001C */ sw $a1, 0x1c($sp)
/* AD3874 8005C6D4 8FA5001C */ lw $a1, 0x1c($sp)
/* AD3878 8005C6D8 8FA40018 */ lw $a0, 0x18($sp)
/* AD387C 8005C6DC 0C01716C */ jal func_8005C5B0
/* AD3880 8005C6E0 24A50028 */ addiu $a1, $a1, 0x28
/* AD3884 8005C6E4 8FBF0014 */ lw $ra, 0x14($sp)
/* AD3888 8005C6E8 27BD0018 */ addiu $sp, $sp, 0x18
/* AD388C 8005C6EC 24020001 */ li $v0, 1
/* AD3890 8005C6F0 03E00008 */ jr $ra
/* AD3894 8005C6F4 00000000 */ nop

2
include/functions.h
View File

@ -691,7 +691,7 @@ s32 func_8005C508(GlobalContext* globalCtx, ColliderCylinderMain* collision);
s32 func_8005C540(GlobalContext* globalCtx, ColliderCylinderMain* collision); s32 func_8005C540(GlobalContext* globalCtx, ColliderCylinderMain* collision);
s32 func_8005C578(GlobalContext* globalCtx, ColliderCylinderMain* collision); s32 func_8005C578(GlobalContext* globalCtx, ColliderCylinderMain* collision);
// ? func_8005C5B0(?); // ? func_8005C5B0(?);
s32 func_8005C5F8(GlobalContext* globalCtx, ColliderTriDim* dim); s32 func_8005C5F8(GlobalContext* globalCtx, ColliderTriItemDim* dim);
// ? func_8005C608(?); // ? func_8005C608(?);
// ? func_8005C6C0(?); // ? func_8005C6C0(?);
// ? func_8005C6F8(?); // ? func_8005C6F8(?);

7
include/z64actor.h
View File

@ -371,9 +371,12 @@ typedef struct {
/* 0x00 */ Vec3f poly[3]; /* 0x00 */ Vec3f poly[3];
/* 0x24 */ Vec3f unitNormal; /* 0x24 */ Vec3f unitNormal;
/* 0x30 */ float normalDist; /* 0x30 */ float normalDist;
} ColliderTriDim; } ColliderTriItemDim;
typedef struct {
/* 0x00 */ ColliderBody body;
/* 0x28 */ ColliderTriItemDim dim;
} ColliderTriItem;
typedef struct typedef struct
{ {

20
src/code/z_collision_check.c
View File

@ -580,23 +580,23 @@ s32 func_8005C578(GlobalContext* globalCtx, ColliderCylinderMain* collision)
return 1; return 1;
} }
extern ColliderTriDim D_8011DE78; extern ColliderTriItemDim D_8011DE78;
//Initialize ColliderTriDim //Initialize ColliderTriItemDim
s32 func_8005C5B0(GlobalContext* globalCtx, ColliderTriDim* dim) s32 func_8005C5B0(GlobalContext* globalCtx, ColliderTriItemDim* dim)
{ {
*dim = D_8011DE78; *dim = D_8011DE78;
return 1; return 1;
} }
//Destruct ColliderTriDim //Destruct ColliderTriItemDim
s32 func_8005C5F8(GlobalContext* globalCtx, ColliderTriDim* dim) s32 func_8005C5F8(GlobalContext* globalCtx, ColliderTriItemDim* dim)
{ {
return 1; return 1;
} }
//Copy ColliderTriDim //Copy ColliderTriItemDim
s32 func_8005C608(GlobalContext* globalCtx, ColliderTriDim* dest, ColliderTriDim* src) s32 func_8005C608(GlobalContext* globalCtx, ColliderTriItemDim* dest, ColliderTriItemDim* src)
{ {
Vec3f* d; Vec3f* d;
Vec3f* s; Vec3f* s;
@ -619,7 +619,11 @@ s32 func_8005C608(GlobalContext* globalCtx, ColliderTriDim* dest, ColliderTriDim
return 1; return 1;
} }
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C6C0.s") s32 func_8005C6C0(GlobalContext* globalCtx, ColliderTriItem* collision) {
func_8005B884(globalCtx, &collision->body);
func_8005C5B0(globalCtx, &collision->dim);
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C6F8.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C6F8.s")