summaryrefslogtreecommitdiff
path: root/include/lib
diff options
context:
space:
mode:
Diffstat (limited to 'include/lib')
-rw-r--r--include/lib/files.h1
-rw-r--r--include/lib/math.h11
2 files changed, 7 insertions, 5 deletions
diff --git a/include/lib/files.h b/include/lib/files.h
index e65e4d09..8fae3247 100644
--- a/include/lib/files.h
+++ b/include/lib/files.h
@@ -10,4 +10,3 @@ struct FileEntry {
/* 0c */ unk32 mUnk_0c;
/* 10 */
};
-
diff --git a/include/lib/math.h b/include/lib/math.h
index 8242284e..f7204acc 100644
--- a/include/lib/math.h
+++ b/include/lib/math.h
@@ -8,10 +8,12 @@ typedef s32 q20;
// Q4.12 fixed point number
typedef s16 q4;
-#define INT_TO_Q20(n) ((s32)((n) << 12))
-#define FLOAT_TO_Q20(n) ((s32)(((n) * 8192 + 1) / 2))
-#define ROUND_Q20(n) (((s32)(n) + 0x800) >> 12)
-#define MUL_Q20(a,b) (q20)((((s64)(a)) * ((s64)(b)) + 0x800) >> 12)
+#define INT_TO_Q20(n) ((s32) ((n) << 12))
+#define FLOAT_TO_Q21(n) ((s32) (((n) * 8192 + 1) / 4))
+#define FLOAT_TO_Q20(n) ((s32) (((n) * 8192 + 1) / 2))
+#define FLOAT_TO_Q19(n) ((s32) (((n) * 8192 + 1)))
+#define ROUND_Q20(n) (((s32) (n) + 0x800) >> 12)
+#define MUL_Q20(a, b) (q20)((((s64) (a)) * ((s64) (b)) + 0x800) >> 12)
#define DEG_TO_ANG(n) ((n) * 0x10000 / 360)
#define SIN(n) (gSinCosTable[2 * ((n) >> 4)])
@@ -60,6 +62,7 @@ inline void Vec3p_Rotate(Vec3p *vec, q20 sin, q20 cos, Vec3p *out) {
inline void Vec3p_CopyXZ(Vec3p *vec, Vec3p *out) {
q20 z = vec->z;
q20 x = vec->x;
+
out->x = x;
out->y = 0;
out->z = z;