summaryrefslogtreecommitdiff
path: root/engine/items
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-04-01 12:56:42 -0400
committeryenatch <yenatch@gmail.com>2015-04-01 12:56:42 -0400
commitc2efe700ac1c5cca88bac710b98388a99665741e (patch)
treeb30d2f676d5ad0d78b959c8ffcf0f8dcfca13943 /engine/items
parent52add272c6bca00d2ea827ef7fa4611a4bc41b47 (diff)
parentce9940a2eb89caa9f53507a6d6071f8eaf85ee48 (diff)
Merge pull request #90 from xCrystal/master
Rename/split battle and move effect files. Battle functions, AI, and attack animations
Diffstat (limited to 'engine/items')
-rwxr-xr-xengine/items/items.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm
index 605e5dde..21e6e924 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -320,8 +320,8 @@ ItemUseBall: ; d687 (3:5687)
ld [W_ANIMATIONID],a
xor a
ld [$fff3],a
- ld [wcc5b],a
- ld [wd05b],a
+ ld [wAnimationType],a
+ ld [wDamageMultipliers],a
ld a,[wWhichPokemon]
push af
ld a,[wcf91]