summaryrefslogtreecommitdiff
path: root/include/trig.h
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 /include/trig.h
parent3919b7130b2a8709562b012099947923a16af02d (diff)
parented9e0e20547e2c96833cddea67c6b423ef7af7ef (diff)
fix merge conflicts
Diffstat (limited to 'include/trig.h')
-rw-r--r--include/trig.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/trig.h b/include/trig.h
index 477a0163f..a2f98a3e6 100644
--- a/include/trig.h
+++ b/include/trig.h
@@ -1,9 +1,6 @@
#ifndef GUARD_TRIG_H
#define GUARD_TRIG_H
-// Converts a number to Q8.8 fixed-point format
-#define Q_8_8(n) ((s16)((n) * 256))
-
extern const s16 gSineTable[];
s16 Sin(s16 index, s16 amplitude);