From fdf55b45c44f4234f9f0ed6662db6f7089828b63 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Thu, 2 Jun 2016 14:24:05 -0400 Subject: Saffron houses --- main.asm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 3a3a7ee1..3febabb2 100755 --- a/main.asm +++ b/main.asm @@ -302,7 +302,9 @@ PewterHouse2Blocks: CeruleanHouse1Blocks: VermilionHouse1Blocks: LavenderHouse1Blocks: -LavenderHouse2Blocks: INCBIN "maps/viridianhouse.blk" +LavenderHouse2Blocks: +SaffronHouse1Blocks: +SaffronHouse2Blocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: CeladonMansion5Blocks: INCBIN "maps/school.blk" CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" @@ -381,7 +383,14 @@ 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/saffronhouse1.asm" +INCLUDE "scripts/saffronhouse1.asm" +INCLUDE "data/mapObjects/saffronhouse1.asm" + +INCLUDE "data/mapHeaders/saffronhouse2.asm" +INCLUDE "scripts/saffronhouse2.asm" +INCLUDE "data/mapObjects/saffronhouse2.asm" INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" -- cgit v1.3.1-sl0p