From 7607ab4ff452ea7387e7faf931a9a35ff515c5b0 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 31 May 2016 21:47:52 -0400 Subject: Celadon Manion Eevee room --- main.asm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index fc0ddd8b..b82b8220 100755 --- a/main.asm +++ b/main.asm @@ -302,6 +302,7 @@ CeruleanHouse1Blocks: VermilionHouse1Blocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: +CeladonMansion5Blocks: INCBIN "maps/school.blk" CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" @@ -370,7 +371,11 @@ INCLUDE "scripts/vermiliondock.asm" INCLUDE "data/mapObjects/vermiliondock.asm" VermilionDockBlocks: INCBIN "maps/vermiliondock.blk" - dr $1d636,$1d7ae ; map scripts + +INCLUDE "data/mapHeaders/celadonmansion5.asm" +INCLUDE "scripts/celadonmansion5.asm" +INCLUDE "data/mapObjects/celadonmansion5.asm" + dr $1d685,$1d7ae ; map scripts INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" -- cgit v1.3.1-sl0p