summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/collision.asm3
-rwxr-xr-xdata/tileset_headers.asm3
2 files changed, 6 insertions, 0 deletions
diff --git a/data/collision.asm b/data/collision.asm
index 78579242..d3659e2a 100644
--- a/data/collision.asm
+++ b/data/collision.asm
@@ -22,3 +22,6 @@ Lab_Coll:: INCBIN "gfx/tilesets/lab.tilecoll"
Club_Coll:: INCBIN "gfx/tilesets/club.tilecoll"
Facility_Coll:: INCBIN "gfx/tilesets/facility.tilecoll"
Plateau_Coll:: INCBIN "gfx/tilesets/plateau.tilecoll"
+IF DEF(_YELLOW)
+BeachHouse_Coll:: INCBIN "gfx/tilesets/beachhouse.tilecoll"
+ENDC
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm
index 84cfaffd..6631b8f0 100755
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -23,3 +23,6 @@ Tilesets: ; c7be (3:47be)
tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR
tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE
tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE
+IF DEF(_YELLOW)
+ tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR
+ENDC