diff options
| -rw-r--r-- | data/collision.asm | 3 | ||||
| -rwxr-xr-x | data/tileset_headers.asm | 3 | ||||
| -rw-r--r-- | gfx/blocksets/beachhouse.bst | bin | 0 -> 320 bytes | |||
| -rw-r--r-- | gfx/tilesets/beachhouse.png | bin | 0 -> 566 bytes | |||
| -rw-r--r-- | gfx/tilesets/beachhouse.tilecoll | 1 | ||||
| -rwxr-xr-x | main.asm | 10 |
6 files changed, 17 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 diff --git a/gfx/blocksets/beachhouse.bst b/gfx/blocksets/beachhouse.bst Binary files differnew file mode 100644 index 00000000..bafbe0b2 --- /dev/null +++ b/gfx/blocksets/beachhouse.bst diff --git a/gfx/tilesets/beachhouse.png b/gfx/tilesets/beachhouse.png Binary files differnew file mode 100644 index 00000000..f5dccf7a --- /dev/null +++ b/gfx/tilesets/beachhouse.png diff --git a/gfx/tilesets/beachhouse.tilecoll b/gfx/tilesets/beachhouse.tilecoll new file mode 100644 index 00000000..54ddac19 --- /dev/null +++ b/gfx/tilesets/beachhouse.tilecoll @@ -0,0 +1 @@ +ÿ
\ No newline at end of file @@ -6635,3 +6635,13 @@ INCLUDE "engine/evolution.asm" 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 |
