From 2ce8f80044038d906ca4c0e09587de1a2f0d4c8f Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 28 May 2016 20:17:56 -0400 Subject: Viridian house --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 2e528fcd..e65ac85a 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -44,7 +44,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(ViridianPokecenter_h) db BANK(ViridianMart_h) db BANK(School_h) - db $07 ; db BANK(ViridianHouse_h) + db BANK(ViridianHouse_h) db $1d ; db BANK(ViridianGym_h) db $07 ; db BANK(DiglettsCaveRoute2_h) db $17 ; db BANK(ViridianForestExit_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index e7a2c570..aeb2b362 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -44,7 +44,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw ViridianPokecenter_h dw ViridianMart_h dw School_h - dw $4dc6 ; dw ViridianHouse_h + dw ViridianHouse_h dw $40d4 ; dw ViridianGym_h dw $57ae ; dw DiglettsCaveRoute2_h dw $5485 ; dw ViridianForestExit_h 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