summaryrefslogtreecommitdiff
path: root/src/trig.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-21 10:50:15 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-21 10:50:15 +0200
commit9ee9a20152694f456841eb890b986d42f3c50e26 (patch)
tree2998678c0f3db391b080318633bc506248542ecb /src/trig.c
parent3919b7130b2a8709562b012099947923a16af02d (diff)
parented9e0e20547e2c96833cddea67c6b423ef7af7ef (diff)
fix merge conflicts
Diffstat (limited to 'src/trig.c')
-rw-r--r--src/trig.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/trig.c b/src/trig.c
index 93cf06893..c2bca3059 100644
--- a/src/trig.c
+++ b/src/trig.c
@@ -1,9 +1,6 @@
#include "global.h"
#include "trig.h"
-// 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[] =
{