diff options
Diffstat (limited to 'engine/battle/animations.asm')
| -rw-r--r-- | engine/battle/animations.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 56db1979..81468a39 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -419,7 +419,7 @@ MoveAnimation: .moveAnimation ; check if battle animations are disabled in the options ld a, [wOptions] - bit 7, a + bit BIT_BATTLE_ANIMATION, a jr nz, .animationsDisabled call ShareMoveAnimations call PlayAnimation @@ -701,7 +701,7 @@ INCLUDE "data/battle_anims/special_effects.asm" DoBallTossSpecialEffects: ld a, [wcf91] - cp 3 ; is it a Master Ball or Ultra Ball? + cp ULTRA_BALL + 1 ; is it a Master Ball or Ultra Ball? jr nc, .skipFlashingEffect .flashingEffect ; do a flashing effect if it's Master Ball or Ultra Ball ldh a, [rOBP0] @@ -717,7 +717,7 @@ DoBallTossSpecialEffects: call PlaySound .skipPlayingSound ld a, [wIsInBattle] - cp 02 ; is it a trainer battle? + cp 2 ; is it a trainer battle? jr z, .isTrainerBattle ld a, [wd11e] cp $10 ; is the enemy pokemon the Ghost Marowak? |