diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-02 22:45:42 -0500 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-02 22:45:42 -0500 |
commit | 45373ec601e5af5bc2be7a72b8556e4311efdc05 (patch) | |
tree | 5e8e92a4383e1f9c89e5f2e4071a838829bf53e3 /engine | |
parent | f258ff8a417ba44a3cc0679c59f1a278ea108ed2 (diff) |
sine_wave macro parameterizes table size, not frequency ("amplitude" was an incorrect comment)
Diffstat (limited to 'engine')
-rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
-rwxr-xr-x | engine/battle_anims/functions.asm | 2 | ||||
-rwxr-xr-x | engine/events/celebi.asm | 2 | ||||
-rwxr-xr-x | engine/routines/sine.asm | 2 | ||||
-rwxr-xr-x | engine/sprites.asm | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 452339e81..0c2f7e8cc 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -789,7 +789,7 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7) ; 8c728 (23:4728) .sinewave ; 8c728 - sine_wave $100 + sine_wave 32 ; 8c768 StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768) diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index 817df4967..25d1a50c4 100755 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -4157,5 +4157,5 @@ BattleAnim_AbsCosinePrecise: ; ce778 ; ce77f BattleAnimSineWave: ; ce77f - sine_wave $100 + sine_wave 32 ; ce7bf diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index 4d60a7d99..f6cedd074 100755 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -281,7 +281,7 @@ CelebiEvent_Cosine: ; 49b3b (12:5b3b) ; 49b6e (12:5b6e) .sinewave ; 49b6e - sine_wave $100 + sine_wave 32 ; 49bae GetCelebiSpriteTile: ; 49bae diff --git a/engine/routines/sine.asm b/engine/routines/sine.asm index 5f56a10a8..8c5ec6347 100755 --- a/engine/routines/sine.asm +++ b/engine/routines/sine.asm @@ -45,4 +45,4 @@ _Sine:: ; 84d9 .sinewave ; 850b ; A $20-word table representing a sine wave. ; 90 degrees is index $10 at a base amplitude of $100. - sine_wave $100 + sine_wave 32 diff --git a/engine/sprites.asm b/engine/sprites.asm index 09f6ae89a..60efe1b13 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -620,7 +620,7 @@ Sprites_Sine: ; 8e72c ; 8e75d .sinewave ; 8e75d - sine_wave $100 + sine_wave 32 AnimateEndOfExpBar: ; 8e79d |