summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-01 18:56:11 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-01 18:56:11 -0400
commit68dbc1cace667ebbf1ad1aa38a7aa906b8322821 (patch)
tree7d089af66c177ffbc8ede032d0e9a129237af8b3 /main.asm
parent8504fdc45d164992c9059dbf0d390afc5acc0a0c (diff)
Fuchsia Mart
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm8
1 files changed, 6 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index d0ae00f7..86689c1d 100755
--- a/main.asm
+++ b/main.asm
@@ -320,7 +320,6 @@ INCLUDE "data/mapObjects/viridianmart.asm"
ViridianMartBlocks:
CeladonMartBlocks:
SaffronMartBlocks:
-FuchsiaMartBlocks:
CinnabarMartBlocks: INCBIN "maps/viridianmart.blk"
INCLUDE "data/mapHeaders/school.asm"
@@ -373,7 +372,12 @@ VermilionDockBlocks: INCBIN "maps/vermiliondock.blk"
INCLUDE "data/mapHeaders/celadonmansion5.asm"
INCLUDE "scripts/celadonmansion5.asm"
INCLUDE "data/mapObjects/celadonmansion5.asm"
- dr $1d685,$1d7ae ; map scripts
+
+INCLUDE "data/mapHeaders/fuchsiamart.asm"
+INCLUDE "scripts/fuchsiamart.asm"
+INCLUDE "data/mapObjects/fuchsiamart.asm"
+FuchsiaMartBlocks: INCBIN "maps/fuchsiamart.blk"
+ dr $1d6db,$1d7ae ; map scripts
INCLUDE "data/mapHeaders/diglettscaveroute2.asm"
INCLUDE "scripts/diglettscaveroute2.asm"