From 21b2ab0065155a3f1aa8406e24f0a02929c06ea4 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Fri, 17 Oct 2014 13:08:40 -0600 Subject: Fix a few more bugs in the beach house. --- main.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 8bc9c17c..400c6806 100755 --- a/main.asm +++ b/main.asm @@ -5059,6 +5059,12 @@ INCLUDE "data/mapHeaders/billshouse.asm" INCLUDE "scripts/billshouse.asm" INCLUDE "data/mapObjects/billshouse.asm" BillsHouseBlocks: INCBIN "maps/billshouse.blk" +IF DEF(_OPTION_BEACH_HOUSE) +INCLUDE "data/mapHeaders/beach_house.asm" +INCLUDE "scripts/beach_house.asm" +BeachHouseBlockdata: INCBIN "maps/beach_house.blk" +INCLUDE "data/mapObjects/beach_house.asm" +ENDC INCLUDE "engine/menu/oaks_pc.asm" @@ -5715,12 +5721,6 @@ CeladonHotelBlocks: INCBIN "maps/celadonhotel.blk" INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" INCLUDE "scripts/mtmoonpokecenter.asm" -IF DEF(_OPTION_BEACH_HOUSE) -INCLUDE "data/mapHeaders/beach_house.asm" -INCLUDE "scripts/beach_house.asm" -BeachHouseBlockdata: INCBIN "maps/beach_house.blk" -INCLUDE "data/mapObjects/beach_house.asm" -ENDC INCLUDE "data/mapObjects/mtmoonpokecenter.asm" INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm" -- cgit v1.3.1-sl0p