diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-16 19:50:48 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-16 19:50:48 -0400 |
| commit | cd71ae03af9e75235c8035821700dd6dc6b69616 (patch) | |
| tree | dc9a8c98e42123aebc6963b71826b25f730e4b1a /engine | |
| parent | d44c7c305c3f94b59e3e2c008408779836a0020a (diff) | |
Separate move/battle animation data from move data (to do: further identify animation data labels+constants)
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/animations.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 4e836510..2e478e5c 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -194,7 +194,7 @@ PlayAnimation: jr .searchSpecialEffectTableLoop .foundMatch ld a, [hli] - cp $FF ; is there a sound to play? + cp -1 ; is there a sound to play? jr z, .skipPlayingSound ld [wAnimSoundID], a ; store sound push hl @@ -267,7 +267,7 @@ LoadSubanimation: ld d, a ; de = address of subanimation ld a, [de] ld b, a - and 31 + and %00011111 ld [wSubAnimCounter], a ; number of frame blocks ld a, b and %11100000 @@ -650,7 +650,7 @@ DoSpecialEffectByAnimationId: pop hl ret -INCLUDE "data/moves/animation_special_effects.asm" +INCLUDE "data/battle_anims/special_effects.asm" DoBallTossSpecialEffects: ld a, [wcf91] @@ -912,7 +912,7 @@ TailWhipAnimationUnused: ld c, 20 jp DelayFrames -INCLUDE "data/moves/animation_special_effect_pointers.asm" +INCLUDE "data/battle_anims/special_effect_pointers.asm" AnimationDelay10: ld c, 10 |