diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-12-09 17:44:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 17:44:09 -0500 |
| commit | e025ab9db0b85cadb42e9b72ac408a58f8133672 (patch) | |
| tree | ff74fb06f4d6715bec8a711e31f41057d4625bb3 /engine/battle/effect_commands.asm | |
| parent | cbf4c663611d4b7d07f3fc8d43f0be756ccc19ed (diff) | |
| parent | fd1fa78ffe78c9101c0ae5a1ca299d4282462ecd (diff) | |
Merge pull request #578 from mid-kid/master
Fixes in the animation subsystem.
Diffstat (limited to 'engine/battle/effect_commands.asm')
| -rw-r--r-- | engine/battle/effect_commands.asm | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 9adf90c82..76d6ee375 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -4854,7 +4854,7 @@ CalcPlayerStats: ld bc, wBattleMonAttack ld a, 5 - call CalcStats + call CalcBattleStats ld hl, BadgeStatBoosts call CallBattleCore @@ -4875,7 +4875,7 @@ CalcEnemyStats: ld bc, wEnemyMonAttack ld a, 5 - call CalcStats + call CalcBattleStats call BattleCommand_SwitchTurn @@ -4887,7 +4887,7 @@ CalcEnemyStats: jp BattleCommand_SwitchTurn -CalcStats: +CalcBattleStats: .loop push af ld a, [hli] @@ -6221,21 +6221,6 @@ BattleCommand_Heal: INCLUDE "engine/battle/move_effects/transform.asm" -BattleSideCopy: -; Copy bc bytes from hl to de if it's the player's turn. -; Copy bc bytes from de to hl if it's the enemy's turn. - ldh a, [hBattleTurn] - and a - jr z, .copy - -; Swap hl and de - push hl - ld h, d - ld l, e - pop de -.copy - jp CopyBytes - BattleEffect_ButItFailed: call AnimateFailedMove jp PrintButItFailed |