summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xengine/menu/vending_machine.asm32
1 files changed, 17 insertions, 15 deletions
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index 8460889f..74a6aadb 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -1,4 +1,4 @@
-VendingMachineMenu: ; 74ee0 (1d:4ee0)
+VendingMachineMenu: ; 74726 (1d:4726)
ld hl, VendingMachineText1
call PrintText
ld a, MONEY_BOX
@@ -18,8 +18,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
ld hl, wd730
set 6, [hl]
coord hl, 0, 3
- ld b, 8
- ld c, 12
+ lb bc, 8, 12
call TextBoxBorder
call UpdateSprites
coord hl, 2, 5
@@ -80,38 +79,38 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
ld hl, VendingMachineText7
jp PrintText
-VendingMachineText1: ; 74f99 (1d:4f99)
+VendingMachineText1: ; 747de (1d:47de)
TX_FAR _VendingMachineText1
db "@"
-DrinkText: ; 74f9e (1d:4f9e)
+DrinkText: ; 747e3 (1d:47e3)
db "FRESH WATER"
next "SODA POP"
next "LEMONADE"
next "CANCEL@"
-DrinkPriceText: ; 74fc3 (1d:4fc3)
+DrinkPriceText: ; 74808 (1d:4808)
db "¥200"
next "¥300"
next "¥350",$4E,"@"
-VendingMachineText4: ; 74fd3 (1d:4fd3)
+VendingMachineText4: ; 74818 (1d:4818)
TX_FAR _VendingMachineText4
db "@"
-VendingMachineText5: ; 74fd8 (1d:4fd8)
+VendingMachineText5: ; 7481d (1d:481d)
TX_FAR _VendingMachineText5
db "@"
-VendingMachineText6: ; 74fdd (1d:4fdd)
+VendingMachineText6: ; 74822 (1d:4822)
TX_FAR _VendingMachineText6
db "@"
-VendingMachineText7: ; 74fe2 (1d:4fe2)
+VendingMachineText7: ; 74827 (1d:4827)
TX_FAR _VendingMachineText7
db "@"
-LoadVendingMachineItem: ; 74fe7 (1d:4fe7)
+LoadVendingMachineItem: ; 7482c (1d:482c)
ld hl, VendingPrices
ld a, [wCurrentMenuItem]
add a
@@ -129,7 +128,10 @@ LoadVendingMachineItem: ; 74fe7 (1d:4fe7)
ld [hVendingMachinePrice + 2], a
ret
-VendingPrices: ; 75000 (1d:5000)
- db FRESH_WATER,$00,$02,$00
- db SODA_POP, $00,$03,$00
- db LEMONADE, $00,$03,$50
+VendingPrices: ; 74845 (1d:4845)
+ db FRESH_WATER
+ money 200
+ db SODA_POP
+ money 300
+ db LEMONADE
+ money 350