diff --git a/include/core1/core1.h b/include/core1/core1.h index e1fb239c..a6ef1e11 100644 --- a/include/core1/core1.h +++ b/include/core1/core1.h @@ -25,8 +25,6 @@ /* need to sort out in individual header files */ -void mlMtx_apply_vec3f(f32[3], f32[3]); -void func_80252C08(f32 arg0[3], f32 arg1[3], f32 scale, f32 arg3[3]); void glcrc_calc_checksum(void *start, void *end, u32 checksum[2]); void func_80250530(s32 arg0, u16 chan_mask, f32 arg2); diff --git a/include/core1/mlmtx.h b/include/core1/mlmtx.h index 0bf54369..be949db6 100644 --- a/include/core1/mlmtx.h +++ b/include/core1/mlmtx.h @@ -12,7 +12,9 @@ void mlMtx_push_mtx(f32* mtx); void mlMtx_push_multiplied(f32* l_mtx); void mlMtx_push_multiplied_2(MtxF * l_mtx, MtxF * r_mtx); void mlMtxIdent(void); +void func_80251B5C(f32 x, f32 y, f32 z); void mlMtxSet(MtxF* arg0); +void mlMtxRotate(f32 a, f32 x, f32 y, f32 z); void mlMtxRotPitch(f32 arg0); void mlMtxRotYaw(f32 arg0); void mlMtxRotRoll(f32 arg0); @@ -21,11 +23,23 @@ void mlMtx_rotate_yaw_deg(f32 arg0); void mlMtxRotatePYR(f32 pitch, f32 yaw, f32 roll); void mlMtxScale_xyz(f32 x, f32 y, f32 z); void mlMtxScale(f32 scale); +void func_80252330(f32 x, f32 y, f32 z); +void mlMtx_apply_vec3f(f32 dst[3], f32 src[3]); +void mlMtx_apply_vec3f_restricted(f32 dst[3], f32 src[3]); void mlMtx_apply_f3(f32 dst[3], f32 x, f32 y, f32 z); void mlMtx_apply_vec3s(s16 dst[3], s16 src[3]); +void func_8025276C(s32 arg0[3], s32 arg1[3], s32 arg2[3], s32 arg3[3]); void mlMtxTranslate(f32 x, f32 y, f32 z); - -MtxF *func_8024DD90(void); -MtxF *func_8024DD9C(void); +void func_80252A38(f32 x, f32 y, f32 z); +void func_80252AF0(f32 arg0[3], f32 arg1[3], f32 rotation[3], f32 scale, f32 arg4[3]); +void func_80252C08(f32 arg0[3], f32 rotation[3], f32 scale, f32 arg3[3]); +void func_80252CC4(f32 position[3], f32 rotation[3], f32 scale, f32 arg3[3]); +void func_80252D8C(f32 position[3], f32 rotation[3]); +void func_80252DDC(f32 position[3], f32 rotation[3]); +void func_80252E4C(f32 position[3], f32 rotation[3]); +void func_80252EC8(f32 position[3], f32 rotation[3]); +void func_80252F50(f32 rotation[3]); +void func_80252F8C(f32 rotation[3]); +void func_80252FC8(f32 rotation[3]); #endif diff --git a/src/core2/code_5FD90.c b/src/core2/code_5FD90.c index 93274fce..430171ae 100644 --- a/src/core2/code_5FD90.c +++ b/src/core2/code_5FD90.c @@ -4,8 +4,6 @@ #include "model.h" -extern void func_80252C08(f32[3],f32[3], f32, f32[3]); -extern void func_80252CC4(f32[3],s32, f32, s32); extern f32 vtxList_getGlobalNorm(BKVertexList *); extern void points_to_boundingBoxWithMargin(f32 arg0[3], f32 arg1[3], f32 margin, f32 min[3], f32 max[3]); diff --git a/src/core2/code_637D0.c b/src/core2/code_637D0.c index 66e4091d..677f32d3 100644 --- a/src/core2/code_637D0.c +++ b/src/core2/code_637D0.c @@ -2,8 +2,6 @@ #include "functions.h" #include "variables.h" -extern void func_80252C08(f32[3], f32[3], f32, f32[3]); -extern void func_80252CC4(f32[3], f32[3], f32, f32[3]); extern void mlMtx_apply_f3(f32[3], f32, f32, f32); extern s32 func_802EBAE0(BKModelUnk14List *arg0, f32 position[3], f32 rotation[3], f32 scale, f32 arg4[3], AnimMtxList* arg5, f32 arg6[3], f32 arg7, f32 arg8[3]); extern MtxF *animMtxList_get(AnimMtxList *this, s32 arg1); diff --git a/src/core2/code_654C0.c b/src/core2/code_654C0.c index 11d97d28..00aca9a9 100644 --- a/src/core2/code_654C0.c +++ b/src/core2/code_654C0.c @@ -3,7 +3,6 @@ #include "functions.h" #include "variables.h" -extern void func_80252CC4(f32[3], f32 [3], f32, f32[3]); extern f32 func_8034A9D0(f32[4], f32); /*.bss */ diff --git a/src/core2/code_6B030.c b/src/core2/code_6B030.c index ed2b237e..26396bd1 100644 --- a/src/core2/code_6B030.c +++ b/src/core2/code_6B030.c @@ -3,11 +3,6 @@ #include "functions.h" #include "variables.h" - - - -extern void func_80252330(f32, f32, f32); - typedef struct { s16 unk0; s16 unk2; diff --git a/src/core2/code_72060.c b/src/core2/code_72060.c index 473be387..ca0e5236 100644 --- a/src/core2/code_72060.c +++ b/src/core2/code_72060.c @@ -8,8 +8,6 @@ typedef struct { f32 unkC[3]; }Struct_core2_72060_0; -extern void func_80251B5C(f32, f32, f32); -extern void func_80252A38(f32, f32, f32); extern f32 vtxList_getGlobalNorm(BKVertexList *); struct4Cs *D_80369280 = NULL; diff --git a/src/core2/code_AC520.c b/src/core2/code_AC520.c index d3e3ecc1..c7a944df 100644 --- a/src/core2/code_AC520.c +++ b/src/core2/code_AC520.c @@ -4,7 +4,6 @@ #include -extern void func_80252CC4(f32[3], f32[3], f32, f32[3]); extern f32 vtxList_getGlobalNorm(BKVertexList *arg0); extern void func_803334B0(f32 position[3], f32 rotation[3], f32 scale, f32[3], f32); diff --git a/src/core2/code_AEDA0.c b/src/core2/code_AEDA0.c index 7eaaea97..f50ac2f5 100644 --- a/src/core2/code_AEDA0.c +++ b/src/core2/code_AEDA0.c @@ -3,7 +3,6 @@ #include "functions.h" #include "variables.h" -void func_80252330(f32, f32, f32); void func_803382D8(s32 arg0); void func_803382E4(s32 arg0); void spriteRender_set1Primative(bool boolean); diff --git a/src/core2/code_B8860.c b/src/core2/code_B8860.c index a450a231..8c4b4516 100644 --- a/src/core2/code_B8860.c +++ b/src/core2/code_B8860.c @@ -5,7 +5,6 @@ extern void mlMtxRotatePYR(f32, f32, f32); -extern void func_80252330(f32, f32, f32); typedef struct { BKSprite *sprite_0; diff --git a/src/core2/code_B9090.c b/src/core2/code_B9090.c index 42303007..b0c66c8e 100644 --- a/src/core2/code_B9090.c +++ b/src/core2/code_B9090.c @@ -4,8 +4,6 @@ #define ABS(s) (((s) >= 0) ? (s) : -(s)) -extern void func_80252CC4(f32[3], f32[3], f32, f32[3]); - /* .code */ bool func_80340020(Struct83s *self, f32 position[3], f32 arg2[3], f32 arg3, f32 *arg4, BKVertexList *arg5, f32 arg6[3], f32 arg7[3]) { f32 sp6C[3]; diff --git a/src/core2/code_BD100.c b/src/core2/code_BD100.c index cebf6dea..76c3bed7 100644 --- a/src/core2/code_BD100.c +++ b/src/core2/code_BD100.c @@ -5,7 +5,6 @@ extern void spriteRender_drawWithSegment(Gfx**, Vtx**, BKSprite *, s32, s32); -extern void func_80252330(f32, f32, f32);\ extern void func_80349AD0(void); diff --git a/src/core2/code_C9F00.c b/src/core2/code_C9F00.c index 495f1872..571fdf5d 100644 --- a/src/core2/code_C9F00.c +++ b/src/core2/code_C9F00.c @@ -2,7 +2,6 @@ #include "functions.h" #include "variables.h" -extern void func_80252CC4(f32[3], f32[3], f32, s32); extern int func_802E805C(BKCollisionList *arg0, BKVertexList *vtxList, f32 arg2[3], f32 arg3[3], f32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8); extern int func_802E9118(BKCollisionList *arg0, BKVertexList *vtxList, f32 arg2[3], f32 arg3[3], f32 arg4, s32 arg5, s32 arg6, f32 arg7, s32 arg8, s32 arg9, s32 arg10); extern int func_802E9DD8(BKCollisionList *arg0, BKVertexList *vtxList, f32 arg2[3], f32 arg3[3], f32 arg4, s32 arg5, f32 arg6, s32 arg7, s32 arg8); diff --git a/src/core2/gc/zoombox.c b/src/core2/gc/zoombox.c index 06a6d86c..b582a350 100644 --- a/src/core2/gc/zoombox.c +++ b/src/core2/gc/zoombox.c @@ -6,7 +6,6 @@ #include "zoombox.h" -void func_80252330(f32, f32, f32); extern f32 func_8033DDB8(void); extern void func_80344090(BKSpriteDisplayData *self, s32 frame, Gfx **gfx); BKSprite *func_8033B6C4(enum asset_e sprite_id, BKSpriteDisplayData **arg1); diff --git a/src/core2/modelRender.c b/src/core2/modelRender.c index 4bf95aad..ffed8de8 100644 --- a/src/core2/modelRender.c +++ b/src/core2/modelRender.c @@ -11,7 +11,6 @@ extern bool func_802ED420(BKModelUnk20List *arg0, u8 *arg1, u32 arg2); extern void func_802ED52C(BKModelUnk20List *, f32[3], f32); -extern void func_80252AF0(f32[3], f32[3], f32[3], f32, f32[3]); extern void mlMtxRotatePYR(f32, f32, f32); extern void assetCache_free(BKModelBin *); extern s32 func_8024DB50(f32[3], f32);