From 77d051479bd0ed96cc2efdba52f837afd1e119c3 Mon Sep 17 00:00:00 2001 From: Sylvie <35663410+Rangi42@users.noreply.github.com> Date: Sun, 4 Aug 2024 10:05:33 -0400 Subject: Identify wcf91 as wCurPartySpecies, wCurItem, and wCurListMenuItem (#457) --- engine/battle/animations.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/battle/animations.asm') diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 41d6a2ef..31851a91 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -683,7 +683,7 @@ DoSpecialEffectByAnimationId: INCLUDE "data/battle_anims/special_effects.asm" DoBallTossSpecialEffects: - ld a, [wcf91] + ld a, [wCurItem] 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 @@ -2031,7 +2031,7 @@ ChangeMonPic: and a jr z, .playerTurn ld a, [wChangeMonPicEnemyTurnSpecies] - ld [wcf91], a + ld [wCurPartySpecies], a ld [wd0b5], a xor a ld [wSpriteFlipped], a @@ -2599,7 +2599,7 @@ TossBallAnimation: ld hl, .PokeBallAnimations ; choose which toss animation to use - ld a, [wcf91] + ld a, [wCurItem] cp POKE_BALL ld b, TOSS_ANIM jr z, .done -- cgit v1.3.1-sl0p