diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/select_menu.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/select_menu.asm')
| -rwxr-xr-x | engine/select_menu.asm | 26 |
1 files changed, 13 insertions, 13 deletions
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 |