summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2014-10-17 08:13:51 -0600
committerIIMarckus <iimarckus@gmail.com>2014-10-17 08:13:51 -0600
commit7db2fe99f83e196a92bd3dab2e4c6b8c7b191682 (patch)
tree2da3877d40ad011c12f45ca0150c1cb0aa103969 /data
parenta3d3f8324a670aad8bf1348b65192544c8ab2d9f (diff)
Add more from the beach house.
Diffstat (limited to 'data')
-rw-r--r--data/mapHeaders/beach_house.asm6
-rw-r--r--data/mapObjects/beach_house.asm20
2 files changed, 26 insertions, 0 deletions
diff --git a/data/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm
new file mode 100644
index 00000000..4dc109ae
--- /dev/null
+++ b/data/mapHeaders/beach_house.asm
@@ -0,0 +1,6 @@
+BeachHouse_h:
+ db BEACH_HOUSE_TILESET
+ dw 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
new file mode 100644
index 00000000..2f836037
--- /dev/null
+++ b/data/mapObjects/beach_house.asm
@@ -0,0 +1,20 @@
+BeachHouseObjects: ; 0xf23a4
+ db $a ; border block
+
+ db 2 ; warps
+ db 7,2,0,$ff
+ db 7,3,0,$ff
+
+ db 4 ; signs
+ db 0,3,3
+ db 0,7,4,
+ db 0,$b,5
+ db 1,$d,6
+
+ db 2 ; people
+ db $27, 3+4, 2+4, $ff, $d0, 1 ; surfin' dude
+ db $3d, 3+4, 5+4, $fe, $01, 2 ; pikachu
+
+ ; warp-to
+ EVENT_DISP BEACH_HOUSE_WIDTH,7,2
+ EVENT_DISP BEACH_HOUSE_WIDTH,7,3