aboutsummaryrefslogtreecommitdiffstats
path: root/engine/menu/vending_machine.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-23 17:50:50 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-06-23 17:50:50 -0400
commit0a62d48df2d73c11ca13e4c3015d3d3abfa20292 (patch)
tree530f89782772bb76a76fbdd28247f1c6e3248483 /engine/menu/vending_machine.asm
parentMerge pull request #243 from Nog-Frog/rename-unused-cd40 (diff)
downloadpokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.tar.gz
pokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.tar.xz
pokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.zip
Move more tables from engine/ to data/
This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
Diffstat (limited to 'engine/menu/vending_machine.asm')
-rwxr-xr-xengine/menu/vending_machine.asm8
1 files changed, 1 insertions, 7 deletions
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index aab4adf4..0b5c8842 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -130,10 +130,4 @@ LoadVendingMachineItem:
ld [hVendingMachinePrice + 2], a
ret
-VendingPrices:
- db FRESH_WATER
- money 200
- db SODA_POP
- money 300
- db LEMONADE
- money 350
+INCLUDE "data/vending_prices.asm"