diff options
| -rw-r--r-- | src/constants/duel_constants.asm | 2 | ||||
| -rw-r--r-- | src/engine/bank01.asm | 4 | ||||
| -rw-r--r-- | src/engine/home.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 0f80a73..dd61a44 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -180,7 +180,7 @@ EFFECTCMDTYPE_UNKNOWN_08 EQU $08 const OPPACTION_EXECUTE_TRAINER_EFFECTS ; $07 const OPPACTION_BEGIN_ATTACK ; $08 const OPPACTION_USE_ATTACK ; $09 - const OPPACTION_DEAL_ATTACK_DAMAGE ; $0a + const OPPACTION_ATTACK_ANIM_AND_DAMAGE ; $0a const OPPACTION_DRAW_CARD ; $0b const OPPACTION_USE_PKMN_POWER ; $0c const OPPACTION_EXECUTE_PKMN_POWER_EFFECT ; $0d diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index a0d736c..6058fcd 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -6496,7 +6496,7 @@ OppActionTable: ; 695e (1:695e) dw OppAction_ExecuteTrainerCardEffectCommands dw OppAction_BeginUseAttack dw OppAction_UseAttack - dw OppAction_PlayAttackAnimation_DealAttackDamage + dw OppAction_PlayAttackAnimationDealAttackDamage dw OppAction_DrawCard dw OppAction_UsePokemonPower dw OppAction_ExecutePokemonPowerEffect @@ -6686,7 +6686,7 @@ OppAction_UseAttack: ; 6a8c (1:6a8c) ret ; 0x6ab1 -OppAction_PlayAttackAnimation_DealAttackDamage: ; 6ab1 (1:6ab1) +OppAction_PlayAttackAnimationDealAttackDamage: ; 6ab1 (1:6ab1) call PlayAttackAnimation_DealAttackDamage ld a, 1 ld [wOpponentTurnEnded], a diff --git a/src/engine/home.asm b/src/engine/home.asm index e6247c9..b46bc44 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -4504,7 +4504,7 @@ UseAttackOrPokemonPower: ; 1730 (0:1730) call ExchangeRNG ld a, EFFECTCMDTYPE_REQUIRE_SELECTION call TryExecuteEffectCommandFunction - ld a, OPPACTION_DEAL_ATTACK_DAMAGE + ld a, OPPACTION_ATTACK_ANIM_AND_DAMAGE call SetOppAction_SerialSendDuelData ; fallthrough |