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

func_8005CE6C ok

This commit is contained in:
mzxrules 2020-03-30 21:07:42 -04:00
parent b0171380ed
commit 0da3f5b708
4 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
asm/non_matchings/code/z_collision_check/func_8005CE6C.s
View File

@ -1,21 +0,0 @@
glabel func_8005CE6C
/* AD400C 8005CE6C 3C0E8012 */ lui $t6, %hi(D_8011DEAC) # $t6, 0x8012
/* AD4010 8005CE70 25CEDEAC */ addiu $t6, %lo(D_8011DEAC) # addiu $t6, $t6, -0x2154
/* AD4014 8005CE74 AFA40000 */ sw $a0, ($sp)
/* AD4018 8005CE78 25C8003C */ addiu $t0, $t6, 0x3c
/* AD401C 8005CE7C 00A0C825 */ move $t9, $a1
.L8005CE80:
/* AD4020 8005CE80 8DD80000 */ lw $t8, ($t6)
/* AD4024 8005CE84 25CE000C */ addiu $t6, $t6, 0xc
/* AD4028 8005CE88 2739000C */ addiu $t9, $t9, 0xc
/* AD402C 8005CE8C AF38FFF4 */ sw $t8, -0xc($t9)
/* AD4030 8005CE90 8DCFFFF8 */ lw $t7, -8($t6)
/* AD4034 8005CE94 AF2FFFF8 */ sw $t7, -8($t9)
/* AD4038 8005CE98 8DD8FFFC */ lw $t8, -4($t6)
/* AD403C 8005CE9C 15C8FFF8 */ bne $t6, $t0, .L8005CE80
/* AD4040 8005CEA0 AF38FFFC */ sw $t8, -4($t9)
/* AD4044 8005CEA4 8DD80000 */ lw $t8, ($t6)
/* AD4048 8005CEA8 24020001 */ li $v0, 1
/* AD404C 8005CEAC 03E00008 */ jr $ra
/* AD4050 8005CEB0 AF380000 */ sw $t8, ($t9)

2
include/functions.h
View File

@ -700,7 +700,7 @@ s32 func_8005C5F8(GlobalContext* globalCtx, ColliderTriItemDim* dim);
// ? func_8005C798(?);
// ? func_8005C7BC(?);
// ? func_8005CE6C(?);
s32 func_8005CEB4(GlobalContext* globalCtx, ColliderCylinderDim* dim);
//s32 func_8005CEB4(GlobalContext* globalCtx, ColliderCylinderDim* dim);
// ? func_8005CEC4(?);
// ? func_8005CEDC(?);
// ? func_8005CF90(?);

19
include/z64actor.h
View File

@ -318,8 +318,7 @@ typedef struct
} ColliderCylinderInit; // size = 0x2C
typedef struct
{
typedef struct {
/* 0x00 */ ColliderInit_Actor body;
/* 0x08 */ ColliderBodyInit inner;
/* 0x20 */ ColliderCylinderDim dim;
@ -348,8 +347,7 @@ typedef struct {
/* 0x18 */ ColliderJntSphItemDimInit dim;
} ColliderJntSphItemInit; // size = 0x24
typedef struct
{
typedef struct {
/* 0x00 */ Collider base;
/* 0x18 */ s32 count;
/* 0x1C */ ColliderJntSphItem* list;
@ -387,20 +385,25 @@ typedef struct {
/* 0x18 */ ColliderTriItemDimInit dim;
} ColliderTriItemInit; //size 0x3C
typedef struct
{
typedef struct {
/* 0x00 */ Collider base;
/* 0x18 */ s32 count;
/* 0x1C */ ColliderTriItem* list;
} ColliderTris; //size = 0x20
typedef struct
{
typedef struct {
/* 0x00 */ ColliderInit body;
/* 0x08 */ s32 count;
/* 0x0C */ ColliderTriItemInit* list;
} ColliderTrisInit;
typedef struct {
/* 0x00 */ Vec3f quad[4];
/* 0x30 */ Vec3s max; //bounding box max
/* 0x36 */ Vec3s min; //bounding box min
/* 0x3C */ s32 unk3C;
} ColliderQuadDim;
typedef struct
{
/* 0x00 */ Actor* actor;

12
src/code/z_collision_check.c
View File

@ -827,9 +827,14 @@ s32 func_8005CDD0(GlobalContext* globalCtx, ColliderTris* collider) {
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CE6C.s")
extern ColliderQuadDim D_8011DEAC;
//Initialize ColliderQuadDim
s32 func_8005CE6C(GlobalContext* globalCtx, ColliderQuadDim* dim) {
*dim = D_8011DEAC;
return 1;
}
s32 func_8005CEB4(GlobalContext* globalCtx, ColliderCylinderDim* dim) {
s32 func_8005CEB4(GlobalContext* globalCtx, ColliderQuadDim* dim) {
return 1;
}
@ -839,7 +844,7 @@ s32 func_8005CEB4(GlobalContext* globalCtx, ColliderCylinderDim* dim) {
#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CF90.s")
//Init Cylinder?
//Init Quad
s32 func_8005D018(GlobalContext* globalCtx, ColliderCylinderMain* collision)
{
func_8005B65C(globalCtx, &collision->base);
@ -848,6 +853,7 @@ s32 func_8005D018(GlobalContext* globalCtx, ColliderCylinderMain* collision)
return 1;
}
//Destruct Cylinder?
s32 func_8005D060(GlobalContext* globalCtx, ColliderCylinderMain* collision)
{