diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
| commit | b65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch) | |
| tree | 151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/menu/vending_machine.asm | |
| parent | b35294752c55b5df88ccfc785279c36f30a43fd6 (diff) | |
| parent | 7b7c563c93155e121e05149779cfb78b0bf9d259 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/menu/vending_machine.asm')
| -rwxr-xr-x | engine/menu/vending_machine.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 1eba782b..88cfcf65 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -1,20 +1,20 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld hl, VendingMachineText1 call PrintText - ld a, $13 + ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID xor a - ld [wCurrentMenuItem], a ; wCurrentMenuItem - ld [wLastMenuItem], a ; wLastMenuItem + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a ld a, $3 - ld [wMenuWatchedKeys], a ; wMenuWatchedKeys + ld [wMenuWatchedKeys], a ld a, $3 - ld [wMaxMenuItem], a ; wMaxMenuItem + ld [wMaxMenuItem], a ld a, $5 - ld [wTopMenuItemY], a ; wTopMenuItemY + ld [wTopMenuItemY], a ld a, $1 - ld [wTopMenuItemX], a ; wTopMenuItemX + ld [wTopMenuItemX], a ld hl, wd730 set 6, [hl] hlCoord 0, 3 @@ -33,7 +33,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) call HandleMenuInput bit 1, a jr nz, .asm_74f93 - ld a, [wCurrentMenuItem] ; wCurrentMenuItem + ld a, [wCurrentMenuItem] cp $3 jr z, .asm_74f93 xor a @@ -66,10 +66,10 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld hl, VendingMachineText5 call PrintText ld hl, $ffde - ld de, wPlayerMoney + 2 ; wd349 + ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef - ld a, $13 + ld a, MONEY_BOX ld [wTextBoxID], a jp DisplayTextBoxID .BagFull |