Revert typedefs in math_util

1 files changed, 9 insertions, 14 deletions

diff --git a/include/math_util.h b/include/math_util.h
index 29fa8f59d..1f8edc5d9 100644
--- a/include/math_util.h
+++ b/include/math_util.h
@@ -3,24 +3,19 @@
 
 // Fixed-point arithmetic library.
 
-// Proposed TODO: Move the macros here from global.h
-typedef s16 fx16;  // Fixed-point Q8.8
-typedef s16 fxn16; // Fixed-point with arbitrary precision (QN.S)
-typedef s32 fx32;  // Fixed-point Q24.8
-
 // x * y
-fx16 Q_8_8_mul(fx16 x, fx16 y);
-fxn16 Q_N_S_mul(u8 s, fxn16 x, fxn16 y);
-fx32 Q_24_8_mul(fx32 x, fx32 y);
+s16 Q_8_8_mul(s16 x, s16 y);
+s16 Q_N_S_mul(u8 s, s16 x, s16 y);
+s32 Q_24_8_mul(s32 x, s32 y);
 
 // x / y
-fx16 Q_8_8_div(fx16 x, fx16 y);
-fxn16 Q_N_S_div(u8 s, fxn16 x, fxn16 y);
-fx32 Q_24_8_div(fx32 x, fx32 y);
+s16 Q_8_8_div(s16 x, s16 y);
+s16 Q_N_S_div(u8 s, s16 x, s16 y);
+s32 Q_24_8_div(s32 x, s32 y);
 
 // 1.0 / y
-fx16 Q_8_8_inv(fx16 y);
-fxn16 Q_N_S_inv(u8 s, fxn16 y);
-fx32 Q_24_8_inv(fx32 y);
+s16 Q_8_8_inv(s16 y);
+s16 Q_N_S_inv(u8 s, s16 y);
+s32 Q_24_8_inv(s32 y);
 
 #endif //GUARD_MATH_UTIL_H