ref: 21b2ab0065155a3f1aa8406e24f0a02929c06ea4
parent: 1d579928dc0a3ecbaa169ae76a7abcc310e2c7ce
author: IIMarckus <iimarckus@gmail.com>
date: Fri Oct 17 09:08:40 EDT 2014
Fix a few more bugs in the beach house.
--- 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
--- a/data/mapObjects/beach_house.asm
+++ b/data/mapObjects/beach_house.asm
@@ -7,7 +7,7 @@
db 4 ; signs
db 0,3,3
- db 0,7,4,
+ db 0,7,4
db 0,$b,5
db 1,$d,6
--- a/data/wild_mons.asm
+++ b/data/wild_mons.asm
@@ -247,7 +247,7 @@
dw NoMons
dw NoMons
dw NoMons
- IF DEF(_YELLOW)
+ IF DEF(_OPTION_BEACH_HOUSE)
dw NoMons
ENDC
dw $FFFF
--- a/main.asm
+++ b/main.asm
@@ -5059,6 +5059,12 @@
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 @@
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"