28 files changed, 136 insertions, 27 deletions

diff --git a/data/tilesets/cave_metatiles.bin b/data/tilesets/cave_metatiles.bin
new file mode 100644
index 00000000..c1b9880c
--- /dev/null
+++ b/data/tilesets/cave_metatiles.bin
@@ -0,0 +1,6 @@
+
















$$$$$$$$
*+:;"#23%&&%&&&&&&&&&&&&&'&&&'
+&
+&&&67&&67&&&&$$$$*+:;$$$$"#23










































()

89

































 !

01























$$















&&&&



















































@@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'$$%&&'%'

&&&&&&&&

+&
+67'67&'&&&&&&&&&&&&








%&&&











&&&&








&&&'























&&&
+&&&












\ No newline at end of file
diff --git a/data/tilesets/champions_room_metatiles.bin b/data/tilesets/champions_room_metatiles.bin
new file mode 100644
index 00000000..85811c0e
--- /dev/null
+++ b/data/tilesets/champions_room_metatiles.bin
@@ -0,0 +1,15 @@
+
 *()  89+,!!          






%'!!	 5 5 5 5 5&&01                    %&&'677:"##$2334ZZZZJJJJJJJJJJJJ
        +,+, *()  89        SSSSSSSSSSSSSSSSFGFGVWVWFGSSVWSS                FGFGVWVWSSFGSSVWnono~~nono~~nono~~nono~~SSSSSSSSFGFGVWVWnono~~nono~~FGSSVWSSFGSSVWSSSSFGSSVWSSFGSSVW./SS>?SSNOSS^_SSSS./SS>?SSNOSS^_S@HH@PQQPPQQPPQQHHHHQQQQQQQQQQQQHHBSQQRBQQRRQQRR----------------PPQQPPQQPCDDCDDDQQQQQQQQTUTUTUTUQQRRQQRRDDERDDDESSSSSSSS
+SS
+SS
+SSSS
+FG
+VW
+FG
+VWFG
+VW
+FG
+VW
+SS
+SS
+SS
+SSnono~~nono~~nono~~nono~~FGFGVWVWFGFGVWVW]]]]]]]]]]]]]]]]nono~~nono~~nono~~nono~~nono~~nono~~nono~~nono~~nono~~nono~~;<<=;<<=;<<=;<<=IIIIIIIIIIIIMMMMJJJJJJJJJJJJJJJJ]]]]]]]]%&&'XYXY./]]>?]]NO]]^_]]]]./]]>?]]NO]]^_KLKL[\[\ZZZZJJJJ%'II5II5ZZ5ZJII%'II5ZZ5JJ55ZJ5ZJ5ZJ5ZJJJ5JJ5JJ5JJ55./5>?5NOXY^_./5>?5NO5^_XYJJJJJJJJTUTUTUTU]]]]]]]]
\ No newline at end of file
diff --git a/data/tilesets/elite_four_room_metatiles.bin b/data/tilesets/elite_four_room_metatiles.bin
new file mode 100644
index 00000000..a9df6062
--- /dev/null
+++ b/data/tilesets/elite_four_room_metatiles.bin
diff --git a/data/tilesets/facility_metatiles.bin b/data/tilesets/facility_metatiles.bin
new file mode 100644
index 00000000..f6089d29
--- /dev/null
+++ b/data/tilesets/facility_metatiles.bin
@@ -0,0 +1,8 @@
+6666666666666666""""""""
&
&&
&
@B@B
+
+
+
+
&
&&
&
88889999
&&
 !
&
&&
&

&01&

&
&&
&
@B@B()()()()*+()
&
&&
&

&
&&
&
	&
&
,-""<=""./
&>?&
"",-""<=
&./&
>?








&
&&
&
''''7777,-
&<=&
./
&>?&

&,-&
<=
&./&
>?@AABPQQRPHIRS::T
&&

&@A&
PQ
&&
AAABQQQREEFEUUVU
+K
+[EFEEUVUUK
+[
&PQ&
S:
&&
QQQR:::T
&&
EFE;UVU;JKJ;Z[Z;6666666666666666AAABMMMN88889999""""""""#$$%WXXY""""@B""PRPRPRPRPR""23""CD
&
&&
&
""""""@B
&PR&
PR;;;;;;;;
&
&&
&

&
&&
&
;;;;;;;;""""@B""PR
&PR&
PR
&PR&
PR
&PR&
PR
&PR&
PR@APRLM
&
&&
&

&@A&
LM
&
&&
&
AB
&MN&

&
&&
&
@B@APRLM
&&

&&
	&
&
@AABPHIR	&
&

&
&&
&
@B
&PR&
PR
&PR&
PR
&&
@BPR#$$%WXXY
&
&&
&
PRPRPRPR@B
&PR&
PR
&PR&
















@AAALMMM
&
&&
&
AAABMMMN
&
&&
&

&@B&
PR
&PR&
PR
&
&&
&
AAAAMMMM""""""""
&&
AAAAMMMM
&
&&
&

&PR&
PR
&PR&
PR
&@A&
PQ
&PQ&
S:@AAALMMM88889999
&PR&
PRABPRMNPR""""""\]
&^_&
@B@APRLMPR
&PR&
AB@BMNPR
&PR&
PRPR
&PR&
PR@ALM
&PR&
PRABPRMN
\ No newline at end of file
diff --git a/data/tilesets/forest_metatiles.bin b/data/tilesets/forest_metatiles.bin
new file mode 100644
index 00000000..a8b82d8c
--- /dev/null
+++ b/data/tilesets/forest_metatiles.bin
@@ -0,0 +1 @@
+
,-./<=>?****
,-./<=>?	***&'&'6767&'67&'&'6767&'67&'67***&'67&'67(9&'8:67&'67&'&'6767&'&'6767&'67&'&'6767
&'67&'67&'67&'67)**********+** !!! !!! !!!!!!!!!!!!!!!!!!"!!!"!!!"02 !!!0111#$$$#$!!!!1111$$$$$$!!!"1112$$$%$%#$$$#$$$#$34#$$$#$$$#$$$3444$$$$$$$$$$$$4444$$$%$$$%$$$%4445
\ No newline at end of file
diff --git a/data/tilesets/game_corner_metatiles.bin b/data/tilesets/game_corner_metatiles.bin
new file mode 100644
index 00000000..b72d03d9
--- /dev/null
+++ b/data/tilesets/game_corner_metatiles.bin
diff --git a/data/tilesets/gate_metatiles.bin b/data/tilesets/gate_metatiles.bin
new file mode 100644
index 00000000..284a2936
--- /dev/null
+++ b/data/tilesets/gate_metatiles.bin
diff --git a/data/tilesets/house_metatiles.bin b/data/tilesets/house_metatiles.bin
new file mode 100644
index 00000000..0d3a22f3
--- /dev/null
+++ b/data/tilesets/house_metatiles.bin
diff --git a/data/tilesets/ice_path_metatiles.bin b/data/tilesets/ice_path_metatiles.bin
new file mode 100644
index 00000000..a00ded27
--- /dev/null
+++ b/data/tilesets/ice_path_metatiles.bin
@@ -0,0 +1,3 @@
+
+

*+:;ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ!""!"""""""""""""#"""#ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ$"$"%%""<=""<=""""!""""""""""#BC



RRRRSS(S
>8(TRRRR,--.IJHKRRRRS)SS9?
V)RRRRSSSS


>TLM
\]XYZ[8//9WGGGU?
NO^_

+*+:;!<=!"<=<=#<="#
!""#&'
67EF




ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
\ No newline at end of file
diff --git a/data/tilesets/johto_metatiles.bin b/data/tilesets/johto_metatiles.bin
new file mode 100644
index 00000000..b64f206e
--- /dev/null
+++ b/data/tilesets/johto_metatiles.bin
diff --git a/data/tilesets/johto_modern_metatiles.bin b/data/tilesets/johto_modern_metatiles.bin
new file mode 100644
index 00000000..bfb99f87
--- /dev/null
+++ b/data/tilesets/johto_modern_metatiles.bin
diff --git a/data/tilesets/kanto_metatiles.bin b/data/tilesets/kanto_metatiles.bin
new file mode 100644
index 00000000..41b0cfff
--- /dev/null
+++ b/data/tilesets/kanto_metatiles.bin
diff --git a/data/tilesets/lab_metatiles.bin b/data/tilesets/lab_metatiles.bin
new file mode 100644
index 00000000..77247152
--- /dev/null
+++ b/data/tilesets/lab_metatiles.bin
diff --git a/data/tilesets/lighthouse_metatiles.bin b/data/tilesets/lighthouse_metatiles.bin
new file mode 100644
index 00000000..4d5712e1
--- /dev/null
+++ b/data/tilesets/lighthouse_metatiles.bin
diff --git a/data/tilesets/mansion_metatiles.bin b/data/tilesets/mansion_metatiles.bin
new file mode 100644
index 00000000..599f5de2
--- /dev/null
+++ b/data/tilesets/mansion_metatiles.bin
@@ -0,0 +1,5 @@
+
























+








+



























EU











((((6868$%"#4523236778FGGHFGGHVWWX68"#./23^_*+,-:;<=JKLMZ[&'
+	







	
+







 !01







68"#*+23:;,-<=LMJKZ[*+,-:;<=JKLMZ[



)DDD9TTT







DDDDTTTT



)D9T











DDDITTTYDDEUTT



DDEUTT	EUDDTT	DDDDTTTT







FGFG\\GGGHGGGH !]01]



67FG







7778GGGH68"#68"#"#2323./>?NO^_6777FGGG7778GGGH./>?NO^_((((FGGGVWWWGGGHWWWXEUDDTT











EUR@SAEUEPSAR@	








\ No newline at end of file
diff --git a/data/tilesets/mart_metatiles.bin b/data/tilesets/mart_metatiles.bin
new file mode 100644
index 00000000..481eed77
--- /dev/null
+++ b/data/tilesets/mart_metatiles.bin
diff --git a/data/tilesets/park_metatiles.bin b/data/tilesets/park_metatiles.bin
new file mode 100644
index 00000000..1dd1f517
--- /dev/null
+++ b/data/tilesets/park_metatiles.bin
diff --git a/data/tilesets/players_house_metatiles.bin b/data/tilesets/players_house_metatiles.bin
new file mode 100644
index 00000000..f316eb8c
--- /dev/null
+++ b/data/tilesets/players_house_metatiles.bin
diff --git a/data/tilesets/players_room_metatiles.bin b/data/tilesets/players_room_metatiles.bin
new file mode 100644
index 00000000..0839798f
--- /dev/null
+++ b/data/tilesets/players_room_metatiles.bin
diff --git a/data/tilesets/pokecenter_metatiles.bin b/data/tilesets/pokecenter_metatiles.bin
new file mode 100644
index 00000000..f775f89a
--- /dev/null
+++ b/data/tilesets/pokecenter_metatiles.bin
@@ -0,0 +1,2 @@
+================,-./<==?LMNO
+




%4444$$$$



44$$$$



45$$FG



 !

01@A


&'"#()23




%


676767FG44$$

567$$67

67FGBCRSQQPPDETU



44$$

67"#FG23



6767FG67

67FG================6\6-.:>>>67VW77>;67
================================================4444$$$$JKJKZ[Z[JKJKZ[Z[6744FG$$JKJKZ[Z[6767,-67<=67LM4444$$ !JK01Z[@A./=?JKNOZ[JKJKZ[Z[JKJKZ[Z[JKJKZ[Z[QQQQPPPP44JK$$Z[JKJKZ[Z[====JKJKZ[Z[QQPP567$$67

89FGHIXY


	"#23



\]\]^_^_^_^_*+*+HIHIXYXYHIXYHIXY444$$$





 !
0167@A67

67FGpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp
\ No newline at end of file
diff --git a/data/tilesets/port_metatiles.bin b/data/tilesets/port_metatiles.bin
new file mode 100644
index 00000000..69a60070
--- /dev/null
+++ b/data/tilesets/port_metatiles.bin
@@ -0,0 +1,65 @@
+











""""











!!!!1111111111111111    ""       !!!!
+,--9::3#$%./02;<=>&'()345?@AB*678CDE+,-39:PQXYZFGHIRRSSZ[\\IJKLT,-U]^^^MNOVW_
ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ""""""""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	

""

1111
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
\ No newline at end of file
diff --git a/data/tilesets/radio_tower_metatiles.bin b/data/tilesets/radio_tower_metatiles.bin
new file mode 100644
index 00000000..30d573fc
--- /dev/null
+++ b/data/tilesets/radio_tower_metatiles.bin
diff --git a/data/tilesets/ruins_of_alph_metatiles.bin b/data/tilesets/ruins_of_alph_metatiles.bin
new file mode 100644
index 00000000..7c6b90e5
--- /dev/null
+++ b/data/tilesets/ruins_of_alph_metatiles.bin
diff --git a/data/tilesets/tower_metatiles.bin b/data/tilesets/tower_metatiles.bin
new file mode 100644
index 00000000..20b87153
--- /dev/null
+++ b/data/tilesets/tower_metatiles.bin
@@ -0,0 +1,2 @@
+
































@ !!A1A1!!!!!!@ A1A1
+A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!!-.=><>MN./>?
,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^



"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$	
"#23!!67"#!!2367%545%545%545%545	



		















FVGWPQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67















































DETU!!!!PPPPPPPPFVGW
\ No newline at end of file
diff --git a/data/tilesets/traditional_house_metatiles.bin b/data/tilesets/traditional_house_metatiles.bin
new file mode 100644
index 00000000..7e91d220
--- /dev/null
+++ b/data/tilesets/traditional_house_metatiles.bin
diff --git a/data/tilesets/train_station_metatiles.bin b/data/tilesets/train_station_metatiles.bin
new file mode 100644
index 00000000..e33348a1
--- /dev/null
+++ b/data/tilesets/train_station_metatiles.bin
diff --git a/data/tilesets/underground_metatiles.bin b/data/tilesets/underground_metatiles.bin
new file mode 100644
index 00000000..28b807e1
--- /dev/null
+++ b/data/tilesets/underground_metatiles.bin
@@ -0,0 +1,2 @@
+































*+:;,-<=EFUV	0144444444


44
444444









CDCDSTSTCDCDSTST







"#23






















+QQQQQQQQ./>?./>?@ANOP]^_&'67



























































































	01	01@AAAPQQQPQQQAAABQQQRQQQR@AABPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQR@B@B()89()89
\ No newline at end of file
diff --git a/main.asm b/main.asm
index a240fd13..6b117eb2 100644
--- a/main.asm
+++ b/main.asm
@@ -103,7 +103,7 @@ INCLUDE "engine/pokemon/breeding.asm"
 SECTION "bank6", ROMX
 
 TilesetKantoMeta::
-	dr $18000, $18800
+INCBIN "data/tilesets/kanto_metatiles.bin"
 TilesetKantoColl::
 	dr $18800, $18a00
 Tileset0GFX::
@@ -112,7 +112,7 @@ TilesetJohtoGFX::
 
 Tileset0Meta::
 TilesetJohtoMeta::
-	dr $19006, $19806
+INCBIN "data/tilesets/johto_metatiles.bin"
 Tileset0Coll::
 TilesetJohtoColl::
 	dr $19806, $19a06
@@ -120,14 +120,14 @@ TilesetJohtoModernGFX::
 	dr $19a06, $1a00c
 
 TilesetJohtoModernMeta::
-	dr $1a00c, $1a80c
+INCBIN "data/tilesets/johto_modern_metatiles.bin"
 TilesetJohtoModernColl::
 	dr $1a80c, $1b40c
 
 TilesetTraditionalHouseGFX::
 	dr $1b40c, $1b8bc
 TilesetTraditionalHouseMeta::
-	dr $1b8bc, $1bcbc
+INCBIN "data/tilesets/traditional_house_metatiles.bin"
 TilesetTraditionalHouseColl::
 	dr $1bcbc, $1bdbc
 
@@ -139,33 +139,33 @@ LoadMapGroupRoof::
 TilesetGateGFX::
 	dr $1c30c, $1c70c
 TilesetGateMeta::
-	dr $1c70c, $1cb0c
+INCBIN "data/tilesets/gate_metatiles.bin"
 TilesetGateColl::
 	dr $1cb0c, $1cc0c
 TilesetPokecenterGFX::
 	dr $1cc0c, $1d03c
 
 TilesetPokecenterMeta::
-	dr $1d03c, $1d43c
+INCBIN "data/tilesets/pokecenter_metatiles.bin"
 TilesetPokecenterColl::
 	dr $1d43c, $1d53c
 TilesetPortGFX::
 	dr $1d53c, $1d94c
 TilesetPortMeta::
-	dr $1d94c, $1dd4c
+INCBIN "data/tilesets/port_metatiles.bin"
 TilesetPortColl::
 	dr $1dd4c, $1de4c
 TilesetPlayersHouseGFX::
 	dr $1de4c, $1e22c
 
 TilesetPlayersHouseMeta::
-	dr $1e22c, $1e62c
+INCBIN "data/tilesets/players_house_metatiles.bin"
 TilesetPlayersHouseColl::
 	dr $1e62c, $1e72c
 TilesetMansionGFX::
 	dr $1e72c, $1eabc
 TilesetMansionMeta::
-	dr $1eabc, $1eebc
+INCBIN "data/tilesets/mansion_metatiles.bin"
 TilesetMansionColl::
 	dr $1eebc, $1efbc
 TilesetCaveGFX::
@@ -173,7 +173,7 @@ TilesetCaveGFX::
 
 TilesetCaveMeta::
 TilesetDarkCaveMeta::
-	dr $1f34c, $1f74c
+INCBIN "data/tilesets/cave_metatiles.bin"
 TilesetCaveColl::
 TilesetDarkCaveColl::
 	dr $1f74c, $1f84c
@@ -188,44 +188,44 @@ RestartClock::
 TilesetTowerGFX::
 	dr $20181, $205b1
 TilesetTowerMeta::
-	dr $205b1, $209b1
+INCBIN "data/tilesets/tower_metatiles.bin"
 TilesetTowerColl::
 	dr $209b1, $20ab1
 TilesetLabGFX::
 	dr $20ab1, $20e81
 TilesetLabMeta::
-	dr $20e81, $21281
+INCBIN "data/tilesets/lab_metatiles.bin"
 
 TilesetLabColl::
 	dr $21281, $21381
 TilesetFacilityGFX::
 	dr $21381, $217a1
 TilesetFacilityMeta::
-	dr $217a1, $21ba1
+INCBIN "data/tilesets/facility_metatiles.bin"
 TilesetFacilityColl::
 	dr $21ba1, $21ca1
 TilesetMartGFX::
 	dr $21ca1, $22051
 
 TilesetMartMeta::
-	dr $22051, $22451
+INCBIN "data/tilesets/mart_metatiles.bin"
 TilesetMartColl::
 	dr $22451, $22551
 TilesetGameCornerGFX::
 	dr $22551, $22951
 TilesetGameCornerMeta::
-	dr $22951, $22d51
+INCBIN "data/tilesets/game_corner_metatiles.bin"
 TilesetGameCornerColl::
 	dr $22d51, $22e51
 TilesetTrainStationGFX::
 	dr $22e51, $231f1
 
 TilesetTrainStationMeta::
-	dr $231f1, $235f1
+INCBIN "data/tilesets/train_station_metatiles.bin"
 TilesetTrainStationColl::
 	dr $235f1, $236f1
 TilesetForestMeta::
-	dr $236f1, $23971
+INCBIN "data/tilesets/forest_metatiles.bin"
 CatchTutorial::
 	dr $23971, $239fe
 
@@ -276,40 +276,40 @@ SECTION "bankC", ROMX
 TilesetEliteFourRoomGFX::
 	dr $30000, $304e0
 TilesetEliteFourRoomMeta::
-	dr $304e0, $308e0
+INCBIN "data/tilesets/elite_four_room_metatiles.bin"
 TilesetEliteFourRoomColl::
 	dr $308e0, $309e0
 TilesetParkGFX::
 	dr $309e0, $30e40
 TilesetParkMeta::
-	dr $30e40, $31240
+INCBIN "data/tilesets/park_metatiles.bin"
 
 TilesetParkColl::
 	dr $31240, $31340
 TilesetRuinsOfAlphGFX::
 	dr $31340, $31670
 TilesetRuinsOfAlphMeta::
-	dr $31670, $31a70
+INCBIN "data/tilesets/ruins_of_alph_metatiles.bin"
 TilesetRuinsOfAlphColl::
 	dr $31a70, $31b70
 TilesetRadioTowerGFX::
 	dr $31b70, $31fc0
 TilesetRadioTowerMeta::
-	dr $31fc0, $323c0
+INCBIN "data/tilesets/radio_tower_metatiles.bin"
 
 TilesetRadioTowerColl::
 	dr $323c0, $324c0
 TilesetUndergroundGFX::
 	dr $324c0, $32890
 TilesetUndergroundMeta::
-	dr $32890, $32c90
+INCBIN "data/tilesets/underground_metatiles.bin"
 TilesetUndergroundColl::
 	dr $32c90, $32d90
 TilesetIcePathGFX::
 	dr $32d90, $331d0
 
 TilesetIcePathMeta::
-	dr $331d0, $335d0
+INCBIN "data/tilesets/ice_path_metatiles.bin"
 TilesetIcePathColl::
 	dr $335d0, $336d0
 TilesetDarkCaveGFX::
@@ -659,25 +659,25 @@ SECTION "bank37_2", ROMX
 TilesetChampionsRoomGFX::
 	dr $dd773, $ddc33
 TilesetChampionsRoomMeta::
-	dr $ddc33, $de033
+INCBIN "data/tilesets/champions_room_metatiles.bin"
 TilesetChampionsRoomColl::
 	dr $de033, $de133
 TilesetHouseGFX::
 	dr $de133, $de5d3
 TilesetHouseMeta::
-	dr $de5d3, $de9d3
+INCBIN "data/tilesets/house_metatiles.bin"
 TilesetHouseColl::
 	dr $de9d3, $dead3
 TilesetLighthouseGFX::
 	dr $dead3, $deed3
 TilesetLighthouseMeta::
-	dr $deed3, $df2d3
+INCBIN "data/tilesets/lighthouse_metatiles.bin"
 TilesetLighthouseColl::
 	dr $df2d3, $df3d3
 TilesetPlayersRoomGFX::
 	dr $df3d3, $df893
 TilesetPlayersRoomMeta::
-	dr $df893, $dfc93
+INCBIN "data/tilesets/players_room_metatiles.bin"
 TilesetPlayersRoomColl::
 	dr $dfc93, $dfd93
 TilesetForestColl::