From ee6b3c1acf4805d6df72b291b8c0f79635e6341a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 5 May 2021 13:03:39 -0400 Subject: Sync berry crush from Emerald --- src/math_util.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/math_util.c') diff --git a/src/math_util.c b/src/math_util.c index f77c82608..d4e2f3f56 100644 --- a/src/math_util.c +++ b/src/math_util.c @@ -1,6 +1,6 @@ #include "global.h" -s16 MathUtil_Mul16(s16 x, s16 y) +s16 mulfx16(s16 x, s16 y) { s32 result; @@ -10,7 +10,7 @@ s16 MathUtil_Mul16(s16 x, s16 y) return result; } -s16 MathUtil_Mul16Shift(u8 s, s16 x, s16 y) +s16 mulfxn16(u8 s, s16 x, s16 y) { s32 result; @@ -20,7 +20,7 @@ s16 MathUtil_Mul16Shift(u8 s, s16 x, s16 y) return result; } -s32 MathUtil_Mul32(s32 x, s32 y) +s32 mulfx32(s32 x, s32 y) { s64 result; @@ -30,7 +30,7 @@ s32 MathUtil_Mul32(s32 x, s32 y) return result; } -s16 MathUtil_Div16(s16 x, s16 y) +s16 divfx16(s16 x, s16 y) { if (y == 0) { @@ -39,7 +39,7 @@ s16 MathUtil_Div16(s16 x, s16 y) return (x << 8) / y; } -s16 MathUtil_Div16Shift(u8 s, s16 x, s16 y) +s16 divfxn16(u8 s, s16 x, s16 y) { if (y == 0) { @@ -48,7 +48,7 @@ s16 MathUtil_Div16Shift(u8 s, s16 x, s16 y) return (x << s) / y; } -s32 MathUtil_Div32(s32 x, s32 y) +s32 divfx32(s32 x, s32 y) { s64 _x; @@ -61,7 +61,7 @@ s32 MathUtil_Div32(s32 x, s32 y) return _x / y; } -s16 MathUtil_Inv16(s16 y) +s16 invfx16(s16 y) { s32 x; @@ -69,7 +69,7 @@ s16 MathUtil_Inv16(s16 y) return x / y; } -s16 MathUtil_Inv16Shift(u8 s, s16 y) +s16 invfxn16(u8 s, s16 y) { s32 x; @@ -77,7 +77,7 @@ s16 MathUtil_Inv16Shift(u8 s, s16 y) return x / y; } -s32 MathUtil_Inv32(s32 y) +s32 invfx32(s32 y) { s64 x; -- cgit v1.2.3 From f2847354f42e7bc62279a713f9331a900f9c7c75 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 6 May 2021 09:27:56 -0400 Subject: Improve documentation of math_util --- src/math_util.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/math_util.c') diff --git a/src/math_util.c b/src/math_util.c index d4e2f3f56..e13c36ea6 100644 --- a/src/math_util.c +++ b/src/math_util.c @@ -1,6 +1,7 @@ #include "global.h" +#include "math_util.h" -s16 mulfx16(s16 x, s16 y) +fx16 mulfx16(fx16 x, fx16 y) { s32 result; @@ -10,7 +11,7 @@ s16 mulfx16(s16 x, s16 y) return result; } -s16 mulfxn16(u8 s, s16 x, s16 y) +fxn16 mulfxn16(u8 s, fxn16 x, fxn16 y) { s32 result; @@ -20,7 +21,7 @@ s16 mulfxn16(u8 s, s16 x, s16 y) return result; } -s32 mulfx32(s32 x, s32 y) +fx32 mulfx32(fx32 x, fx32 y) { s64 result; @@ -30,7 +31,7 @@ s32 mulfx32(s32 x, s32 y) return result; } -s16 divfx16(s16 x, s16 y) +fx16 divfx16(fx16 x, fx16 y) { if (y == 0) { @@ -39,7 +40,7 @@ s16 divfx16(s16 x, s16 y) return (x << 8) / y; } -s16 divfxn16(u8 s, s16 x, s16 y) +fxn16 divfxn16(u8 s, fxn16 x, fxn16 y) { if (y == 0) { @@ -48,7 +49,7 @@ s16 divfxn16(u8 s, s16 x, s16 y) return (x << s) / y; } -s32 divfx32(s32 x, s32 y) +fx32 divfx32(fx32 x, fx32 y) { s64 _x; @@ -61,7 +62,7 @@ s32 divfx32(s32 x, s32 y) return _x / y; } -s16 invfx16(s16 y) +fx16 invfx16(fx16 y) { s32 x; @@ -69,7 +70,7 @@ s16 invfx16(s16 y) return x / y; } -s16 invfxn16(u8 s, s16 y) +fxn16 invfxn16(u8 s, fxn16 y) { s32 x; @@ -77,7 +78,7 @@ s16 invfxn16(u8 s, s16 y) return x / y; } -s32 invfx32(s32 y) +fx32 invfx32(fx32 y) { s64 x; -- cgit v1.2.3 From 5c965f5357c09a9eaaad029441401498e0877966 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 24 May 2021 14:59:35 -0400 Subject: Rename fixed point math routines again --- src/math_util.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/math_util.c') diff --git a/src/math_util.c b/src/math_util.c index e13c36ea6..eff2fd7c0 100644 --- a/src/math_util.c +++ b/src/math_util.c @@ -1,7 +1,7 @@ #include "global.h" #include "math_util.h" -fx16 mulfx16(fx16 x, fx16 y) +fx16 Q_8_8_mul(fx16 x, fx16 y) { s32 result; @@ -11,7 +11,7 @@ fx16 mulfx16(fx16 x, fx16 y) return result; } -fxn16 mulfxn16(u8 s, fxn16 x, fxn16 y) +fxn16 Q_N_S_mul(u8 s, fxn16 x, fxn16 y) { s32 result; @@ -21,7 +21,7 @@ fxn16 mulfxn16(u8 s, fxn16 x, fxn16 y) return result; } -fx32 mulfx32(fx32 x, fx32 y) +fx32 Q_24_8_mul(fx32 x, fx32 y) { s64 result; @@ -31,7 +31,7 @@ fx32 mulfx32(fx32 x, fx32 y) return result; } -fx16 divfx16(fx16 x, fx16 y) +fx16 Q_8_8_div(fx16 x, fx16 y) { if (y == 0) { @@ -40,7 +40,7 @@ fx16 divfx16(fx16 x, fx16 y) return (x << 8) / y; } -fxn16 divfxn16(u8 s, fxn16 x, fxn16 y) +fxn16 Q_N_S_div(u8 s, fxn16 x, fxn16 y) { if (y == 0) { @@ -49,7 +49,7 @@ fxn16 divfxn16(u8 s, fxn16 x, fxn16 y) return (x << s) / y; } -fx32 divfx32(fx32 x, fx32 y) +fx32 Q_24_8_div(fx32 x, fx32 y) { s64 _x; @@ -62,7 +62,7 @@ fx32 divfx32(fx32 x, fx32 y) return _x / y; } -fx16 invfx16(fx16 y) +fx16 Q_8_8_inv(fx16 y) { s32 x; @@ -70,7 +70,7 @@ fx16 invfx16(fx16 y) return x / y; } -fxn16 invfxn16(u8 s, fxn16 y) +fxn16 Q_N_S_inv(u8 s, fxn16 y) { s32 x; @@ -78,7 +78,7 @@ fxn16 invfxn16(u8 s, fxn16 y) return x / y; } -fx32 invfx32(fx32 y) +fx32 Q_24_8_inv(fx32 y) { s64 x; -- cgit v1.2.3 From 1a9ba7bb0aeb27a7d0bca43190edd054e517f27b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 May 2021 09:59:32 -0400 Subject: Revert typedefs in math_util --- src/math_util.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/math_util.c') diff --git a/src/math_util.c b/src/math_util.c index eff2fd7c0..767e4d93d 100644 --- a/src/math_util.c +++ b/src/math_util.c @@ -1,7 +1,7 @@ #include "global.h" #include "math_util.h" -fx16 Q_8_8_mul(fx16 x, fx16 y) +s16 Q_8_8_mul(s16 x, s16 y) { s32 result; @@ -11,7 +11,7 @@ fx16 Q_8_8_mul(fx16 x, fx16 y) return result; } -fxn16 Q_N_S_mul(u8 s, fxn16 x, fxn16 y) +s16 Q_N_S_mul(u8 s, s16 x, s16 y) { s32 result; @@ -21,7 +21,7 @@ fxn16 Q_N_S_mul(u8 s, fxn16 x, fxn16 y) return result; } -fx32 Q_24_8_mul(fx32 x, fx32 y) +s32 Q_24_8_mul(s32 x, s32 y) { s64 result; @@ -31,7 +31,7 @@ fx32 Q_24_8_mul(fx32 x, fx32 y) return result; } -fx16 Q_8_8_div(fx16 x, fx16 y) +s16 Q_8_8_div(s16 x, s16 y) { if (y == 0) { @@ -40,7 +40,7 @@ fx16 Q_8_8_div(fx16 x, fx16 y) return (x << 8) / y; } -fxn16 Q_N_S_div(u8 s, fxn16 x, fxn16 y) +s16 Q_N_S_div(u8 s, s16 x, s16 y) { if (y == 0) { @@ -49,7 +49,7 @@ fxn16 Q_N_S_div(u8 s, fxn16 x, fxn16 y) return (x << s) / y; } -fx32 Q_24_8_div(fx32 x, fx32 y) +s32 Q_24_8_div(s32 x, s32 y) { s64 _x; @@ -62,7 +62,7 @@ fx32 Q_24_8_div(fx32 x, fx32 y) return _x / y; } -fx16 Q_8_8_inv(fx16 y) +s16 Q_8_8_inv(s16 y) { s32 x; @@ -70,7 +70,7 @@ fx16 Q_8_8_inv(fx16 y) return x / y; } -fxn16 Q_N_S_inv(u8 s, fxn16 y) +s16 Q_N_S_inv(u8 s, s16 y) { s32 x; @@ -78,7 +78,7 @@ fxn16 Q_N_S_inv(u8 s, fxn16 y) return x / y; } -fx32 Q_24_8_inv(fx32 y) +s32 Q_24_8_inv(s32 y) { s64 x; -- cgit v1.2.3