Add tileset pngs.

31 files changed, 6 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 7b6a70e0..91143513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@ gfx/pokegear/pokegear_sprites.2bpp
 gfx/slots/slots_*.2bpp
 gfx/pokedex/pokedex.2bpp
 gfx/pokedex/slowpoke.2bpp
+gfx/tilesets/*.2bpp
diff --git a/gfx/tilesets/cave.png b/gfx/tilesets/cave.png
new file mode 100644
index 00000000..fe15a740
--- /dev/null
+++ b/gfx/tilesets/cave.png
diff --git a/gfx/tilesets/champions_room.png b/gfx/tilesets/champions_room.png
new file mode 100644
index 00000000..804da541
--- /dev/null
+++ b/gfx/tilesets/champions_room.png
diff --git a/gfx/tilesets/dark_cave.png b/gfx/tilesets/dark_cave.png
new file mode 100644
index 00000000..1d0a91e5
--- /dev/null
+++ b/gfx/tilesets/dark_cave.png
diff --git a/gfx/tilesets/elite_four_room.png b/gfx/tilesets/elite_four_room.png
new file mode 100644
index 00000000..27f64afa
--- /dev/null
+++ b/gfx/tilesets/elite_four_room.png
diff --git a/gfx/tilesets/facility.png b/gfx/tilesets/facility.png
new file mode 100644
index 00000000..e2e50107
--- /dev/null
+++ b/gfx/tilesets/facility.png
diff --git a/gfx/tilesets/forest.png b/gfx/tilesets/forest.png
new file mode 100644
index 00000000..55ce4d6e
--- /dev/null
+++ b/gfx/tilesets/forest.png
diff --git a/gfx/tilesets/game_corner.png b/gfx/tilesets/game_corner.png
new file mode 100644
index 00000000..74acad68
--- /dev/null
+++ b/gfx/tilesets/game_corner.png
diff --git a/gfx/tilesets/gate.png b/gfx/tilesets/gate.png
new file mode 100644
index 00000000..a555fc68
--- /dev/null
+++ b/gfx/tilesets/gate.png
diff --git a/gfx/tilesets/house.png b/gfx/tilesets/house.png
new file mode 100644
index 00000000..a2662674
--- /dev/null
+++ b/gfx/tilesets/house.png
diff --git a/gfx/tilesets/ice_path.png b/gfx/tilesets/ice_path.png
new file mode 100644
index 00000000..de515a99
--- /dev/null
+++ b/gfx/tilesets/ice_path.png
diff --git a/gfx/tilesets/johto.png b/gfx/tilesets/johto.png
new file mode 100644
index 00000000..e6418f25
--- /dev/null
+++ b/gfx/tilesets/johto.png
diff --git a/gfx/tilesets/johto_modern.png b/gfx/tilesets/johto_modern.png
new file mode 100644
index 00000000..807bd543
--- /dev/null
+++ b/gfx/tilesets/johto_modern.png
diff --git a/gfx/tilesets/kanto.png b/gfx/tilesets/kanto.png
new file mode 100644
index 00000000..a3036406
--- /dev/null
+++ b/gfx/tilesets/kanto.png
diff --git a/gfx/tilesets/lab.png b/gfx/tilesets/lab.png
new file mode 100644
index 00000000..19641aae
--- /dev/null
+++ b/gfx/tilesets/lab.png
diff --git a/gfx/tilesets/lighthouse.png b/gfx/tilesets/lighthouse.png
new file mode 100644
index 00000000..f97ce251
--- /dev/null
+++ b/gfx/tilesets/lighthouse.png
diff --git a/gfx/tilesets/mansion.png b/gfx/tilesets/mansion.png
new file mode 100644
index 00000000..e2ebbe41
--- /dev/null
+++ b/gfx/tilesets/mansion.png
diff --git a/gfx/tilesets/mart.png b/gfx/tilesets/mart.png
new file mode 100644
index 00000000..b1e1483a
--- /dev/null
+++ b/gfx/tilesets/mart.png
diff --git a/gfx/tilesets/park.png b/gfx/tilesets/park.png
new file mode 100644
index 00000000..e21338f2
--- /dev/null
+++ b/gfx/tilesets/park.png
diff --git a/gfx/tilesets/players_house.png b/gfx/tilesets/players_house.png
new file mode 100644
index 00000000..76e47078
--- /dev/null
+++ b/gfx/tilesets/players_house.png
diff --git a/gfx/tilesets/players_room.png b/gfx/tilesets/players_room.png
new file mode 100644
index 00000000..a0f268eb
--- /dev/null
+++ b/gfx/tilesets/players_room.png
diff --git a/gfx/tilesets/pokecenter.png b/gfx/tilesets/pokecenter.png
new file mode 100644
index 00000000..98b9cc5d
--- /dev/null
+++ b/gfx/tilesets/pokecenter.png
diff --git a/gfx/tilesets/port.png b/gfx/tilesets/port.png
new file mode 100644
index 00000000..3e05e0da
--- /dev/null
+++ b/gfx/tilesets/port.png
diff --git a/gfx/tilesets/radio_tower.png b/gfx/tilesets/radio_tower.png
new file mode 100644
index 00000000..08171091
--- /dev/null
+++ b/gfx/tilesets/radio_tower.png
diff --git a/gfx/tilesets/ruins_of_alph.png b/gfx/tilesets/ruins_of_alph.png
new file mode 100644
index 00000000..14e5af4d
--- /dev/null
+++ b/gfx/tilesets/ruins_of_alph.png
diff --git a/gfx/tilesets/tower.png b/gfx/tilesets/tower.png
new file mode 100644
index 00000000..ab59fa8f
--- /dev/null
+++ b/gfx/tilesets/tower.png
diff --git a/gfx/tilesets/traditional_house.png b/gfx/tilesets/traditional_house.png
new file mode 100644
index 00000000..5537f63c
--- /dev/null
+++ b/gfx/tilesets/traditional_house.png
diff --git a/gfx/tilesets/train_station.png b/gfx/tilesets/train_station.png
new file mode 100644
index 00000000..47a4ee0f
--- /dev/null
+++ b/gfx/tilesets/train_station.png
diff --git a/gfx/tilesets/underground.png b/gfx/tilesets/underground.png
new file mode 100644
index 00000000..62b01581
--- /dev/null
+++ b/gfx/tilesets/underground.png
diff --git a/main.asm b/main.asm
index f3b4005a..26103c43 100644
--- a/main.asm
+++ b/main.asm
@@ -136,6 +136,7 @@ SECTION "bank7", ROMX
 
 LoadMapGroupRoof::
 	dr $1c000, $1c30c
+
 TilesetGateGFX::
 INCBIN "gfx/tilesets/gate.2bpp.lz"
 TilesetGateMeta::
@@ -163,7 +164,7 @@ INCBIN "data/tilesets/players_house_metatiles.bin"
 TilesetPlayersHouseColl::
 	dr $1e62c, $1e72c
 TilesetMansionGFX::
-	dr $1e72c, $1eabc
+INCBIN "gfx/tilesets/mansion.2bpp.lz"
 TilesetMansionMeta::
 INCBIN "data/tilesets/mansion_metatiles.bin"
 TilesetMansionColl::
diff --git a/tools/gfx.py b/tools/gfx.py
index ff0802c7..520f55d0 100644
--- a/tools/gfx.py
+++ b/tools/gfx.py
@@ -194,6 +194,9 @@ def filepath_rules(filepath):
         else:
             args['width'] = 16
 
+    elif 'gfx/tilesets' in filedir:
+        args['width'] = 128
+
     elif 'gfx/trainer_card' in filedir:
         if name in ['badges', 'trainer_card']:
             args['width'] = 16