From 41716ea20c032b59194812627d5c797f4c00d315 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Thu, 2 Jun 2016 14:58:19 -0400 Subject: Route 12 and 16 houses --- main.asm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index e72bcefa..a7fc7642 100755 --- a/main.asm +++ b/main.asm @@ -304,7 +304,8 @@ VermilionHouse1Blocks: LavenderHouse1Blocks: LavenderHouse2Blocks: SaffronHouse1Blocks: -SaffronHouse2Blocks: INCBIN "maps/viridianhouse.blk" +SaffronHouse2Blocks: +Route16HouseBlocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: CeladonMansion5Blocks: INCBIN "maps/school.blk" CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" @@ -431,7 +432,11 @@ PowerPlantBlocks: INCBIN "maps/powerplant.blk" INCLUDE "data/mapHeaders/diglettscaveroute11.asm" INCLUDE "scripts/diglettscaveroute11.asm" INCLUDE "data/mapObjects/diglettscaveroute11.asm" - dr $1def6,$1e06e ; map scripts + +INCLUDE "data/mapHeaders/route16house.asm" +INCLUDE "scripts/route16house.asm" +INCLUDE "data/mapObjects/route16house.asm" + dr $1df81,$1e06e ; map scripts INCLUDE "data/mapHeaders/billshouse.asm" INCLUDE "scripts/billshouse.asm" @@ -1243,7 +1248,8 @@ INCLUDE "data/mapObjects/route21.asm" Route21Blocks: INCBIN "maps/route21.blk" ; 5507d DayCareMBlocks: -VermilionHouse2Blocks: INCBIN "maps/daycarem.blk" +VermilionHouse2Blocks: +Route12HouseBlocks: INCBIN "maps/daycarem.blk" FuchsiaHouse3Blocks: INCBIN "maps/fuchsiahouse3.blk" INCLUDE "engine/battle/experience.asm" @@ -1275,7 +1281,11 @@ INCLUDE "data/mapObjects/fuchsiahouse3.asm" INCLUDE "data/mapHeaders/daycarem.asm" INCLUDE "scripts/daycarem.asm" INCLUDE "data/mapObjects/daycarem.asm" - dr $564a5,$56714 + +INCLUDE "data/mapHeaders/route12house.asm" +INCLUDE "scripts/route12house.asm" +INCLUDE "data/mapObjects/route12house.asm" + dr $5652a,$56714 INCLUDE "engine/menu/diploma_1.asm" -- cgit v1.3.1-sl0p