aboutsummaryrefslogtreecommitdiffstats
path: root/engine/pokemon/learn_move.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-04 16:19:15 -0400
committerGitHub <noreply@github.com>2020-07-04 16:19:15 -0400
commit2718c36065e7eb201a149938bcdd51987c4e56b6 (patch)
tree4a1c0294193a497e15ec8e6be59390eb1f84b5d3 /engine/pokemon/learn_move.asm
parentMerge pull request #256 from Rangi42/master (diff)
parentUPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET... (diff)
downloadpokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.gz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.xz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.zip
Merge pull request #257 from Rangi42/master
More reorganization
Diffstat (limited to 'engine/pokemon/learn_move.asm')
-rwxr-xr-xengine/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 53c7f87e..09413c9b 100755
--- a/engine/pokemon/learn_move.asm
+++ b/engine/pokemon/learn_move.asm
@@ -126,13 +126,13 @@ TryingToLearn:
call TextBoxBorder
coord hl, 6, 8
ld de, wMovesString
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
set 2, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
call PlaceString
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
res 2, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
ld hl, wTopMenuItemY
ld a, 8
ld [hli], a ; wTopMenuItemY
@@ -146,10 +146,10 @@ TryingToLearn:
ld a, A_BUTTON | B_BUTTON
ld [hli], a ; wMenuWatchedKeys
ld [hl], 0 ; wLastMenuItem
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
set 1, [hl]
call HandleMenuInput
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
res 1, [hl]
push af
call LoadScreenTilesFromBuffer1