aboutsummaryrefslogtreecommitdiffstats
path: root/engine/pokemon/learn_move.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/pokemon/learn_move.asm')
-rw-r--r--engine/pokemon/learn_move.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm
index 03f17bcc..e10c6bcf 100644
--- a/engine/pokemon/learn_move.asm
+++ b/engine/pokemon/learn_move.asm
@@ -3,7 +3,7 @@ LearnMove:
ld a, [wWhichPokemon]
ld hl, wPartyMonNicks
call GetPartyMonName
- ld hl, wcd6d
+ ld hl, wNameBuffer
ld de, wLearnMoveMonName
ld bc, NAME_LENGTH
call CopyData
@@ -29,7 +29,7 @@ DontAbandonLearning:
jp c, AbandonLearning
push hl
push de
- ld [wd11e], a
+ ld [wNamedObjectIndex], a
call GetMoveName
ld hl, OneTwoAndText
call PrintText
@@ -126,11 +126,11 @@ TryingToLearn:
hlcoord 6, 8
ld de, wMovesString
ldh a, [hUILayoutFlags]
- set 2, a
+ set BIT_SINGLE_SPACED_LINES, a
ldh [hUILayoutFlags], a
call PlaceString
ldh a, [hUILayoutFlags]
- res 2, a
+ res BIT_SINGLE_SPACED_LINES, a
ldh [hUILayoutFlags], a
ld hl, wTopMenuItemY
ld a, 8
@@ -146,10 +146,10 @@ TryingToLearn:
ld [hli], a ; wMenuWatchedKeys
ld [hl], 0 ; wLastMenuItem
ld hl, hUILayoutFlags
- set 1, [hl]
+ set BIT_DOUBLE_SPACED_MENU, [hl]
call HandleMenuInput
ld hl, hUILayoutFlags
- res 1, [hl]
+ res BIT_DOUBLE_SPACED_MENU, [hl]
push af
call LoadScreenTilesFromBuffer1
pop af