summaryrefslogtreecommitdiff
path: root/battle/core.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-12-30 23:22:27 -0500
committeryenatch <yenatch@gmail.com>2013-12-30 23:22:27 -0500
commitbfaad924e7f0ebad59da85830211b9b0c8d2afa8 (patch)
treea9b8d3fc69c556986e7efb825f21d7f96b86e43b /battle/core.asm
parent82214440e190fc250023a7b59bb4c20432700555 (diff)
label more pointers to Moves
Diffstat (limited to 'battle/core.asm')
-rw-r--r--battle/core.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/battle/core.asm b/battle/core.asm
index 728d5e5bf..9650a9323 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -896,10 +896,10 @@ GetMovePriority: ; 3c5c5
Function3c5ec: ; 3c5ec
ld a, b
dec a
- ld hl, $5afc
- ld bc, $0007
+ ld hl, Moves + MOVE_EFFECT
+ ld bc, Move2 - Move1
call AddNTimes
- ld a, $10
+ ld a, BANK(Moves)
call GetFarByte
ld b, a
ret
@@ -3399,11 +3399,11 @@ Function3d5d7: ; 3d5d7
push de
push bc
dec a
- ld hl, $5afb
- ld bc, $0007
+ ld hl, Moves + MOVE_ANIM
+ ld bc, Move2 - Move1
call AddNTimes
ld de, EnemyMoveAnimation
- ld a, $10
+ ld a, BANK(Moves)
call FarCopyBytes
call SetEnemyTurn
callab Function0x347c8