diff --git a/src/decomp/engine/math_util.c b/src/decomp/engine/math_util.c index 9aee2a2..91396ff 100644 --- a/src/decomp/engine/math_util.c +++ b/src/decomp/engine/math_util.c @@ -2185,9 +2185,10 @@ s16 atan2s(f32 y, f32 x) { /** * Compute the atan2 in radians by calling atan2s and converting the result. */ -f32 atan2f(f32 y, f32 x) { - return (f32) atan2s(y, x) * M_PI / 0x8000; -} +// libsm64: `atan2f()` is not used anywhere and collides with `math.h`'s definition of the function, better to remove it entirely. +// f32 atan2f(f32 y, f32 x) { +// return (f32) atan2s(y, x) * M_PI / 0x8000; +// } #define CURVE_BEGIN_1 1 #define CURVE_BEGIN_2 2 diff --git a/src/decomp/engine/math_util.h b/src/decomp/engine/math_util.h index 5f089e5..a035bb5 100644 --- a/src/decomp/engine/math_util.h +++ b/src/decomp/engine/math_util.h @@ -68,7 +68,8 @@ void vec3f_set_dist_and_angle(Vec3f from, Vec3f to, f32 dist, s16 pitch, s16 s32 approach_s32(s32 current, s32 target, s32 inc, s32 dec); f32 approach_f32(f32 current, f32 target, f32 inc, f32 dec); s16 atan2s(f32 y, f32 x); -f32 atan2f(f32 a, f32 b); +// libsm64: `atan2f()` is not used anywhere and collides with `math.h`'s definition of the function, better to remove it entirely. +// f32 atan2f(f32 a, f32 b); void spline_get_weights(Vec4f result, f32 t, UNUSED s32 c); void anim_spline_init(Vec4s *keyFrames); s32 anim_spline_poll(Vec3f result);