diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-18 15:51:07 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-18 15:51:07 -0400 |
| commit | 3a97ec326ceba86c7afd3b3f92ef3b308beea835 (patch) | |
| tree | 14bec0281e0708974011cf9f91aa2b7690839889 | |
| parent | 7d667194684d2e047257958bad974891017414ce (diff) | |
Use pokecrystal's sine_table macro
| -rw-r--r-- | engine/minigame/surfing_pikachu.asm | 2 | ||||
| -rw-r--r-- | engine/movie/intro_yellow.asm | 2 | ||||
| -rw-r--r-- | engine/pikachu/pikachu_movement.asm | 2 | ||||
| -rw-r--r-- | macros/data.asm | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm index e66926d4..b362c933 100644 --- a/engine/minigame/surfing_pikachu.asm +++ b/engine/minigame/surfing_pikachu.asm @@ -2740,7 +2740,7 @@ SurfingPikachu_Sine: ; sine ret .SineWave: - sine_wave $100 + sine_table 32 SurfingPikachuSpawnStateDataPointer: db $00, $00, $00 ; 0 diff --git a/engine/movie/intro_yellow.asm b/engine/movie/intro_yellow.asm index 673d207c..8a2e6f4c 100644 --- a/engine/movie/intro_yellow.asm +++ b/engine/movie/intro_yellow.asm @@ -1077,7 +1077,7 @@ Func_fa08e: ret Unkn_fa0aa: - sine_wave $100 + sine_table 32 INCLUDE "data/sprite_anims/intro_frames.asm" INCLUDE "data/sprite_anims/intro_oam.asm" diff --git a/engine/pikachu/pikachu_movement.asm b/engine/pikachu/pikachu_movement.asm index 6a0877c8..2ca7aa2f 100644 --- a/engine/pikachu/pikachu_movement.asm +++ b/engine/pikachu/pikachu_movement.asm @@ -1045,4 +1045,4 @@ GetSine: ret SineWave_3f: - sine_wave $100 + sine_table 32 diff --git a/macros/data.asm b/macros/data.asm index f9274392..b5836b50 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -69,11 +69,11 @@ dbbw: MACRO dw \3 ENDM -sine_wave: MACRO -; \1: amplitude +sine_table: MACRO +; \1 samples of sin(x) from x=0 to x<32768 (pi radians) x = 0 -REPT $20 +REPT \1 dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up -x = x + (\1) * $40000 +x = x + DIV(32768, \1) ; a circle has 65536 "degrees" ENDR ENDM |