From a1951cefc09035e11077a433b28ec8c66b3b03db Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Tue, 23 Jan 2018 17:39:09 -0500 Subject: Prefix wram labels with w, part 2. --- engine/select_menu.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'engine/select_menu.asm') diff --git a/engine/select_menu.asm b/engine/select_menu.asm index e92c3ee50..2135cd5bf 100755 --- a/engine/select_menu.asm +++ b/engine/select_menu.asm @@ -22,7 +22,7 @@ ItemMayBeRegisteredText: ; 13340 CheckRegisteredItem: ; 13345 - ld a, [WhichRegisteredItem] + ld a, [wWhichRegisteredItem] and a jr z, .NoRegisteredItem and REGISTERED_POCKET @@ -39,7 +39,7 @@ CheckRegisteredItem: ; 13345 dw .CheckTMHM .CheckItem: - ld hl, NumItems + ld hl, wNumItems call .CheckRegisteredNo jr c, .NoRegisteredItem inc hl @@ -53,18 +53,18 @@ CheckRegisteredItem: ; 13345 ret .CheckKeyItem: - ld a, [RegisteredItem] - ld hl, KeyItems + ld a, [wRegisteredItem] + ld hl, wKeyItems ld de, 1 call IsInArray jr nc, .NoRegisteredItem - ld a, [RegisteredItem] - ld [CurItem], a + ld a, [wRegisteredItem] + ld [wCurItem], a and a ret .CheckBall: - ld hl, NumBalls + ld hl, wNumBalls call .CheckRegisteredNo jr nc, .NoRegisteredItem inc hl @@ -81,20 +81,20 @@ CheckRegisteredItem: ; 13345 .NoRegisteredItem: xor a - ld [WhichRegisteredItem], a - ld [RegisteredItem], a + ld [wWhichRegisteredItem], a + ld [wRegisteredItem], a scf ret ; 133a6 .CheckRegisteredNo: ; 133a6 - ld a, [WhichRegisteredItem] + ld a, [wWhichRegisteredItem] and REGISTERED_NUMBER dec a cp [hl] jr nc, .NotEnoughItems - ld [CurItemQuantity], a + ld [wCurItemQuantity], a and a ret @@ -105,10 +105,10 @@ CheckRegisteredItem: ; 13345 .IsSameItem: ; 133b6 - ld a, [RegisteredItem] + ld a, [wRegisteredItem] cp [hl] jr nz, .NotSameItem - ld [CurItem], a + ld [wCurItem], a and a ret -- cgit v1.2.3