diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
| commit | 7bb0fcf182e5a760ab9e08878a381566819dc8f2 (patch) | |
| tree | bbb0603d41fa6d0d71a838c7e2fde85fe346fbe1 /include/trig.h | |
| parent | 601fc9e85b383792819768c31728e4855e854f32 (diff) | |
| parent | a57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff) | |
merge with master and fix conflicts
Diffstat (limited to 'include/trig.h')
| -rw-r--r-- | include/trig.h | 3 |
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); |