From 9fced4d9846a1029eebe299f132f667eeeea63db Mon Sep 17 00:00:00 2001 From: entrpntr Date: Thu, 21 May 2020 16:11:48 -0400 Subject: Add tileset pngs. --- .gitignore | 1 + gfx/tilesets/cave.png | Bin 0 -> 1031 bytes gfx/tilesets/champions_room.png | Bin 0 -> 1305 bytes gfx/tilesets/dark_cave.png | Bin 0 -> 840 bytes gfx/tilesets/elite_four_room.png | Bin 0 -> 1272 bytes gfx/tilesets/facility.png | Bin 0 -> 1123 bytes gfx/tilesets/forest.png | Bin 0 -> 1038 bytes gfx/tilesets/game_corner.png | Bin 0 -> 1103 bytes gfx/tilesets/gate.png | Bin 0 -> 1124 bytes gfx/tilesets/house.png | Bin 0 -> 1595 bytes gfx/tilesets/ice_path.png | Bin 0 -> 1533 bytes gfx/tilesets/johto.png | Bin 0 -> 1296 bytes gfx/tilesets/johto_modern.png | Bin 0 -> 1315 bytes gfx/tilesets/kanto.png | Bin 0 -> 1301 bytes gfx/tilesets/lab.png | Bin 0 -> 1044 bytes gfx/tilesets/lighthouse.png | Bin 0 -> 1118 bytes gfx/tilesets/mansion.png | Bin 0 -> 988 bytes gfx/tilesets/mart.png | Bin 0 -> 957 bytes gfx/tilesets/park.png | Bin 0 -> 1206 bytes gfx/tilesets/players_house.png | Bin 0 -> 999 bytes gfx/tilesets/players_room.png | Bin 0 -> 1221 bytes gfx/tilesets/pokecenter.png | Bin 0 -> 1169 bytes gfx/tilesets/port.png | Bin 0 -> 1048 bytes gfx/tilesets/radio_tower.png | Bin 0 -> 1367 bytes gfx/tilesets/ruins_of_alph.png | Bin 0 -> 850 bytes gfx/tilesets/tower.png | Bin 0 -> 1139 bytes gfx/tilesets/traditional_house.png | Bin 0 -> 1161 bytes gfx/tilesets/train_station.png | Bin 0 -> 1122 bytes gfx/tilesets/underground.png | Bin 0 -> 1098 bytes main.asm | 3 ++- tools/gfx.py | 3 +++ 31 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 gfx/tilesets/cave.png create mode 100644 gfx/tilesets/champions_room.png create mode 100644 gfx/tilesets/dark_cave.png create mode 100644 gfx/tilesets/elite_four_room.png create mode 100644 gfx/tilesets/facility.png create mode 100644 gfx/tilesets/forest.png create mode 100644 gfx/tilesets/game_corner.png create mode 100644 gfx/tilesets/gate.png create mode 100644 gfx/tilesets/house.png create mode 100644 gfx/tilesets/ice_path.png create mode 100644 gfx/tilesets/johto.png create mode 100644 gfx/tilesets/johto_modern.png create mode 100644 gfx/tilesets/kanto.png create mode 100644 gfx/tilesets/lab.png create mode 100644 gfx/tilesets/lighthouse.png create mode 100644 gfx/tilesets/mansion.png create mode 100644 gfx/tilesets/mart.png create mode 100644 gfx/tilesets/park.png create mode 100644 gfx/tilesets/players_house.png create mode 100644 gfx/tilesets/players_room.png create mode 100644 gfx/tilesets/pokecenter.png create mode 100644 gfx/tilesets/port.png create mode 100644 gfx/tilesets/radio_tower.png create mode 100644 gfx/tilesets/ruins_of_alph.png create mode 100644 gfx/tilesets/tower.png create mode 100644 gfx/tilesets/traditional_house.png create mode 100644 gfx/tilesets/train_station.png create mode 100644 gfx/tilesets/underground.png 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 Binary files /dev/null and b/gfx/tilesets/cave.png differ diff --git a/gfx/tilesets/champions_room.png b/gfx/tilesets/champions_room.png new file mode 100644 index 00000000..804da541 Binary files /dev/null and b/gfx/tilesets/champions_room.png differ diff --git a/gfx/tilesets/dark_cave.png b/gfx/tilesets/dark_cave.png new file mode 100644 index 00000000..1d0a91e5 Binary files /dev/null and b/gfx/tilesets/dark_cave.png differ diff --git a/gfx/tilesets/elite_four_room.png b/gfx/tilesets/elite_four_room.png new file mode 100644 index 00000000..27f64afa Binary files /dev/null and b/gfx/tilesets/elite_four_room.png differ diff --git a/gfx/tilesets/facility.png b/gfx/tilesets/facility.png new file mode 100644 index 00000000..e2e50107 Binary files /dev/null and b/gfx/tilesets/facility.png differ diff --git a/gfx/tilesets/forest.png b/gfx/tilesets/forest.png new file mode 100644 index 00000000..55ce4d6e Binary files /dev/null and b/gfx/tilesets/forest.png differ diff --git a/gfx/tilesets/game_corner.png b/gfx/tilesets/game_corner.png new file mode 100644 index 00000000..74acad68 Binary files /dev/null and b/gfx/tilesets/game_corner.png differ diff --git a/gfx/tilesets/gate.png b/gfx/tilesets/gate.png new file mode 100644 index 00000000..a555fc68 Binary files /dev/null and b/gfx/tilesets/gate.png differ diff --git a/gfx/tilesets/house.png b/gfx/tilesets/house.png new file mode 100644 index 00000000..a2662674 Binary files /dev/null and b/gfx/tilesets/house.png differ diff --git a/gfx/tilesets/ice_path.png b/gfx/tilesets/ice_path.png new file mode 100644 index 00000000..de515a99 Binary files /dev/null and b/gfx/tilesets/ice_path.png differ diff --git a/gfx/tilesets/johto.png b/gfx/tilesets/johto.png new file mode 100644 index 00000000..e6418f25 Binary files /dev/null and b/gfx/tilesets/johto.png differ diff --git a/gfx/tilesets/johto_modern.png b/gfx/tilesets/johto_modern.png new file mode 100644 index 00000000..807bd543 Binary files /dev/null and b/gfx/tilesets/johto_modern.png differ diff --git a/gfx/tilesets/kanto.png b/gfx/tilesets/kanto.png new file mode 100644 index 00000000..a3036406 Binary files /dev/null and b/gfx/tilesets/kanto.png differ diff --git a/gfx/tilesets/lab.png b/gfx/tilesets/lab.png new file mode 100644 index 00000000..19641aae Binary files /dev/null and b/gfx/tilesets/lab.png differ diff --git a/gfx/tilesets/lighthouse.png b/gfx/tilesets/lighthouse.png new file mode 100644 index 00000000..f97ce251 Binary files /dev/null and b/gfx/tilesets/lighthouse.png differ diff --git a/gfx/tilesets/mansion.png b/gfx/tilesets/mansion.png new file mode 100644 index 00000000..e2ebbe41 Binary files /dev/null and b/gfx/tilesets/mansion.png differ diff --git a/gfx/tilesets/mart.png b/gfx/tilesets/mart.png new file mode 100644 index 00000000..b1e1483a Binary files /dev/null and b/gfx/tilesets/mart.png differ diff --git a/gfx/tilesets/park.png b/gfx/tilesets/park.png new file mode 100644 index 00000000..e21338f2 Binary files /dev/null and b/gfx/tilesets/park.png differ diff --git a/gfx/tilesets/players_house.png b/gfx/tilesets/players_house.png new file mode 100644 index 00000000..76e47078 Binary files /dev/null and b/gfx/tilesets/players_house.png differ diff --git a/gfx/tilesets/players_room.png b/gfx/tilesets/players_room.png new file mode 100644 index 00000000..a0f268eb Binary files /dev/null and b/gfx/tilesets/players_room.png differ diff --git a/gfx/tilesets/pokecenter.png b/gfx/tilesets/pokecenter.png new file mode 100644 index 00000000..98b9cc5d Binary files /dev/null and b/gfx/tilesets/pokecenter.png differ diff --git a/gfx/tilesets/port.png b/gfx/tilesets/port.png new file mode 100644 index 00000000..3e05e0da Binary files /dev/null and b/gfx/tilesets/port.png differ diff --git a/gfx/tilesets/radio_tower.png b/gfx/tilesets/radio_tower.png new file mode 100644 index 00000000..08171091 Binary files /dev/null and b/gfx/tilesets/radio_tower.png differ diff --git a/gfx/tilesets/ruins_of_alph.png b/gfx/tilesets/ruins_of_alph.png new file mode 100644 index 00000000..14e5af4d Binary files /dev/null and b/gfx/tilesets/ruins_of_alph.png differ diff --git a/gfx/tilesets/tower.png b/gfx/tilesets/tower.png new file mode 100644 index 00000000..ab59fa8f Binary files /dev/null and b/gfx/tilesets/tower.png differ diff --git a/gfx/tilesets/traditional_house.png b/gfx/tilesets/traditional_house.png new file mode 100644 index 00000000..5537f63c Binary files /dev/null and b/gfx/tilesets/traditional_house.png differ diff --git a/gfx/tilesets/train_station.png b/gfx/tilesets/train_station.png new file mode 100644 index 00000000..47a4ee0f Binary files /dev/null and b/gfx/tilesets/train_station.png differ diff --git a/gfx/tilesets/underground.png b/gfx/tilesets/underground.png new file mode 100644 index 00000000..62b01581 Binary files /dev/null and b/gfx/tilesets/underground.png differ 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 -- cgit v1.2.3