From 2ce8f80044038d906ca4c0e09587de1a2f0d4c8f Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 28 May 2016 20:17:56 -0400 Subject: Viridian house --- main.asm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index fa68ed90..c2146a37 100755 --- a/main.asm +++ b/main.asm @@ -292,7 +292,8 @@ INCBIN "maps/route1.blk" dr $1c1b0,$1c1c0 ; headers, objects, blocks OaksLabBlocks: INCBIN "maps/oakslab.blk" - dr $1c1de,$1c1ee ; headers, objects, blocks +ViridianHouseBlocks: +INCBIN "maps/viridianhouse.blk" SchoolBlocks: INCBIN "maps/school.blk" dr $1c1fe,$1c21e ; headers, objects, blocks @@ -325,7 +326,10 @@ INCLUDE "data/mapHeaders/school.asm" INCLUDE "scripts/school.asm" INCLUDE "data/mapObjects/school.asm" - dr $1cdc6,$1e2ae ; map scripts +INCLUDE "data/mapHeaders/viridianhouse.asm" +INCLUDE "scripts/viridianhouse.asm" +INCLUDE "data/mapObjects/viridianhouse.asm" + dr $1ce30,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" -- cgit v1.3.1-sl0p