kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

core1/code_72B0.c done

Browse Source
This commit is contained in:
Banjo Kazooie
2022-10-15 00:25:33 -05:00
parent 237a00e999
commit 2a5d6a0842
15 changed files with 199 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core2/code_34790.c
View File

@@ -5,7 +5,7 @@
extern void func_802BEA4C(f32[3], f32[3], f32, f32[3]);
extern void func_802BEBE8(f32[3], f32[3], f32, f32[3]);
extern void func_802BEAAC(f32[3], f32[3], f32, f32[3], f32[3], f32[3], f32[3]);
extern Struct66s *func_80320B98(f32[3], f32[3], f32[3], s32);
extern BKCollisionTri *func_80320B98(f32[3], f32[3], f32[3], s32);
f32 func_802BB938(f32[3], f32[3]);
f32 func_802BBD48(void);
f32 func_802BBEA4(f32 arg0[3], f32 arg1[3], f32 arg2, s32 arg3, s32 arg4);
@@ -194,7 +194,7 @@ f32 func_802BBEA4(f32 arg0[3], f32 arg1[3], f32 arg2, s32 arg3, s32 arg4) {
f32 sp4C[3];
f32 phi_f2;
f32 sp3C[3];
Struct66s *sp38;
BKCollisionTri *sp38;
s32 i;
if (arg3 == 0) {
@@ -207,7 +207,7 @@ f32 func_802BBEA4(f32 arg0[3], f32 arg1[3], f32 arg2, s32 arg3, s32 arg4) {
sp38 = func_80320B98(arg0, sp4C, sp3C, arg4);
if (sp38 != NULL) {
phi_f2 = ml_vec3f_distance(arg0, &sp4C);
D_8037D8D0.unk0[D_8037D8D0.unk30] = sp38->unk8;
D_8037D8D0.unk0[D_8037D8D0.unk30] = sp38->flags;
} else {
phi_f2 = arg2;
D_8037D8D0.unk0[D_8037D8D0.unk30] = 0;

24
src/core2/code_7AF80.c
View File

@@ -11,8 +11,8 @@ extern f32 func_803243D0(struct56s *arg0, f32 arg1[3]);
extern void func_802CAF14(u32*, s32, bool);
extern void func_8032D510(Cube *, Gfx **, Mtx **, Vtx **);
extern ActorProp *func_803322F0(Cube *, ActorMarker *, f32, s32, s32 *);
extern Struct66s *func_803319C0(Cube *cube, f32 position[3], f32 radius, f32 arg2[3], u32 flags);
extern Struct66s *func_80331638(Cube *cube, f32 volume_p1[3], f32 volume_p2[3], f32 radius, f32 arg2[3], s32, u32 flags);
extern BKCollisionTri *func_803319C0(Cube *cube, f32 position[3], f32 radius, f32 arg2[3], u32 flags);
extern BKCollisionTri *func_80331638(Cube *cube, f32 volume_p1[3], f32 volume_p2[3], f32 radius, f32 arg2[3], s32, u32 flags);
typedef struct {
s32 unk0;
@@ -542,7 +542,7 @@ void func_80303664(s32 arg0[3], s32 arg1[3]){
arg1[2] = D_80381FA0.max[2];
}
//Struct66s *
//BKCollisionTri *
void * func_803036A0(f32 volume_p1[3], f32 volume_p2[3], f32 arg2[3], u32 arg3) {
s32 cube_indx[3];
s32 min[3];
@@ -594,17 +594,17 @@ void * func_80303800(f32 volume_p1[3], f32 volume_p2[3], f32 arg2[3], u32 arg3)
return NULL;
}
//Struct66s *
//BKCollisionTri *
#ifndef NONMATCHING
Struct66s * func_80303960(f32 volume_p1[3], f32 volume_p2[3], f32 radius, f32 arg3[3], s32 arg4, u32 flags);
BKCollisionTri * func_80303960(f32 volume_p1[3], f32 volume_p2[3], f32 radius, f32 arg3[3], s32 arg4, u32 flags);
#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_7AF80/func_80303960.s")
#else
Struct66s * func_80303960(f32 volume_p1[3], f32 volume_p2[3], f32 radius, f32 arg3[3], s32 arg4, u32 flags) {
BKCollisionTri * func_80303960(f32 volume_p1[3], f32 volume_p2[3], f32 radius, f32 arg3[3], s32 arg4, u32 flags) {
s32 cube_indx[3];
s32 min[3];
s32 max[3];
Struct66s *temp_v0;
Struct66s *var_s5;
BKCollisionTri *temp_v0;
BKCollisionTri *var_s5;
var_s5 = NULL;
cube_volumeToIndices(min, max, volume_p1, volume_p2, radius + D_80381FA0.unk4);
@@ -626,13 +626,13 @@ Struct66s * func_80303960(f32 volume_p1[3], f32 volume_p2[3], f32 radius, f32 ar
}
#endif
//Struct66s *
Struct66s * func_80303AF0(f32 position[3], f32 radius, f32 arg2[3], u32 arg3) {
//BKCollisionTri *
BKCollisionTri * func_80303AF0(f32 position[3], f32 radius, f32 arg2[3], u32 arg3) {
s32 cube_indx[3];
s32 min[3];
s32 max[3];
Struct66s *temp_v0;
Struct66s *var_s5;
BKCollisionTri *temp_v0;
BKCollisionTri *var_s5;
var_s5 = NULL;
cube_volumeToIndices(min, max, position, position, radius + D_80381FA0.unk4);

26
src/core2/code_999A0.c
View File

@@ -5,9 +5,9 @@
extern void func_80303F7C(ActorMarker *, f32, s32, s32);
extern ActorProp *func_80303FE4(ActorMarker *, f32, s32);
typedef Struct66s * (*Method_Core2_999A0_0)(f32[3], f32[3], f32[3], u32);
typedef Struct66s * (*Method_Core2_999A0_1)(f32[3], f32[3], f32, f32[3], s32, u32);
typedef Struct66s * (*Method_Core2_999A0_2)(f32[3], f32, f32[3], u32);
typedef BKCollisionTri * (*Method_Core2_999A0_0)(f32[3], f32[3], f32[3], u32);
typedef BKCollisionTri * (*Method_Core2_999A0_1)(f32[3], f32[3], f32, f32[3], s32, u32);
typedef BKCollisionTri * (*Method_Core2_999A0_2)(f32[3], f32, f32[3], u32);
typedef void * (*Method_Core2_999A0_3)(void);
typedef struct {
@@ -25,7 +25,7 @@ struct {
}D_80383230;
/* .public */
Struct66s *func_80320B98(f32 arg0[3], f32 arg1[3], f32 arg2[3], u32 arg3);
BKCollisionTri *func_80320B98(f32 arg0[3], f32 arg1[3], f32 arg2[3], u32 arg3);
void func_80320B44(Method_Core2_999A0_0 arg0, Method_Core2_999A0_1 arg1, Method_Core2_999A0_2 arg2, Method_Core2_999A0_3 arg3);
/* .code */
@@ -103,10 +103,10 @@ void func_80320B84(void){
D_80383230.unk84 = NULL;
}
Struct66s *func_80320B98(f32 arg0[3], f32 arg1[3], f32 arg2[3], u32 arg3) {
BKCollisionTri *func_80320B98(f32 arg0[3], f32 arg1[3], f32 arg2[3], u32 arg3) {
Struct_core2_999A0_0 *var_s0;
Struct66s * temp_v0_2;
Struct66s * var_s7;
BKCollisionTri * temp_v0_2;
BKCollisionTri * var_s7;
var_s7 = NULL;
D_80383230.unk84 = NULL;
@@ -126,10 +126,10 @@ Struct66s *func_80320B98(f32 arg0[3], f32 arg1[3], f32 arg2[3], u32 arg3) {
return var_s7;
}
Struct66s *func_80320C94(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3[3], s32 arg4, u32 arg5) {
BKCollisionTri *func_80320C94(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3[3], s32 arg4, u32 arg5) {
Struct_core2_999A0_0 *var_s0;
Struct66s * temp_v0_2;
Struct66s * var_s7;
BKCollisionTri * temp_v0_2;
BKCollisionTri * var_s7;
var_s7 = NULL;
D_80383230.unk84 = NULL;
@@ -149,10 +149,10 @@ Struct66s *func_80320C94(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3[3], s32 ar
return var_s7;
}
Struct66s *func_80320DB0(f32 arg0[3], f32 arg1, f32 arg2[3], u32 arg3) {
BKCollisionTri *func_80320DB0(f32 arg0[3], f32 arg1, f32 arg2[3], u32 arg3) {
Struct_core2_999A0_0 *var_s0;
Struct66s * temp_v0_2;
Struct66s * var_s7;
BKCollisionTri * temp_v0_2;
BKCollisionTri * var_s7;
var_s7 = NULL;
D_80383230.unk84 = NULL;

4
src/core2/code_A4D00.c
View File

@@ -12,7 +12,7 @@ extern f32 func_8033229C(ActorMarker *marker);
extern f32 func_80309B24(f32 [3]);
extern f32 ml_vec3f_dot_product(f32[3], f32[3]);
extern f32 ml_vec3f_distance_squared(f32[3], f32[3]);
extern Struct66s *func_80320C94(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3[3], s32 arg4, u32 arg5);
extern BKCollisionTri *func_80320C94(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3[3], s32 arg4, u32 arg5);
/* .h */
typedef bool (*method_core2_A4D00_0)(Actor *, f32[3], s32, s32);
@@ -20,7 +20,7 @@ typedef bool (*method_core2_A4D00_0)(Actor *, f32[3], s32, s32);
typedef struct {
f32 unk0[3];
f32 unkC[3];
Struct66s * unk18;
BKCollisionTri * unk18;
f32 unk1C[3];
f32 unk28[3];
f32 unk34[3];

6
src/core2/code_A5BC0.c
View File

@@ -1785,9 +1785,9 @@ s32 func_80331638(Cube *cube, f32 arg1[3], f32 arg2[3], f32 arg3, f32 arg4[3], s
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_A5BC0/func_803319C0.s")
#else
Struct66s *func_803319C0(Cube *arg0, f32 arg1[3], f32 arg2, s32 arg3, f32 arg4[3], u32 arg5) {
Struct66s *var_s7;
Struct66s *var_v0;
BKCollisionTri *func_803319C0(Cube *arg0, f32 arg1[3], f32 arg2, s32 arg3, f32 arg4[3], u32 arg5) {
BKCollisionTri *var_s7;
BKCollisionTri *var_v0;
s32 var_s3;
Prop *var_s0;

6
src/core2/code_C4B0.c
View File

@@ -9,10 +9,10 @@ extern f32 func_8031C5E4(struct0*);
extern void func_8031C5FC(struct0 *, f32);
extern void func_80244FC0(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3, s32 arg4, u32 arg5);
extern s32 func_80244E54(f32[3], f32[3], f32 [3], u32, f32, f32);
extern Struct66s *func_802457C4(f32[3], f32[3], f32, f32, f32[3], s32, u32);
extern BKCollisionTri *func_802457C4(f32[3], f32[3], f32, f32, f32[3], s32, u32);
extern f32 func_80255D70(f32 arg0);
extern s32 func_8029463C(void);
extern Struct66s *func_80320C94(f32[3], f32[3], f32, f32[3], s32, u32);
extern BKCollisionTri *func_80320C94(f32[3], f32[3], f32, f32[3], s32, u32);
void func_80294378(s32 arg0);
void func_80294384(s32 arg0);
@@ -21,7 +21,7 @@ void func_80294390(void);
typedef struct {
f32 unk0[3];
f32 unkC[3];
Struct66s *unk18;
BKCollisionTri *unk18;
f32 unk1C[3];
f32 unk28[3];
f32 unk34[3];

24
src/core2/code_C5440.c
View File

@@ -59,16 +59,16 @@ func_8034C3D0(BKModel *arg0, s32 arg1, s32 vtx_xform_id, s32 arg3){
v0->unk6 = vtx_xform_id;
v0->unk0 = arg0;
v0->unk4 = arg1;
D_80372030[v0->unk6].unk0(&v0->pad8[0], arg3, v0->unk0, v0->unk4);
D_80372030[v0->unk6].unk0(&v0->unk8, arg3, v0->unk0, v0->unk4);
}
void * func_8034C448(s32 arg0){
Struct70s *func_8034C448(s32 arg0){
struct1Ds *iPtr;
struct1Ds *endPtr = vector_getEnd(D_80386140.unk4);
for(iPtr = vector_getBegin(D_80386140.unk4); iPtr < endPtr; iPtr++){
if(iPtr->unk6 == 8 && iPtr->unk4 == arg0)
return &iPtr->pad8[0];
return &iPtr->unk8;
}
return NULL;
}
@@ -94,29 +94,29 @@ s16 func_8034C50C(s32 arg0) {
}
Struct6Ds * func_8034C528(s32 arg0){
Struct70s *func_8034C528(s32 arg0){
struct1Ds *iPtr;
struct1Ds *endPtr = vector_getEnd(D_80386140.unk4);
for(iPtr = vector_getBegin(D_80386140.unk4); iPtr < endPtr; iPtr++){
if(iPtr->unk6 == 2 && iPtr->unk4 == arg0)
return &iPtr->pad8[0];
return &iPtr->unk8;
}
return NULL;
}
Struct73s *func_8034C5AC(s32 arg0){
Struct70s *func_8034C5AC(s32 arg0){
struct1Ds *iPtr;
struct1Ds *endPtr = vector_getEnd(D_80386140.unk4);
for(iPtr = vector_getBegin(D_80386140.unk4); iPtr < endPtr; iPtr++){
if(iPtr->unk6 == 3 && iPtr->unk4 == arg0)
return &iPtr->pad8[0];
return &iPtr->unk8;
}
return NULL;
}
void * func_8034C630(s32 arg0){
Struct70s *func_8034C630(s32 arg0){
struct1Ds *iPtr;
struct1Ds *endPtr = vector_getEnd(D_80386140.unk4);
@@ -124,7 +124,7 @@ void * func_8034C630(s32 arg0){
if( (iPtr->unk6 == 3)
&& func_802E9FEC(func_8033F2AC(iPtr->unk0), iPtr->unk4, arg0)
){
return &iPtr->pad8[0];
return &iPtr->unk8;
}
}
return NULL;
@@ -169,12 +169,12 @@ void func_8034C6DC(BKModel *arg0){
}
}
void * func_8034C8D8(void){
void func_8034C8D8(void){
struct1Ds *iPtr;
struct1Ds *endPtr = vector_getEnd(D_80386140.unk4);
for(iPtr = vector_getBegin(D_80386140.unk4); iPtr < endPtr; iPtr++){
D_80372030[iPtr->unk6].unk8(&iPtr->pad8[0]);
D_80372030[iPtr->unk6].unk8(&iPtr->unk8);
}
vector_free(D_80386140.unk4);
}
@@ -193,7 +193,7 @@ void * func_8034C9D4(void){
struct1Ds *endPtr = vector_getEnd(D_80386140.unk4);
for(iPtr = vector_getBegin(D_80386140.unk4); iPtr < endPtr; iPtr++){
D_80372030[iPtr->unk6].unk4(&iPtr->pad8[0], iPtr->unk0, iPtr->unk4);
D_80372030[iPtr->unk6].unk4(&iPtr->unk8, iPtr->unk0, iPtr->unk4);
}
}