diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 12:12:05 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 12:12:05 -0400 |
| commit | 6bc203541bbced1e237b5e27db7ab42739b65655 (patch) | |
| tree | 1f0118e19711ebe3ce6e4f32c4a8a7bc8df5b27d /engine | |
| parent | 9048adc08a9ba6ec2a3d2bfe14733749b5ee23f3 (diff) | |
Use pokecrystal's sine_table macro
A circle has 65536 "degrees", so 32768 "degrees" = pi radians = half a circle
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/battle_transition.asm | 5 | ||||
| -rw-r--r-- | engine/battle_anims/functions.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/sprites.asm | 5 | ||||
| -rw-r--r-- | engine/math/sine.asm | 7 |
4 files changed, 5 insertions, 14 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index ad4b359c..21d332fe 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -669,10 +669,7 @@ WipeLYOverrides: ret StartTrainerBattle_DrawSineWave: - calc_sine_wave .SineWave - -.SineWave: - sine_table 256 + calc_sine_wave StartTrainerBattle_ZoomToBlack: farcall Function55a1 diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index e7bd9beb..94c90749 100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -4151,4 +4151,4 @@ BattleAnim_AbsCosinePrecise: ret BattleAnimSineWave: - sine_table 256 + sine_table 32 diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index 824ceac4..2e671002 100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm @@ -545,10 +545,7 @@ Sprites_Cosine: ; fallthrough Sprites_Sine: ; a = d * sin(a * pi/32) - calc_sine_wave .SineWave - -.SineWave: - sine_table 256 + calc_sine_wave AnimateEndOfExpBar: ldh a, [hSGB] diff --git a/engine/math/sine.asm b/engine/math/sine.asm index 5db3bd60..c7422aaf 100644 --- a/engine/math/sine.asm +++ b/engine/math/sine.asm @@ -1,7 +1,4 @@ _Sine:: -; a = d * sin(e * pi/256) +; a = d * sin(e * pi/32) ld a, e - calc_sine_wave .SineWave - -.SineWave: - sine_table $100 + calc_sine_wave |