From bc6680d6184aa94eb2efe930e82b151b87be3d8c Mon Sep 17 00:00:00 2001 From: mariob92 <21146795-mariob92@users.noreply.gitlab.com> Date: Thu, 17 Oct 2024 10:58:39 +0200 Subject: [PATCH] src/core1: cleaned up function prototypes for math library (ml) umbenannt: src/core1/code_18350.c -> src/core1/ml.c neue Datei: include/core1/ml.h --- decompressed.pal.yaml | 6 +- decompressed.us.v10.yaml | 6 +- include/core1/core1.h | 4 +- include/core1/ml.h | 122 ++++++++++++++++++++++++++++++ include/functions.h | 32 -------- include/ml.h | 10 --- src/BGS/ch/flibbit.c | 1 - src/BGS/code_3420.c | 2 - src/CC/code_1F70.c | 1 - src/GV/code_4740.c | 1 - src/MMM/ch/loggo.c | 3 - src/MMM/code_47D0.c | 1 - src/RBB/ch/boombox.c | 1 - src/TTC/ch/clam.c | 1 - src/core1/code_72B0.c | 1 - src/core1/{code_18350.c => ml.c} | 4 - src/core1/viewport.c | 1 - src/core2/ba/anim.c | 1 - src/core2/ba/marker.c | 2 - src/core2/ba/model.c | 2 - src/core2/ba/physics.c | 4 - src/core2/bs/beeMain.c | 1 - src/core2/bs/dronexform.c | 3 - src/core2/bs/walk.c | 1 - src/core2/bs/walrus.c | 1 - src/core2/ch/bat.c | 1 - src/core2/ch/bottlesbonus.c | 1 - src/core2/ch/bottlesbonuscursor.c | 1 - src/core2/ch/climbBase.c | 1 - src/core2/ch/crab.c | 2 - src/core2/ch/gravestone.c | 1 - src/core2/ch/icecube.c | 1 - src/core2/ch/snacker.c | 1 - src/core2/ch/snowman.c | 1 - src/core2/code_12360.c | 2 - src/core2/code_13FC0.c | 1 - src/core2/code_14420.c | 1 - src/core2/code_16010.c | 2 - src/core2/code_34310.c | 3 - src/core2/code_39D0.c | 1 - src/core2/code_3B2C0.c | 3 - src/core2/code_41FB0.c | 2 - src/core2/code_45310.c | 2 - src/core2/code_47BD0.c | 1 - src/core2/code_4A6F0.c | 1 - src/core2/code_4C020.c | 2 - src/core2/code_53C10.c | 2 - src/core2/code_5FD90.c | 1 - src/core2/code_6B030.c | 1 - src/core2/code_7AF80.c | 2 - src/core2/code_85800.c | 1 - src/core2/code_956B0.c | 2 - src/core2/code_98CB0.c | 2 - src/core2/code_9C170.c | 1 - src/core2/code_9E370.c | 2 - src/core2/code_A4D00.c | 4 - src/core2/code_B850.c | 1 - src/core2/code_BE2C0.c | 3 +- src/core2/code_C4B0.c | 3 +- src/core2/code_C89C0.c | 1 - src/core2/code_CB050.c | 2 - src/core2/code_CC1E0.c | 2 - src/core2/code_D0CA0.c | 3 - src/core2/code_EF50.c | 1 - src/core2/gc/transition.c | 3 +- src/core2/nc/dynamicCam1.c | 1 - src/core2/nc/dynamicCam12.c | 1 - src/core2/nc/dynamicCam3.c | 1 - src/core2/nc/dynamicCam4.c | 1 - src/core2/nc/dynamicCam9.c | 1 - src/core2/nc/dynamicCamera.c | 3 - src/core2/nc/firstpersoncamera.c | 1 - src/core2/nc/staticCamera.c | 1 - src/core2/snackerctl.c | 1 - src/fight/chfinalboss.c | 4 +- src/lair/ch/brentilda.c | 2 - src/lair/code_86F0.c | 1 - src/lair/code_9C40.c | 2 - 78 files changed, 133 insertions(+), 167 deletions(-) create mode 100644 include/core1/ml.h delete mode 100644 include/ml.h rename src/core1/{code_18350.c => ml.c} (99%) diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index f46c6264..1007d531 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -180,7 +180,7 @@ segments: - [0xF54AE0, c, eeprom] - [0xF54BE0, c, ucode] - [0xF54CE0, c, lookup] - - [0xF54D20, c, code_18350] + - [0xF54D20, c, ml] - [0xF58860, c, code_1BE90] - [0xF59F60, c, stub_1D590] - [0xF59F90, hasm, code_1D5C0] @@ -384,7 +384,7 @@ segments: - [0xF75630, .data, code_15B30] - [0xF75640, .data, memory] - [0xF75670, .data, lookup] - - [0xF75D60, .data, code_18350] + - [0xF75D60, .data, ml] - [0xF75EE0, .data, code_1BE90] - [0xF75EF0, .data, code_1D5D0] - [0xF75F10, .data, sns] @@ -422,7 +422,7 @@ segments: - [0xF77220, .rodata, rumblemanager] - [0xF77230, .rodata, overlaymanager] - [0xF772B0, .rodata, code_13990] - - [0xF772D0, .rodata, code_18350] + - [0xF772D0, .rodata, ml] - [0xF773D0, .rodata, code_1BE90] - [0xF77400, .rodata, code_1D5D0] - [0xF77460, .rodata, audio/n_synthesizer] diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index b6ce5ccb..1b5bd203 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -181,7 +181,7 @@ segments: - [0xF31360, c, eeprom] #DONE - [0xF31460, c, ucode] #DONE - [0xF31560, c, lookup] #DONE - - [0xF315A0, c, code_18350] #DONE + - [0xF315A0, c, ml] #DONE - [0xF350E0, c, code_1BE90] #DONE - [0xF367E0, c, stub_1D590] #DONE - [0xF36810, hasm, code_1D5C0] #DONE @@ -385,7 +385,7 @@ segments: - [0xF51DB0, .data, code_15B30] - [0xF51DC0, .data, memory] - [0xF51DF0, .data, lookup] - - [0xF524E0, .data, code_18350] + - [0xF524E0, .data, ml] - [0xF52660, .data, code_1BE90] - [0xF52670, .data, code_1D5D0] - [0xF52690, .data, sns] @@ -424,7 +424,7 @@ segments: - [0xF539C0, .rodata, rumblemanager] - [0xF539D0, .rodata, overlaymanager] - [0xF53A50, .rodata, code_13990] - - [0xF53A70, .rodata, code_18350] + - [0xF53A70, .rodata, ml] - [0xF53B70, .rodata, code_1BE90] - [0xF53BA0, .rodata, code_1D5D0] - [0xF53C00, .rodata, audio/n_synthesizer] diff --git a/include/core1/core1.h b/include/core1/core1.h index 2d9d7277..4f193fd7 100644 --- a/include/core1/core1.h +++ b/include/core1/core1.h @@ -12,6 +12,7 @@ #include "core1/lookup.h" #include "core1/main.h" #include "core1/mem.h" +#include "core1/ml.h" #include "core1/pfsmanager.h" #include "core1/rarezip.h" #include "core1/sns.h" @@ -26,11 +27,8 @@ 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]); -f32 ml_cos_deg(f32); -f32 ml_sin_deg(f32); void func_80250530(s32 arg0, u16 chan_mask, f32 arg2); -int func_802585E0(s32 vec[3], s32 minX, s32 minY, s32 minZ, s32 maxX, s32 maxY, s32 maxZ); void func_8025A104(enum comusic_e arg0, s32 arg1); void func_8025A55C(s32 arg0, s32 arg1, s32 arg2); diff --git a/include/core1/ml.h b/include/core1/ml.h new file mode 100644 index 00000000..c416416b --- /dev/null +++ b/include/core1/ml.h @@ -0,0 +1,122 @@ +#ifndef BANJO_KAZOOIE_CORE1_ML_H +#define BANJO_KAZOOIE_CORE1_ML_H + +f32 func_80255D70(f32 x); +void func_80255E58(f32 vec1[3], f32 vec2[3], f32 vec3[3], f32 vec4[3]); +f32 func_80255F14(f32 vec1[3], f32 vec2[3]); +void ml_crossProduct_vec3f(f32 dst[3], f32 vec1[3], f32 vec2[3]); +void ml_interpolate_vec3f(f32 dst[3], f32 vec1[3], f32 vec2[3], f32 scale); +f32 ml_dotProduct_vec3f(f32 vec1[3], f32 vec2[3]); +f32 ml_distance_vec3f(f32 vec1[3], f32 vec2[3]); +f32 func_802560D0(f32 arg0[3], f32 arg1[3], f32 arg2[3]); +f32 ml_distanceSquared_vec3f(f32 vec1[3], f32 vec2[3]); +void func_802562DC(f32 vec1[3], f32 vec2[3], f32 vec3[3]); +f32 ml_vec3f_length_unused(f32 vec[3]); +void ml_vec3f_normalize_copy(f32 arg0[3], f32 arg1[3]); +void ml_vec3f_normalize(f32 vec[3]); +void ml_vec2f_normalize(f32 vec[2]); +void ml_3f_normalize(f32 *x, f32 *y, f32 *z); +void ml_vec3f_set_length_copy(f32 dst[3], f32 src[3], f32 len); +void func_80256664(f32 ptr[3]); +void func_80256740(f32 vec[3]); +void ml_vec3f_pitch_rotate_copy(f32 dst[3], f32 src[3], f32 pitch); +void ml_vec3f_yaw_rotate_copy(f32 dst[3], f32 src[3], f32 yaw); +void ml_vec3f_roll_rotate_copy(f32 dst[3], f32 src[3], f32 roll); +void ml_vec3f_set_length(f32 vec[3], f32 length); +f32 func_80256AB4(f32 x1, f32 y1, f32 x2, f32 y2); +f32 func_80256B54(f32 vec1[3], f32 vec2[3]); +f32 func_80256C60(f32 vec[3], s32 val); +void func_80256D0C(f32 val1, f32 val2, f32 x, f32 y, f32 z, f32 *dstX, f32 *dstY, f32 *dstZ); +void func_80256E24(f32 dst[3], f32 theta, f32 phi, f32 x, f32 y, f32 z); +void func_80256F44(f32 vec1[3], f32 vec2[3], f32 vec3[3], f32 dst[3]); +f32 ml_acosf(f32 x); +f32 func_8025715C(f32 val1, f32 val2); +f32 func_80257204(f32 val1, f32 val2, f32 val3, f32 val4); +f32 func_80257248(f32 vec1[3], f32 vec2[3]); +void func_8025727C(f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z2, f32 *o1, f32 *o2); +void ml_init(void); +void ml_free(void); +f32 func_802575BC(f32 val); +f32 func_80257618(f32 val); +f32 func_80257658(f32 val); +f32 func_80257680(f32 val1, f32 val2, f32 val3); +void ml_defrag(void); +bool ml_timer_update(f32 *timer, f32 delta); +void func_8025778C(f32 dst[3], f32 arg1[3], f32 arg2[3][3]); +void func_802578A4(f32 dst[3], f32 vec1[3], f32 vec2[3]); +void func_80257918(f32 arg0[3], f32 arg1[3], f32 arg2[3], f32 arg3[3]); +bool func_802579B0(f32 vec[3], f32 x1, f32 z1, f32 x2, f32 z2); +f32 func_80257A44(f32 val1, f32 val2); +f32 func_80257A6C(f32 val1, f32 val2); +f32 func_80257AD4(f32 val1, f32 val2); +f32 ml_map_f(f32 val, f32 in_min, f32 in_max, f32 out_min, f32 out_max); +f32 ml_mapRange_f(f32 val, f32 in_min, f32 in_max, f32 out_min, f32 out_max); +f32 ml_interpolate_f(f32 arg0, f32 arg1, f32 arg2); +f32 ml_mapFunction_f(f32 a, f32 b, f32 c, f32 d, f32 e, f32 (*func)(f32)); +f32 func_80257CC0(f32 a, f32 b, f32 c, f32 d, f32 e); +f32 func_80257CF8(f32 a, f32 b, f32 c, f32 d, f32 e); +f32 ml_mapAbsRange_f(f32 val, f32 in_min, f32 in_max, f32 out_min, f32 out_max); +void func_80257DB0(f32 arg0[3], f32 arg1[3], f32 arg2[3]); +void ml_setLength_vec3f(f32 v[3], f32 a); +s32 ml_clamp_w(s32 val, s32 min, s32 max); +f32 ml_clamp_f(f32 val, f32 min, f32 max); +int func_80257F18(f32 src[3], f32 target[3], f32 *yaw); +int func_8025801C(f32 target[3], f32 *yaw); +int func_80258108(f32 vec[3], f32 *arg1, f32 *arg2); +int func_80258210(f32 x, f32 y, f32 *dst); +int ml_isZero_vec3f(f32 vec[3]); +bool ml_isNonzero_vec3f(f32 vec[3]); +int func_802583D8(f32 vec[3]); +int func_80258424(f32 vec[3], f32 minX, f32 minY, f32 minZ, f32 maxX, f32 maxY, f32 maxZ); +int func_802584FC(f32 vec[3], f32 min[3], f32 max[3]); +int func_802585E0(s32 vec[3], s32 minX, s32 minY, s32 minZ, s32 maxX, s32 maxY, s32 maxZ); +f32 ml_vec3f_horizontal_distance_zero_likely(f32 vec1[3], f32 vec2[3]); +f32 func_802586B0(f32 vec1[3], f32 vec2[3]); +f32 ml_vec3f_length(f32 vec1[3], f32 vec2[3]); +f32 ml_vec3f_length_sq(f32 vec1[3], f32 vec2[3]); +f32 ml_sin_deg(f32 angle_deg); +f32 ml_cos_deg(f32 angle_deg); +f32 mlNormalizeAngle(f32 angle); +f32 ml_remainder_f(f32 arg0, f32 arg1); +f32 ml_max_f(f32 arg0, f32 arg1); +f32 ml_min_f(f32 arg0, f32 arg1); +int ml_max_w(int arg0, int arg1); +int ml_min_w(int arg0, int arg1); +f32 mlAbsF(f32 arg0); +f32 func_80258994(f32 arg0[3]); +int ml_abs_w(int arg0); +void func_802589E4(f32 dst[3], f32 yaw, f32 length); +void func_80258A4C(f32 vec1[3], f32 arg1, f32 vec2[3], f32 *arg3, f32 *arg4, f32 *arg5); +void ml_vec3f_clear(f32 dst[3]); +void ml_vec3f_copy(f32 dst[3], f32 src[3]); +void ml_vec3f_diff_copy(f32 dst[3], f32 src1[3], f32 src2[3]); +void ml_vec3f_diff(f32 dst[3], f32 src[3]); +void ml_vec3f_assign(f32 dst[3], f32 x, f32 y, f32 z); +void ml_vec3f_add(f32 dst[3], f32 src1[3], f32 src2[3]); +void ml_vec3f_scale(f32 vec[3], f32 scale); +void ml_vec3f_scale_copy(f32 dst[3], f32 src[3], f32 scale); +void func_80258CDC(f32 vec1[3], f32 vec2[3]); +void ml_vec3w_to_vec3f(f32 dst[3], s32 src[3]); +void ml_vec3h_to_vec3f(f32 dst[3], s16 src[3]); +void ml_vec3f_to_vec3w(s32 dst[3], f32 src[3]); +void ml_vec3f_to_vec3h(s16 dst[3], f32 src[3]); +void ml_translate_y_local(f32 position[3], f32 rotation[3], f32 dy); +void ml_translate_z_local(f32 dst[3], f32 src[3], f32 dz); +void ml_translate_x_local(f32 dst[3], f32 src[3], f32 dx); +void func_8025901C(f32 arg0, f32 arg1[3], f32 arg2[3], f32 arg3); +f32 func_80259198(f32 arg0, f32 arg1); +f32 mlDiffDegF(f32 arg0, f32 arg1); +bool ml_vec3f_point_within_horizontal_distance(f32 vec[3], f32 x, f32 z, f32 distance); +bool ml_vec3f_within_horizontal_distance(f32 vec1[3], f32 vec2[3], f32 distance); +bool ml_vec3w_within_horizontal_distance(s32 vec1[3], s32 vec2[3], s32 distance); +bool ml_vec3f_within_distance(f32 vec1[3], f32 vec2[3], f32 distance); +bool func_80259400(f32 a0); +void func_80259430(f32 *val); +void func_8025947C(f32 a0[3], f32 a1[3], f32 a2[3], f32 a3[3]); +f32 func_80259554(f32 dst[3], f32 vec1[3], f32 vec2[3], f32 vec3[3]); +void func_802596AC(f32 a0[3], f32 a1[3], f32 a2[3], f32 a3[3]); +s32 func_8025975C(f32 a0); +bool func_80259808(f32 a0); +void func_8025982C(f32 dst[3], f32 arg1[3], f32 arg2[3], f32 arg3); + +#endif diff --git a/include/functions.h b/include/functions.h index 576a6cdd..23103ea0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -14,7 +14,6 @@ #include "core2/core2.h" #include "math.h" // ToDo: sort out actual dependencies -#include "ml.h" #include "ml/mtx.h" #include "bs_funcs.h" @@ -45,16 +44,6 @@ void * malloc(s32 size); void free(void*); void *realloc(void* ptr, s32 size); -f32 ml_map_f(f32 val, f32 in_min, f32 in_max, f32 out_min, f32 out_max); -float mlNormalizeAngle(float); -f32 ml_max_f(f32, f32); -f32 ml_min_f(f32, f32); -void ml_vec3f_copy(f32 dst[3], f32 src[3]); - -void ml_vec3f_add(f32 dst[3], f32 src1[3], f32 src2[3]); -void ml_vec3f_scale(f32 vec[3], f32 scale); -void ml_vec3f_scale_copy(f32 dst[3], f32 src[3], f32 scale); - float gu_sqrtf(float val); bool baanim_isAt(f32); @@ -224,22 +213,7 @@ void particleEmitter_setSpawnInterval(ParticleEmitter *, f32); OSContPad *func_8024F3F4(void); OSMesgQueue *pfsManager_getFrameReplyQ(void); -void ml_vec3f_clear(f32 dst[3]); -void ml_vec3f_roll_rotate_copy(f32[3], f32[3], f32); void rumbleManager_80250D94(f32, f32, f32); -void func_80256E24(f32[3], f32, f32, f32, f32, f32); -void func_8025727C(f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z2, f32 *o1, f32 *o2); -f32 func_80257A44(f32, f32); -f32 ml_interpolate_f(f32, f32, f32); -f32 ml_mapAbsRange_f(f32, f32, f32, f32, f32); -int func_80257F18(f32 src[3], f32 target[3], f32 *yaw); -bool func_8025801C(f32[3], f32*); - -f32 mlAbsF(f32); -f32 ml_clamp_f(f32, f32, f32); -f32 ml_remainder_f(f32, f32); -void func_802589E4(f32 dst[3], f32 yaw, f32 length); -f32 mlDiffDegF(f32, f32); void func_8025A6EC(enum comusic_e, s32); void comusic_playTrack(enum comusic_e); @@ -454,15 +428,12 @@ Actor *actorArray_findClosestActorFromActorId(f32 position[3], enum actor_e acto Actor *subaddie_getLinkedActor(Actor *); /* used in RBB */ -void ml_vec3f_pitch_rotate_copy(f32 dst[3], f32 src[3], f32 pitch); -int ml_timer_update(f32 *arg0, f32 arg1); Actor *actor_draw(ActorMarker *, Gfx**, Mtx**, Vtx **); Actor *func_80325340(ActorMarker *, Gfx **, Mtx **, Vtx **); void func_8032AA58(Actor *, f32); void func_80324E38(f32, s32); void timed_playSfx(f32, enum sfx_e, f32, s32); -f32 ml_distance_vec3f(f32 [3], f32 [3]); void timed_setStaticCameraToNode(f32, s32); void timed_exitStaticCamera(f32); int actor_animationIsAt(Actor*, f32); @@ -477,10 +448,8 @@ void func_802FA060(s32, s32, s32, f32); Actor *actorArray_findActorFromActorId(enum actor_e); f32 func_8038A6B8(ActorMarker *); void *defrag_asset(void *); -void ml_interpolate_vec3f(f32 [3], f32 [3], f32 [3], f32); void sfxsource_set_fade_distances(u8, f32, f32); void func_8030DB04(u8, s32, f32 position[3], f32, f32); -void func_80258A4C(f32 [3], f32, f32 [3], f32 *, f32 *, f32 *); void func_802E4078(enum map_e map, s32 exit, s32 transition); @@ -492,7 +461,6 @@ void mapSpecificFlags_set(s32, s32); struct0 *func_8031B9D8(void); -extern int func_80259808(f32); void actor_playAnimationOnce(Actor *); void actor_loopAnimation(Actor *); diff --git a/include/ml.h b/include/ml.h deleted file mode 100644 index 5e168f1f..00000000 --- a/include/ml.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __MATH_LIBRARY_H__ -#define __MATH_LIBRARY_H__ - -void ml_vec3f_normalize_copy(f32 arg0[3], f32 arg1[3]); -void ml_vec3f_yaw_rotate_copy(f32 arg0[3], f32 arg1[3], f32 arg2); -void ml_vec3f_diff_copy(f32 dst[3], f32 src1[3], f32 src2[3]); -void ml_vec3f_set_length_copy(f32 dst[3], f32 src[3], f32 len); -void ml_vec3f_set_length(f32 arg0[3], f32 arg2); - -#endif diff --git a/src/BGS/ch/flibbit.c b/src/BGS/ch/flibbit.c index 7290ed2f..3a8fa1fb 100644 --- a/src/BGS/ch/flibbit.c +++ b/src/BGS/ch/flibbit.c @@ -17,7 +17,6 @@ typedef struct{ extern f32 mapModel_getFloorY(f32 *); -extern void func_80256E24(f32 [3], f32, f32, f32, f32, f32); void chflibbit_update(Actor *this); Actor *chflibbit_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); diff --git a/src/BGS/code_3420.c b/src/BGS/code_3420.c index d8b1276e..d14c5cb7 100644 --- a/src/BGS/code_3420.c +++ b/src/BGS/code_3420.c @@ -3,8 +3,6 @@ #include "math.h" #include "variables.h" -extern f32 func_80256AB4(f32, f32, f32, f32); -extern f32 func_8025715C(f32, f32); extern f32 *chVile_getPostion(ActorMarker *); extern void bundle_setRandomVelocity(f32); extern void func_802FDCB8(s32); diff --git a/src/CC/code_1F70.c b/src/CC/code_1F70.c index 81450d22..a881df67 100644 --- a/src/CC/code_1F70.c +++ b/src/CC/code_1F70.c @@ -19,7 +19,6 @@ extern int func_80340020(s32, f32[3], s32, f32, s32, BKVertexList *, f32[3], f32 extern void boneTransformList_getBoneScale(s32, s32, f32[3]); extern void boneTransformList_setBoneScale(s32, s32, f32[3]); extern void func_8033A9A8(s32, s32, f32[3]); -extern void ml_vec3f_normalize(f32[3]); extern void func_8033A45C(s32, s32); extern void modelRender_setBoneTransformList(s32); extern void func_8028FAB0(f32[3]); diff --git a/src/GV/code_4740.c b/src/GV/code_4740.c index 3ec5a757..cebc4a72 100644 --- a/src/GV/code_4740.c +++ b/src/GV/code_4740.c @@ -2,7 +2,6 @@ #include "functions.h" #include "variables.h" -f32 func_80257204(f32, f32, f32, f32); void func_8038B124(Actor *this); /* .data */ diff --git a/src/MMM/ch/loggo.c b/src/MMM/ch/loggo.c index 3513d7f0..34c6e446 100644 --- a/src/MMM/ch/loggo.c +++ b/src/MMM/ch/loggo.c @@ -2,9 +2,6 @@ #include "functions.h" #include "variables.h" -/* extern functions */ -extern void ml_vec3f_assign(f32[3], f32, f32, f32); - /* public functions */ void chLoggo_update(Actor *this); diff --git a/src/MMM/code_47D0.c b/src/MMM/code_47D0.c index 8f33379a..e0db2b8c 100644 --- a/src/MMM/code_47D0.c +++ b/src/MMM/code_47D0.c @@ -5,7 +5,6 @@ /* extern functions */ extern void sfxsource_setSampleRate(u8, s32); -extern f32 ml_vec3f_horizontal_distance_zero_likely(f32[3], f32[3]); /* data */ enum chTumblar_state_e { diff --git a/src/RBB/ch/boombox.c b/src/RBB/ch/boombox.c index 3f79a4e9..0b292517 100644 --- a/src/RBB/ch/boombox.c +++ b/src/RBB/ch/boombox.c @@ -4,7 +4,6 @@ #include "core2/particle.h" -extern void ml_interpolate_vec3f(f32 [3], f32 [3], f32 [3], f32); extern void bundle_setYaw(f32); extern int func_80309EB0(f32(*)[3], f32, f32 (*)[3], s32); extern int func_803342AC(f32(*)[3], f32(*)[3],f32); diff --git a/src/TTC/ch/clam.c b/src/TTC/ch/clam.c index 417ccf92..2cf817c3 100644 --- a/src/TTC/ch/clam.c +++ b/src/TTC/ch/clam.c @@ -3,7 +3,6 @@ #include "variables.h" extern Actor *spawnQueue_bundle_f32(s32, s32, s32, s32); -extern f32 func_80257204(f32, f32, f32, f32); extern ActorProp * func_80320EB0(ActorMarker *, f32, s32); static void __chClam_updateFunc(Actor *this); diff --git a/src/core1/code_72B0.c b/src/core1/code_72B0.c index 1e4299c7..2e6de3ec 100644 --- a/src/core1/code_72B0.c +++ b/src/core1/code_72B0.c @@ -6,7 +6,6 @@ int collisionTri_isHitFromAbove_actor(f32 arg0[3], Actor *arg1, s32 arg2); extern bool func_80320DB0(f32[3], f32, f32[3], u32); extern bool func_80323240(struct56s *, f32, f32[3]); -extern f32 ml_dotProduct_vec3f(f32[3], f32[3]); extern BKCollisionTri *func_80320B98(f32[3], f32[3], f32[3], u32); extern BKCollisionTri *func_80320C94(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3[3], s32 arg4, u32 arg5); extern f32 func_8031C5D4(struct0*); diff --git a/src/core1/code_18350.c b/src/core1/ml.c similarity index 99% rename from src/core1/code_18350.c rename to src/core1/ml.c index 80953a68..be62bbbb 100644 --- a/src/core1/code_18350.c +++ b/src/core1/ml.c @@ -37,10 +37,6 @@ f32 ml_acosValTbl[90] = { //D_80276CBC 0.0871559978, 0.0697569996, 0.0523359999, 0.0348990001, 0.0174519997 }; -// .h -void func_80257918(f32 arg0[3], f32 arg1[3], f32 arg2[3], f32 arg3[3]); -void ml_vec3f_roll_rotate_copy(f32 arg0[3], f32 arg1[3], f32); - #define _SQ2(x, y) ((x) * (x) + (y) * (y)) #define _SQ3(x, y, z) (((x) * (x)) + ((y) * (y)) + ((z) * (z))) diff --git a/src/core1/viewport.c b/src/core1/viewport.c index 3d52039f..4c80ed19 100644 --- a/src/core1/viewport.c +++ b/src/core1/viewport.c @@ -5,7 +5,6 @@ extern void guPerspective(Mtx *, u16*, f32, f32, f32, f32, f32); -extern f32 ml_dotProduct_vec3f(f32[3], f32[3]); #define VIEWPORT_FOVY_DEFAULT (40.0f) #define VIEWPORT_STACK_SIZE (8) diff --git a/src/core2/ba/anim.c b/src/core2/ba/anim.c index d2624627..e7b4fc21 100644 --- a/src/core2/ba/anim.c +++ b/src/core2/ba/anim.c @@ -6,7 +6,6 @@ extern f32 func_802E4B38(void); -extern f32 ml_mapRange_f(f32, f32, f32, f32, f32); void baanim_80289F30(void); diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index 04515264..94be57d9 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -7,14 +7,12 @@ #include "prop.h" extern void func_803012F8(void); -extern f32 ml_distanceSquared_vec3f(f32 arg0[3], f32 arg1[3]); extern void __baMarker_8028BA00(s32); extern void spawnQueue_actor_s16(void); extern void func_802A6388(f32); extern f32 chwadingboots_802D6E4C(Actor *); extern void set_turbo_duration(f32); extern f32 chtrainers_getDuration(Actor *); -extern int ml_vec3f_point_within_horizontal_distance(f32 vec[3], f32 x, f32 z, f32 val); extern void func_802EE354(Actor *, s32, s32, s32, f32, f32, f32, f32 arg8[3], s32, f32 arg10[2]); extern void func_8035644C(s32); extern void func_8035646C(s32 arg0); diff --git a/src/core2/ba/model.c b/src/core2/ba/model.c index c907e327..f3724cf0 100644 --- a/src/core2/ba/model.c +++ b/src/core2/ba/model.c @@ -6,9 +6,7 @@ #include "core2/ba/physics.h" void func_80254008(void); -extern void func_80256E24(f32[3], f32, f32, f32, f32, f32); void assetcache_release(void *); //assetcache_free -extern void ml_vec3f_assign(f32[3], f32, f32, f32); void func_8033A280(f32); extern s32 osCicId; diff --git a/src/core2/ba/physics.c b/src/core2/ba/physics.c index a575dfce..1b2030dc 100644 --- a/src/core2/ba/physics.c +++ b/src/core2/ba/physics.c @@ -3,10 +3,6 @@ #include "variables.h" #include "core2/ba/physics.h" -extern f32 ml_sin_deg(f32); -extern f32 ml_dotProduct_vec3f(f32[3], f32[3]); -extern void func_80256D0C(f32, f32, f32, f32, f32, f32 *, f32 *, f32 *); -extern void func_80256E24(f32[3], f32, f32, f32, f32, f32); extern f32 climbGetRadius(void); extern f32 func_8029CED0(void); diff --git a/src/core2/bs/beeMain.c b/src/core2/bs/beeMain.c index 3acc4ccd..ba6082c2 100644 --- a/src/core2/bs/beeMain.c +++ b/src/core2/bs/beeMain.c @@ -14,7 +14,6 @@ f32 baanim_getTimer(void); void baanim_setEndAndDuration(f32, f32); f32 func_8029B2E8(void); f32 func_8029B33C(void); -f32 ml_interpolate_f(f32, f32, f32); f32 func_8029B30C(); /* .data */ diff --git a/src/core2/bs/dronexform.c b/src/core2/bs/dronexform.c index b2f4af0d..2e3219c0 100644 --- a/src/core2/bs/dronexform.c +++ b/src/core2/bs/dronexform.c @@ -7,10 +7,7 @@ extern void player_setYPosition(f32); extern void yaw_applyIdeal(void); -extern f32 func_80257A44(f32, f32); extern f32 cosf(f32); -extern f32 ml_remainder_f(f32, f32); -extern f32 func_80257AD4(f32, f32); /* .bss */ struct { diff --git a/src/core2/bs/walk.c b/src/core2/bs/walk.c index c9afc348..60ba74f4 100644 --- a/src/core2/bs/walk.c +++ b/src/core2/bs/walk.c @@ -11,7 +11,6 @@ f32 func_8029B2E8(void); void func_8029AD28(f32, s32); void baanim_scaleDuration(f32); f32 func_8029B30C(void); -f32 ml_interpolate_f(f32, f32, f32); void func_80299594(s32, f32); // .data diff --git a/src/core2/bs/walrus.c b/src/core2/bs/walrus.c index e52915b2..db870343 100644 --- a/src/core2/bs/walrus.c +++ b/src/core2/bs/walrus.c @@ -5,7 +5,6 @@ #include "core2/ba/physics.h" extern void func_8029AD68(f32, s32); -extern f32 ml_dotProduct_vec3f(f32[3], f32[3]); int bswalrus_inSet(enum bs_e state); diff --git a/src/core2/ch/bat.c b/src/core2/ch/bat.c index 65726619..e014a398 100644 --- a/src/core2/ch/bat.c +++ b/src/core2/ch/bat.c @@ -4,7 +4,6 @@ #include extern f32 mapModel_getFloorY(f32[3]); -extern f32 func_80257204(f32, f32, f32, f32); typedef enum { CH_BAT_STATE_ROOSTING = 1, diff --git a/src/core2/ch/bottlesbonus.c b/src/core2/ch/bottlesbonus.c index b0299545..4a505586 100644 --- a/src/core2/ch/bottlesbonus.c +++ b/src/core2/ch/bottlesbonus.c @@ -3,7 +3,6 @@ #include "functions.h" #include "variables.h" -extern void func_8025982C(f32[3], f32[3], f32[3], f32); extern void func_8025A6CC(enum comusic_e arg0, s32 arg1); extern void chBottlesBonusCursor_func_802DF99C(void); extern f32 *chBottlesBonusCursor_func_802E05AC(s32); diff --git a/src/core2/ch/bottlesbonuscursor.c b/src/core2/ch/bottlesbonuscursor.c index 9326e1e4..b1a60543 100644 --- a/src/core2/ch/bottlesbonuscursor.c +++ b/src/core2/ch/bottlesbonuscursor.c @@ -11,7 +11,6 @@ extern u8 D_8037DCC8; //bottles bonus flags??? -extern void ml_vec3f_assign(f32[3], f32, f32, f32); extern void func_8025AABC(enum comusic_e); extern f32 func_8024E420(s32, s32, s32); extern f32 func_8033DDB8(void); diff --git a/src/core2/ch/climbBase.c b/src/core2/ch/climbBase.c index 434828db..a6864ff5 100644 --- a/src/core2/ch/climbBase.c +++ b/src/core2/ch/climbBase.c @@ -5,7 +5,6 @@ void func_802D77D4(Actor *this); extern void player_setClimbParams(f32[3], f32[3], f32, u32); -extern f32 ml_vec3f_horizontal_distance_zero_likely(f32[3], f32[3]); typedef struct { f32 unk0[3]; diff --git a/src/core2/ch/crab.c b/src/core2/ch/crab.c index 44549163..cab76e25 100644 --- a/src/core2/ch/crab.c +++ b/src/core2/ch/crab.c @@ -2,8 +2,6 @@ #include "functions.h" #include "variables.h" -extern bool ml_vec3f_point_within_horizontal_distance(f32[3], f32, f32, f32); - /* .data */ ActorAnimationInfo chCrabAnimations[] ={ { 0, 0.0f}, diff --git a/src/core2/ch/gravestone.c b/src/core2/ch/gravestone.c index ee3de36f..31e38496 100644 --- a/src/core2/ch/gravestone.c +++ b/src/core2/ch/gravestone.c @@ -7,7 +7,6 @@ Actor *func_8035ECA0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void func_8035F138(Actor *this); BKModelBin *func_803257B4(ActorMarker *marker); extern void actor_postdrawMethod(ActorMarker *); -extern f32 func_80257204(f32, f32, f32, f32); typedef struct { s32 unk0; diff --git a/src/core2/ch/icecube.c b/src/core2/ch/icecube.c index 954493af..e4c0f549 100644 --- a/src/core2/ch/icecube.c +++ b/src/core2/ch/icecube.c @@ -4,7 +4,6 @@ #define _HorzDist3v(v1, v2) ((v1[0]-v2[0])*(v1[0]-v2[0]) + (v1[2]-v2[2])*(v1[2]-v2[2])) extern void func_802D729C(Actor *, f32); -extern f32 func_80257204(f32, f32, f32, f32); extern Actor *bundle_spawn_f32(enum actor_e, f32[3]); void chicecube_update(Actor *this); diff --git a/src/core2/ch/snacker.c b/src/core2/ch/snacker.c index e00e1fbd..5190c9eb 100644 --- a/src/core2/ch/snacker.c +++ b/src/core2/ch/snacker.c @@ -4,7 +4,6 @@ #include "snacker.h" -extern f32 ml_distanceSquared_vec3f(f32 [3], f32 [3]); extern f32 func_80309B24(f32[3]); extern void func_80328FF0(Actor *, f32); extern void mapSpecificFlags_setN(s32, s32, s32); diff --git a/src/core2/ch/snowman.c b/src/core2/ch/snowman.c index 5ace6a27..a234e937 100644 --- a/src/core2/ch/snowman.c +++ b/src/core2/ch/snowman.c @@ -2,7 +2,6 @@ #include "functions.h" #include "variables.h" -extern int ml_vec3f_within_horizontal_distance(f32[3], f32[3], f32); extern void func_802EFA20(ParticleEmitter *, f32, f32); extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32); extern void func_80328FB0(Actor *, f32); diff --git a/src/core2/code_12360.c b/src/core2/code_12360.c index e39e3a48..4ec15b7e 100644 --- a/src/core2/code_12360.c +++ b/src/core2/code_12360.c @@ -2,8 +2,6 @@ #include "functions.h" #include "variables.h" -extern f32 ml_mapAbsRange_f(f32, f32, f32, f32, f32); -extern void func_8025901C(f32, f32 *, f32 *, f32); extern f32 func_8029B2D0(void); void func_8029957C(s32 arg0); diff --git a/src/core2/code_13FC0.c b/src/core2/code_13FC0.c index f5d75b70..134e6a80 100644 --- a/src/core2/code_13FC0.c +++ b/src/core2/code_13FC0.c @@ -4,7 +4,6 @@ #include "variables.h" extern void controller_getJoystick(s32, f32*); -extern f32 ml_acosf(f32); extern f32 player_getYaw(void); extern void particleEmitter_setSphericalParticleVelocityRange(ParticleEmitter *this, f32 pitch_min, f32 yaw_min, f32 radial_min, f32 pitch_max, f32 yaw_max, f32 radial_max); ParticleEmitter * func_802EDD8C(f32[3], f32, f32); diff --git a/src/core2/code_14420.c b/src/core2/code_14420.c index 2b183758..3aed725a 100644 --- a/src/core2/code_14420.c +++ b/src/core2/code_14420.c @@ -8,7 +8,6 @@ #include "core2/ba/physics.h" extern void controller_getJoystick(s32, f32*); -extern f32 ml_acosf(f32); extern f32 player_getYaw(void); extern void particleEmitter_setSphericalParticleVelocityRange(ParticleEmitter *this, f32 pitch_min, f32 yaw_min, f32 radial_min, f32 pitch_max, f32 yaw_max, f32 radial_max); ParticleEmitter * func_802EDD8C(f32[3], f32, f32); diff --git a/src/core2/code_16010.c b/src/core2/code_16010.c index 33cfd739..87a0c405 100644 --- a/src/core2/code_16010.c +++ b/src/core2/code_16010.c @@ -4,8 +4,6 @@ #include "core2/statetimer.h" -extern int func_80258424(f32 vec[3], f32 minX, f32 minY, f32 minZ, f32 maxX, f32 maxY, f32 maxZ); - /* .bss */ u8 D_8037D210; u8 D_8037D211; diff --git a/src/core2/code_34310.c b/src/core2/code_34310.c index 82a63b29..0d674489 100644 --- a/src/core2/code_34310.c +++ b/src/core2/code_34310.c @@ -4,9 +4,6 @@ extern void rumbleManager_80250E6C(f32, f32); -extern void ml_translate_y_local(f32[3], f32[3], f32); -extern void ml_translate_z_local(f32[3], f32[3], f32); -extern void ml_translate_x_local(f32[3], f32[3], f32); extern void func_802BE720(void); typedef struct { diff --git a/src/core2/code_39D0.c b/src/core2/code_39D0.c index b42286f0..18fe91a9 100644 --- a/src/core2/code_39D0.c +++ b/src/core2/code_39D0.c @@ -8,7 +8,6 @@ #include "core2/ba/physics.h" -extern int ml_vec3f_point_within_horizontal_distance(f32 vec[3], f32 x, f32 z, f32 val); extern f32 player_getYaw(void); /* .bss */ diff --git a/src/core2/code_3B2C0.c b/src/core2/code_3B2C0.c index dcb3cad2..c76d52ed 100644 --- a/src/core2/code_3B2C0.c +++ b/src/core2/code_3B2C0.c @@ -3,9 +3,6 @@ #include "variables.h" -f32 mlDiffDegF(f32, f32); - - /* .bss */ static f32 s_position[3]; static f32 s_rotation[3]; diff --git a/src/core2/code_41FB0.c b/src/core2/code_41FB0.c index 34775003..096882c1 100644 --- a/src/core2/code_41FB0.c +++ b/src/core2/code_41FB0.c @@ -7,8 +7,6 @@ extern bool func_80320C94(f32[3], f32[3], f32, f32 sp54[3], s32, s32); extern f32 func_8033229C(ActorMarker *); extern bool func_80309D58(f32[3], s32); -extern void ml_vec3f_normalize(f32 [3]); - typedef struct { s16 flags; // u8 pad2[0x2]; diff --git a/src/core2/code_45310.c b/src/core2/code_45310.c index b2b85228..5a964af5 100644 --- a/src/core2/code_45310.c +++ b/src/core2/code_45310.c @@ -3,8 +3,6 @@ #include "functions.h" #include "variables.h" -extern f32 func_8025715C(f32, f32); -extern f32 func_802575BC(f32); extern f32 func_80309B24(f32[3]); extern void sfxsource_playSfxAtVolume(u8, f32); extern void func_802CC340(Actor *, f32[3]); diff --git a/src/core2/code_47BD0.c b/src/core2/code_47BD0.c index 29106801..543f6b11 100644 --- a/src/core2/code_47BD0.c +++ b/src/core2/code_47BD0.c @@ -11,7 +11,6 @@ extern void sfxsource_set_fade_distances(u8, f32, f32); extern void sfxsource_set_position(u8, f32[3]); extern void func_8030E2C4(u8); extern void sfxsource_setSampleRate(u8, s32); -extern void ml_vec3f_normalize(f32[3]); typedef struct{ f32 unk0[3]; diff --git a/src/core2/code_4A6F0.c b/src/core2/code_4A6F0.c index ae8efa66..3e7ccda2 100644 --- a/src/core2/code_4A6F0.c +++ b/src/core2/code_4A6F0.c @@ -2,7 +2,6 @@ #include "functions.h" #include "variables.h" -extern void func_80256E24(f32 [3], f32, f32, f32, f32, f32); extern void func_802EE6CC(f32[3], f32[3], s32[4], s32, f32, f32, s32, s32, s32); extern void func_803255FC(Actor *); extern void func_80325760(Actor *); diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 92c91e46..9cffb360 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -3,13 +3,11 @@ #include "functions.h" #include "variables.h" -extern f32 ml_vec3f_horizontal_distance_zero_likely(f32 [3], f32[3]); extern void func_8025A788(enum comusic_e, f32, f32); extern void func_8031CC40(enum map_e, s32); extern void fxRipple_802F363C(f32); extern void func_802F9D38(s32); extern void func_802EE6CC(f32[3], f32[3], s32[4], s32, f32, f32, s32, s32, s32); -extern void ml_vec3f_assign(f32[3], f32, f32, f32); extern void func_802EE2E8(Actor *arg0, s32 arg1, s32 cnt, s32 arg3, f32 arg4, f32 arg5, f32 arg6); extern void gcquiz_func_80319EA4(void); extern void fileProgressFlag_set(enum file_progress_e, bool); diff --git a/src/core2/code_53C10.c b/src/core2/code_53C10.c index 94cbc3a5..eb319825 100644 --- a/src/core2/code_53C10.c +++ b/src/core2/code_53C10.c @@ -2,8 +2,6 @@ #include "functions.h" #include "variables.h" -extern f32 func_80257248(f32[3], f32[3]); - typedef struct { f32 unk0; f32 unk4; diff --git a/src/core2/code_5FD90.c b/src/core2/code_5FD90.c index 3a0f33ae..497c5caf 100644 --- a/src/core2/code_5FD90.c +++ b/src/core2/code_5FD90.c @@ -6,7 +6,6 @@ extern void func_80252C08(f32[3],f32[3], f32, f32[3]); extern void func_80252CC4(f32[3],s32, f32, s32); -extern f32 func_802560D0(f32[3], f32[3], f32[3]); 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_6B030.c b/src/core2/code_6B030.c index 41cdd868..5bb7c268 100644 --- a/src/core2/code_6B030.c +++ b/src/core2/code_6B030.c @@ -8,7 +8,6 @@ -extern f32 func_80257680(f32, f32, f32); extern void func_80252330(f32, f32, f32); typedef struct { diff --git a/src/core2/code_7AF80.c b/src/core2/code_7AF80.c index bb9f6997..4a334996 100644 --- a/src/core2/code_7AF80.c +++ b/src/core2/code_7AF80.c @@ -7,8 +7,6 @@ #include #include "prop.h" -extern f32 ml_distanceSquared_vec3f(f32[3], f32[3]); -extern f32 func_802586B0(f32[3], f32[3]); extern void mapModel_getCubeBounds(s32 min[3], s32 max[3]); extern f32 func_803243D0(struct56s *arg0, f32 arg1[3]); extern void bitfield_setBit(u32*, s32, bool); diff --git a/src/core2/code_85800.c b/src/core2/code_85800.c index fd3bd13a..62b34214 100644 --- a/src/core2/code_85800.c +++ b/src/core2/code_85800.c @@ -4,7 +4,6 @@ #include "variables.h" #include "n_libaudio.h" -extern f32 func_80256AB4(f32, f32, f32, f32); extern void func_80335394(s32, f32); extern f32 sfx_randf2(f32, f32); diff --git a/src/core2/code_956B0.c b/src/core2/code_956B0.c index 9036e561..f62fa64c 100644 --- a/src/core2/code_956B0.c +++ b/src/core2/code_956B0.c @@ -9,10 +9,8 @@ extern s32 fileProgressFlag_get(s32); extern s32 fileProgressFlag_getN(s32 offset, s32 numBits); extern void func_8031FFAC(void); extern void fileProgressFlag_set(enum file_progress_e index, s32 set); -extern void ml_vec3h_to_vec3f(f32 *, s32); extern NodeProp *func_80304ED0(void*, f32 *); extern void func_8031CD44(enum map_e, s32, f32, f32, s32); -extern void func_80256E24(f32 *, f32, f32, f32, f32, f32); extern void mapSpecificFlags_set(s32, s32); bool cutscene_skipEnterLairCutsceneCheck(void); diff --git a/src/core2/code_98CB0.c b/src/core2/code_98CB0.c index 2cb555f1..0f9eb3f6 100644 --- a/src/core2/code_98CB0.c +++ b/src/core2/code_98CB0.c @@ -13,11 +13,9 @@ void volatileFlag_clear(void); void volatileFlag_set(enum volatile_flags_e index, s32 set); s32 fileProgressFlag_getN(enum file_progress_e offset, s32 numBits); void func_8031CE70(f32 *arg0, s32 arg1, s32 arg2); -void ml_vec3h_to_vec3f(f32 *, s32); void func_8028F3D8(f32 *, f32, void(*)(ActorMarker *), ActorMarker *); struct unkfunc_80304ED0 *func_80304ED0(void*, f32 *); void func_8031CD44(s32, s32, f32, f32, s32); -void func_80256E24(f32 *, f32, f32, f32, f32, f32); #define OBSCURE(ptr) (((((s32)(ptr) ^ 0x746DF219) & 0xFF) + ((((s32)(ptr) >> 0x18) & 0xFF) << 0x18) + ((((s32)(ptr) >> 8) & 0xFFFF) << 8)) ^ 0x19) diff --git a/src/core2/code_9C170.c b/src/core2/code_9C170.c index e1b6cf60..868506fa 100644 --- a/src/core2/code_9C170.c +++ b/src/core2/code_9C170.c @@ -46,7 +46,6 @@ void func_80323238(void){} // =============================================BREAK ??? extern f32 ml_vec3f_length(f32 [3], f32[3]); -extern f32 ml_distanceSquared_vec3f(f32 [3], f32 [3]); extern void func_80341180(f32, s32, s32, f32 *, f32 [3]); /* .code */ diff --git a/src/core2/code_9E370.c b/src/core2/code_9E370.c index 95b6b829..874131e8 100644 --- a/src/core2/code_9E370.c +++ b/src/core2/code_9E370.c @@ -8,8 +8,6 @@ #define DIST_SQ_VEC3F(v1, v2) ((v1[0] - v2[0])*(v1[0] - v2[0]) + (v1[1] - v2[1])*(v1[1] - v2[1]) + (v1[2] - v2[2])*(v1[2] - v2[2])) -extern f32 ml_vec3f_length(f32[3], f32[3]); -extern bool ml_vec3f_within_distance(f32[3], f32[3], f32); extern void func_802D7124(Actor *, f32); extern void func_802EE6CC(f32[3], s32[4], s32[4], s32, f32, f32, s32, s32, s32); diff --git a/src/core2/code_A4D00.c b/src/core2/code_A4D00.c index 3f258024..89dc5701 100644 --- a/src/core2/code_A4D00.c +++ b/src/core2/code_A4D00.c @@ -15,10 +15,6 @@ extern f32 func_8033229C(ActorMarker *marker); extern f32 func_80309B24(f32 [3]); -extern f32 ml_dotProduct_vec3f(f32[3], f32[3]); - -extern f32 ml_distanceSquared_vec3f(f32[3], f32[3]); - extern BKCollisionTri *func_80320C94(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3[3], s32 arg4, u32 arg5); /* .h */ diff --git a/src/core2/code_B850.c b/src/core2/code_B850.c index 5520c05e..2c71deae 100644 --- a/src/core2/code_B850.c +++ b/src/core2/code_B850.c @@ -4,7 +4,6 @@ #include "core2/ba/physics.h" -extern void ml_vec3f_assign(f32[3], f32, f32, f32); /* .data */ s32 D_80363790 = 0; diff --git a/src/core2/code_BE2C0.c b/src/core2/code_BE2C0.c index 15da711f..5d3e7b23 100644 --- a/src/core2/code_BE2C0.c +++ b/src/core2/code_BE2C0.c @@ -1,11 +1,10 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "ml/mtx.h" -extern f32 func_80255D70(f32); - #define LENGTH_SQ_VEC4F(v) (v[0]*v[0] + v[1]*v[1] + v[2]*v[2] + v[3]*v[3]) /* .data */ diff --git a/src/core2/code_C4B0.c b/src/core2/code_C4B0.c index b2fe6bc9..01efe3a1 100644 --- a/src/core2/code_C4B0.c +++ b/src/core2/code_C4B0.c @@ -1,10 +1,10 @@ #include +#include "core1/core1.h" #include "functions.h" #include "variables.h" #include "core2/ba/physics.h" -extern int func_80258424(f32 vec[3], f32 minX, f32 minY, f32 minZ, f32 maxX, f32 maxY, f32 maxZ); extern f32 func_8031C5D4(struct0*); extern void func_8031C5AC(struct0 *, f32 *); extern f32 func_8031C5E4(struct0*); @@ -12,7 +12,6 @@ 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 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 BKCollisionTri *func_80320C94(f32[3], f32[3], f32, f32[3], s32, u32); diff --git a/src/core2/code_C89C0.c b/src/core2/code_C89C0.c index d3371771..3dd81f18 100644 --- a/src/core2/code_C89C0.c +++ b/src/core2/code_C89C0.c @@ -5,7 +5,6 @@ extern void func_8032F64C(f32[3], s32); extern void func_80323240(struct56s *, f32, f32[3]); extern f32 func_80323F74(struct56s *, f32, f32); -extern f32 func_80256AB4(f32, f32, f32, f32); typedef struct { s32 unk0; diff --git a/src/core2/code_CB050.c b/src/core2/code_CB050.c index 46b92aa2..0caf4bd3 100644 --- a/src/core2/code_CB050.c +++ b/src/core2/code_CB050.c @@ -2,8 +2,6 @@ #include "functions.h" #include "variables.h" -extern f32 ml_vec3f_length_sq(f32[3], f32[3]); - typedef struct{ f32 unk0; f32 unk4[3]; diff --git a/src/core2/code_CC1E0.c b/src/core2/code_CC1E0.c index 401f0b44..2099e1f7 100644 --- a/src/core2/code_CC1E0.c +++ b/src/core2/code_CC1E0.c @@ -7,8 +7,6 @@ extern void func_80244D94(f32[3], f32[3], f32[3], u32, f32); -extern void func_80256E24(f32[3], f32, f32, f32, f32, f32); - extern f32 func_8033EA14(s32); extern void func_8033EA40(s32, f32); extern void projectile_setSprite(u8, enum asset_e); diff --git a/src/core2/code_D0CA0.c b/src/core2/code_D0CA0.c index 4eac6687..8ed33b74 100644 --- a/src/core2/code_D0CA0.c +++ b/src/core2/code_D0CA0.c @@ -2,9 +2,6 @@ #include "functions.h" #include "variables.h" -extern f32 func_8025715C(f32, f32); -extern f32 func_802575BC(f32); -extern void ml_interpolate_vec3f(f32[3], f32[3], f32[3], f32); extern bool func_80320DB0(f32[3], f32, f32[3], u32); /* .h */ diff --git a/src/core2/code_EF50.c b/src/core2/code_EF50.c index 9bd09b71..0f434da3 100644 --- a/src/core2/code_EF50.c +++ b/src/core2/code_EF50.c @@ -4,7 +4,6 @@ #include "core2/ba/physics.h" -extern void func_80256E24(f32[3], f32, f32, f32, f32, f32); extern f32 player_getYaw(void); extern void chJigsawDance_setState(Actor *, s32); extern void bsjig_setJiggyMarkerPtr(ActorMarker *); diff --git a/src/core2/gc/transition.c b/src/core2/gc/transition.c index 0565aa0c..8d5db1ca 100644 --- a/src/core2/gc/transition.c +++ b/src/core2/gc/transition.c @@ -6,7 +6,6 @@ void animctrl_setAnimTimer(AnimCtrl*, f32); void func_8025AC20(s32, s32, s32, f32, char*, s32); -f32 func_80257618(void); typedef enum { TRANSITION_ID_1_BLACK_IN = 1, @@ -320,7 +319,7 @@ void gctransition_draw(Gfx **gdl, Mtx **mptr, Vtx **vptr){ case 0xA: //zoom out only vp_rotation[2] = 0.0f; - scale = (1.0f - func_80257618())*s_current_transition.transistion_info->scale + 0.1; + scale = (1.0f - func_80257618(percentage))*s_current_transition.transistion_info->scale + 0.1; break; } if(!(s_current_transition.substate < 3) || s_current_transition.transistion_info->uid != 0x11){ diff --git a/src/core2/nc/dynamicCam1.c b/src/core2/nc/dynamicCam1.c index 1714290e..fd28a665 100644 --- a/src/core2/nc/dynamicCam1.c +++ b/src/core2/nc/dynamicCam1.c @@ -2,7 +2,6 @@ #include "functions.h" #include "variables.h" -extern f32 func_80259198(f32, f32); extern f32 func_802BD51C(void); extern f32 player_getYaw(void); extern void func_802BD870(f32, f32, f32, f32); diff --git a/src/core2/nc/dynamicCam12.c b/src/core2/nc/dynamicCam12.c index 227ca436..02802186 100644 --- a/src/core2/nc/dynamicCam12.c +++ b/src/core2/nc/dynamicCam12.c @@ -3,7 +3,6 @@ #include "variables.h" extern f32 func_802453DC(struct56s *, f32, f32[3], s32); -extern f32 func_80259198(f32, f32); extern f32 func_802BD51C(void); extern f32 player_getYaw(void); extern void func_802BE244(f32, f32); diff --git a/src/core2/nc/dynamicCam3.c b/src/core2/nc/dynamicCam3.c index a89d634d..250c6e30 100644 --- a/src/core2/nc/dynamicCam3.c +++ b/src/core2/nc/dynamicCam3.c @@ -2,7 +2,6 @@ #include "functions.h" #include "variables.h" -extern f32 func_80259198(f32, f32); extern f32 player_getYaw(void); extern void func_802BD870(f32, f32, f32, f32); diff --git a/src/core2/nc/dynamicCam4.c b/src/core2/nc/dynamicCam4.c index 0400100e..b7b5a662 100644 --- a/src/core2/nc/dynamicCam4.c +++ b/src/core2/nc/dynamicCam4.c @@ -2,7 +2,6 @@ #include "functions.h" #include "variables.h" -extern f32 func_80259198(f32, f32); extern f32 player_getYaw(void); extern f32 player_getPitch(void); extern void func_802BD870(f32, f32, f32, f32); diff --git a/src/core2/nc/dynamicCam9.c b/src/core2/nc/dynamicCam9.c index 2328a096..99de8693 100644 --- a/src/core2/nc/dynamicCam9.c +++ b/src/core2/nc/dynamicCam9.c @@ -2,7 +2,6 @@ #include "functions.h" #include "variables.h" -extern f32 func_80259198(f32, f32); extern void func_802BD870(f32, f32, f32, f32); /* .bss */ diff --git a/src/core2/nc/dynamicCamera.c b/src/core2/nc/dynamicCamera.c index 79fb3028..10e0f7a0 100644 --- a/src/core2/nc/dynamicCamera.c +++ b/src/core2/nc/dynamicCamera.c @@ -7,13 +7,10 @@ extern bool func_80245314(f32[3], f32[3], f32, f32, u32); extern int func_80244D94(f32[3], f32[3], f32[3], u32, f32); extern int func_8024575C(f32[3], f32[3], f32, f32[3], s32, u32); -extern f32 ml_vec3f_length(f32[3], f32[3]); -extern f32 func_80259198(f32, f32); extern f32 func_8028E82C(void); extern f32 player_getYaw(void); extern f32 func_8028EF88(void); extern int func_80320DB0(f32[3], f32, f32[3], u32); -extern f32 ml_dotProduct_vec3f(f32[3], f32[3]); typedef struct { f32* unk0; diff --git a/src/core2/nc/firstpersoncamera.c b/src/core2/nc/firstpersoncamera.c index 5af38183..c397bd49 100644 --- a/src/core2/nc/firstpersoncamera.c +++ b/src/core2/nc/firstpersoncamera.c @@ -4,7 +4,6 @@ extern void func_802BD780(f32[3], f32[3], f32, f32, f32, f32); -extern f32 func_80257CF8(f32, f32, f32, f32, f32); void ncFirstPersonCamera_setState(enum nc_first_person_state state); diff --git a/src/core2/nc/staticCamera.c b/src/core2/nc/staticCamera.c index e1d7f299..ce33c3a6 100644 --- a/src/core2/nc/staticCamera.c +++ b/src/core2/nc/staticCamera.c @@ -5,7 +5,6 @@ #include "core2/nc/camera.h" -extern void func_8025727C(f32, f32, f32, f32, f32, f32, f32*, f32*); /* .bss */ static f32 ncStaticCameraPosition[3]; diff --git a/src/core2/snackerctl.c b/src/core2/snackerctl.c index 5a43b190..0e79be65 100644 --- a/src/core2/snackerctl.c +++ b/src/core2/snackerctl.c @@ -11,7 +11,6 @@ #define SNACKER_BB_DIALOG_0 VER_SELECT(0xe26, 0xa68, 0, 0) #define SNACKER_BB_DIALOG_1 VER_SELECT(0xe33, 0xa75, 0, 0) -s32 ml_vec3f_point_within_horizontal_distance(f32 *, f32, f32, f32); void ncFirstPersonCamera_getZoomedInRotation(f32 *); extern u8 D_8037DCCA; diff --git a/src/fight/chfinalboss.c b/src/fight/chfinalboss.c index 293fc577..cf2c05b4 100644 --- a/src/fight/chfinalboss.c +++ b/src/fight/chfinalboss.c @@ -3,7 +3,6 @@ #include "variables.h" #include "fight.h" -extern f32 func_8025715C(f32, f32); extern void func_8028F4B8(f32[3], f32, f32); extern void func_80320ED8(ActorMarker *, f32, s32); s32 func_803297C8(Actor*, f32*); @@ -13,7 +12,6 @@ extern void func_803298D8(); extern void func_80324CFC(f32, enum comusic_e, s32); extern void sfxsource_setSampleRate(u8, s32); extern void func_80328FF0(Actor *arg0, f32 arg1); -extern f32 func_80257204(f32, f32, f32, f32); extern void func_8028F85C(f32[3]); extern void player_setIdealRotation(f32[3]); extern f32 func_8033229C(ActorMarker *); @@ -696,7 +694,7 @@ void chfinalboss_func_80387D4C(Actor *actor) { sp20[1] = -2.0 * (100.0f - local->unk1C); sp20[2] = actor->velocity[2] * local->unk14; - ml_vec3f_normalize(sp20, actor); + ml_vec3f_normalize(sp20); sp20[0] = sp20[0] * actor->actor_specific_1_f; sp20[1] = sp20[1] * actor->actor_specific_1_f; sp20[2] = sp20[2] * actor->actor_specific_1_f; diff --git a/src/lair/ch/brentilda.c b/src/lair/ch/brentilda.c index 799a34e9..5c45d86a 100644 --- a/src/lair/ch/brentilda.c +++ b/src/lair/ch/brentilda.c @@ -2,8 +2,6 @@ #include "functions.h" #include "variables.h" -extern f32 ml_vec3f_horizontal_distance_zero_likely(f32[3], f32[3]); - typedef struct { s32 unk0; } ActorLocal_lair_5640; diff --git a/src/lair/code_86F0.c b/src/lair/code_86F0.c index 4b566399..9a511432 100644 --- a/src/lair/code_86F0.c +++ b/src/lair/code_86F0.c @@ -2,7 +2,6 @@ #include "functions.h" #include "variables.h" -extern f32 ml_distanceSquared_vec3f(f32[3], f32[3]); extern void func_8028F3D8(f32[3], f32, void(*)(ActorMarker *), ActorMarker *); extern void func_80324CFC(f32, enum comusic_e, s32); extern void rand_seed(s32); diff --git a/src/lair/code_9C40.c b/src/lair/code_9C40.c index 93261678..ab6a0e04 100644 --- a/src/lair/code_9C40.c +++ b/src/lair/code_9C40.c @@ -2,8 +2,6 @@ #include "functions.h" #include "variables.h" -extern bool ml_vec3f_within_distance(f32[3], f32[3], f32); - void func_803902B8(Actor *this); Actor *func_80390030(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);