ref: 16ad16302e0c5ee116c697454cb98a62cf0bb58b
parent: 292cf55baddf6d0f32b9d59816497c2041e99953
author: IIMarckus <iimarckus@gmail.com>
date: Fri Oct 17 07:13:22 EDT 2014
Add the beach house tileset.
--- a/data/collision.asm
+++ b/data/collision.asm
@@ -22,3 +22,6 @@
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
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -23,3 +23,6 @@
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
binary files /dev/null b/gfx/blocksets/beachhouse.bst differ
binary files /dev/null b/gfx/tilesets/beachhouse.png differ
--- /dev/null
+++ b/gfx/tilesets/beachhouse.tilecoll
@@ -1,0 +1,1 @@
+
\ No newline at end of file
--- a/main.asm
+++ b/main.asm
@@ -6635,3 +6635,13 @@
INCLUDE "engine/overworld/elevator.asm"
INCLUDE "engine/items/tm_prices.asm"
+
+IF DEF(_YELLOW)
+SECTION "bank3C",ROMX[$314],BANK[$3C]
+
+BeachHouse_GFX:
+ INCBIN "gfx/tilesets/beachhouse.2bpp"
+
+BeachHouse_Block:
+ INCBIN "gfx/blocksets/beachhouse.bst"
+ENDC