summaryrefslogtreecommitdiff
path: root/src/trig.c
diff options
context:
space:
mode:
authorU-User-PC\User <golemgalvanize@github.com>2017-10-03 15:54:19 -0400
committerU-User-PC\User <golemgalvanize@github.com>2017-10-03 15:54:19 -0400
commit1ae3d9b57b0f4ad506a1bd7323e46d2fa768b6b7 (patch)
treefca8b14b2e5e3a2390c1b890db2f56f6f8cff744 /src/trig.c
parent0a88d1042a80bcc703d05f1cf19527272424a03f (diff)
parentd32ec8bf7246468625ab68a2d62835d70b7ac98c (diff)
I hope this fixes merge conflicts
Diffstat (limited to 'src/trig.c')
-rw-r--r--src/trig.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/trig.c b/src/trig.c
index e16a69e63..c2bca3059 100644
--- a/src/trig.c
+++ b/src/trig.c
@@ -1,12 +1,6 @@
#include "global.h"
#include "trig.h"
-// Converts a number to Q8.8 fixed-point format
-#define Q_8_8(n) ((s16)((n) * 256))
-
-// Converts a number to Q4.12 fixed-point format
-#define Q_4_12(n) ((s16)((n) * 4096))
-
// Values of sin(x*(π/128)) as Q8.8 fixed-point numbers from x = 0 to x = 319
const s16 gSineTable[] =
{