summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 18:50:52 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 18:50:52 -0400
commit00cefcb4f35c0fd433c6852e88bce10e520abe13 (patch)
tree1e14747c04721b074a2e9c495bc055f2af1d73b0
parent21a27b118788c781506007799bfc2d8bb1f7aad2 (diff)
Actually commit with vending_machine.asm included
-rwxr-xr-xmain.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index a7b573cb..22f3b315 100755
--- a/main.asm
+++ b/main.asm
@@ -1359,8 +1359,8 @@ INCLUDE "scripts/pewtermart.asm"
INCLUDE "data/mapObjects/pewtermart.asm"
dr $7453d,$74726
-VendingMachineMenu: ; 74726 (1d:4726)
- dr $74726,$75dfe
+INCLUDE "engine/menu/vending_machine.asm"
+ dr $74851,$75dfe
PKMNLeaguePC: ; 75dfe (1d:5dfe)
dr $75dfe,$75f74