aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-28 17:43:51 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-28 17:43:51 -0400
commitc93574436f30106fd2211abea452fe3a96948211 (patch)
tree3147c82a48ccd933576cdc485e54d7e13677df85 /main.asm
parentViridian pokecenter (diff)
downloadpokeyellow-c93574436f30106fd2211abea452fe3a96948211.tar.gz
pokeyellow-c93574436f30106fd2211abea452fe3a96948211.tar.xz
pokeyellow-c93574436f30106fd2211abea452fe3a96948211.zip
Viridian Mart
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm15
1 files changed, 14 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 926e8984..325bcdbe 100755
--- a/main.asm
+++ b/main.asm
@@ -304,7 +304,20 @@ INCLUDE "data/mapHeaders/oakslab.asm"
INCLUDE "scripts/oakslab.asm"
INCLUDE "data/mapObjects/oakslab.asm"
- dr $1cc6e,$1e2ae ; map scripts
+INCLUDE "data/mapHeaders/viridianmart.asm"
+INCLUDE "scripts/viridianmart.asm"
+INCLUDE "data/mapObjects/viridianmart.asm"
+ViridianMartBlocks:
+PewterMartBlocks:
+CeruleanMartBlocks:
+VermilionMartBlocks:
+LavenderMartBlocks:
+CeladonMartBlocks:
+SaffronMartBlocks:
+FuchsiaMartBlocks:
+CinnabarMartBlocks:
+INCBIN "maps/viridianmart.blk"
+ dr $1cd6d,$1e2ae ; map scripts
INCLUDE "engine/menu/oaks_pc.asm"