summaryrefslogtreecommitdiff
path: root/engine/learn_move.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-06-14 04:12:40 -0700
committeryenatch <yenatch@gmail.com>2014-06-14 04:12:40 -0700
commit53ae0e93fad9f4c3eaef92f102b1eeb531e59d68 (patch)
treecfc859d11d462e8b4bab1968360a9a85cd83154d /engine/learn_move.asm
parent9eefed45f7ff3b9ee6023fb0829528e34aa0729a (diff)
Use monster struct macros in wram. Rename related labels for consistency.
Diffstat (limited to 'engine/learn_move.asm')
-rwxr-xr-xengine/learn_move.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/learn_move.asm b/engine/learn_move.asm
index 3d72fdaa..0561abcd 100755
--- a/engine/learn_move.asm
+++ b/engine/learn_move.asm
@@ -1,7 +1,7 @@
LearnMove: ; 6e43 (1:6e43)
call SaveScreenTilesToBuffer1
ld a, [wWhichPokemon] ; wWhichPokemon
- ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
+ ld hl, wPartyMonNicks ; wPartyMonNicks
call GetPartyMonName
ld hl, wcd6d
ld de, wd036
@@ -9,7 +9,7 @@ LearnMove: ; 6e43 (1:6e43)
call CopyData
DontAbandonLearning: ; 6e5b (1:6e5b)
- ld hl, W_PARTYMON1_MOVE1 ; W_PARTYMON1_MOVE1
+ ld hl, wPartyMon1Moves ; wPartyMon1Moves
ld bc, $2c
ld a, [wWhichPokemon] ; wWhichPokemon
call AddNTimes
@@ -63,12 +63,12 @@ DontAbandonLearning: ; 6e5b (1:6e5b)
jp nz, PrintLearnedMove
ld h, d
ld l, e
- ld de, W_PLAYERMONMOVES
+ ld de, wBattleMonMoves
ld bc, $4
call CopyData
ld bc, $11
add hl, bc
- ld de, W_PLAYERMONPP ; W_PLAYERMONPP
+ ld de, wBattleMonPP ; wBattleMonPP
ld bc, $4
call CopyData
jp PrintLearnedMove