thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-11 07:44:47 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a few more bugs in the beach house.

Browse source
This commit is contained in:
IIMarckus 2014-10-17 13:08:40 -06:00
parent 1d579928dc
commit 21b2ab0065
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/mapHeaders/beach_house.asm
View file

@ -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

2
data/mapObjects/beach_house.asm
View file

@ -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

2
data/wild_mons.asm
View file

@ -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

12
main.asm
View file

@ -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"