From 4353422326e112b1a2ae8234f5b6871720bca4ea Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 31 May 2016 12:10:49 -0400 Subject: Vermilion Mart --- main.asm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 1144789a..ef5381a4 100755 --- a/main.asm +++ b/main.asm @@ -322,7 +322,6 @@ INCLUDE "data/mapHeaders/viridianmart.asm" INCLUDE "scripts/viridianmart.asm" INCLUDE "data/mapObjects/viridianmart.asm" ViridianMartBlocks: -VermilionMartBlocks: LavenderMartBlocks: CeladonMartBlocks: SaffronMartBlocks: @@ -1213,6 +1212,7 @@ INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17",ROMX,BANK[$17] CeruleanMartBlocks: +VermilionMartBlocks: INCBIN "maps/ceruleanmart.blk" RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" @@ -1283,7 +1283,11 @@ INCLUDE "data/mapObjects/ceruleanmart.asm" INCLUDE "data/mapHeaders/vermilionpokecenter.asm" INCLUDE "scripts/vermilionpokecenter.asm" INCLUDE "data/mapObjects/vermilionpokecenter.asm" - dr $5c8cb,$5d485 + +INCLUDE "data/mapHeaders/vermilionmart.asm" +INCLUDE "scripts/vermilionmart.asm" +INCLUDE "data/mapObjects/vermilionmart.asm" + dr $5c910,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" -- cgit v1.3.1-sl0p