From 16ad16302e0c5ee116c697454cb98a62cf0bb58b Mon Sep 17 00:00:00 2001
From: IIMarckus <iimarckus@gmail.com>
Date: Fri, 17 Oct 2014 11:13:22 -0600
Subject: [PATCH] Add the beach house tileset.

---
 data/collision.asm               |   3 +++
 data/tileset_headers.asm         |   3 +++
 gfx/blocksets/beachhouse.bst     | Bin 0 -> 320 bytes
 gfx/tilesets/beachhouse.png      | Bin 0 -> 566 bytes
 gfx/tilesets/beachhouse.tilecoll |   1 +
 main.asm                         |  10 ++++++++++
 6 files changed, 17 insertions(+)
 create mode 100644 gfx/blocksets/beachhouse.bst
 create mode 100644 gfx/tilesets/beachhouse.png
 create mode 100644 gfx/tilesets/beachhouse.tilecoll

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
new file mode 100644
index 0000000000000000000000000000000000000000..bafbe0b24d7be0f0dd48a33977fa6a1c5aaf1ce5
GIT binary patch
literal 320
zcmaiu$qs@*42Iho<9e|(#`U705YPjQD|&GEUEvMj<>W982_F0|Uz)#d{xnOoyvU2x
zSV+fJdVdgd<12khTu;d3NojvAWO7y-3}|pX#|y$Bv~0_c;wY}?0L>P_a6|^qt9iKs
z*zOR!J;dpZ_xXRn2H!PG1|`oIQM*I*{t%5PoK_YRQEC46Yk=zwV7@@SKM<?_-1DEm
DNrxK%

literal 0
HcmV?d00001

diff --git a/gfx/tilesets/beachhouse.png b/gfx/tilesets/beachhouse.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5dccf7ad62f8c84af31dbad10d56fb64bbb734a
GIT binary patch
literal 566
zcmV-60?GY}P)<h;3K|Lk000e1NJLTq004jh001xo00000wl6iq0005~Nkl<Zc-rOD
z&r2Io5C`x{R%!I45D#8T8%5%tT6>eiZn2?a4>2@TiU%#y2JAnOV*{4rE$O9r3$Yfq
z)4R9g8ZC&F_SpZyi)_S;eRX{Mi)Qyd;vdjCEG&HZ?!0-kK(rqeGXTlzetf^leFcai
zsMRdC0W#Civ8V-z7B3NXPSz(YT0ms+Vj*{T_SNKe0>nM|30pg(g^{tLmXh!d@$E+R
ziQ=7{+QZ)dRoe$oFR63<!<bUR>DM+QK>3O~=i=}%0RWg|(B#t{uaPaMz*z`3Sd{tF
z^WJ<Z>k|UNo>-O5C_pxe7y&z@fU`ZKHW7;^b5E@35+v{w{JY@WRZf9F><_9|V}Y{R
zHCRcAuR8##g8RSuas1*!P=;KK-Fec0s5_Aa{141iP`gQhcmp6B4DKQ327-qG#eqO}
zF491bV|h552>6dNfT0L9vJ!;j&;v_^3DpUGf^)HE1__3%PjFT~n|_ndv+t%JtX+iQ
z)6ae|9!)d;gaXn{N?^GCAU;%l%)~x80A?N_f6n|XSljf%ESt`-QLnqlmXN<(Qw0@E
zl;#kRx|`h=dzyrb>69MS{~pb56{?(VsGtL|G)MIA;Kl1l;>ia~O#mqQ$DF~u!y_-%
zgbaW^Aus2^9$o0&YBklhXI>0$x0ttj8CwN>L;WY<8ha;=9{AnTr~m)}07*qoM6N<$
Ef|}U}+W-In

literal 0
HcmV?d00001

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
diff --git a/main.asm b/main.asm
index 2423d139..7ee32d93 100755
--- a/main.asm
+++ b/main.asm
@@ -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