diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:00:22 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:00:22 -0500 |
| commit | dfcca93b451cecb6857f8b6bc6b9f67e997b09c9 (patch) | |
| tree | acf41a46e600fa3452536f97dc3f934968b3c839 /engine/battle_anims/functions.asm | |
| parent | 5c28d05bb40b47f084a34eb732da92c899e18db6 (diff) | |
| parent | 6c5cd7a963fb2b5eed109aeef25f041eabba0004 (diff) | |
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
# Conflicts:
# engine/battle/core.asm
# engine/save.asm
Diffstat (limited to 'engine/battle_anims/functions.asm')
| -rwxr-xr-x | engine/battle_anims/functions.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index 4b77cd77c..5e85ffdb0 100755 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -428,9 +428,9 @@ GetBallAnimPal: ; cd249 (33:5249) ld hl, BallColors ld a, [rSVBK] push af - ld a, $1 + ld a, BANK(CurItem) ld [rSVBK], a - ld a, [CurItem] ; CurItem + ld a, [CurItem] ld e, a pop af ld [rSVBK], a |