diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-02 19:57:08 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-02 19:57:08 -0400 |
| commit | 58d08bff4386815b83c9260bd831719507acfcec (patch) | |
| tree | 7fcfd0dbf93b2c4e7253c2f7e445c0c2c22e46b4 /engine/battle/animations.asm | |
| parent | `warp_event` warp IDs start at 1, like in pokegold/pokecrystal (diff) | |
| download | pokeyellow-58d08bff4386815b83c9260bd831719507acfcec.tar.gz pokeyellow-58d08bff4386815b83c9260bd831719507acfcec.tar.xz pokeyellow-58d08bff4386815b83c9260bd831719507acfcec.zip | |
Identify some percentage constant values
Diffstat (limited to 'engine/battle/animations.asm')
| -rw-r--r-- | engine/battle/animations.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 75713592..a93af9e9 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -653,7 +653,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] @@ -668,7 +668,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? |