summaryrefslogtreecommitdiff
path: root/data/items
diff options
context:
space:
mode:
Diffstat (limited to 'data/items')
-rw-r--r--data/items/guard_drink_items.asm5
-rw-r--r--data/items/use_overworld.asm2
-rw-r--r--data/items/use_party.asm2
-rw-r--r--data/items/vending_prices.asm15
4 files changed, 15 insertions, 9 deletions
diff --git a/data/items/guard_drink_items.asm b/data/items/guard_drink_items.asm
index effef203..e76d1f77 100644
--- a/data/items/guard_drink_items.asm
+++ b/data/items/guard_drink_items.asm
@@ -1,2 +1,5 @@
GuardDrinksList:
- db FRESH_WATER, SODA_POP, LEMONADE, $00
+ db FRESH_WATER
+ db SODA_POP
+ db LEMONADE
+ db 0 ; end
diff --git a/data/items/use_overworld.asm b/data/items/use_overworld.asm
index c2c244fe..5a2ba102 100644
--- a/data/items/use_overworld.asm
+++ b/data/items/use_overworld.asm
@@ -6,4 +6,4 @@ UsableItems_CloseMenu:
db OLD_ROD
db GOOD_ROD
db SUPER_ROD
- db $ff
+ db -1 ; end
diff --git a/data/items/use_party.asm b/data/items/use_party.asm
index 0126ed5e..e8da68be 100644
--- a/data/items/use_party.asm
+++ b/data/items/use_party.asm
@@ -36,4 +36,4 @@ UsableItems_PartyMenu:
db MAX_ETHER
db ELIXER
db MAX_ELIXER
- db $ff
+ db -1 ; end
diff --git a/data/items/vending_prices.asm b/data/items/vending_prices.asm
index 9a473cc9..527dd9cc 100644
--- a/data/items/vending_prices.asm
+++ b/data/items/vending_prices.asm
@@ -1,7 +1,10 @@
+vend_item: MACRO
+ db \1
+ money \2
+ENDM
+
VendingPrices:
- db FRESH_WATER
- money 200
- db SODA_POP
- money 300
- db LEMONADE
- money 350
+; item id, price
+ vend_item FRESH_WATER, 200
+ vend_item SODA_POP, 300
+ vend_item LEMONADE, 350