From 21b2ab0065155a3f1aa8406e24f0a02929c06ea4 Mon Sep 17 00:00:00 2001
From: IIMarckus <iimarckus@gmail.com>
Date: Fri, 17 Oct 2014 13:08:40 -0600
Subject: [PATCH] Fix a few more bugs in the beach house.

---
 data/mapHeaders/beach_house.asm |  3 ++-
 data/mapObjects/beach_house.asm |  2 +-
 data/wild_mons.asm              |  2 +-
 main.asm                        | 12 ++++++------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/data/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm
index 4dc109ae..11579ef1 100644
--- a/data/mapHeaders/beach_house.asm
+++ b/data/mapHeaders/beach_house.asm
@@ -1,6 +1,7 @@
 BeachHouse_h: 
+
 	db BEACH_HOUSE_TILESET
-	dw BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x)
+	db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x)
 	dw BeachHouseBlockdata,BeachHouseTextPointers,BeachHouseScript ; blocks, texts, scripts
 	db 0 ; connections
 	dw BeachHouseObjects ; objects
diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm
index bad05ac9..ad648931 100644
--- a/data/mapObjects/beach_house.asm
+++ b/data/mapObjects/beach_house.asm
@@ -7,7 +7,7 @@ BeachHouseObjects: ; 0xf23a4
 
 	db 4 ; signs
 	db 0,3,3
-	db 0,7,4,
+	db 0,7,4
 	db 0,$b,5
 	db 1,$d,6
 
diff --git a/data/wild_mons.asm b/data/wild_mons.asm
index ac1bb3cc..f29fd340 100755
--- a/data/wild_mons.asm
+++ b/data/wild_mons.asm
@@ -247,7 +247,7 @@ WildDataPointers: ; ceeb (3:4eeb)
 	dw NoMons
 	dw NoMons
 	dw NoMons
-	IF DEF(_YELLOW)
+	IF DEF(_OPTION_BEACH_HOUSE)
 		dw NoMons
 	ENDC
 	dw $FFFF
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"