From 68dbc1cace667ebbf1ad1aa38a7aa906b8322821 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Wed, 1 Jun 2016 18:56:11 -0400 Subject: Fuchsia Mart --- main.asm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'main.asm') 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" -- cgit v1.3.1-sl0p