diff --git a/Makefile b/Makefile index b60672e35..c4d9370d3 100644 --- a/Makefile +++ b/Makefile @@ -153,6 +153,16 @@ gfx/fx/rocks.2bpp: tools/gfx += --remove-whitespace gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace gfx/fx/status.2bpp: tools/gfx += --remove-whitespace +gfx/misc/chris.2bpp: rgbgfx += -h +gfx/misc/chris_card.2bpp: rgbgfx += -h +gfx/misc/kris.2bpp: rgbgfx += -h +gfx/misc/kris_card.2bpp: rgbgfx += -h +gfx/misc/kris_back.2bpp: rgbgfx += -h +gfx/misc/dude.2bpp: rgbgfx += -h +gfx/misc/player.2bpp: rgbgfx += -h +gfx/misc/pokegear.2bpp: tools/gfx += --trim-whitespace +gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace + %.bin: ; %.blk: ; diff --git a/gfx/misc/boulderdust.2bpp b/gfx/misc/boulderdust.2bpp deleted file mode 100644 index f8b9f0180..000000000 Binary files a/gfx/misc/boulderdust.2bpp and /dev/null differ diff --git a/gfx/misc/boulderdust.png b/gfx/misc/boulderdust.png new file mode 100644 index 000000000..9acb11c1b Binary files /dev/null and b/gfx/misc/boulderdust.png differ diff --git a/gfx/misc/card_right_corner.2bpp b/gfx/misc/card_right_corner.2bpp deleted file mode 100644 index 8445737b6..000000000 Binary files a/gfx/misc/card_right_corner.2bpp and /dev/null differ diff --git a/gfx/misc/card_right_corner.png b/gfx/misc/card_right_corner.png new file mode 100644 index 000000000..fa9aea024 Binary files /dev/null and b/gfx/misc/card_right_corner.png differ diff --git a/gfx/misc/card_status.2bpp b/gfx/misc/card_status.2bpp deleted file mode 100644 index 3234368a9..000000000 Binary files a/gfx/misc/card_status.2bpp and /dev/null differ diff --git a/gfx/misc/card_status.png b/gfx/misc/card_status.png new file mode 100644 index 000000000..b33bb2029 Binary files /dev/null and b/gfx/misc/card_status.png differ diff --git a/gfx/misc/chris.7x7.2bpp b/gfx/misc/chris.7x7.2bpp deleted file mode 100644 index e11cc53a8..000000000 Binary files a/gfx/misc/chris.7x7.2bpp and /dev/null differ diff --git a/gfx/misc/chris.png b/gfx/misc/chris.png new file mode 100644 index 000000000..19869944e Binary files /dev/null and b/gfx/misc/chris.png differ diff --git a/gfx/misc/chris_card.5x7.2bpp b/gfx/misc/chris_card.5x7.2bpp deleted file mode 100644 index 747bd0da5..000000000 Binary files a/gfx/misc/chris_card.5x7.2bpp and /dev/null differ diff --git a/gfx/misc/chris_card.png b/gfx/misc/chris_card.png new file mode 100644 index 000000000..977981d41 Binary files /dev/null and b/gfx/misc/chris_card.png differ diff --git a/gfx/misc/copyright.2bpp b/gfx/misc/copyright.2bpp deleted file mode 100644 index ba11614b1..000000000 Binary files a/gfx/misc/copyright.2bpp and /dev/null differ diff --git a/gfx/misc/copyright.png b/gfx/misc/copyright.png new file mode 100644 index 000000000..023bb93dd Binary files /dev/null and b/gfx/misc/copyright.png differ diff --git a/gfx/misc/cut_grass.2bpp b/gfx/misc/cut_grass.2bpp deleted file mode 100644 index 1c8a3f9a8..000000000 Binary files a/gfx/misc/cut_grass.2bpp and /dev/null differ diff --git a/gfx/misc/cut_grass.png b/gfx/misc/cut_grass.png new file mode 100644 index 000000000..b10e0cf8c Binary files /dev/null and b/gfx/misc/cut_grass.png differ diff --git a/gfx/misc/cut_tree.2bpp b/gfx/misc/cut_tree.2bpp deleted file mode 100644 index aa8078f31..000000000 Binary files a/gfx/misc/cut_tree.2bpp and /dev/null differ diff --git a/gfx/misc/cut_tree.png b/gfx/misc/cut_tree.png new file mode 100644 index 000000000..c1f1bc97d Binary files /dev/null and b/gfx/misc/cut_tree.png differ diff --git a/gfx/misc/dude.6x6.2bpp.lz b/gfx/misc/dude.2bpp.lz.d13fb490 similarity index 100% rename from gfx/misc/dude.6x6.2bpp.lz rename to gfx/misc/dude.2bpp.lz.d13fb490 diff --git a/gfx/misc/dude.png b/gfx/misc/dude.png new file mode 100644 index 000000000..9a74a90d6 Binary files /dev/null and b/gfx/misc/dude.png differ diff --git a/gfx/misc/fast_ship.2bpp b/gfx/misc/fast_ship.2bpp deleted file mode 100644 index e4a5525b6..000000000 Binary files a/gfx/misc/fast_ship.2bpp and /dev/null differ diff --git a/gfx/misc/fast_ship.png b/gfx/misc/fast_ship.png new file mode 100644 index 000000000..e92f00f55 Binary files /dev/null and b/gfx/misc/fast_ship.png differ diff --git a/gfx/misc/fishing2.2bpp b/gfx/misc/fishing2.2bpp deleted file mode 100644 index bb3ed2bbf..000000000 Binary files a/gfx/misc/fishing2.2bpp and /dev/null differ diff --git a/gfx/misc/fishing2.png b/gfx/misc/fishing2.png new file mode 100644 index 000000000..32d277269 Binary files /dev/null and b/gfx/misc/fishing2.png differ diff --git a/gfx/misc/fishing4.2bpp b/gfx/misc/fishing4.2bpp deleted file mode 100644 index 987a4ad34..000000000 --- a/gfx/misc/fishing4.2bpp +++ /dev/null @@ -1 +0,0 @@ -@ 2 Ìd 6  \ No newline at end of file diff --git a/gfx/misc/fishing4.png b/gfx/misc/fishing4.png new file mode 100644 index 000000000..0b2d73e2c Binary files /dev/null and b/gfx/misc/fishing4.png differ diff --git a/gfx/misc/gbc_only.w112.2bpp.lz b/gfx/misc/gbc_only.2bpp.lz.4a5bba0e similarity index 100% rename from gfx/misc/gbc_only.w112.2bpp.lz rename to gfx/misc/gbc_only.2bpp.lz.4a5bba0e diff --git a/gfx/misc/gbc_only.png b/gfx/misc/gbc_only.png new file mode 100644 index 000000000..72bcf0131 Binary files /dev/null and b/gfx/misc/gbc_only.png differ diff --git a/gfx/misc/kris.7x7.2bpp b/gfx/misc/kris.7x7.2bpp deleted file mode 100644 index ac7a64689..000000000 Binary files a/gfx/misc/kris.7x7.2bpp and /dev/null differ diff --git a/gfx/misc/kris.png b/gfx/misc/kris.png new file mode 100644 index 000000000..7a855e676 Binary files /dev/null and b/gfx/misc/kris.png differ diff --git a/gfx/misc/kris_back.6x6.2bpp b/gfx/misc/kris_back.6x6.2bpp deleted file mode 100644 index e1c25d12c..000000000 Binary files a/gfx/misc/kris_back.6x6.2bpp and /dev/null differ diff --git a/gfx/misc/kris_back.png b/gfx/misc/kris_back.png new file mode 100644 index 000000000..eb0c1e941 Binary files /dev/null and b/gfx/misc/kris_back.png differ diff --git a/gfx/misc/kris_card.5x7.2bpp b/gfx/misc/kris_card.5x7.2bpp deleted file mode 100644 index 0cb916e9f..000000000 Binary files a/gfx/misc/kris_card.5x7.2bpp and /dev/null differ diff --git a/gfx/misc/kris_card.png b/gfx/misc/kris_card.png new file mode 100644 index 000000000..2ffa11159 Binary files /dev/null and b/gfx/misc/kris_card.png differ diff --git a/gfx/misc/leaders.png b/gfx/misc/leaders.png new file mode 100644 index 000000000..6e7eb0f8d Binary files /dev/null and b/gfx/misc/leaders.png differ diff --git a/gfx/misc/leaders.w24.2bpp b/gfx/misc/leaders.w24.2bpp deleted file mode 100644 index fecae45db..000000000 Binary files a/gfx/misc/leaders.w24.2bpp and /dev/null differ diff --git a/gfx/misc/mobile_adapter.2bpp b/gfx/misc/mobile_adapter.2bpp deleted file mode 100644 index 7c496ac42..000000000 Binary files a/gfx/misc/mobile_adapter.2bpp and /dev/null differ diff --git a/gfx/misc/mobile_adapter.png b/gfx/misc/mobile_adapter.png new file mode 100644 index 000000000..fa5965e92 Binary files /dev/null and b/gfx/misc/mobile_adapter.png differ diff --git a/gfx/misc/mystery_gift.2bpp b/gfx/misc/mystery_gift.2bpp deleted file mode 100644 index 04aff2048..000000000 Binary files a/gfx/misc/mystery_gift.2bpp and /dev/null differ diff --git a/gfx/misc/mystery_gift.png b/gfx/misc/mystery_gift.png new file mode 100644 index 000000000..0fd458dec Binary files /dev/null and b/gfx/misc/mystery_gift.png differ diff --git a/gfx/misc/mystery_gift_jp.2bpp b/gfx/misc/mystery_gift_jp.2bpp deleted file mode 100644 index 2439f25e1..000000000 Binary files a/gfx/misc/mystery_gift_jp.2bpp and /dev/null differ diff --git a/gfx/misc/mystery_gift_jp.png b/gfx/misc/mystery_gift_jp.png new file mode 100644 index 000000000..692cf8732 Binary files /dev/null and b/gfx/misc/mystery_gift_jp.png differ diff --git a/gfx/misc/pack.png b/gfx/misc/pack.png index 738a9dd94..b85fc0990 100644 Binary files a/gfx/misc/pack.png and b/gfx/misc/pack.png differ diff --git a/gfx/misc/pack_menu.2bpp b/gfx/misc/pack_menu.2bpp deleted file mode 100644 index 484bc94cb..000000000 Binary files a/gfx/misc/pack_menu.2bpp and /dev/null differ diff --git a/gfx/misc/pack_menu.png b/gfx/misc/pack_menu.png new file mode 100644 index 000000000..52e2bcdd5 Binary files /dev/null and b/gfx/misc/pack_menu.png differ diff --git a/gfx/misc/player.6x6.2bpp.lz b/gfx/misc/player.2bpp.lz.0312ddce similarity index 100% rename from gfx/misc/player.6x6.2bpp.lz rename to gfx/misc/player.2bpp.lz.0312ddce diff --git a/gfx/misc/player.png b/gfx/misc/player.png new file mode 100644 index 000000000..7bf3c50db Binary files /dev/null and b/gfx/misc/player.png differ diff --git a/gfx/misc/pokegear.2bpp.lz b/gfx/misc/pokegear.2bpp.lz.42315ab4 similarity index 100% rename from gfx/misc/pokegear.2bpp.lz rename to gfx/misc/pokegear.2bpp.lz.42315ab4 diff --git a/gfx/misc/pokegear.png b/gfx/misc/pokegear.png new file mode 100644 index 000000000..78774a260 Binary files /dev/null and b/gfx/misc/pokegear.png differ diff --git a/gfx/misc/pokegear_sprites.2bpp.lz b/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f similarity index 100% rename from gfx/misc/pokegear_sprites.2bpp.lz rename to gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f diff --git a/gfx/misc/pokegear_sprites.png b/gfx/misc/pokegear_sprites.png new file mode 100644 index 000000000..746d4b486 Binary files /dev/null and b/gfx/misc/pokegear_sprites.png differ diff --git a/gfx/misc/sgb_border.2bpp b/gfx/misc/sgb_border.2bpp deleted file mode 100644 index 7f5f7f6fa..000000000 Binary files a/gfx/misc/sgb_border.2bpp and /dev/null differ diff --git a/gfx/misc/sgb_border.png b/gfx/misc/sgb_border.png new file mode 100644 index 000000000..867c36b10 Binary files /dev/null and b/gfx/misc/sgb_border.png differ diff --git a/gfx/misc/shadow.2bpp b/gfx/misc/shadow.2bpp deleted file mode 100644 index b62b99ffc..000000000 --- a/gfx/misc/shadow.2bpp +++ /dev/null @@ -1 +0,0 @@ -???? \ No newline at end of file diff --git a/gfx/misc/shadow.png b/gfx/misc/shadow.png new file mode 100644 index 000000000..ba3dab5be Binary files /dev/null and b/gfx/misc/shadow.png differ diff --git a/gfx/misc/town_map.2bpp.lz b/gfx/misc/town_map.2bpp.lz.c0587c86 similarity index 100% rename from gfx/misc/town_map.2bpp.lz rename to gfx/misc/town_map.2bpp.lz.c0587c86 diff --git a/gfx/misc/town_map.png b/gfx/misc/town_map.png new file mode 100644 index 000000000..6e7af59d0 Binary files /dev/null and b/gfx/misc/town_map.png differ diff --git a/gfx/misc/trainer_card.2bpp b/gfx/misc/trainer_card.2bpp deleted file mode 100644 index 09de7a2df..000000000 Binary files a/gfx/misc/trainer_card.2bpp and /dev/null differ diff --git a/gfx/misc/trainer_card.png b/gfx/misc/trainer_card.png new file mode 100644 index 000000000..88ce35bca Binary files /dev/null and b/gfx/misc/trainer_card.png differ diff --git a/gfx/misc/unknown_egg.5x5.2bpp.lz b/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa similarity index 100% rename from gfx/misc/unknown_egg.5x5.2bpp.lz rename to gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa diff --git a/gfx/misc/unknown_egg.png b/gfx/misc/unknown_egg.png new file mode 100644 index 000000000..0642c28cf Binary files /dev/null and b/gfx/misc/unknown_egg.png differ diff --git a/gfx/misc/unown_font.2bpp b/gfx/misc/unown_font.2bpp deleted file mode 100644 index 4ec0bbea6..000000000 Binary files a/gfx/misc/unown_font.2bpp and /dev/null differ diff --git a/gfx/misc/unown_font.png b/gfx/misc/unown_font.png new file mode 100644 index 000000000..5ac70b807 Binary files /dev/null and b/gfx/misc/unown_font.png differ