diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-10-02 22:42:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-10-02 22:42:26 -0400 |
| commit | 7dd9d7dc80dcd57ce079d0f365257035e9df4614 (patch) | |
| tree | 3807ecb72443ecf12feb4faa0e4d811bad279458 /macros | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| parent | Require rgbds 0.6.0 (diff) | |
| download | pokeyellow-7dd9d7dc80dcd57ce079d0f365257035e9df4614.tar.gz pokeyellow-7dd9d7dc80dcd57ce079d0f365257035e9df4614.tar.xz pokeyellow-7dd9d7dc80dcd57ce079d0f365257035e9df4614.zip | |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to '')
| -rw-r--r-- | macros.asm | 15 | ||||
| -rw-r--r-- | macros/data.asm | 10 |
2 files changed, 4 insertions, 21 deletions
diff --git a/macros.asm b/macros.asm deleted file mode 100644 index 5dd71f71..00000000 --- a/macros.asm +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE "macros/asserts.asm" -INCLUDE "macros/const.asm" -INCLUDE "macros/predef.asm" -INCLUDE "macros/farcall.asm" -INCLUDE "macros/data.asm" -INCLUDE "macros/code.asm" -INCLUDE "macros/gfx.asm" -INCLUDE "macros/coords.asm" -INCLUDE "macros/vc.asm" - -INCLUDE "macros/scripts/audio.asm" -INCLUDE "macros/scripts/maps.asm" -INCLUDE "macros/scripts/events.asm" -INCLUDE "macros/scripts/text.asm" -INCLUDE "macros/scripts/gfx_anims.asm" diff --git a/macros/data.asm b/macros/data.asm index b7a16190..775b6adc 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -71,10 +71,8 @@ MACRO dab ; dwb address, bank ENDM MACRO sine_table -; \1 samples of sin(x) from x=0 to x<32768 (pi radians) - DEF x = 0 - REPT \1 - dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up - DEF x += DIV(32768, \1) ; a circle has 65536 "degrees" - ENDR +; \1 samples of sin(x) from x=0 to x<0.5 turns (pi radians) + for x, \1 + dw sin(x * 0.5 / (\1)) + endr ENDM |