summaryrefslogtreecommitdiff
path: root/src/trig.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-23 20:36:00 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-23 20:36:00 +0200
commit7bb0fcf182e5a760ab9e08878a381566819dc8f2 (patch)
treebbb0603d41fa6d0d71a838c7e2fde85fe346fbe1 /src/trig.c
parent601fc9e85b383792819768c31728e4855e854f32 (diff)
parenta57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff)
merge with master and fix 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[] =
{