diff --git a/.gitignore b/.gitignore index 9af0a0bd4..a4639d0ca 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ pokecrystal.txt *.dimensions *.gbcpal *.2bpp +*.1bpp *.lz *.pal *.animated.tilemap diff --git a/INSTALL.md b/INSTALL.md index c68896bb6..e126c20ea 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -56,10 +56,10 @@ make To build on Windows, install [**Cygwin**](http://cygwin.com/install.html) with the default settings. -In the installer, select the following packages: `make` `git` `gettext` +In the installer, select the following packages: `make` `git` `gettext` `gcc-core` Then get [**rgbds 0.2.5**](https://github.com/rednex/rgbds/releases/). Versions 0.3.0 and later are not compatible. -Extract the archive and put `rgbasm.exe`, `rgblink.exe`, `rgbfix.exe` and `rgbgfx.exe` in `C:\cygwin64\usr\local\bin`. +Extract the archive and put all the `exe` and `dll` files individually in `C:\cygwin64\usr\local\bin`. In the **Cygwin terminal**: @@ -67,7 +67,7 @@ In the **Cygwin terminal**: git clone https://github.com/pret/pokecrystal cd pokecrystal -make tools +make tools CC=gcc ``` To build **pokecrystal.gbc**: diff --git a/Makefile b/Makefile index 27df84035..61f1b6c8a 100644 --- a/Makefile +++ b/Makefile @@ -58,10 +58,6 @@ pokecrystal.gbc: $(crystal_obj) rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ -define LOUD -echo "$1"; $1 -endef - # For files that the compressor can't match, there will be a .lz file suffixed with the hash of the correct uncompressed file. # If the hash of the uncompressed file matches, use this .lz instead. # This allows pngs to be used for compressed graphics and still match. @@ -69,11 +65,7 @@ endef %.lz: hash = $(shell md5sum $(*D)/$(*F) | sed "s/\(.\{8\}\).*/\1/") %.lz: % $(eval filename := $@.$(hash)) - @if [ -f $(filename) ]; then \ - $(call LOUD, cp $(filename) $@); \ - else \ - $(call LOUD, tools/lzcomp $< $@); \ - fi + $(if $(wildcard $(filename)),cp $(filename) $@,tools/lzcomp $< $@) # Terrible hacks to match animations. Delete these rules if you don't care about matching. @@ -118,20 +110,82 @@ gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimens # Misc file-specific graphics rules -gfx/shrink%.2bpp: gfx/shrink%.png - rgbgfx -h -o $@ $< +gfx/shrink1.2bpp: rgbgfx += -h +gfx/shrink2.2bpp: rgbgfx += -h -gfx/trainers/%.2bpp: gfx/trainers/%.png - rgbgfx -h -o $@ $< +gfx/trainers/%.2bpp: rgbgfx += -h +gfx/trainers/%.pal: gfx/trainers/%.gbcpal + tools/palette -p $< > $@ + +gfx/mail/0b9b46.1bpp: tools/gfx += --remove-whitespace +gfx/mail/0b9d46.1bpp: tools/gfx += --remove-whitespace +gfx/mail/0b9d86.1bpp: tools/gfx += --remove-whitespace +gfx/mail/0b9dc6.1bpp: tools/gfx += --remove-whitespace +gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace + +gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace + +gfx/title/crystal.2bpp: tools/gfx += --interleave --width=48 +gfx/title/old_fg.2bpp: tools/gfx += --interleave --width=64 +gfx/title/logo.2bpp: rgbgfx += -x 4 + +gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace + +gfx/slots_2.2bpp: tools/gfx += --interleave --width=16 +gfx/slots_3.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip +gfx/slots_3a.2bpp: tools/gfx += --interleave --width=16 +gfx/slots_3b.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip + +gfx/fx/angels.2bpp: tools/gfx += --trim-whitespace +gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace +gfx/fx/bubble.2bpp: tools/gfx += --trim-whitespace +gfx/fx/charge.2bpp: tools/gfx += --trim-whitespace +gfx/fx/egg.2bpp: tools/gfx += --remove-whitespace +gfx/fx/explosion.2bpp: tools/gfx += --remove-whitespace +gfx/fx/hit.2bpp: tools/gfx += --remove-whitespace +gfx/fx/horn.2bpp: tools/gfx += --remove-whitespace +gfx/fx/lightning.2bpp: tools/gfx += --remove-whitespace +gfx/fx/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/fx/noise.2bpp: tools/gfx += --remove-whitespace +gfx/fx/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip +gfx/fx/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace +gfx/fx/reflect.2bpp: tools/gfx += --remove-whitespace +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/unknown_egg.2bpp: rgbgfx += -h +gfx/misc/player.2bpp: rgbgfx += -h +gfx/misc/pokegear.2bpp: rgbgfx += -x2 +gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace + +gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace +gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace +gfx/unknown/16c173.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/1715a4.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/1715a4_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/unknown/171db1.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/172f1f.2bpp: tools/gfx += --trim-whitespace %.bin: ; %.blk: ; %.2bpp: %.png - rgbgfx -o $@ $< + rgbgfx $(rgbgfx) -o $@ $< + $(if $(tools/gfx),tools/gfx $(tools/gfx) -o $@ $@) + %.1bpp: %.png - rgbgfx -d1 -o $@ $< + rgbgfx $(rgbgfx) -d1 -o $@ $< + $(if $(tools/gfx),tools/gfx $(tools/gfx) -d1 -o $@ $@) + %.tilemap: %.png rgbgfx -t $@ $< %.gbcpal: %.png diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index e324ed476..1c0d7cd3e 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -367,7 +367,8 @@ GameFreakLogoPalettes: ; e47ac ; e47cc GameFreakLogo: ; e47cc -INCBIN "gfx/splash/logo.1bpp" +INCBIN "gfx/splash/logo1.1bpp" +INCBIN "gfx/splash/logo2.1bpp" ; e48ac CrystalIntro: ; e48ac diff --git a/engine/pokegear.asm b/engine/pokegear.asm index c6ea8ed4f..8e5697f75 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -2987,7 +2987,7 @@ INCBIN "gfx/misc/kanto.bin" PokedexNestIconGFX: ; 922d1 INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp" FlyMapLabelBorderGFX: ; 922e1 -INCBIN "gfx/pokegear/flymap_label_border.2bpp" +INCBIN "gfx/pokegear/flymap_label_border.1bpp" ; XXX xor a diff --git a/engine/timeset.asm b/engine/timeset.asm index f828b0ff8..d560ae817 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -397,11 +397,11 @@ OakText_ResponseToSetTime: ; 0x908b8 ; 0x908fb GFX_908fb: ; 908fb -INCBIN "gfx/unknown/0908fb.2bpp" +INCBIN "gfx/unknown/0908fb.1bpp" GFX_90903: ; 90903 -INCBIN "gfx/unknown/090903.2bpp" +INCBIN "gfx/unknown/090903.1bpp" GFX_9090b: ; 9090b -INCBIN "gfx/unknown/09090b.2bpp" +INCBIN "gfx/unknown/09090b.1bpp" ; 90913 Special_SetDayOfWeek: ; 90913 diff --git a/engine/title.asm b/engine/title.asm index 787872939..36e2851d3 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -387,15 +387,15 @@ AnimateTitleCrystal: ; 10ef32 ; 10ef46 TitleSuicuneGFX: ; 10ef46 -INCBIN "gfx/title/suicune.w128.2bpp.lz" +INCBIN "gfx/title/suicune.2bpp.lz" ; 10f326 TitleLogoGFX: ; 10f326 -INCBIN "gfx/title/logo.w160.t4.2bpp.lz" +INCBIN "gfx/title/logo.2bpp.lz" ; 10fcee TitleCrystalGFX: ; 10fcee -INCBIN "gfx/title/crystal.w48.interleave.2bpp.lz" +INCBIN "gfx/title/crystal.2bpp.lz" ; 10fede TitleScreenPalettes: diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index a993ce4ba..23defe919 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -608,8 +608,8 @@ TrainerCard_JohtoBadgesOAM: ; 254c9 CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp" -LeaderGFX: INCBIN "gfx/misc/leaders.w24.2bpp" -LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp" +LeaderGFX: INCBIN "gfx/misc/leaders.2bpp" +LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp" BadgeGFX: INCBIN "gfx/misc/badges.2bpp" BadgeGFX2: INCBIN "gfx/misc/badges.2bpp" diff --git a/gfx/battle/balls.2bpp b/gfx/battle/balls.2bpp deleted file mode 100644 index 626c4e3e3..000000000 Binary files a/gfx/battle/balls.2bpp and /dev/null differ diff --git a/gfx/battle/balls.png b/gfx/battle/balls.png new file mode 100644 index 000000000..21bb5e372 Binary files /dev/null and b/gfx/battle/balls.png differ diff --git a/gfx/battle/enemy_hp_bar_border.1bpp b/gfx/battle/enemy_hp_bar_border.1bpp deleted file mode 100644 index 629b4770a..000000000 Binary files a/gfx/battle/enemy_hp_bar_border.1bpp and /dev/null differ diff --git a/gfx/battle/enemy_hp_bar_border.png b/gfx/battle/enemy_hp_bar_border.png new file mode 100644 index 000000000..895949688 Binary files /dev/null and b/gfx/battle/enemy_hp_bar_border.png differ diff --git a/gfx/battle/expbar.2bpp b/gfx/battle/expbar.2bpp deleted file mode 100644 index cf869d98b..000000000 Binary files a/gfx/battle/expbar.2bpp and /dev/null differ diff --git a/gfx/battle/expbar.png b/gfx/battle/expbar.png new file mode 100644 index 000000000..9fa3a2128 Binary files /dev/null and b/gfx/battle/expbar.png differ diff --git a/gfx/battle/expbarend.2bpp b/gfx/battle/expbarend.2bpp deleted file mode 100644 index 24f32e155..000000000 Binary files a/gfx/battle/expbarend.2bpp and /dev/null differ diff --git a/gfx/battle/expbarend.png b/gfx/battle/expbarend.png new file mode 100644 index 000000000..51c0e7201 Binary files /dev/null and b/gfx/battle/expbarend.png differ diff --git a/gfx/battle/expbarend_sgb.2bpp b/gfx/battle/expbarend_sgb.2bpp deleted file mode 100644 index dbeb3fdee..000000000 Binary files a/gfx/battle/expbarend_sgb.2bpp and /dev/null differ diff --git a/gfx/battle/expbarend_sgb.png b/gfx/battle/expbarend_sgb.png new file mode 100644 index 000000000..25eed4a62 Binary files /dev/null and b/gfx/battle/expbarend_sgb.png differ diff --git a/gfx/battle/hp_exp_bar_border.1bpp b/gfx/battle/hp_exp_bar_border.1bpp deleted file mode 100644 index 1e5dd7af6..000000000 Binary files a/gfx/battle/hp_exp_bar_border.1bpp and /dev/null differ diff --git a/gfx/battle/hp_exp_bar_border.png b/gfx/battle/hp_exp_bar_border.png new file mode 100644 index 000000000..f0f5d31a6 Binary files /dev/null and b/gfx/battle/hp_exp_bar_border.png differ diff --git a/gfx/battle/minimize.2bpp b/gfx/battle/minimize.2bpp deleted file mode 100644 index 66b554de4..000000000 Binary files a/gfx/battle/minimize.2bpp and /dev/null differ diff --git a/gfx/battle/minimize.png b/gfx/battle/minimize.png new file mode 100644 index 000000000..95502f194 Binary files /dev/null and b/gfx/battle/minimize.png differ diff --git a/gfx/debug/color_test.2bpp b/gfx/debug/color_test.2bpp deleted file mode 100644 index 113aa1256..000000000 Binary files a/gfx/debug/color_test.2bpp and /dev/null differ diff --git a/gfx/debug/color_test.png b/gfx/debug/color_test.png new file mode 100644 index 000000000..1c3ee326b Binary files /dev/null and b/gfx/debug/color_test.png differ diff --git a/gfx/emotes/bolt.2bpp b/gfx/emotes/bolt.2bpp deleted file mode 100644 index 019f4733c..000000000 Binary files a/gfx/emotes/bolt.2bpp and /dev/null differ diff --git a/gfx/emotes/bolt.png b/gfx/emotes/bolt.png new file mode 100644 index 000000000..0eef6ad3f Binary files /dev/null and b/gfx/emotes/bolt.png differ diff --git a/gfx/emotes/fish.2bpp b/gfx/emotes/fish.2bpp deleted file mode 100644 index 310ec1752..000000000 Binary files a/gfx/emotes/fish.2bpp and /dev/null differ diff --git a/gfx/emotes/fish.png b/gfx/emotes/fish.png new file mode 100644 index 000000000..216c9c43a Binary files /dev/null and b/gfx/emotes/fish.png differ diff --git a/gfx/emotes/happy.2bpp b/gfx/emotes/happy.2bpp deleted file mode 100644 index babc52ec6..000000000 Binary files a/gfx/emotes/happy.2bpp and /dev/null differ diff --git a/gfx/emotes/happy.png b/gfx/emotes/happy.png new file mode 100644 index 000000000..dd65f4d1a Binary files /dev/null and b/gfx/emotes/happy.png differ diff --git a/gfx/emotes/heart.2bpp b/gfx/emotes/heart.2bpp deleted file mode 100644 index 15cdc88b7..000000000 Binary files a/gfx/emotes/heart.2bpp and /dev/null differ diff --git a/gfx/emotes/heart.png b/gfx/emotes/heart.png new file mode 100644 index 000000000..166fff515 Binary files /dev/null and b/gfx/emotes/heart.png differ diff --git a/gfx/emotes/question.2bpp b/gfx/emotes/question.2bpp deleted file mode 100644 index 2408bbf44..000000000 Binary files a/gfx/emotes/question.2bpp and /dev/null differ diff --git a/gfx/emotes/question.png b/gfx/emotes/question.png new file mode 100644 index 000000000..091ddbbad Binary files /dev/null and b/gfx/emotes/question.png differ diff --git a/gfx/emotes/sad.2bpp b/gfx/emotes/sad.2bpp deleted file mode 100644 index cccdcf97a..000000000 Binary files a/gfx/emotes/sad.2bpp and /dev/null differ diff --git a/gfx/emotes/sad.png b/gfx/emotes/sad.png new file mode 100644 index 000000000..e241a5b1b Binary files /dev/null and b/gfx/emotes/sad.png differ diff --git a/gfx/emotes/shock.2bpp b/gfx/emotes/shock.2bpp deleted file mode 100644 index 351921654..000000000 Binary files a/gfx/emotes/shock.2bpp and /dev/null differ diff --git a/gfx/emotes/shock.png b/gfx/emotes/shock.png new file mode 100644 index 000000000..f15cf50fa Binary files /dev/null and b/gfx/emotes/shock.png differ diff --git a/gfx/emotes/sleep.2bpp b/gfx/emotes/sleep.2bpp deleted file mode 100644 index 1c9e26ec7..000000000 Binary files a/gfx/emotes/sleep.2bpp and /dev/null differ diff --git a/gfx/emotes/sleep.png b/gfx/emotes/sleep.png new file mode 100644 index 000000000..41c958f74 Binary files /dev/null and b/gfx/emotes/sleep.png differ diff --git a/gfx/evo/bubble.2bpp b/gfx/evo/bubble.2bpp deleted file mode 100644 index 741ee9026..000000000 Binary files a/gfx/evo/bubble.2bpp and /dev/null differ diff --git a/gfx/evo/bubble.png b/gfx/evo/bubble.png new file mode 100644 index 000000000..28fba397d Binary files /dev/null and b/gfx/evo/bubble.png differ diff --git a/gfx/evo/bubble_large.2bpp b/gfx/evo/bubble_large.2bpp deleted file mode 100644 index a69044414..000000000 Binary files a/gfx/evo/bubble_large.2bpp and /dev/null differ diff --git a/gfx/evo/bubble_large.png b/gfx/evo/bubble_large.png new file mode 100644 index 000000000..34f630041 Binary files /dev/null and b/gfx/evo/bubble_large.png differ diff --git a/gfx/font.asm b/gfx/font.asm index 92bc25f25..30549b26f 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -59,11 +59,11 @@ INCBIN "gfx/mobile/overworld_phone_icon.2bpp" ; f8f34 GFX_f8f34: ; unused bold letters + unown chars -INCBIN "gfx/unknown/0f8f34.w64.1bpp" +INCBIN "gfx/unknown/0f8f34.1bpp" ; f9204 TextBoxSpaceGFX: ; f9204 -INCBIN "gfx/frames/space.2bpp" +INCBIN "gfx/frames/space.1bpp" ; f9214 MobilePhoneTilesGFX: ; f9214 diff --git a/gfx/font/english.1bpp b/gfx/font/english.1bpp deleted file mode 100644 index ff8d2d4fe..000000000 Binary files a/gfx/font/english.1bpp and /dev/null differ diff --git a/gfx/font/english.png b/gfx/font/english.png new file mode 100644 index 000000000..7119c0691 Binary files /dev/null and b/gfx/font/english.png differ diff --git a/gfx/font/french_german.1bpp b/gfx/font/french_german.1bpp deleted file mode 100644 index 84d542986..000000000 Binary files a/gfx/font/french_german.1bpp and /dev/null differ diff --git a/gfx/font/french_german.png b/gfx/font/french_german.png new file mode 100644 index 000000000..4e4545662 Binary files /dev/null and b/gfx/font/french_german.png differ diff --git a/gfx/font/spanish_italian.1bpp b/gfx/font/spanish_italian.1bpp deleted file mode 100644 index 8f316db4e..000000000 Binary files a/gfx/font/spanish_italian.1bpp and /dev/null differ diff --git a/gfx/font/spanish_italian.png b/gfx/font/spanish_italian.png new file mode 100644 index 000000000..5663800f1 Binary files /dev/null and b/gfx/font/spanish_italian.png differ diff --git a/gfx/frames/1.1bpp b/gfx/frames/1.1bpp deleted file mode 100644 index 63005ab72..000000000 Binary files a/gfx/frames/1.1bpp and /dev/null differ diff --git a/gfx/frames/1.png b/gfx/frames/1.png new file mode 100644 index 000000000..fee7de870 Binary files /dev/null and b/gfx/frames/1.png differ diff --git a/gfx/frames/2.1bpp b/gfx/frames/2.1bpp deleted file mode 100644 index 4dfe9a949..000000000 Binary files a/gfx/frames/2.1bpp and /dev/null differ diff --git a/gfx/frames/2.png b/gfx/frames/2.png new file mode 100644 index 000000000..0ed5ebbed Binary files /dev/null and b/gfx/frames/2.png differ diff --git a/gfx/frames/3.1bpp b/gfx/frames/3.1bpp deleted file mode 100644 index 9c488c555..000000000 Binary files a/gfx/frames/3.1bpp and /dev/null differ diff --git a/gfx/frames/3.png b/gfx/frames/3.png new file mode 100644 index 000000000..c3489ca0d Binary files /dev/null and b/gfx/frames/3.png differ diff --git a/gfx/frames/4.1bpp b/gfx/frames/4.1bpp deleted file mode 100644 index 01449a04c..000000000 Binary files a/gfx/frames/4.1bpp and /dev/null differ diff --git a/gfx/frames/4.png b/gfx/frames/4.png new file mode 100644 index 000000000..c2908c75b Binary files /dev/null and b/gfx/frames/4.png differ diff --git a/gfx/frames/5.1bpp b/gfx/frames/5.1bpp deleted file mode 100644 index 83651da00..000000000 Binary files a/gfx/frames/5.1bpp and /dev/null differ diff --git a/gfx/frames/5.png b/gfx/frames/5.png new file mode 100644 index 000000000..f44542aaf Binary files /dev/null and b/gfx/frames/5.png differ diff --git a/gfx/frames/6.1bpp b/gfx/frames/6.1bpp deleted file mode 100644 index 032154047..000000000 Binary files a/gfx/frames/6.1bpp and /dev/null differ diff --git a/gfx/frames/6.png b/gfx/frames/6.png new file mode 100644 index 000000000..3ae386746 Binary files /dev/null and b/gfx/frames/6.png differ diff --git a/gfx/frames/7.1bpp b/gfx/frames/7.1bpp deleted file mode 100644 index 21793f20a..000000000 Binary files a/gfx/frames/7.1bpp and /dev/null differ diff --git a/gfx/frames/7.png b/gfx/frames/7.png new file mode 100644 index 000000000..54bdbbecc Binary files /dev/null and b/gfx/frames/7.png differ diff --git a/gfx/frames/8.1bpp b/gfx/frames/8.1bpp deleted file mode 100644 index 509bf898a..000000000 Binary files a/gfx/frames/8.1bpp and /dev/null differ diff --git a/gfx/frames/8.png b/gfx/frames/8.png new file mode 100644 index 000000000..2eab82999 Binary files /dev/null and b/gfx/frames/8.png differ diff --git a/gfx/frames/9.1bpp b/gfx/frames/9.1bpp deleted file mode 100644 index 9be4865b3..000000000 Binary files a/gfx/frames/9.1bpp and /dev/null differ diff --git a/gfx/frames/9.png b/gfx/frames/9.png new file mode 100644 index 000000000..a23257365 Binary files /dev/null and b/gfx/frames/9.png differ diff --git a/gfx/frames/map_entry_sign.2bpp b/gfx/frames/map_entry_sign.2bpp deleted file mode 100644 index a0143875a..000000000 Binary files a/gfx/frames/map_entry_sign.2bpp and /dev/null differ diff --git a/gfx/frames/map_entry_sign.png b/gfx/frames/map_entry_sign.png new file mode 100644 index 000000000..921013720 Binary files /dev/null and b/gfx/frames/map_entry_sign.png differ diff --git a/gfx/frames/space.2bpp b/gfx/frames/space.2bpp deleted file mode 100644 index 01d633b27..000000000 Binary files a/gfx/frames/space.2bpp and /dev/null differ diff --git a/gfx/frames/space.png b/gfx/frames/space.png new file mode 100755 index 000000000..7590b85dd Binary files /dev/null and b/gfx/frames/space.png differ diff --git a/gfx/fx/aeroblast.2bpp.lz b/gfx/fx/aeroblast.2bpp.lz.2f07c4ea similarity index 100% rename from gfx/fx/aeroblast.2bpp.lz rename to gfx/fx/aeroblast.2bpp.lz.2f07c4ea diff --git a/gfx/fx/aeroblast.png b/gfx/fx/aeroblast.png new file mode 100644 index 000000000..1fdc07c2f Binary files /dev/null and b/gfx/fx/aeroblast.png differ diff --git a/gfx/fx/angels.2bpp.lz b/gfx/fx/angels.2bpp.lz.b026d81e similarity index 100% rename from gfx/fx/angels.2bpp.lz rename to gfx/fx/angels.2bpp.lz.b026d81e diff --git a/gfx/fx/angels.png b/gfx/fx/angels.png new file mode 100644 index 000000000..ef38c61d2 Binary files /dev/null and b/gfx/fx/angels.png differ diff --git a/gfx/fx/beam.2bpp.lz b/gfx/fx/beam.2bpp.lz.80b6d613 similarity index 100% rename from gfx/fx/beam.2bpp.lz rename to gfx/fx/beam.2bpp.lz.80b6d613 diff --git a/gfx/fx/beam.png b/gfx/fx/beam.png new file mode 100755 index 000000000..32a3b1967 Binary files /dev/null and b/gfx/fx/beam.png differ diff --git a/gfx/fx/bubble.2bpp.lz b/gfx/fx/bubble.2bpp.lz.03b8ac99 similarity index 100% rename from gfx/fx/bubble.2bpp.lz rename to gfx/fx/bubble.2bpp.lz.03b8ac99 diff --git a/gfx/fx/bubble.png b/gfx/fx/bubble.png new file mode 100644 index 000000000..b6febb0a8 Binary files /dev/null and b/gfx/fx/bubble.png differ diff --git a/gfx/fx/charge.2bpp.lz b/gfx/fx/charge.2bpp.lz.95d3ea98 similarity index 100% rename from gfx/fx/charge.2bpp.lz rename to gfx/fx/charge.2bpp.lz.95d3ea98 diff --git a/gfx/fx/charge.png b/gfx/fx/charge.png new file mode 100644 index 000000000..90cb72f9f Binary files /dev/null and b/gfx/fx/charge.png differ diff --git a/gfx/fx/cut.2bpp.lz b/gfx/fx/cut.2bpp.lz.03d343ed similarity index 100% rename from gfx/fx/cut.2bpp.lz rename to gfx/fx/cut.2bpp.lz.03d343ed diff --git a/gfx/fx/cut.png b/gfx/fx/cut.png new file mode 100644 index 000000000..e227ad413 Binary files /dev/null and b/gfx/fx/cut.png differ diff --git a/gfx/fx/egg.2bpp.lz b/gfx/fx/egg.2bpp.lz.41dd1a53 similarity index 100% rename from gfx/fx/egg.2bpp.lz rename to gfx/fx/egg.2bpp.lz.41dd1a53 diff --git a/gfx/fx/egg.png b/gfx/fx/egg.png new file mode 100644 index 000000000..38aab505d Binary files /dev/null and b/gfx/fx/egg.png differ diff --git a/gfx/fx/explosion.2bpp.lz b/gfx/fx/explosion.2bpp.lz.55fc334f similarity index 100% rename from gfx/fx/explosion.2bpp.lz rename to gfx/fx/explosion.2bpp.lz.55fc334f diff --git a/gfx/fx/explosion.png b/gfx/fx/explosion.png new file mode 100644 index 000000000..0af9f1a0d Binary files /dev/null and b/gfx/fx/explosion.png differ diff --git a/gfx/fx/fire.2bpp.lz b/gfx/fx/fire.2bpp.lz.d7701cda similarity index 100% rename from gfx/fx/fire.2bpp.lz rename to gfx/fx/fire.2bpp.lz.d7701cda diff --git a/gfx/fx/fire.png b/gfx/fx/fire.png new file mode 100644 index 000000000..19f01141b Binary files /dev/null and b/gfx/fx/fire.png differ diff --git a/gfx/fx/flower.2bpp.lz b/gfx/fx/flower.2bpp.lz.1bc2e9d2 similarity index 100% rename from gfx/fx/flower.2bpp.lz rename to gfx/fx/flower.2bpp.lz.1bc2e9d2 diff --git a/gfx/fx/flower.png b/gfx/fx/flower.png new file mode 100644 index 000000000..61b4f58ce Binary files /dev/null and b/gfx/fx/flower.png differ diff --git a/gfx/fx/globe.2bpp.lz b/gfx/fx/globe.2bpp.lz.710dbb8e similarity index 100% rename from gfx/fx/globe.2bpp.lz rename to gfx/fx/globe.2bpp.lz.710dbb8e diff --git a/gfx/fx/globe.png b/gfx/fx/globe.png new file mode 100644 index 000000000..8d3a35683 Binary files /dev/null and b/gfx/fx/globe.png differ diff --git a/gfx/fx/haze.2bpp.lz b/gfx/fx/haze.2bpp.lz.91424607 similarity index 100% rename from gfx/fx/haze.2bpp.lz rename to gfx/fx/haze.2bpp.lz.91424607 diff --git a/gfx/fx/haze.png b/gfx/fx/haze.png new file mode 100644 index 000000000..8a870ba98 Binary files /dev/null and b/gfx/fx/haze.png differ diff --git a/gfx/fx/hit.2bpp.lz b/gfx/fx/hit.2bpp.lz.2b3c83f2 similarity index 100% rename from gfx/fx/hit.2bpp.lz rename to gfx/fx/hit.2bpp.lz.2b3c83f2 diff --git a/gfx/fx/hit.png b/gfx/fx/hit.png new file mode 100644 index 000000000..228066331 Binary files /dev/null and b/gfx/fx/hit.png differ diff --git a/gfx/fx/horn.2bpp.lz b/gfx/fx/horn.2bpp.lz.48908aae similarity index 100% rename from gfx/fx/horn.2bpp.lz rename to gfx/fx/horn.2bpp.lz.48908aae diff --git a/gfx/fx/horn.png b/gfx/fx/horn.png new file mode 100644 index 000000000..56e8ca241 Binary files /dev/null and b/gfx/fx/horn.png differ diff --git a/gfx/fx/ice.2bpp.lz b/gfx/fx/ice.2bpp.lz.664d900f similarity index 100% rename from gfx/fx/ice.2bpp.lz rename to gfx/fx/ice.2bpp.lz.664d900f diff --git a/gfx/fx/ice.png b/gfx/fx/ice.png new file mode 100644 index 000000000..62a67641e Binary files /dev/null and b/gfx/fx/ice.png differ diff --git a/gfx/fx/lightning.2bpp.lz b/gfx/fx/lightning.2bpp.lz.a88fc131 similarity index 100% rename from gfx/fx/lightning.2bpp.lz rename to gfx/fx/lightning.2bpp.lz.a88fc131 diff --git a/gfx/fx/lightning.png b/gfx/fx/lightning.png new file mode 100755 index 000000000..6606fad12 Binary files /dev/null and b/gfx/fx/lightning.png differ diff --git a/gfx/fx/misc.2bpp.lz b/gfx/fx/misc.2bpp.lz.4b20c3d7 similarity index 100% rename from gfx/fx/misc.2bpp.lz rename to gfx/fx/misc.2bpp.lz.4b20c3d7 diff --git a/gfx/fx/misc.png b/gfx/fx/misc.png new file mode 100755 index 000000000..d7e67508e Binary files /dev/null and b/gfx/fx/misc.png differ diff --git a/gfx/fx/noise.2bpp.lz b/gfx/fx/noise.2bpp.lz.acb4a76e similarity index 100% rename from gfx/fx/noise.2bpp.lz rename to gfx/fx/noise.2bpp.lz.acb4a76e diff --git a/gfx/fx/noise.png b/gfx/fx/noise.png new file mode 100755 index 000000000..17540a5e8 Binary files /dev/null and b/gfx/fx/noise.png differ diff --git a/gfx/fx/objects.2bpp.lz b/gfx/fx/objects.2bpp.lz.83f812de similarity index 100% rename from gfx/fx/objects.2bpp.lz rename to gfx/fx/objects.2bpp.lz.83f812de diff --git a/gfx/fx/objects.png b/gfx/fx/objects.png new file mode 100755 index 000000000..91ea435b8 Binary files /dev/null and b/gfx/fx/objects.png differ diff --git a/gfx/fx/plant.2bpp.lz b/gfx/fx/plant.2bpp.lz.4a00c417 similarity index 100% rename from gfx/fx/plant.2bpp.lz rename to gfx/fx/plant.2bpp.lz.4a00c417 diff --git a/gfx/fx/plant.png b/gfx/fx/plant.png new file mode 100644 index 000000000..ec1125054 Binary files /dev/null and b/gfx/fx/plant.png differ diff --git a/gfx/fx/poison.2bpp.lz b/gfx/fx/poison.2bpp.lz.fc7dc9c1 similarity index 100% rename from gfx/fx/poison.2bpp.lz rename to gfx/fx/poison.2bpp.lz.fc7dc9c1 diff --git a/gfx/fx/poison.png b/gfx/fx/poison.png new file mode 100755 index 000000000..ebbbc52be Binary files /dev/null and b/gfx/fx/poison.png differ diff --git a/gfx/fx/pokeball.2bpp.lz b/gfx/fx/pokeball.2bpp.lz.c58f7e01 similarity index 100% rename from gfx/fx/pokeball.2bpp.lz rename to gfx/fx/pokeball.2bpp.lz.c58f7e01 diff --git a/gfx/fx/pokeball.png b/gfx/fx/pokeball.png new file mode 100755 index 000000000..47edf2190 Binary files /dev/null and b/gfx/fx/pokeball.png differ diff --git a/gfx/fx/powder.2bpp.lz b/gfx/fx/powder.2bpp.lz.bfd566bb similarity index 100% rename from gfx/fx/powder.2bpp.lz rename to gfx/fx/powder.2bpp.lz.bfd566bb diff --git a/gfx/fx/powder.png b/gfx/fx/powder.png new file mode 100644 index 000000000..b2cb4d459 Binary files /dev/null and b/gfx/fx/powder.png differ diff --git a/gfx/fx/psychic.2bpp.lz b/gfx/fx/psychic.2bpp.lz.d80f285c similarity index 100% rename from gfx/fx/psychic.2bpp.lz rename to gfx/fx/psychic.2bpp.lz.d80f285c diff --git a/gfx/fx/psychic.png b/gfx/fx/psychic.png new file mode 100644 index 000000000..a6d22db2f Binary files /dev/null and b/gfx/fx/psychic.png differ diff --git a/gfx/fx/reflect.2bpp.lz b/gfx/fx/reflect.2bpp.lz.9a9c822d similarity index 100% rename from gfx/fx/reflect.2bpp.lz rename to gfx/fx/reflect.2bpp.lz.9a9c822d diff --git a/gfx/fx/reflect.png b/gfx/fx/reflect.png new file mode 100644 index 000000000..48fbd7d0d Binary files /dev/null and b/gfx/fx/reflect.png differ diff --git a/gfx/fx/rocks.2bpp.lz b/gfx/fx/rocks.2bpp.lz.73d0153e similarity index 100% rename from gfx/fx/rocks.2bpp.lz rename to gfx/fx/rocks.2bpp.lz.73d0153e diff --git a/gfx/fx/rocks.png b/gfx/fx/rocks.png new file mode 100755 index 000000000..d7fe76b2f Binary files /dev/null and b/gfx/fx/rocks.png differ diff --git a/gfx/fx/rope.2bpp.lz b/gfx/fx/rope.2bpp.lz.209d63dd similarity index 100% rename from gfx/fx/rope.2bpp.lz rename to gfx/fx/rope.2bpp.lz.209d63dd diff --git a/gfx/fx/rope.png b/gfx/fx/rope.png new file mode 100644 index 000000000..a12553c7a Binary files /dev/null and b/gfx/fx/rope.png differ diff --git a/gfx/fx/sand.2bpp.lz b/gfx/fx/sand.2bpp.lz.c87c0eaa similarity index 100% rename from gfx/fx/sand.2bpp.lz rename to gfx/fx/sand.2bpp.lz.c87c0eaa diff --git a/gfx/fx/sand.png b/gfx/fx/sand.png new file mode 100755 index 000000000..a54db235d Binary files /dev/null and b/gfx/fx/sand.png differ diff --git a/gfx/fx/shapes.2bpp.lz b/gfx/fx/shapes.2bpp.lz.262d77f0 similarity index 100% rename from gfx/fx/shapes.2bpp.lz rename to gfx/fx/shapes.2bpp.lz.262d77f0 diff --git a/gfx/fx/shapes.png b/gfx/fx/shapes.png new file mode 100644 index 000000000..b99fc601a Binary files /dev/null and b/gfx/fx/shapes.png differ diff --git a/gfx/fx/shine.2bpp.lz b/gfx/fx/shine.2bpp.lz.5fb79056 similarity index 100% rename from gfx/fx/shine.2bpp.lz rename to gfx/fx/shine.2bpp.lz.5fb79056 diff --git a/gfx/fx/shine.png b/gfx/fx/shine.png new file mode 100644 index 000000000..1b7e9834b Binary files /dev/null and b/gfx/fx/shine.png differ diff --git a/gfx/fx/skyattack.2bpp.lz b/gfx/fx/skyattack.2bpp.lz.31738ab8 similarity index 100% rename from gfx/fx/skyattack.2bpp.lz rename to gfx/fx/skyattack.2bpp.lz.31738ab8 diff --git a/gfx/fx/skyattack.png b/gfx/fx/skyattack.png new file mode 100644 index 000000000..e731c691c Binary files /dev/null and b/gfx/fx/skyattack.png differ diff --git a/gfx/fx/smoke.2bpp.lz b/gfx/fx/smoke.2bpp.lz.aa05905e similarity index 100% rename from gfx/fx/smoke.2bpp.lz rename to gfx/fx/smoke.2bpp.lz.aa05905e diff --git a/gfx/fx/smoke.png b/gfx/fx/smoke.png new file mode 100644 index 000000000..1b09874ba Binary files /dev/null and b/gfx/fx/smoke.png differ diff --git a/gfx/fx/speed.2bpp.lz b/gfx/fx/speed.2bpp.lz.1732b364 similarity index 100% rename from gfx/fx/speed.2bpp.lz rename to gfx/fx/speed.2bpp.lz.1732b364 diff --git a/gfx/fx/speed.png b/gfx/fx/speed.png new file mode 100644 index 000000000..e219b38c9 Binary files /dev/null and b/gfx/fx/speed.png differ diff --git a/gfx/fx/status.2bpp.lz b/gfx/fx/status.2bpp.lz.0c0aa13e similarity index 100% rename from gfx/fx/status.2bpp.lz rename to gfx/fx/status.2bpp.lz.0c0aa13e diff --git a/gfx/fx/status.png b/gfx/fx/status.png new file mode 100644 index 000000000..cb8527963 Binary files /dev/null and b/gfx/fx/status.png differ diff --git a/gfx/fx/water.2bpp.lz b/gfx/fx/water.2bpp.lz.7b52ed12 similarity index 100% rename from gfx/fx/water.2bpp.lz rename to gfx/fx/water.2bpp.lz.7b52ed12 diff --git a/gfx/fx/water.png b/gfx/fx/water.png new file mode 100644 index 000000000..4e3c3b719 Binary files /dev/null and b/gfx/fx/water.png differ diff --git a/gfx/fx/wave.2bpp.lz b/gfx/fx/wave.2bpp.lz.bee99402 similarity index 100% rename from gfx/fx/wave.2bpp.lz rename to gfx/fx/wave.2bpp.lz.bee99402 diff --git a/gfx/fx/wave.png b/gfx/fx/wave.png new file mode 100644 index 000000000..55d4faa5f Binary files /dev/null and b/gfx/fx/wave.png differ diff --git a/gfx/fx/web.2bpp.lz b/gfx/fx/web.2bpp.lz.80e3d480 similarity index 100% rename from gfx/fx/web.2bpp.lz rename to gfx/fx/web.2bpp.lz.80e3d480 diff --git a/gfx/fx/web.png b/gfx/fx/web.png new file mode 100644 index 000000000..2aeffef0e Binary files /dev/null and b/gfx/fx/web.png differ diff --git a/gfx/fx/whip.2bpp.lz b/gfx/fx/whip.2bpp.lz.d80d8d6e similarity index 100% rename from gfx/fx/whip.2bpp.lz rename to gfx/fx/whip.2bpp.lz.d80d8d6e diff --git a/gfx/fx/whip.png b/gfx/fx/whip.png new file mode 100644 index 000000000..92d7ded6f Binary files /dev/null and b/gfx/fx/whip.png differ diff --git a/gfx/fx/wind.2bpp.lz b/gfx/fx/wind.2bpp.lz.5a785180 similarity index 100% rename from gfx/fx/wind.2bpp.lz rename to gfx/fx/wind.2bpp.lz.5a785180 diff --git a/gfx/fx/wind.png b/gfx/fx/wind.png new file mode 100644 index 000000000..b02031392 Binary files /dev/null and b/gfx/fx/wind.png differ diff --git a/gfx/icon/bat.2bpp b/gfx/icon/bat.2bpp deleted file mode 100644 index 0e5cd7d43..000000000 Binary files a/gfx/icon/bat.2bpp and /dev/null differ diff --git a/gfx/icon/bat.png b/gfx/icon/bat.png new file mode 100644 index 000000000..3ea2ea832 Binary files /dev/null and b/gfx/icon/bat.png differ diff --git a/gfx/icon/bigmon.2bpp b/gfx/icon/bigmon.2bpp deleted file mode 100644 index 6883bd80f..000000000 Binary files a/gfx/icon/bigmon.2bpp and /dev/null differ diff --git a/gfx/icon/bigmon.png b/gfx/icon/bigmon.png new file mode 100644 index 000000000..4a77f1ece Binary files /dev/null and b/gfx/icon/bigmon.png differ diff --git a/gfx/icon/bird.2bpp b/gfx/icon/bird.2bpp deleted file mode 100644 index fb1793da5..000000000 Binary files a/gfx/icon/bird.2bpp and /dev/null differ diff --git a/gfx/icon/bird.png b/gfx/icon/bird.png new file mode 100644 index 000000000..e13bc6cba Binary files /dev/null and b/gfx/icon/bird.png differ diff --git a/gfx/icon/blob.2bpp b/gfx/icon/blob.2bpp deleted file mode 100644 index a855f008e..000000000 Binary files a/gfx/icon/blob.2bpp and /dev/null differ diff --git a/gfx/icon/blob.png b/gfx/icon/blob.png new file mode 100644 index 000000000..aef74ae64 Binary files /dev/null and b/gfx/icon/blob.png differ diff --git a/gfx/icon/bug.2bpp b/gfx/icon/bug.2bpp deleted file mode 100644 index e57e4c80c..000000000 Binary files a/gfx/icon/bug.2bpp and /dev/null differ diff --git a/gfx/icon/bug.png b/gfx/icon/bug.png new file mode 100644 index 000000000..97504f721 Binary files /dev/null and b/gfx/icon/bug.png differ diff --git a/gfx/icon/bulbasaur.2bpp b/gfx/icon/bulbasaur.2bpp deleted file mode 100644 index 56dd284c1..000000000 Binary files a/gfx/icon/bulbasaur.2bpp and /dev/null differ diff --git a/gfx/icon/bulbasaur.png b/gfx/icon/bulbasaur.png new file mode 100644 index 000000000..1de6636f8 Binary files /dev/null and b/gfx/icon/bulbasaur.png differ diff --git a/gfx/icon/caterpillar.2bpp b/gfx/icon/caterpillar.2bpp deleted file mode 100644 index 964b6a6ad..000000000 Binary files a/gfx/icon/caterpillar.2bpp and /dev/null differ diff --git a/gfx/icon/caterpillar.png b/gfx/icon/caterpillar.png new file mode 100644 index 000000000..85558104b Binary files /dev/null and b/gfx/icon/caterpillar.png differ diff --git a/gfx/icon/charmander.2bpp b/gfx/icon/charmander.2bpp deleted file mode 100644 index 4e2182636..000000000 Binary files a/gfx/icon/charmander.2bpp and /dev/null differ diff --git a/gfx/icon/charmander.png b/gfx/icon/charmander.png new file mode 100644 index 000000000..3d85f1316 Binary files /dev/null and b/gfx/icon/charmander.png differ diff --git a/gfx/icon/clefairy.2bpp b/gfx/icon/clefairy.2bpp deleted file mode 100644 index 6a5aed325..000000000 Binary files a/gfx/icon/clefairy.2bpp and /dev/null differ diff --git a/gfx/icon/clefairy.png b/gfx/icon/clefairy.png new file mode 100644 index 000000000..0017d9ddb Binary files /dev/null and b/gfx/icon/clefairy.png differ diff --git a/gfx/icon/diglett.2bpp b/gfx/icon/diglett.2bpp deleted file mode 100644 index 6a997c1cb..000000000 Binary files a/gfx/icon/diglett.2bpp and /dev/null differ diff --git a/gfx/icon/diglett.png b/gfx/icon/diglett.png new file mode 100644 index 000000000..307181f71 Binary files /dev/null and b/gfx/icon/diglett.png differ diff --git a/gfx/icon/egg.2bpp b/gfx/icon/egg.2bpp deleted file mode 100644 index 03a623777..000000000 Binary files a/gfx/icon/egg.2bpp and /dev/null differ diff --git a/gfx/icon/egg.png b/gfx/icon/egg.png new file mode 100644 index 000000000..129346fd9 Binary files /dev/null and b/gfx/icon/egg.png differ diff --git a/gfx/icon/equine.2bpp b/gfx/icon/equine.2bpp deleted file mode 100644 index 8853b5bdd..000000000 Binary files a/gfx/icon/equine.2bpp and /dev/null differ diff --git a/gfx/icon/equine.png b/gfx/icon/equine.png new file mode 100644 index 000000000..b3da7181b Binary files /dev/null and b/gfx/icon/equine.png differ diff --git a/gfx/icon/fighter.2bpp b/gfx/icon/fighter.2bpp deleted file mode 100644 index 671b7e8af..000000000 Binary files a/gfx/icon/fighter.2bpp and /dev/null differ diff --git a/gfx/icon/fighter.png b/gfx/icon/fighter.png new file mode 100644 index 000000000..9deab976f Binary files /dev/null and b/gfx/icon/fighter.png differ diff --git a/gfx/icon/fish.2bpp b/gfx/icon/fish.2bpp deleted file mode 100644 index e99315b52..000000000 Binary files a/gfx/icon/fish.2bpp and /dev/null differ diff --git a/gfx/icon/fish.png b/gfx/icon/fish.png new file mode 100644 index 000000000..35dbb1d2f Binary files /dev/null and b/gfx/icon/fish.png differ diff --git a/gfx/icon/fox.2bpp b/gfx/icon/fox.2bpp deleted file mode 100644 index bbe04c03d..000000000 Binary files a/gfx/icon/fox.2bpp and /dev/null differ diff --git a/gfx/icon/fox.png b/gfx/icon/fox.png new file mode 100644 index 000000000..0419c87c7 Binary files /dev/null and b/gfx/icon/fox.png differ diff --git a/gfx/icon/geodude.2bpp b/gfx/icon/geodude.2bpp deleted file mode 100644 index ff8bdfdeb..000000000 Binary files a/gfx/icon/geodude.2bpp and /dev/null differ diff --git a/gfx/icon/geodude.png b/gfx/icon/geodude.png new file mode 100644 index 000000000..02db8771d Binary files /dev/null and b/gfx/icon/geodude.png differ diff --git a/gfx/icon/ghost.2bpp b/gfx/icon/ghost.2bpp deleted file mode 100644 index d47e8b62c..000000000 Binary files a/gfx/icon/ghost.2bpp and /dev/null differ diff --git a/gfx/icon/ghost.png b/gfx/icon/ghost.png new file mode 100644 index 000000000..7ecf8ed0f Binary files /dev/null and b/gfx/icon/ghost.png differ diff --git a/gfx/icon/gyarados.2bpp b/gfx/icon/gyarados.2bpp deleted file mode 100644 index ffe536ad0..000000000 Binary files a/gfx/icon/gyarados.2bpp and /dev/null differ diff --git a/gfx/icon/gyarados.png b/gfx/icon/gyarados.png new file mode 100644 index 000000000..fad5d8ae3 Binary files /dev/null and b/gfx/icon/gyarados.png differ diff --git a/gfx/icon/ho_oh.2bpp b/gfx/icon/ho_oh.2bpp deleted file mode 100644 index db4277a31..000000000 Binary files a/gfx/icon/ho_oh.2bpp and /dev/null differ diff --git a/gfx/icon/ho_oh.png b/gfx/icon/ho_oh.png new file mode 100644 index 000000000..6ee91781e Binary files /dev/null and b/gfx/icon/ho_oh.png differ diff --git a/gfx/icon/humanshape.2bpp b/gfx/icon/humanshape.2bpp deleted file mode 100644 index 4dbbac0c8..000000000 Binary files a/gfx/icon/humanshape.2bpp and /dev/null differ diff --git a/gfx/icon/humanshape.png b/gfx/icon/humanshape.png new file mode 100644 index 000000000..f5d0b9290 Binary files /dev/null and b/gfx/icon/humanshape.png differ diff --git a/gfx/icon/item.2bpp b/gfx/icon/item.2bpp deleted file mode 100644 index 5d47aba7a..000000000 --- a/gfx/icon/item.2bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÿÿÿÿ½ç½ÿÿÿÿÿ \ No newline at end of file diff --git a/gfx/icon/item.png b/gfx/icon/item.png new file mode 100644 index 000000000..a47d55009 Binary files /dev/null and b/gfx/icon/item.png differ diff --git a/gfx/icon/jellyfish.2bpp b/gfx/icon/jellyfish.2bpp deleted file mode 100644 index cfda6ecca..000000000 Binary files a/gfx/icon/jellyfish.2bpp and /dev/null differ diff --git a/gfx/icon/jellyfish.png b/gfx/icon/jellyfish.png new file mode 100644 index 000000000..8583d5cdc Binary files /dev/null and b/gfx/icon/jellyfish.png differ diff --git a/gfx/icon/jigglypuff.2bpp b/gfx/icon/jigglypuff.2bpp deleted file mode 100644 index bc00c535d..000000000 Binary files a/gfx/icon/jigglypuff.2bpp and /dev/null differ diff --git a/gfx/icon/jigglypuff.png b/gfx/icon/jigglypuff.png new file mode 100644 index 000000000..70f87b0df Binary files /dev/null and b/gfx/icon/jigglypuff.png differ diff --git a/gfx/icon/lapras.2bpp b/gfx/icon/lapras.2bpp deleted file mode 100644 index 47684bae3..000000000 Binary files a/gfx/icon/lapras.2bpp and /dev/null differ diff --git a/gfx/icon/lapras.png b/gfx/icon/lapras.png new file mode 100644 index 000000000..89ad063d0 Binary files /dev/null and b/gfx/icon/lapras.png differ diff --git a/gfx/icon/lugia.2bpp b/gfx/icon/lugia.2bpp deleted file mode 100644 index fc1467546..000000000 Binary files a/gfx/icon/lugia.2bpp and /dev/null differ diff --git a/gfx/icon/lugia.png b/gfx/icon/lugia.png new file mode 100644 index 000000000..56dbf283b Binary files /dev/null and b/gfx/icon/lugia.png differ diff --git a/gfx/icon/mail.2bpp b/gfx/icon/mail.2bpp deleted file mode 100644 index a04f4eff8..000000000 --- a/gfx/icon/mail.2bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÿÿÿÃÿ¥ÿ™ÿÿÿÿ \ No newline at end of file diff --git a/gfx/icon/mail.png b/gfx/icon/mail.png new file mode 100644 index 000000000..53db461e5 Binary files /dev/null and b/gfx/icon/mail.png differ diff --git a/gfx/icon/mail2.2bpp b/gfx/icon/mail2.2bpp deleted file mode 100644 index 188926899..000000000 Binary files a/gfx/icon/mail2.2bpp and /dev/null differ diff --git a/gfx/icon/mail2.png b/gfx/icon/mail2.png new file mode 100644 index 000000000..7ad25edbf Binary files /dev/null and b/gfx/icon/mail2.png differ diff --git a/gfx/icon/monster.2bpp b/gfx/icon/monster.2bpp deleted file mode 100644 index ce8863cd4..000000000 Binary files a/gfx/icon/monster.2bpp and /dev/null differ diff --git a/gfx/icon/monster.png b/gfx/icon/monster.png new file mode 100644 index 000000000..f97c67b64 Binary files /dev/null and b/gfx/icon/monster.png differ diff --git a/gfx/icon/moth.2bpp b/gfx/icon/moth.2bpp deleted file mode 100644 index 96d5d42f1..000000000 Binary files a/gfx/icon/moth.2bpp and /dev/null differ diff --git a/gfx/icon/moth.png b/gfx/icon/moth.png new file mode 100644 index 000000000..f44440f5c Binary files /dev/null and b/gfx/icon/moth.png differ diff --git a/gfx/icon/oddish.2bpp b/gfx/icon/oddish.2bpp deleted file mode 100644 index c9c7665ed..000000000 Binary files a/gfx/icon/oddish.2bpp and /dev/null differ diff --git a/gfx/icon/oddish.png b/gfx/icon/oddish.png new file mode 100644 index 000000000..c069bd444 Binary files /dev/null and b/gfx/icon/oddish.png differ diff --git a/gfx/icon/pikachu.2bpp b/gfx/icon/pikachu.2bpp deleted file mode 100644 index ec73af114..000000000 Binary files a/gfx/icon/pikachu.2bpp and /dev/null differ diff --git a/gfx/icon/pikachu.png b/gfx/icon/pikachu.png new file mode 100644 index 000000000..7b7d23dbd Binary files /dev/null and b/gfx/icon/pikachu.png differ diff --git a/gfx/icon/poliwag.2bpp b/gfx/icon/poliwag.2bpp deleted file mode 100644 index 3d3da6748..000000000 Binary files a/gfx/icon/poliwag.2bpp and /dev/null differ diff --git a/gfx/icon/poliwag.png b/gfx/icon/poliwag.png new file mode 100644 index 000000000..b6b63a81e Binary files /dev/null and b/gfx/icon/poliwag.png differ diff --git a/gfx/icon/serpent.2bpp b/gfx/icon/serpent.2bpp deleted file mode 100644 index 4be1a62aa..000000000 Binary files a/gfx/icon/serpent.2bpp and /dev/null differ diff --git a/gfx/icon/serpent.png b/gfx/icon/serpent.png new file mode 100644 index 000000000..de575f088 Binary files /dev/null and b/gfx/icon/serpent.png differ diff --git a/gfx/icon/shell.2bpp b/gfx/icon/shell.2bpp deleted file mode 100644 index 9e9dd787c..000000000 Binary files a/gfx/icon/shell.2bpp and /dev/null differ diff --git a/gfx/icon/shell.png b/gfx/icon/shell.png new file mode 100644 index 000000000..4daf27634 Binary files /dev/null and b/gfx/icon/shell.png differ diff --git a/gfx/icon/slowpoke.2bpp b/gfx/icon/slowpoke.2bpp deleted file mode 100644 index 045980e57..000000000 --- a/gfx/icon/slowpoke.2bpp +++ /dev/null @@ -1,2 +0,0 @@ -88GP|c<+<#@O88Äüü|Œx¨xˆüüä?  ? ? øððøøüüˆøpp#?(?>1? ?'âþ -þ>Æ<Ô<Äþþò ? ? üøøøøüüˆøpp \ No newline at end of file diff --git a/gfx/icon/slowpoke.png b/gfx/icon/slowpoke.png new file mode 100644 index 000000000..221f3f7a5 Binary files /dev/null and b/gfx/icon/slowpoke.png differ diff --git a/gfx/icon/snorlax.2bpp b/gfx/icon/snorlax.2bpp deleted file mode 100644 index 1adb5c848..000000000 Binary files a/gfx/icon/snorlax.2bpp and /dev/null differ diff --git a/gfx/icon/snorlax.png b/gfx/icon/snorlax.png new file mode 100644 index 000000000..f2c1b0b74 Binary files /dev/null and b/gfx/icon/snorlax.png differ diff --git a/gfx/icon/squirtle.2bpp b/gfx/icon/squirtle.2bpp deleted file mode 100644 index b6558faa5..000000000 Binary files a/gfx/icon/squirtle.2bpp and /dev/null differ diff --git a/gfx/icon/squirtle.png b/gfx/icon/squirtle.png new file mode 100644 index 000000000..614aa21b2 Binary files /dev/null and b/gfx/icon/squirtle.png differ diff --git a/gfx/icon/staryu.2bpp b/gfx/icon/staryu.2bpp deleted file mode 100644 index 890cfe20b..000000000 Binary files a/gfx/icon/staryu.2bpp and /dev/null differ diff --git a/gfx/icon/staryu.png b/gfx/icon/staryu.png new file mode 100644 index 000000000..52361c780 Binary files /dev/null and b/gfx/icon/staryu.png differ diff --git a/gfx/icon/sudowoodo.2bpp b/gfx/icon/sudowoodo.2bpp deleted file mode 100644 index 1c9390935..000000000 Binary files a/gfx/icon/sudowoodo.2bpp and /dev/null differ diff --git a/gfx/icon/sudowoodo.png b/gfx/icon/sudowoodo.png new file mode 100644 index 000000000..d115356bb Binary files /dev/null and b/gfx/icon/sudowoodo.png differ diff --git a/gfx/icon/unown.2bpp b/gfx/icon/unown.2bpp deleted file mode 100644 index b1cddd8be..000000000 Binary files a/gfx/icon/unown.2bpp and /dev/null differ diff --git a/gfx/icon/unown.png b/gfx/icon/unown.png new file mode 100644 index 000000000..0a4d0e426 Binary files /dev/null and b/gfx/icon/unown.png differ diff --git a/gfx/icon/voltorb.2bpp b/gfx/icon/voltorb.2bpp deleted file mode 100644 index b75cafe3d..000000000 Binary files a/gfx/icon/voltorb.2bpp and /dev/null differ diff --git a/gfx/icon/voltorb.png b/gfx/icon/voltorb.png new file mode 100644 index 000000000..ef289541a Binary files /dev/null and b/gfx/icon/voltorb.png differ diff --git a/gfx/intro/001.tilemap b/gfx/intro/001.tilemap new file mode 100644 index 000000000..8b1b66033 Binary files /dev/null and b/gfx/intro/001.tilemap differ diff --git a/gfx/intro/001.tilemap.lz b/gfx/intro/001.tilemap.lz.c2341875 similarity index 100% rename from gfx/intro/001.tilemap.lz rename to gfx/intro/001.tilemap.lz.c2341875 diff --git a/gfx/intro/002.tilemap b/gfx/intro/002.tilemap new file mode 100644 index 000000000..6a035d14a Binary files /dev/null and b/gfx/intro/002.tilemap differ diff --git a/gfx/intro/002.tilemap.lz b/gfx/intro/002.tilemap.lz.54d5b74b similarity index 100% rename from gfx/intro/002.tilemap.lz rename to gfx/intro/002.tilemap.lz.54d5b74b diff --git a/gfx/intro/003.tilemap b/gfx/intro/003.tilemap new file mode 100644 index 000000000..98512513c Binary files /dev/null and b/gfx/intro/003.tilemap differ diff --git a/gfx/intro/003.tilemap.lz b/gfx/intro/003.tilemap.lz.9f90366a similarity index 100% rename from gfx/intro/003.tilemap.lz rename to gfx/intro/003.tilemap.lz.9f90366a diff --git a/gfx/intro/004.tilemap b/gfx/intro/004.tilemap new file mode 100644 index 000000000..2dd6b6ea7 Binary files /dev/null and b/gfx/intro/004.tilemap differ diff --git a/gfx/intro/004.tilemap.lz b/gfx/intro/004.tilemap.lz.4c7562ee similarity index 100% rename from gfx/intro/004.tilemap.lz rename to gfx/intro/004.tilemap.lz.4c7562ee diff --git a/gfx/intro/005.tilemap b/gfx/intro/005.tilemap new file mode 100644 index 000000000..3f7d23b64 Binary files /dev/null and b/gfx/intro/005.tilemap differ diff --git a/gfx/intro/005.tilemap.lz b/gfx/intro/005.tilemap.lz.bed1ff6d similarity index 100% rename from gfx/intro/005.tilemap.lz rename to gfx/intro/005.tilemap.lz.bed1ff6d diff --git a/gfx/intro/006.tilemap b/gfx/intro/006.tilemap new file mode 100644 index 000000000..4af27a158 Binary files /dev/null and b/gfx/intro/006.tilemap differ diff --git a/gfx/intro/006.tilemap.lz b/gfx/intro/006.tilemap.lz.c8756972 similarity index 100% rename from gfx/intro/006.tilemap.lz rename to gfx/intro/006.tilemap.lz.c8756972 diff --git a/gfx/intro/007.tilemap b/gfx/intro/007.tilemap new file mode 100644 index 000000000..2e3fdb41a Binary files /dev/null and b/gfx/intro/007.tilemap differ diff --git a/gfx/intro/007.tilemap.lz b/gfx/intro/007.tilemap.lz.a9cbcbca similarity index 100% rename from gfx/intro/007.tilemap.lz rename to gfx/intro/007.tilemap.lz.a9cbcbca diff --git a/gfx/intro/008.tilemap b/gfx/intro/008.tilemap new file mode 100644 index 000000000..903f59ae5 Binary files /dev/null and b/gfx/intro/008.tilemap differ diff --git a/gfx/intro/008.tilemap.lz b/gfx/intro/008.tilemap.lz.f12ed6d9 similarity index 100% rename from gfx/intro/008.tilemap.lz rename to gfx/intro/008.tilemap.lz.f12ed6d9 diff --git a/gfx/intro/009.tilemap b/gfx/intro/009.tilemap new file mode 100644 index 000000000..554e919a8 Binary files /dev/null and b/gfx/intro/009.tilemap differ diff --git a/gfx/intro/009.tilemap.lz b/gfx/intro/009.tilemap.lz.911a1ace similarity index 100% rename from gfx/intro/009.tilemap.lz rename to gfx/intro/009.tilemap.lz.911a1ace diff --git a/gfx/intro/010.tilemap b/gfx/intro/010.tilemap new file mode 100644 index 000000000..4ddef19c7 Binary files /dev/null and b/gfx/intro/010.tilemap differ diff --git a/gfx/intro/010.tilemap.lz b/gfx/intro/010.tilemap.lz.2717d106 similarity index 100% rename from gfx/intro/010.tilemap.lz rename to gfx/intro/010.tilemap.lz.2717d106 diff --git a/gfx/intro/011.tilemap b/gfx/intro/011.tilemap new file mode 100644 index 000000000..59f365a34 Binary files /dev/null and b/gfx/intro/011.tilemap differ diff --git a/gfx/intro/011.tilemap.lz b/gfx/intro/011.tilemap.lz.bb066632 similarity index 100% rename from gfx/intro/011.tilemap.lz rename to gfx/intro/011.tilemap.lz.bb066632 diff --git a/gfx/intro/012.tilemap b/gfx/intro/012.tilemap new file mode 100644 index 000000000..3577fc467 Binary files /dev/null and b/gfx/intro/012.tilemap differ diff --git a/gfx/intro/012.tilemap.lz b/gfx/intro/012.tilemap.lz.bc182264 similarity index 100% rename from gfx/intro/012.tilemap.lz rename to gfx/intro/012.tilemap.lz.bc182264 diff --git a/gfx/intro/013.tilemap b/gfx/intro/013.tilemap new file mode 100644 index 000000000..28e27ad62 Binary files /dev/null and b/gfx/intro/013.tilemap differ diff --git a/gfx/intro/013.tilemap.lz b/gfx/intro/013.tilemap.lz.18e3115f similarity index 100% rename from gfx/intro/013.tilemap.lz rename to gfx/intro/013.tilemap.lz.18e3115f diff --git a/gfx/intro/014.tilemap b/gfx/intro/014.tilemap new file mode 100644 index 000000000..52829cc74 Binary files /dev/null and b/gfx/intro/014.tilemap differ diff --git a/gfx/intro/014.tilemap.lz b/gfx/intro/014.tilemap.lz.7b59259d similarity index 100% rename from gfx/intro/014.tilemap.lz rename to gfx/intro/014.tilemap.lz.7b59259d diff --git a/gfx/intro/015.tilemap b/gfx/intro/015.tilemap new file mode 100644 index 000000000..f97c9cb93 Binary files /dev/null and b/gfx/intro/015.tilemap differ diff --git a/gfx/intro/015.tilemap.lz b/gfx/intro/015.tilemap.lz.1bfc5a89 similarity index 100% rename from gfx/intro/015.tilemap.lz rename to gfx/intro/015.tilemap.lz.1bfc5a89 diff --git a/gfx/intro/017.tilemap b/gfx/intro/017.tilemap new file mode 100644 index 000000000..05c37dbf2 Binary files /dev/null and b/gfx/intro/017.tilemap differ diff --git a/gfx/intro/017.tilemap.lz b/gfx/intro/017.tilemap.lz.e4772015 similarity index 100% rename from gfx/intro/017.tilemap.lz rename to gfx/intro/017.tilemap.lz.e4772015 diff --git a/gfx/intro/background.2bpp.lz b/gfx/intro/background.2bpp.lz.b58b3984 similarity index 100% rename from gfx/intro/background.2bpp.lz rename to gfx/intro/background.2bpp.lz.b58b3984 diff --git a/gfx/intro/background.png b/gfx/intro/background.png new file mode 100644 index 000000000..ede95e46b Binary files /dev/null and b/gfx/intro/background.png differ diff --git a/gfx/intro/crystal_unowns.2bpp.lz b/gfx/intro/crystal_unowns.2bpp.lz.e7f8ad51 similarity index 100% rename from gfx/intro/crystal_unowns.2bpp.lz rename to gfx/intro/crystal_unowns.2bpp.lz.e7f8ad51 diff --git a/gfx/intro/crystal_unowns.png b/gfx/intro/crystal_unowns.png new file mode 100644 index 000000000..130606b85 Binary files /dev/null and b/gfx/intro/crystal_unowns.png differ diff --git a/gfx/intro/gender_screen.2bpp b/gfx/intro/gender_screen.2bpp deleted file mode 100644 index 5cc990f1d..000000000 Binary files a/gfx/intro/gender_screen.2bpp and /dev/null differ diff --git a/gfx/intro/gender_screen.png b/gfx/intro/gender_screen.png new file mode 100644 index 000000000..726178132 Binary files /dev/null and b/gfx/intro/gender_screen.png differ diff --git a/gfx/intro/grass1.2bpp b/gfx/intro/grass1.2bpp deleted file mode 100644 index 7e371f23e..000000000 Binary files a/gfx/intro/grass1.2bpp and /dev/null differ diff --git a/gfx/intro/grass1.png b/gfx/intro/grass1.png new file mode 100644 index 000000000..59c5f5f62 Binary files /dev/null and b/gfx/intro/grass1.png differ diff --git a/gfx/intro/grass2.2bpp b/gfx/intro/grass2.2bpp deleted file mode 100644 index 3068eb080..000000000 Binary files a/gfx/intro/grass2.2bpp and /dev/null differ diff --git a/gfx/intro/grass2.png b/gfx/intro/grass2.png new file mode 100644 index 000000000..49f5eabf6 Binary files /dev/null and b/gfx/intro/grass2.png differ diff --git a/gfx/intro/grass3.2bpp b/gfx/intro/grass3.2bpp deleted file mode 100644 index 47f3330d8..000000000 Binary files a/gfx/intro/grass3.2bpp and /dev/null differ diff --git a/gfx/intro/grass3.png b/gfx/intro/grass3.png new file mode 100644 index 000000000..2bfd2b673 Binary files /dev/null and b/gfx/intro/grass3.png differ diff --git a/gfx/intro/grass4.2bpp b/gfx/intro/grass4.2bpp deleted file mode 100644 index 4f2b4cdfd..000000000 Binary files a/gfx/intro/grass4.2bpp and /dev/null differ diff --git a/gfx/intro/grass4.png b/gfx/intro/grass4.png new file mode 100644 index 000000000..115d61f38 Binary files /dev/null and b/gfx/intro/grass4.png differ diff --git a/gfx/intro/logo.2bpp.lz b/gfx/intro/logo.2bpp.lz.e03ee257 similarity index 100% rename from gfx/intro/logo.2bpp.lz rename to gfx/intro/logo.2bpp.lz.e03ee257 diff --git a/gfx/intro/logo.png b/gfx/intro/logo.png new file mode 100644 index 000000000..0ed4094cf Binary files /dev/null and b/gfx/intro/logo.png differ diff --git a/gfx/intro/pichu_wooper.2bpp.lz b/gfx/intro/pichu_wooper.2bpp.lz.4bccf7f4 similarity index 100% rename from gfx/intro/pichu_wooper.2bpp.lz rename to gfx/intro/pichu_wooper.2bpp.lz.4bccf7f4 diff --git a/gfx/intro/pichu_wooper.png b/gfx/intro/pichu_wooper.png new file mode 100644 index 000000000..923e70b83 Binary files /dev/null and b/gfx/intro/pichu_wooper.png differ diff --git a/gfx/intro/pulse.2bpp.lz b/gfx/intro/pulse.2bpp.lz.9fb06bb6 similarity index 100% rename from gfx/intro/pulse.2bpp.lz rename to gfx/intro/pulse.2bpp.lz.9fb06bb6 diff --git a/gfx/intro/pulse.png b/gfx/intro/pulse.png new file mode 100644 index 000000000..85bad3415 Binary files /dev/null and b/gfx/intro/pulse.png differ diff --git a/gfx/intro/suicune_back.2bpp.lz b/gfx/intro/suicune_back.2bpp.lz.c6f529b0 similarity index 100% rename from gfx/intro/suicune_back.2bpp.lz rename to gfx/intro/suicune_back.2bpp.lz.c6f529b0 diff --git a/gfx/intro/suicune_back.png b/gfx/intro/suicune_back.png new file mode 100644 index 000000000..0e791e2a7 Binary files /dev/null and b/gfx/intro/suicune_back.png differ diff --git a/gfx/intro/suicune_close.2bpp.lz b/gfx/intro/suicune_close.2bpp.lz.7e362923 similarity index 100% rename from gfx/intro/suicune_close.2bpp.lz rename to gfx/intro/suicune_close.2bpp.lz.7e362923 diff --git a/gfx/intro/suicune_close.png b/gfx/intro/suicune_close.png new file mode 100644 index 000000000..ef365de96 Binary files /dev/null and b/gfx/intro/suicune_close.png differ diff --git a/gfx/intro/suicune_jump.2bpp.lz b/gfx/intro/suicune_jump.2bpp.lz.1b09fb64 similarity index 100% rename from gfx/intro/suicune_jump.2bpp.lz rename to gfx/intro/suicune_jump.2bpp.lz.1b09fb64 diff --git a/gfx/intro/suicune_jump.png b/gfx/intro/suicune_jump.png new file mode 100644 index 000000000..67cd7502a Binary files /dev/null and b/gfx/intro/suicune_jump.png differ diff --git a/gfx/intro/suicune_run.2bpp.lz b/gfx/intro/suicune_run.2bpp.lz.ef999ad2 similarity index 100% rename from gfx/intro/suicune_run.2bpp.lz rename to gfx/intro/suicune_run.2bpp.lz.ef999ad2 diff --git a/gfx/intro/suicune_run.png b/gfx/intro/suicune_run.png new file mode 100644 index 000000000..470ff0c0b Binary files /dev/null and b/gfx/intro/suicune_run.png differ diff --git a/gfx/intro/unown_back.2bpp.lz b/gfx/intro/unown_back.2bpp.lz.740c4d28 similarity index 100% rename from gfx/intro/unown_back.2bpp.lz rename to gfx/intro/unown_back.2bpp.lz.740c4d28 diff --git a/gfx/intro/unown_back.png b/gfx/intro/unown_back.png new file mode 100644 index 000000000..4d355a607 Binary files /dev/null and b/gfx/intro/unown_back.png differ diff --git a/gfx/intro/unowns.2bpp.lz b/gfx/intro/unowns.2bpp.lz.3a1f185e similarity index 100% rename from gfx/intro/unowns.2bpp.lz rename to gfx/intro/unowns.2bpp.lz.3a1f185e diff --git a/gfx/intro/unowns.png b/gfx/intro/unowns.png new file mode 100644 index 000000000..d4c7998b4 Binary files /dev/null and b/gfx/intro/unowns.png differ diff --git a/gfx/mail.asm b/gfx/mail.asm index 575fe9ef5..d4fde366e 100755 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -226,7 +226,7 @@ LoadEonMailGFX: ; b93d2 ld de, EonMailBorder1GFX ld c, 1 * 8 call LoadMailGFX_Color2 - ld de, EonMailBorder3GFX + ld de, SurfMailBorderGFX + 6 * 8 ld c, 1 * 8 call LoadMailGFX_Color2 ld de, MailEeveeGFX @@ -329,15 +329,15 @@ LoadMorphMailGFX: ; b94d6 ld hl, VTiles2 tile $31 ld bc, 5 * 8 call MailGFX_GenerateMonochromeTilesColor2 + ld de, MorphMailBorderCornerGFX + 3 * 8 + ld c, 1 * 8 + call LoadMailGFX_Color2 + ld de, MorphMailBorderCornerGFX + ld c, 1 * 8 + call LoadMailGFX_Color2 ld de, MorphMailBorderGFX ld c, 1 * 8 call LoadMailGFX_Color2 - ld de, MorphMailBorderCorner1GFX - ld c, 1 * 8 - call LoadMailGFX_Color2 - ld de, MorphMailBorderCorner2GFX - ld c, 1 * 8 - call LoadMailGFX_Color2 ld de, EonMailBorder1GFX ld c, 1 * 8 call LoadMailGFX_Color1 @@ -418,16 +418,16 @@ LoadBlueSkyMailGFX: ; b9582 ld de, MailCloudGFX ld c, 6 * 8 call LoadMailGFX_Color1 - ld de, FlowerMailSenderUnderlineGFX + ld de, FlowerMailBorderGFX + 6 * 8 ld c, 1 * 8 call LoadMailGFX_Color1 ld de, MailCloudGFX ld c, 1 * 8 call LoadMailGFX_Color1 - ld de, MailCloud2GFX + ld de, MailCloudGFX + 2 * 8 ld c, 2 * 8 call LoadMailGFX_Color1 - ld de, MailCloud3GFX + ld de, MailCloudGFX + 5 * 8 ld c, 1 * 8 call LoadMailGFX_Color1 @@ -497,10 +497,10 @@ LoadFlowerMailGFX: ; b963e ld de, MailOddishGFX ld c, 4 * 8 call LoadMailGFX_Color3 - ld de, FlowerMailSenderUnderlineGFX + ld de, FlowerMailBorderGFX + 6 * 8 ld c, 1 * 8 call LoadMailGFX_Color2 - ld de, FlowerMailLargeFlowerGFX + ld de, FlowerMailFlowerGFX ld c, 4 * 8 call LoadMailGFX_Color1 ld c, 4 * 8 @@ -580,7 +580,7 @@ LoadMusicMailGFX: ; b9710 ld de, MusicMailBorderGFX ld c, 4 * 8 call LoadMailGFX_Color2 - ld de, MorphMailBorderCorner2GFX + ld de, MorphMailBorderGFX ld c, 2 * 8 call LoadMailGFX_Color2 ld de, MailNatuGFX @@ -628,10 +628,10 @@ LoadMirageMailGFX: ; b9776 ld de, MailMewGFX ld c, 18 * 8 call LoadMailGFX_Color2 - ld de, MirageMailTopDividerGFX + ld de, LiteBlueMailBorderGFX + 1 * 8 ld c, 1 * 8 call LoadMailGFX_Color1 - ld de, MirageMailBottomDividerGFX + ld de, LiteBlueMailBorderGFX + 6 * 8 ld c, 1 * 8 call LoadMailGFX_Color1 @@ -947,7 +947,7 @@ INCBIN "gfx/mail/0b992e.1bpp" PortraitMailSmallPokeballGFX: ; b9936 INCBIN "gfx/mail/0b9936.1bpp" -MorphMailBorderCorner2GFX: ; b993e +MorphMailBorderGFX: ; b993e INCBIN "gfx/mail/0b993e.1bpp" MusicMailSmallNoteGFX: ; b9946 @@ -1016,20 +1016,14 @@ INCBIN "gfx/mail/0b9c3e.1bpp" LovelyMailLargeHeartGFX: ; b9c5e INCBIN "gfx/mail/0b9c5e.1bpp" -MorphMailBorderCorner1GFX: ; b9c7e +MorphMailBorderCornerGFX: ; b9c7e INCBIN "gfx/mail/0b9c7e.1bpp" -MorphMailBorderGFX: ; b9c96 -INCBIN "gfx/mail/0b9c96.1bpp" - MailLargeCircleGFX: ; b9c9e INCBIN "gfx/mail/0b9c9e.1bpp" -FlowerMailLargeFlowerGFX: ; b9cbe +FlowerMailFlowerGFX: ; b9cbe INCBIN "gfx/mail/0b9cbe.1bpp" - -FlowerMailSmallFlowerGFX: ; b9cde -; indirectly referenced INCBIN "gfx/mail/0b9cde.1bpp" MusicMailLargeNoteGFX: ; b9cfe @@ -1038,33 +1032,15 @@ INCBIN "gfx/mail/0b9cfe.1bpp" MailCloudGFX: ; b9d16 INCBIN "gfx/mail/0b9d16.1bpp" -MailCloud2GFX: ; b9d26 -INCBIN "gfx/mail/0b9d26.1bpp" - -MailCloud3GFX: ; b9d3e -INCBIN "gfx/mail/0b9d3e.1bpp" - SurfMailBorderGFX: ; b9d46 INCBIN "gfx/mail/0b9d46.1bpp" -EonMailBorder3GFX: ; b9d76 -INCBIN "gfx/mail/0b9d76.1bpp" - FlowerMailBorderGFX: ; b9d86 INCBIN "gfx/mail/0b9d86.1bpp" -FlowerMailSenderUnderlineGFX: ; b9db6 -INCBIN "gfx/mail/0b9db6.1bpp" - LiteBlueMailBorderGFX: ; b9dc6 INCBIN "gfx/mail/0b9dc6.1bpp" -MirageMailTopDividerGFX: ; b9dce -INCBIN "gfx/mail/0b9dce.1bpp" - -MirageMailBottomDividerGFX: ; b9df6 -INCBIN "gfx/mail/0b9df6.1bpp" - MusicMailBorderGFX: ; b9e06 INCBIN "gfx/mail/0b9e06.1bpp" diff --git a/gfx/mail/0b9926.1bpp b/gfx/mail/0b9926.1bpp deleted file mode 100644 index 07411676c..000000000 Binary files a/gfx/mail/0b9926.1bpp and /dev/null differ diff --git a/gfx/mail/0b9926.png b/gfx/mail/0b9926.png new file mode 100644 index 000000000..8a280b399 Binary files /dev/null and b/gfx/mail/0b9926.png differ diff --git a/gfx/mail/0b992e.1bpp b/gfx/mail/0b992e.1bpp deleted file mode 100644 index 4efb35675..000000000 --- a/gfx/mail/0b992e.1bpp +++ /dev/null @@ -1 +0,0 @@ -ˆHLm}ÿÿ \ No newline at end of file diff --git a/gfx/mail/0b992e.png b/gfx/mail/0b992e.png new file mode 100644 index 000000000..7e1f17619 Binary files /dev/null and b/gfx/mail/0b992e.png differ diff --git a/gfx/mail/0b9936.1bpp b/gfx/mail/0b9936.1bpp deleted file mode 100644 index 3db4de269..000000000 --- a/gfx/mail/0b9936.1bpp +++ /dev/null @@ -1 +0,0 @@ -<~çÛç~< \ No newline at end of file diff --git a/gfx/mail/0b9936.png b/gfx/mail/0b9936.png new file mode 100644 index 000000000..666c59813 Binary files /dev/null and b/gfx/mail/0b9936.png differ diff --git a/gfx/mail/0b993e.1bpp b/gfx/mail/0b993e.1bpp deleted file mode 100644 index 28cda20bf..000000000 Binary files a/gfx/mail/0b993e.1bpp and /dev/null differ diff --git a/gfx/mail/0b993e.png b/gfx/mail/0b993e.png new file mode 100644 index 000000000..0fc395ef8 Binary files /dev/null and b/gfx/mail/0b993e.png differ diff --git a/gfx/mail/0b9946.1bpp b/gfx/mail/0b9946.1bpp deleted file mode 100644 index 4352e1061..000000000 --- a/gfx/mail/0b9946.1bpp +++ /dev/null @@ -1 +0,0 @@ -pð` \ No newline at end of file diff --git a/gfx/mail/0b9946.png b/gfx/mail/0b9946.png new file mode 100644 index 000000000..cc95134f6 Binary files /dev/null and b/gfx/mail/0b9946.png differ diff --git a/gfx/mail/0b994e.1bpp b/gfx/mail/0b994e.1bpp deleted file mode 100644 index 88ddd73f9..000000000 Binary files a/gfx/mail/0b994e.1bpp and /dev/null differ diff --git a/gfx/mail/0b994e.png b/gfx/mail/0b994e.png new file mode 100644 index 000000000..2f8d140c4 Binary files /dev/null and b/gfx/mail/0b994e.png differ diff --git a/gfx/mail/0b995e.1bpp b/gfx/mail/0b995e.1bpp deleted file mode 100644 index af75f645a..000000000 Binary files a/gfx/mail/0b995e.1bpp and /dev/null differ diff --git a/gfx/mail/0b995e.png b/gfx/mail/0b995e.png new file mode 100644 index 000000000..6c32516ed Binary files /dev/null and b/gfx/mail/0b995e.png differ diff --git a/gfx/mail/0b9966.1bpp b/gfx/mail/0b9966.1bpp deleted file mode 100644 index bbf05317b..000000000 Binary files a/gfx/mail/0b9966.1bpp and /dev/null differ diff --git a/gfx/mail/0b9966.png b/gfx/mail/0b9966.png new file mode 100644 index 000000000..211848bff Binary files /dev/null and b/gfx/mail/0b9966.png differ diff --git a/gfx/mail/0b996e.1bpp b/gfx/mail/0b996e.1bpp deleted file mode 100644 index 266c91964..000000000 Binary files a/gfx/mail/0b996e.1bpp and /dev/null differ diff --git a/gfx/mail/0b996e.png b/gfx/mail/0b996e.png new file mode 100644 index 000000000..51a61a19d Binary files /dev/null and b/gfx/mail/0b996e.png differ diff --git a/gfx/mail/0b9976.1bpp b/gfx/mail/0b9976.1bpp deleted file mode 100644 index 1c2e21946..000000000 Binary files a/gfx/mail/0b9976.1bpp and /dev/null differ diff --git a/gfx/mail/0b9976.png b/gfx/mail/0b9976.png new file mode 100644 index 000000000..f5d98bf9d Binary files /dev/null and b/gfx/mail/0b9976.png differ diff --git a/gfx/mail/0b997e.1bpp b/gfx/mail/0b997e.1bpp deleted file mode 100644 index 4957ff4c2..000000000 Binary files a/gfx/mail/0b997e.1bpp and /dev/null differ diff --git a/gfx/mail/0b997e.png b/gfx/mail/0b997e.png new file mode 100644 index 000000000..83c029e90 Binary files /dev/null and b/gfx/mail/0b997e.png differ diff --git a/gfx/mail/0b998e.1bpp b/gfx/mail/0b998e.1bpp deleted file mode 100644 index 8d6a0e319..000000000 --- a/gfx/mail/0b998e.1bpp +++ /dev/null @@ -1 +0,0 @@ -<~ÿÿÿÿ~< \ No newline at end of file diff --git a/gfx/mail/0b998e.png b/gfx/mail/0b998e.png new file mode 100644 index 000000000..b34ffce17 Binary files /dev/null and b/gfx/mail/0b998e.png differ diff --git a/gfx/mail/0b9996.1bpp b/gfx/mail/0b9996.1bpp deleted file mode 100644 index 62814ccbb..000000000 Binary files a/gfx/mail/0b9996.1bpp and /dev/null differ diff --git a/gfx/mail/0b9996.png b/gfx/mail/0b9996.png new file mode 100644 index 000000000..ef4c1ebeb Binary files /dev/null and b/gfx/mail/0b9996.png differ diff --git a/gfx/mail/0b99c6.1bpp b/gfx/mail/0b99c6.1bpp deleted file mode 100644 index 77d1e45ba..000000000 Binary files a/gfx/mail/0b99c6.1bpp and /dev/null differ diff --git a/gfx/mail/0b99c6.png b/gfx/mail/0b99c6.png new file mode 100644 index 000000000..51c0d4a93 Binary files /dev/null and b/gfx/mail/0b99c6.png differ diff --git a/gfx/mail/0b99f6.1bpp b/gfx/mail/0b99f6.1bpp deleted file mode 100644 index 3d9dcac5b..000000000 Binary files a/gfx/mail/0b99f6.1bpp and /dev/null differ diff --git a/gfx/mail/0b99f6.png b/gfx/mail/0b99f6.png new file mode 100644 index 000000000..a1b092e60 Binary files /dev/null and b/gfx/mail/0b99f6.png differ diff --git a/gfx/mail/0b9a26.1bpp b/gfx/mail/0b9a26.1bpp deleted file mode 100644 index 295dec49d..000000000 Binary files a/gfx/mail/0b9a26.1bpp and /dev/null differ diff --git a/gfx/mail/0b9a26.png b/gfx/mail/0b9a26.png new file mode 100644 index 000000000..5ea40f472 Binary files /dev/null and b/gfx/mail/0b9a26.png differ diff --git a/gfx/mail/0b9a56.1bpp b/gfx/mail/0b9a56.1bpp deleted file mode 100644 index 7ade46c6c..000000000 Binary files a/gfx/mail/0b9a56.1bpp and /dev/null differ diff --git a/gfx/mail/0b9a56.png b/gfx/mail/0b9a56.png new file mode 100644 index 000000000..6c020746f Binary files /dev/null and b/gfx/mail/0b9a56.png differ diff --git a/gfx/mail/0b9a86.1bpp b/gfx/mail/0b9a86.1bpp deleted file mode 100644 index 34fa18d29..000000000 Binary files a/gfx/mail/0b9a86.1bpp and /dev/null differ diff --git a/gfx/mail/0b9a86.png b/gfx/mail/0b9a86.png new file mode 100644 index 000000000..d0775fc32 Binary files /dev/null and b/gfx/mail/0b9a86.png differ diff --git a/gfx/mail/0b9ab6.1bpp b/gfx/mail/0b9ab6.1bpp deleted file mode 100644 index f37262f7e..000000000 Binary files a/gfx/mail/0b9ab6.1bpp and /dev/null differ diff --git a/gfx/mail/0b9ab6.png b/gfx/mail/0b9ab6.png new file mode 100644 index 000000000..8a8ea55e0 Binary files /dev/null and b/gfx/mail/0b9ab6.png differ diff --git a/gfx/mail/0b9b46.1bpp b/gfx/mail/0b9b46.1bpp deleted file mode 100644 index 6a3ae927d..000000000 Binary files a/gfx/mail/0b9b46.1bpp and /dev/null differ diff --git a/gfx/mail/0b9b46.png b/gfx/mail/0b9b46.png new file mode 100755 index 000000000..9f792d31c Binary files /dev/null and b/gfx/mail/0b9b46.png differ diff --git a/gfx/mail/0b9bce.1bpp b/gfx/mail/0b9bce.1bpp deleted file mode 100644 index 208e14fcb..000000000 Binary files a/gfx/mail/0b9bce.1bpp and /dev/null differ diff --git a/gfx/mail/0b9bce.png b/gfx/mail/0b9bce.png new file mode 100644 index 000000000..b277a2c9c Binary files /dev/null and b/gfx/mail/0b9bce.png differ diff --git a/gfx/mail/0b9bee.1bpp b/gfx/mail/0b9bee.1bpp deleted file mode 100644 index 33c93f017..000000000 --- a/gfx/mail/0b9bee.1bpp +++ /dev/null @@ -1 +0,0 @@ -ƒKKm}ÿÿÈøüýýÿÿ \ No newline at end of file diff --git a/gfx/mail/0b9bee.png b/gfx/mail/0b9bee.png new file mode 100644 index 000000000..bdc18dbaa Binary files /dev/null and b/gfx/mail/0b9bee.png differ diff --git a/gfx/mail/0b9bfe.1bpp b/gfx/mail/0b9bfe.1bpp deleted file mode 100644 index ac8385990..000000000 Binary files a/gfx/mail/0b9bfe.1bpp and /dev/null differ diff --git a/gfx/mail/0b9bfe.png b/gfx/mail/0b9bfe.png new file mode 100644 index 000000000..5c2dcb10b Binary files /dev/null and b/gfx/mail/0b9bfe.png differ diff --git a/gfx/mail/0b9c1e.1bpp b/gfx/mail/0b9c1e.1bpp deleted file mode 100644 index 205a60248..000000000 Binary files a/gfx/mail/0b9c1e.1bpp and /dev/null differ diff --git a/gfx/mail/0b9c1e.png b/gfx/mail/0b9c1e.png new file mode 100644 index 000000000..761432369 Binary files /dev/null and b/gfx/mail/0b9c1e.png differ diff --git a/gfx/mail/0b9c3e.1bpp b/gfx/mail/0b9c3e.1bpp deleted file mode 100644 index faa0439c8..000000000 Binary files a/gfx/mail/0b9c3e.1bpp and /dev/null differ diff --git a/gfx/mail/0b9c3e.png b/gfx/mail/0b9c3e.png new file mode 100644 index 000000000..1a518f774 Binary files /dev/null and b/gfx/mail/0b9c3e.png differ diff --git a/gfx/mail/0b9c5e.1bpp b/gfx/mail/0b9c5e.1bpp deleted file mode 100644 index 6587f4505..000000000 Binary files a/gfx/mail/0b9c5e.1bpp and /dev/null differ diff --git a/gfx/mail/0b9c5e.png b/gfx/mail/0b9c5e.png new file mode 100644 index 000000000..075328574 Binary files /dev/null and b/gfx/mail/0b9c5e.png differ diff --git a/gfx/mail/0b9c7e.1bpp b/gfx/mail/0b9c7e.1bpp deleted file mode 100644 index 0057e120d..000000000 Binary files a/gfx/mail/0b9c7e.1bpp and /dev/null differ diff --git a/gfx/mail/0b9c7e.png b/gfx/mail/0b9c7e.png new file mode 100755 index 000000000..f9e7a3cae Binary files /dev/null and b/gfx/mail/0b9c7e.png differ diff --git a/gfx/mail/0b9c96.1bpp b/gfx/mail/0b9c96.1bpp deleted file mode 100644 index 8798f0fec..000000000 Binary files a/gfx/mail/0b9c96.1bpp and /dev/null differ diff --git a/gfx/mail/0b9c9e.1bpp b/gfx/mail/0b9c9e.1bpp deleted file mode 100644 index d1f0f6b7e..000000000 Binary files a/gfx/mail/0b9c9e.1bpp and /dev/null differ diff --git a/gfx/mail/0b9c9e.png b/gfx/mail/0b9c9e.png new file mode 100644 index 000000000..d91eae23f Binary files /dev/null and b/gfx/mail/0b9c9e.png differ diff --git a/gfx/mail/0b9cbe.1bpp b/gfx/mail/0b9cbe.1bpp deleted file mode 100644 index 503b8da3c..000000000 Binary files a/gfx/mail/0b9cbe.1bpp and /dev/null differ diff --git a/gfx/mail/0b9cbe.png b/gfx/mail/0b9cbe.png new file mode 100644 index 000000000..2147bef31 Binary files /dev/null and b/gfx/mail/0b9cbe.png differ diff --git a/gfx/mail/0b9cde.1bpp b/gfx/mail/0b9cde.1bpp deleted file mode 100644 index d6d1b99c2..000000000 Binary files a/gfx/mail/0b9cde.1bpp and /dev/null differ diff --git a/gfx/mail/0b9cde.png b/gfx/mail/0b9cde.png new file mode 100644 index 000000000..3f0d34edc Binary files /dev/null and b/gfx/mail/0b9cde.png differ diff --git a/gfx/mail/0b9cfe.1bpp b/gfx/mail/0b9cfe.1bpp deleted file mode 100644 index 09e552df6..000000000 Binary files a/gfx/mail/0b9cfe.1bpp and /dev/null differ diff --git a/gfx/mail/0b9cfe.png b/gfx/mail/0b9cfe.png new file mode 100755 index 000000000..4b7a26faa Binary files /dev/null and b/gfx/mail/0b9cfe.png differ diff --git a/gfx/mail/0b9d16.1bpp b/gfx/mail/0b9d16.1bpp deleted file mode 100644 index 61e9e3034..000000000 Binary files a/gfx/mail/0b9d16.1bpp and /dev/null differ diff --git a/gfx/mail/0b9d16.png b/gfx/mail/0b9d16.png new file mode 100755 index 000000000..bc0786238 Binary files /dev/null and b/gfx/mail/0b9d16.png differ diff --git a/gfx/mail/0b9d26.1bpp b/gfx/mail/0b9d26.1bpp deleted file mode 100644 index 2f7129dab..000000000 Binary files a/gfx/mail/0b9d26.1bpp and /dev/null differ diff --git a/gfx/mail/0b9d3e.1bpp b/gfx/mail/0b9d3e.1bpp deleted file mode 100644 index e8417d211..000000000 Binary files a/gfx/mail/0b9d3e.1bpp and /dev/null differ diff --git a/gfx/mail/0b9d46.1bpp b/gfx/mail/0b9d46.1bpp deleted file mode 100644 index e3e1dc2e7..000000000 Binary files a/gfx/mail/0b9d46.1bpp and /dev/null differ diff --git a/gfx/mail/0b9d46.png b/gfx/mail/0b9d46.png new file mode 100755 index 000000000..466d26c39 Binary files /dev/null and b/gfx/mail/0b9d46.png differ diff --git a/gfx/mail/0b9d76.1bpp b/gfx/mail/0b9d76.1bpp deleted file mode 100644 index cd7cd4e76..000000000 Binary files a/gfx/mail/0b9d76.1bpp and /dev/null differ diff --git a/gfx/mail/0b9d86.1bpp b/gfx/mail/0b9d86.1bpp deleted file mode 100644 index b048e2bfd..000000000 Binary files a/gfx/mail/0b9d86.1bpp and /dev/null differ diff --git a/gfx/mail/0b9d86.png b/gfx/mail/0b9d86.png new file mode 100755 index 000000000..d0ac239f3 Binary files /dev/null and b/gfx/mail/0b9d86.png differ diff --git a/gfx/mail/0b9db6.1bpp b/gfx/mail/0b9db6.1bpp deleted file mode 100644 index e894196d7..000000000 Binary files a/gfx/mail/0b9db6.1bpp and /dev/null differ diff --git a/gfx/mail/0b9dc6.1bpp b/gfx/mail/0b9dc6.1bpp deleted file mode 100644 index 9c56c6746..000000000 --- a/gfx/mail/0b9dc6.1bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÿÀßÐÐÐÐ \ No newline at end of file diff --git a/gfx/mail/0b9dc6.png b/gfx/mail/0b9dc6.png new file mode 100755 index 000000000..878021bf8 Binary files /dev/null and b/gfx/mail/0b9dc6.png differ diff --git a/gfx/mail/0b9dce.1bpp b/gfx/mail/0b9dce.1bpp deleted file mode 100644 index 3afe8b303..000000000 Binary files a/gfx/mail/0b9dce.1bpp and /dev/null differ diff --git a/gfx/mail/0b9df6.1bpp b/gfx/mail/0b9df6.1bpp deleted file mode 100644 index d74a3ff4a..000000000 Binary files a/gfx/mail/0b9df6.1bpp and /dev/null differ diff --git a/gfx/mail/0b9e06.1bpp b/gfx/mail/0b9e06.1bpp deleted file mode 100644 index 8f082c642..000000000 Binary files a/gfx/mail/0b9e06.1bpp and /dev/null differ diff --git a/gfx/mail/0b9e06.png b/gfx/mail/0b9e06.png new file mode 100644 index 000000000..035757ee4 Binary files /dev/null and b/gfx/mail/0b9e06.png differ diff --git a/gfx/mail/0b9e26.1bpp b/gfx/mail/0b9e26.1bpp deleted file mode 100644 index efe2887cf..000000000 --- a/gfx/mail/0b9e26.1bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÙ¥¥™ÃÿÿÿÿçÃÃç<þþóááóþþ<çÃÃçÿÿÿχ‡Ï \ No newline at end of file diff --git a/gfx/mail/0b9e26.png b/gfx/mail/0b9e26.png new file mode 100644 index 000000000..48b8e7b7b Binary files /dev/null and b/gfx/mail/0b9e26.png differ diff --git a/gfx/mail/0b9e4e.1bpp b/gfx/mail/0b9e4e.1bpp deleted file mode 100644 index 9207cfc8b..000000000 Binary files a/gfx/mail/0b9e4e.1bpp and /dev/null differ diff --git a/gfx/mail/0b9e4e.png b/gfx/mail/0b9e4e.png new file mode 100644 index 000000000..9efb3401f Binary files /dev/null and b/gfx/mail/0b9e4e.png differ 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 diff --git a/gfx/mobile/havewant.2bpp b/gfx/mobile/havewant.2bpp deleted file mode 100644 index 02cb8bb2c..000000000 Binary files a/gfx/mobile/havewant.2bpp and /dev/null differ diff --git a/gfx/mobile/havewant.png b/gfx/mobile/havewant.png new file mode 100644 index 000000000..7aa0a0544 Binary files /dev/null and b/gfx/mobile/havewant.png differ diff --git a/gfx/mobile/hp.1bpp b/gfx/mobile/hp.1bpp deleted file mode 100644 index 6ba57017b..000000000 Binary files a/gfx/mobile/hp.1bpp and /dev/null differ diff --git a/gfx/mobile/hp.png b/gfx/mobile/hp.png new file mode 100644 index 000000000..908141634 Binary files /dev/null and b/gfx/mobile/hp.png differ diff --git a/gfx/mobile/lv.1bpp b/gfx/mobile/lv.1bpp deleted file mode 100644 index 467a12dea..000000000 Binary files a/gfx/mobile/lv.1bpp and /dev/null differ diff --git a/gfx/mobile/lv.png b/gfx/mobile/lv.png new file mode 100644 index 000000000..5176fc585 Binary files /dev/null and b/gfx/mobile/lv.png differ diff --git a/gfx/mobile/overworld_phone_icon.2bpp b/gfx/mobile/overworld_phone_icon.2bpp deleted file mode 100644 index d19ae7f12..000000000 --- a/gfx/mobile/overworld_phone_icon.2bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÿ÷÷ÃÃÛÛÛÛÃÃÃÃÿÿ \ No newline at end of file diff --git a/gfx/mobile/overworld_phone_icon.png b/gfx/mobile/overworld_phone_icon.png new file mode 100644 index 000000000..9e13a121b Binary files /dev/null and b/gfx/mobile/overworld_phone_icon.png differ diff --git a/gfx/mobile/phone_tiles.2bpp b/gfx/mobile/phone_tiles.2bpp deleted file mode 100644 index 93b085ee4..000000000 Binary files a/gfx/mobile/phone_tiles.2bpp and /dev/null differ diff --git a/gfx/mobile/phone_tiles.png b/gfx/mobile/phone_tiles.png new file mode 100644 index 000000000..5450c15f8 Binary files /dev/null and b/gfx/mobile/phone_tiles.png differ diff --git a/gfx/mobile/pokemon_news.2bpp b/gfx/mobile/pokemon_news.2bpp deleted file mode 100644 index cb67b634e..000000000 Binary files a/gfx/mobile/pokemon_news.2bpp and /dev/null differ diff --git a/gfx/mobile/pokemon_news.png b/gfx/mobile/pokemon_news.png new file mode 100644 index 000000000..f473f8d5c Binary files /dev/null and b/gfx/mobile/pokemon_news.png differ diff --git a/gfx/mobile/select.2bpp b/gfx/mobile/select.2bpp deleted file mode 100644 index 53144abf9..000000000 Binary files a/gfx/mobile/select.2bpp and /dev/null differ diff --git a/gfx/mobile/select.png b/gfx/mobile/select.png new file mode 100644 index 000000000..040205150 Binary files /dev/null and b/gfx/mobile/select.png differ diff --git a/gfx/overworld/000.2bpp b/gfx/overworld/000.2bpp deleted file mode 100644 index e05a2c3f1..000000000 Binary files a/gfx/overworld/000.2bpp and /dev/null differ diff --git a/gfx/overworld/000.png b/gfx/overworld/000.png new file mode 100644 index 000000000..1050bb02c Binary files /dev/null and b/gfx/overworld/000.png differ diff --git a/gfx/overworld/001.2bpp b/gfx/overworld/001.2bpp deleted file mode 100644 index af04601ad..000000000 --- a/gfx/overworld/001.2bpp +++ /dev/null @@ -1,2 +0,0 @@ -3?9OO3>üL|œþòþòü|Høðp€€0?;<_Oààðøø üÜ<þúþò??;7\t?<üüÜìþ:.þü<Øèðp€€8???ààðøì>ÂŒüüüø˜?"?(?!ððøüÄüæþþÿÿ!?9?<OO?>þ&>ÎþòþòÌ|øx@À€€?/?'ððøüüþîÿýÿù5;?.>?þþîöÿÿþøøXè°° ? ?p?)?)ÀÀ àð8Ø|„øøøð0? ?>ü úê~òÎüÌ8øœü||>!? ? ?(ÀÀà pøüüüdü? üxè¸øäœäüüøðð (7P@oR€€à`0Ðøìþ -þöJ?0Oy_~??ü òžú~üüøø8ø0ðÀÀ /0P@oP€€à`0Ðøô þ -þö -?0_x_~Os?3ü úú~òÎüÌ8ø0ðÀÀ #<}B@@P€€À@à ðøøøÈø(@>1=#ø(ðÐpð àpðpðàà \ No newline at end of file diff --git a/gfx/overworld/008.png b/gfx/overworld/008.png new file mode 100644 index 000000000..90b499f16 Binary files /dev/null and b/gfx/overworld/008.png differ diff --git a/gfx/overworld/009.2bpp b/gfx/overworld/009.2bpp deleted file mode 100644 index 65cbdb1a2..000000000 Binary files a/gfx/overworld/009.2bpp and /dev/null differ diff --git a/gfx/overworld/009.png b/gfx/overworld/009.png new file mode 100644 index 000000000..b49f8e573 Binary files /dev/null and b/gfx/overworld/009.png differ diff --git a/gfx/overworld/010.2bpp b/gfx/overworld/010.2bpp deleted file mode 100644 index 1f21db12d..000000000 Binary files a/gfx/overworld/010.2bpp and /dev/null differ diff --git a/gfx/overworld/010.png b/gfx/overworld/010.png new file mode 100644 index 000000000..bd7fc20ea Binary files /dev/null and b/gfx/overworld/010.png differ diff --git a/gfx/overworld/011.2bpp b/gfx/overworld/011.2bpp deleted file mode 100644 index 36f409c46..000000000 Binary files a/gfx/overworld/011.2bpp and /dev/null differ diff --git a/gfx/overworld/011.png b/gfx/overworld/011.png new file mode 100644 index 000000000..36010c92d Binary files /dev/null and b/gfx/overworld/011.png differ diff --git a/gfx/overworld/012.2bpp b/gfx/overworld/012.2bpp deleted file mode 100644 index fc40c0f15..000000000 Binary files a/gfx/overworld/012.2bpp and /dev/null differ diff --git a/gfx/overworld/012.png b/gfx/overworld/012.png new file mode 100644 index 000000000..6ce1f3092 Binary files /dev/null and b/gfx/overworld/012.png differ diff --git a/gfx/overworld/013.2bpp b/gfx/overworld/013.2bpp deleted file mode 100644 index df6b3a16c..000000000 Binary files a/gfx/overworld/013.2bpp and /dev/null differ diff --git a/gfx/overworld/013.png b/gfx/overworld/013.png new file mode 100644 index 000000000..5644764c0 Binary files /dev/null and b/gfx/overworld/013.png differ diff --git a/gfx/overworld/014.2bpp b/gfx/overworld/014.2bpp deleted file mode 100644 index 58ce75371..000000000 Binary files a/gfx/overworld/014.2bpp and /dev/null differ diff --git a/gfx/overworld/014.png b/gfx/overworld/014.png new file mode 100644 index 000000000..84f330f1d Binary files /dev/null and b/gfx/overworld/014.png differ diff --git a/gfx/overworld/015.2bpp b/gfx/overworld/015.2bpp deleted file mode 100644 index 5de055557..000000000 Binary files a/gfx/overworld/015.2bpp and /dev/null differ diff --git a/gfx/overworld/015.png b/gfx/overworld/015.png new file mode 100644 index 000000000..ed1439b69 Binary files /dev/null and b/gfx/overworld/015.png differ diff --git a/gfx/overworld/016.2bpp b/gfx/overworld/016.2bpp deleted file mode 100644 index bdce93ada..000000000 --- a/gfx/overworld/016.2bpp +++ /dev/null @@ -1 +0,0 @@ - "?"?*?O_yÀÀ0ðøü$ü4ürþúž/??'>' ôüøüä|äÈøpðð``  ? ? ?@DÀÀ0ðøüüüþ"þ$??/?/ $üXøüôüô˜øpðð`` ?DI.?ÀÀ0ðøøüüüø   ðààààà`à`ÀÀ@ÀÀÀ \ No newline at end of file diff --git a/gfx/overworld/016.png b/gfx/overworld/016.png new file mode 100644 index 000000000..5229bb404 Binary files /dev/null and b/gfx/overworld/016.png differ diff --git a/gfx/overworld/017.2bpp b/gfx/overworld/017.2bpp deleted file mode 100644 index f51ec2470..000000000 Binary files a/gfx/overworld/017.2bpp and /dev/null differ diff --git a/gfx/overworld/017.png b/gfx/overworld/017.png new file mode 100644 index 000000000..a9bc75dbd Binary files /dev/null and b/gfx/overworld/017.png differ diff --git a/gfx/overworld/018.2bpp b/gfx/overworld/018.2bpp deleted file mode 100644 index 354fcfdca..000000000 Binary files a/gfx/overworld/018.2bpp and /dev/null differ diff --git a/gfx/overworld/018.png b/gfx/overworld/018.png new file mode 100644 index 000000000..ff8b28b98 Binary files /dev/null and b/gfx/overworld/018.png differ diff --git a/gfx/overworld/019.2bpp b/gfx/overworld/019.2bpp deleted file mode 100644 index 298a38351..000000000 Binary files a/gfx/overworld/019.2bpp and /dev/null differ diff --git a/gfx/overworld/019.png b/gfx/overworld/019.png new file mode 100644 index 000000000..b528045b5 Binary files /dev/null and b/gfx/overworld/019.png differ diff --git a/gfx/overworld/020.2bpp b/gfx/overworld/020.2bpp deleted file mode 100644 index 2c1da80cc..000000000 Binary files a/gfx/overworld/020.2bpp and /dev/null differ diff --git a/gfx/overworld/020.png b/gfx/overworld/020.png new file mode 100644 index 000000000..dcee550e0 Binary files /dev/null and b/gfx/overworld/020.png differ diff --git a/gfx/overworld/021.2bpp b/gfx/overworld/021.2bpp deleted file mode 100644 index 82240e622..000000000 Binary files a/gfx/overworld/021.2bpp and /dev/null differ diff --git a/gfx/overworld/021.png b/gfx/overworld/021.png new file mode 100644 index 000000000..54300be2d Binary files /dev/null and b/gfx/overworld/021.png differ diff --git a/gfx/overworld/022.2bpp b/gfx/overworld/022.2bpp deleted file mode 100644 index 2fd8ce8b6..000000000 Binary files a/gfx/overworld/022.2bpp and /dev/null differ diff --git a/gfx/overworld/022.png b/gfx/overworld/022.png new file mode 100644 index 000000000..0d8be19ec Binary files /dev/null and b/gfx/overworld/022.png differ diff --git a/gfx/overworld/023.2bpp b/gfx/overworld/023.2bpp deleted file mode 100644 index 745b1afca..000000000 Binary files a/gfx/overworld/023.2bpp and /dev/null differ diff --git a/gfx/overworld/023.png b/gfx/overworld/023.png new file mode 100644 index 000000000..69f152a3c Binary files /dev/null and b/gfx/overworld/023.png differ diff --git a/gfx/overworld/024.2bpp b/gfx/overworld/024.2bpp deleted file mode 100644 index 32bef007e..000000000 Binary files a/gfx/overworld/024.2bpp and /dev/null differ diff --git a/gfx/overworld/024.png b/gfx/overworld/024.png new file mode 100644 index 000000000..c4e721b75 Binary files /dev/null and b/gfx/overworld/024.png differ diff --git a/gfx/overworld/025.2bpp b/gfx/overworld/025.2bpp deleted file mode 100644 index 4ed34a450..000000000 Binary files a/gfx/overworld/025.2bpp and /dev/null differ diff --git a/gfx/overworld/025.png b/gfx/overworld/025.png new file mode 100644 index 000000000..f9f8ec431 Binary files /dev/null and b/gfx/overworld/025.png differ diff --git a/gfx/overworld/026.2bpp b/gfx/overworld/026.2bpp deleted file mode 100644 index 7be42b2df..000000000 --- a/gfx/overworld/026.2bpp +++ /dev/null @@ -1,2 +0,0 @@ - ?"='?(HJÀÀð0øüD¼äüþþR?*?$C?% üTü$þÂü¤ø¸ðÐð`` ? ? ? @@ÀÀð0øüüüþþ? ?!C?' üü„þÂüäøøðÐð`` ÀÀð0øüüü„øˆü  - þþ‚üþü,ðð@ÀÀÀ \ No newline at end of file diff --git a/gfx/overworld/026.png b/gfx/overworld/026.png new file mode 100644 index 000000000..8b95fb3fc Binary files /dev/null and b/gfx/overworld/026.png differ diff --git a/gfx/overworld/027.2bpp b/gfx/overworld/027.2bpp deleted file mode 100644 index 9381d7555..000000000 Binary files a/gfx/overworld/027.2bpp and /dev/null differ diff --git a/gfx/overworld/027.png b/gfx/overworld/027.png new file mode 100644 index 000000000..5f77217ef Binary files /dev/null and b/gfx/overworld/027.png differ diff --git a/gfx/overworld/028.2bpp b/gfx/overworld/028.2bpp deleted file mode 100644 index f5450a0f1..000000000 Binary files a/gfx/overworld/028.2bpp and /dev/null differ diff --git a/gfx/overworld/028.png b/gfx/overworld/028.png new file mode 100644 index 000000000..8b9857a85 Binary files /dev/null and b/gfx/overworld/028.png differ diff --git a/gfx/overworld/029.2bpp b/gfx/overworld/029.2bpp deleted file mode 100644 index 12fc0c187..000000000 Binary files a/gfx/overworld/029.2bpp and /dev/null differ diff --git a/gfx/overworld/029.png b/gfx/overworld/029.png new file mode 100644 index 000000000..5a2372dfa Binary files /dev/null and b/gfx/overworld/029.png differ diff --git a/gfx/overworld/030.2bpp b/gfx/overworld/030.2bpp deleted file mode 100644 index cdb942ab9..000000000 Binary files a/gfx/overworld/030.2bpp and /dev/null differ diff --git a/gfx/overworld/030.png b/gfx/overworld/030.png new file mode 100644 index 000000000..ae165c7ab Binary files /dev/null and b/gfx/overworld/030.png differ diff --git a/gfx/overworld/031.2bpp b/gfx/overworld/031.2bpp deleted file mode 100644 index 16691d982..000000000 Binary files a/gfx/overworld/031.2bpp and /dev/null differ diff --git a/gfx/overworld/031.png b/gfx/overworld/031.png new file mode 100644 index 000000000..22c157d82 Binary files /dev/null and b/gfx/overworld/031.png differ diff --git a/gfx/overworld/032.2bpp b/gfx/overworld/032.2bpp deleted file mode 100644 index db7652bbd..000000000 Binary files a/gfx/overworld/032.2bpp and /dev/null differ diff --git a/gfx/overworld/032.png b/gfx/overworld/032.png new file mode 100644 index 000000000..8afd066bd Binary files /dev/null and b/gfx/overworld/032.png differ diff --git a/gfx/overworld/033.2bpp b/gfx/overworld/033.2bpp deleted file mode 100644 index d2aff635f..000000000 Binary files a/gfx/overworld/033.2bpp and /dev/null differ diff --git a/gfx/overworld/033.png b/gfx/overworld/033.png new file mode 100644 index 000000000..ef29e27d5 Binary files /dev/null and b/gfx/overworld/033.png differ diff --git a/gfx/overworld/034.2bpp b/gfx/overworld/034.2bpp deleted file mode 100644 index ae075c338..000000000 Binary files a/gfx/overworld/034.2bpp and /dev/null differ diff --git a/gfx/overworld/034.png b/gfx/overworld/034.png new file mode 100644 index 000000000..ffd94f410 Binary files /dev/null and b/gfx/overworld/034.png differ diff --git a/gfx/overworld/035.2bpp b/gfx/overworld/035.2bpp deleted file mode 100644 index 17c6687a5..000000000 Binary files a/gfx/overworld/035.2bpp and /dev/null differ diff --git a/gfx/overworld/035.png b/gfx/overworld/035.png new file mode 100644 index 000000000..53bf81b13 Binary files /dev/null and b/gfx/overworld/035.png differ diff --git a/gfx/overworld/036.2bpp b/gfx/overworld/036.2bpp deleted file mode 100644 index 6edb8a305..000000000 Binary files a/gfx/overworld/036.2bpp and /dev/null differ diff --git a/gfx/overworld/036.png b/gfx/overworld/036.png new file mode 100644 index 000000000..e1306b6a0 Binary files /dev/null and b/gfx/overworld/036.png differ diff --git a/gfx/overworld/037.2bpp b/gfx/overworld/037.2bpp deleted file mode 100644 index 597f0e4ba..000000000 Binary files a/gfx/overworld/037.2bpp and /dev/null differ diff --git a/gfx/overworld/037.png b/gfx/overworld/037.png new file mode 100644 index 000000000..caa9f43af Binary files /dev/null and b/gfx/overworld/037.png differ diff --git a/gfx/overworld/038.2bpp b/gfx/overworld/038.2bpp deleted file mode 100644 index f0f329b63..000000000 Binary files a/gfx/overworld/038.2bpp and /dev/null differ diff --git a/gfx/overworld/038.png b/gfx/overworld/038.png new file mode 100644 index 000000000..5c0d33939 Binary files /dev/null and b/gfx/overworld/038.png differ diff --git a/gfx/overworld/039.2bpp b/gfx/overworld/039.2bpp deleted file mode 100644 index 4e8485fc2..000000000 Binary files a/gfx/overworld/039.2bpp and /dev/null differ diff --git a/gfx/overworld/039.png b/gfx/overworld/039.png new file mode 100644 index 000000000..762108ad5 Binary files /dev/null and b/gfx/overworld/039.png differ diff --git a/gfx/overworld/040.2bpp b/gfx/overworld/040.2bpp deleted file mode 100644 index 0901ed9b0..000000000 Binary files a/gfx/overworld/040.2bpp and /dev/null differ diff --git a/gfx/overworld/040.png b/gfx/overworld/040.png new file mode 100644 index 000000000..2107159e9 Binary files /dev/null and b/gfx/overworld/040.png differ diff --git a/gfx/overworld/041.2bpp b/gfx/overworld/041.2bpp deleted file mode 100644 index 00886ad62..000000000 Binary files a/gfx/overworld/041.2bpp and /dev/null differ diff --git a/gfx/overworld/041.png b/gfx/overworld/041.png new file mode 100644 index 000000000..af5a7e7e7 Binary files /dev/null and b/gfx/overworld/041.png differ diff --git a/gfx/overworld/042.2bpp b/gfx/overworld/042.2bpp deleted file mode 100644 index c3a136249..000000000 Binary files a/gfx/overworld/042.2bpp and /dev/null differ diff --git a/gfx/overworld/042.png b/gfx/overworld/042.png new file mode 100644 index 000000000..6866c7b30 Binary files /dev/null and b/gfx/overworld/042.png differ diff --git a/gfx/overworld/043.2bpp b/gfx/overworld/043.2bpp deleted file mode 100644 index 2542203c2..000000000 Binary files a/gfx/overworld/043.2bpp and /dev/null differ diff --git a/gfx/overworld/043.png b/gfx/overworld/043.png new file mode 100644 index 000000000..50ac2089e Binary files /dev/null and b/gfx/overworld/043.png differ diff --git a/gfx/overworld/044.2bpp b/gfx/overworld/044.2bpp deleted file mode 100644 index 2e167caf4..000000000 Binary files a/gfx/overworld/044.2bpp and /dev/null differ diff --git a/gfx/overworld/044.png b/gfx/overworld/044.png new file mode 100644 index 000000000..fea7979d3 Binary files /dev/null and b/gfx/overworld/044.png differ diff --git a/gfx/overworld/045.2bpp b/gfx/overworld/045.2bpp deleted file mode 100644 index 1f6239516..000000000 --- a/gfx/overworld/045.2bpp +++ /dev/null @@ -1 +0,0 @@ -;>?8ààððøøèøÜ|üøHøH ?/?(?<pððøèüôüü<ø8øø;?=?ààpð¸øØøÜü¼üxøøè?/_X~ðøøüôþúþþ~ø¸øø>?=3ÀÀàøèüìþìþìþðüüü øxðpààðððøøøøðð;>?8ààððøøèøÜ|üøHøH ?/?(?<pððøèüôüü<ø8àà;?=?ààpð¸øØøÜü¼üxøøè?/_X~ðøèüôüüøøxð°àà>?=3ÀÀàøèüìþìþìþðüüü  øxðpààððüœü|ü|ðð \ No newline at end of file diff --git a/gfx/overworld/045.png b/gfx/overworld/045.png new file mode 100644 index 000000000..aa1fbc06f Binary files /dev/null and b/gfx/overworld/045.png differ diff --git a/gfx/overworld/046.2bpp b/gfx/overworld/046.2bpp deleted file mode 100644 index 8a5d7ec67..000000000 Binary files a/gfx/overworld/046.2bpp and /dev/null differ diff --git a/gfx/overworld/046.png b/gfx/overworld/046.png new file mode 100644 index 000000000..abe61a31d Binary files /dev/null and b/gfx/overworld/046.png differ diff --git a/gfx/overworld/047.2bpp b/gfx/overworld/047.2bpp deleted file mode 100644 index 7b563b1c7..000000000 Binary files a/gfx/overworld/047.2bpp and /dev/null differ diff --git a/gfx/overworld/047.png b/gfx/overworld/047.png new file mode 100644 index 000000000..763b2a2b1 Binary files /dev/null and b/gfx/overworld/047.png differ diff --git a/gfx/overworld/048.2bpp b/gfx/overworld/048.2bpp deleted file mode 100644 index 882f016cf..000000000 Binary files a/gfx/overworld/048.2bpp and /dev/null differ diff --git a/gfx/overworld/048.png b/gfx/overworld/048.png new file mode 100644 index 000000000..4c1818b2b Binary files /dev/null and b/gfx/overworld/048.png differ diff --git a/gfx/overworld/049.2bpp b/gfx/overworld/049.2bpp deleted file mode 100644 index b1e79ffb0..000000000 Binary files a/gfx/overworld/049.2bpp and /dev/null differ diff --git a/gfx/overworld/049.png b/gfx/overworld/049.png new file mode 100644 index 000000000..eed753ab2 Binary files /dev/null and b/gfx/overworld/049.png differ diff --git a/gfx/overworld/050.2bpp b/gfx/overworld/050.2bpp deleted file mode 100644 index 9b45a1c2b..000000000 Binary files a/gfx/overworld/050.2bpp and /dev/null differ diff --git a/gfx/overworld/050.png b/gfx/overworld/050.png new file mode 100644 index 000000000..f53f71105 Binary files /dev/null and b/gfx/overworld/050.png differ diff --git a/gfx/overworld/051.2bpp b/gfx/overworld/051.2bpp deleted file mode 100644 index 1e4f970a2..000000000 Binary files a/gfx/overworld/051.2bpp and /dev/null differ diff --git a/gfx/overworld/051.png b/gfx/overworld/051.png new file mode 100644 index 000000000..e6a3d7d03 Binary files /dev/null and b/gfx/overworld/051.png differ diff --git a/gfx/overworld/052.2bpp b/gfx/overworld/052.2bpp deleted file mode 100644 index 2bc8793ab..000000000 Binary files a/gfx/overworld/052.2bpp and /dev/null differ diff --git a/gfx/overworld/052.png b/gfx/overworld/052.png new file mode 100644 index 000000000..43a71bd6e Binary files /dev/null and b/gfx/overworld/052.png differ diff --git a/gfx/overworld/053.2bpp b/gfx/overworld/053.2bpp deleted file mode 100644 index 97a5e6ab6..000000000 Binary files a/gfx/overworld/053.2bpp and /dev/null differ diff --git a/gfx/overworld/053.png b/gfx/overworld/053.png new file mode 100644 index 000000000..b8714ba6f Binary files /dev/null and b/gfx/overworld/053.png differ diff --git a/gfx/overworld/054.2bpp b/gfx/overworld/054.2bpp deleted file mode 100644 index fec70f27c..000000000 Binary files a/gfx/overworld/054.2bpp and /dev/null differ diff --git a/gfx/overworld/054.png b/gfx/overworld/054.png new file mode 100644 index 000000000..4cd71fcfc Binary files /dev/null and b/gfx/overworld/054.png differ diff --git a/gfx/overworld/055.2bpp b/gfx/overworld/055.2bpp deleted file mode 100644 index df716add1..000000000 Binary files a/gfx/overworld/055.2bpp and /dev/null differ diff --git a/gfx/overworld/055.png b/gfx/overworld/055.png new file mode 100644 index 000000000..b6c98bbef Binary files /dev/null and b/gfx/overworld/055.png differ diff --git a/gfx/overworld/056.2bpp b/gfx/overworld/056.2bpp deleted file mode 100644 index 6d69aee66..000000000 Binary files a/gfx/overworld/056.2bpp and /dev/null differ diff --git a/gfx/overworld/056.png b/gfx/overworld/056.png new file mode 100644 index 000000000..77a5fb914 Binary files /dev/null and b/gfx/overworld/056.png differ diff --git a/gfx/overworld/057.2bpp b/gfx/overworld/057.2bpp deleted file mode 100644 index 0c62b196b..000000000 Binary files a/gfx/overworld/057.2bpp and /dev/null differ diff --git a/gfx/overworld/057.png b/gfx/overworld/057.png new file mode 100644 index 000000000..a84a2e371 Binary files /dev/null and b/gfx/overworld/057.png differ diff --git a/gfx/overworld/058.2bpp b/gfx/overworld/058.2bpp deleted file mode 100644 index 702f325a1..000000000 Binary files a/gfx/overworld/058.2bpp and /dev/null differ diff --git a/gfx/overworld/058.png b/gfx/overworld/058.png new file mode 100644 index 000000000..748444f8e Binary files /dev/null and b/gfx/overworld/058.png differ diff --git a/gfx/overworld/059.2bpp b/gfx/overworld/059.2bpp deleted file mode 100644 index a4e8d6899..000000000 Binary files a/gfx/overworld/059.2bpp and /dev/null differ diff --git a/gfx/overworld/059.png b/gfx/overworld/059.png new file mode 100644 index 000000000..39c44291e Binary files /dev/null and b/gfx/overworld/059.png differ diff --git a/gfx/overworld/060.2bpp b/gfx/overworld/060.2bpp deleted file mode 100644 index 32daceb69..000000000 Binary files a/gfx/overworld/060.2bpp and /dev/null differ diff --git a/gfx/overworld/060.png b/gfx/overworld/060.png new file mode 100644 index 000000000..0ea041f5b Binary files /dev/null and b/gfx/overworld/060.png differ diff --git a/gfx/overworld/061.2bpp b/gfx/overworld/061.2bpp deleted file mode 100644 index 69b2e4e70..000000000 Binary files a/gfx/overworld/061.2bpp and /dev/null differ diff --git a/gfx/overworld/061.png b/gfx/overworld/061.png new file mode 100644 index 000000000..802230467 Binary files /dev/null and b/gfx/overworld/061.png differ diff --git a/gfx/overworld/062.2bpp b/gfx/overworld/062.2bpp deleted file mode 100644 index b1f5b464b..000000000 Binary files a/gfx/overworld/062.2bpp and /dev/null differ diff --git a/gfx/overworld/062.png b/gfx/overworld/062.png new file mode 100644 index 000000000..d979b9a6e Binary files /dev/null and b/gfx/overworld/062.png differ diff --git a/gfx/overworld/063.2bpp b/gfx/overworld/063.2bpp deleted file mode 100644 index e7fd2bc18..000000000 Binary files a/gfx/overworld/063.2bpp and /dev/null differ diff --git a/gfx/overworld/063.png b/gfx/overworld/063.png new file mode 100644 index 000000000..38a6125d2 Binary files /dev/null and b/gfx/overworld/063.png differ diff --git a/gfx/overworld/064.2bpp b/gfx/overworld/064.2bpp deleted file mode 100644 index 28c141dfa..000000000 Binary files a/gfx/overworld/064.2bpp and /dev/null differ diff --git a/gfx/overworld/064.png b/gfx/overworld/064.png new file mode 100644 index 000000000..9aec228c5 Binary files /dev/null and b/gfx/overworld/064.png differ diff --git a/gfx/overworld/065.2bpp b/gfx/overworld/065.2bpp deleted file mode 100644 index 826e6460e..000000000 Binary files a/gfx/overworld/065.2bpp and /dev/null differ diff --git a/gfx/overworld/065.png b/gfx/overworld/065.png new file mode 100644 index 000000000..0d102b04a Binary files /dev/null and b/gfx/overworld/065.png differ diff --git a/gfx/overworld/066.2bpp b/gfx/overworld/066.2bpp deleted file mode 100644 index da551977f..000000000 Binary files a/gfx/overworld/066.2bpp and /dev/null differ diff --git a/gfx/overworld/066.png b/gfx/overworld/066.png new file mode 100644 index 000000000..f62252038 Binary files /dev/null and b/gfx/overworld/066.png differ diff --git a/gfx/overworld/067.2bpp b/gfx/overworld/067.2bpp deleted file mode 100644 index b35296544..000000000 Binary files a/gfx/overworld/067.2bpp and /dev/null differ diff --git a/gfx/overworld/067.png b/gfx/overworld/067.png new file mode 100644 index 000000000..9dfe77ff4 Binary files /dev/null and b/gfx/overworld/067.png differ diff --git a/gfx/overworld/068.2bpp b/gfx/overworld/068.2bpp deleted file mode 100644 index 3cac02f74..000000000 --- a/gfx/overworld/068.2bpp +++ /dev/null @@ -1 +0,0 @@ -88GP|c<+<#@O88Äüü|Œx¨xˆüüä?  ? ? øððøøüüˆøpp \ No newline at end of file diff --git a/gfx/overworld/068.png b/gfx/overworld/068.png new file mode 100644 index 000000000..d651ad3e6 Binary files /dev/null and b/gfx/overworld/068.png differ diff --git a/gfx/overworld/069.2bpp b/gfx/overworld/069.2bpp deleted file mode 100644 index 8b5d0dc34..000000000 Binary files a/gfx/overworld/069.2bpp and /dev/null differ diff --git a/gfx/overworld/069.png b/gfx/overworld/069.png new file mode 100644 index 000000000..7408cbbbc Binary files /dev/null and b/gfx/overworld/069.png differ diff --git a/gfx/overworld/070.2bpp b/gfx/overworld/070.2bpp deleted file mode 100644 index f13f3a80c..000000000 Binary files a/gfx/overworld/070.2bpp and /dev/null differ diff --git a/gfx/overworld/070.png b/gfx/overworld/070.png new file mode 100644 index 000000000..45f27649e Binary files /dev/null and b/gfx/overworld/070.png differ diff --git a/gfx/overworld/071.2bpp b/gfx/overworld/071.2bpp deleted file mode 100644 index de6d4772a..000000000 Binary files a/gfx/overworld/071.2bpp and /dev/null differ diff --git a/gfx/overworld/071.png b/gfx/overworld/071.png new file mode 100644 index 000000000..a1f74da03 Binary files /dev/null and b/gfx/overworld/071.png differ diff --git a/gfx/overworld/072.2bpp b/gfx/overworld/072.2bpp deleted file mode 100644 index bbd9e6f30..000000000 Binary files a/gfx/overworld/072.2bpp and /dev/null differ diff --git a/gfx/overworld/072.png b/gfx/overworld/072.png new file mode 100644 index 000000000..b4d3b5f2a Binary files /dev/null and b/gfx/overworld/072.png differ diff --git a/gfx/overworld/073.2bpp b/gfx/overworld/073.2bpp deleted file mode 100644 index e650a0fa6..000000000 --- a/gfx/overworld/073.2bpp +++ /dev/null @@ -1,2 +0,0 @@ -???:?0ToRÀÀððøøüüü\ü þ*öJ?0?'<'ü x˜üä<äØxÈøðð€€??????_o_ÀÀððøøüüüüüüþúöú?0?/ÿÿ÷Úï¦þüüpx \ No newline at end of file diff --git a/gfx/overworld/088.png b/gfx/overworld/088.png new file mode 100644 index 000000000..5a614d7bb Binary files /dev/null and b/gfx/overworld/088.png differ diff --git a/gfx/overworld/089.2bpp b/gfx/overworld/089.2bpp deleted file mode 100644 index f3386f2a5..000000000 --- a/gfx/overworld/089.2bpp +++ /dev/null @@ -1 +0,0 @@ -? @ºÅÕªê•Ñ®¨×øøäR®¦^C¿ÿ+ßÿÒ­Àÿ’ïÀÿêÿu??ƒÿÿ+ÿWÿ¯ÿ~þþþüü \ No newline at end of file diff --git a/gfx/overworld/089.png b/gfx/overworld/089.png new file mode 100644 index 000000000..9b408e021 Binary files /dev/null and b/gfx/overworld/089.png differ diff --git a/gfx/overworld/090.2bpp b/gfx/overworld/090.2bpp deleted file mode 100644 index ec7867d54..000000000 Binary files a/gfx/overworld/090.2bpp and /dev/null differ diff --git a/gfx/overworld/090.png b/gfx/overworld/090.png new file mode 100644 index 000000000..4eaae4591 Binary files /dev/null and b/gfx/overworld/090.png differ diff --git a/gfx/overworld/091.2bpp b/gfx/overworld/091.2bpp deleted file mode 100644 index 182a360fe..000000000 Binary files a/gfx/overworld/091.2bpp and /dev/null differ diff --git a/gfx/overworld/091.png b/gfx/overworld/091.png new file mode 100644 index 000000000..15ff22d0a Binary files /dev/null and b/gfx/overworld/091.png differ diff --git a/gfx/overworld/092.2bpp b/gfx/overworld/092.2bpp deleted file mode 100644 index 3c38a9b3a..000000000 --- a/gfx/overworld/092.2bpp +++ /dev/null @@ -1 +0,0 @@ -;2nO]i6)]`¯Ð¹Àø¸lLvòÚ–l”úÉ3M³™àGx0?>ùâ üàðÀÀøÀüà¸À \ No newline at end of file diff --git a/gfx/overworld/092.png b/gfx/overworld/092.png new file mode 100644 index 000000000..b27633907 Binary files /dev/null and b/gfx/overworld/092.png differ diff --git a/gfx/overworld/093.2bpp b/gfx/overworld/093.2bpp deleted file mode 100644 index 594985e43..000000000 Binary files a/gfx/overworld/093.2bpp and /dev/null differ diff --git a/gfx/overworld/093.png b/gfx/overworld/093.png new file mode 100644 index 000000000..cc12f9f34 Binary files /dev/null and b/gfx/overworld/093.png differ diff --git a/gfx/overworld/094.2bpp b/gfx/overworld/094.2bpp deleted file mode 100644 index 73964d04e..000000000 Binary files a/gfx/overworld/094.2bpp and /dev/null differ diff --git a/gfx/overworld/094.png b/gfx/overworld/094.png new file mode 100644 index 000000000..458cda431 Binary files /dev/null and b/gfx/overworld/094.png differ diff --git a/gfx/overworld/095.2bpp b/gfx/overworld/095.2bpp deleted file mode 100644 index a4d55c72d..000000000 Binary files a/gfx/overworld/095.2bpp and /dev/null differ diff --git a/gfx/overworld/095.png b/gfx/overworld/095.png new file mode 100644 index 000000000..d4339470e Binary files /dev/null and b/gfx/overworld/095.png differ diff --git a/gfx/overworld/096.2bpp b/gfx/overworld/096.2bpp deleted file mode 100644 index 11e6a4fd5..000000000 --- a/gfx/overworld/096.2bpp +++ /dev/null @@ -1,2 +0,0 @@ - %?/:ÿâàà0ÐÈ8xȤüô\øÿGŸòxOO3>ùOþþòþòü|Høðp€€(7/8èÿààðèÈ8ìôèøÿ†ÿc\t?<aÿÆþþ:.þü<Øèðp€€ '>-;ààð8ÈÈ8øÈ„üäüø˜ ?3S¼ÿÿ»|D88ü„üøøþâ_ýÿÝ>"   qððèä<äÒþú.ü þ"Oy?<OO?>ý'ÿþòþòÌ|øx@À€€  tððøô ä -öúôüþC1?1ÿãÿÿÿþøøXè°°,3O|[w?%?)?)ÀÀà ppðøÈøð0>#?3Sÿ¿þ»uM88øøôôþâÿÝ?ýúæ \ No newline at end of file diff --git a/gfx/overworld/096.png b/gfx/overworld/096.png new file mode 100644 index 000000000..161ce5722 Binary files /dev/null and b/gfx/overworld/096.png differ diff --git a/gfx/overworld/097.2bpp b/gfx/overworld/097.2bpp deleted file mode 100644 index 7da1f4b4a..000000000 --- a/gfx/overworld/097.2bpp +++ /dev/null @@ -1,2 +0,0 @@ -/0P@oVÀÀððèØøˆô þ -þöjp?3{LK?<8/ü þÎÞ2þÒü<ôøøàà??___ÀÀððøøøøüüþúþúþú??/<[X0?üüô<þÚþ üøøøøàà? ? ? ?,ÀÀððxø¸xü<ü<ü|ü? üxèøøx˜ø˜øøøðð \ No newline at end of file diff --git a/gfx/overworld/097.png b/gfx/overworld/097.png new file mode 100644 index 000000000..69e46b84c Binary files /dev/null and b/gfx/overworld/097.png differ diff --git a/gfx/overworld/098.2bpp b/gfx/overworld/098.2bpp deleted file mode 100644 index 45ee3056d..000000000 --- a/gfx/overworld/098.2bpp +++ /dev/null @@ -1 +0,0 @@ - >}}56=w^€°À| þ°þ¨üø,ünú÷½ê¯ê¯y_y_ê®R^ ï½OýWõžúžúWuJz08 \ No newline at end of file diff --git a/gfx/overworld/098.png b/gfx/overworld/098.png new file mode 100644 index 000000000..c3aef5c6c Binary files /dev/null and b/gfx/overworld/098.png differ diff --git a/gfx/overworld/099.2bpp b/gfx/overworld/099.2bpp deleted file mode 100644 index e95759482..000000000 --- a/gfx/overworld/099.2bpp +++ /dev/null @@ -1 +0,0 @@ -?8O~5?C7=€€ØXøhüò~¬üÂþì¼7~V||üü¼î¾ÎþÄü^~~j>> \ No newline at end of file diff --git a/gfx/overworld/100.png b/gfx/overworld/100.png new file mode 100644 index 000000000..4a5f1f186 Binary files /dev/null and b/gfx/overworld/100.png differ diff --git a/gfx/overworld/101.2bpp b/gfx/overworld/101.2bpp deleted file mode 100644 index 579b552f1..000000000 --- a/gfx/overworld/101.2bpp +++ /dev/null @@ -1 +0,0 @@ -????_~ToRÀÀððøøüüüüú~þ*öJ?2?'=&üLx˜üä¼døððèøxx????__o_ÀÀððøøüüüüúþþúöú;7?/8/Üìø8üôôøxøèøpp??7?+7ÀÀððøøüüüüþþþ.Þ. ü ø8ððð0ð0ððààÀÀ \ No newline at end of file diff --git a/gfx/overworld/101.png b/gfx/overworld/101.png new file mode 100644 index 000000000..61a8b79c6 Binary files /dev/null and b/gfx/overworld/101.png differ diff --git a/gfx/overworld/chris_fish.2bpp b/gfx/overworld/chris_fish.2bpp deleted file mode 100644 index c3609ab54..000000000 Binary files a/gfx/overworld/chris_fish.2bpp and /dev/null differ diff --git a/gfx/overworld/chris_fish.png b/gfx/overworld/chris_fish.png new file mode 100644 index 000000000..ea0730151 Binary files /dev/null and b/gfx/overworld/chris_fish.png differ diff --git a/gfx/overworld/kris_fish.2bpp b/gfx/overworld/kris_fish.2bpp deleted file mode 100644 index 9d47dc140..000000000 Binary files a/gfx/overworld/kris_fish.2bpp and /dev/null differ diff --git a/gfx/overworld/kris_fish.png b/gfx/overworld/kris_fish.png new file mode 100644 index 000000000..a47b89042 Binary files /dev/null and b/gfx/overworld/kris_fish.png differ diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.2bpp b/gfx/overworld/trainer_battle_pokeball_tiles.2bpp deleted file mode 100644 index 09e51fd67..000000000 --- a/gfx/overworld/trainer_battle_pokeball_tiles.2bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÿÃçç™Ã½ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ \ No newline at end of file diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.png b/gfx/overworld/trainer_battle_pokeball_tiles.png new file mode 100644 index 000000000..a4655d26e Binary files /dev/null and b/gfx/overworld/trainer_battle_pokeball_tiles.png differ diff --git a/gfx/pc.2bpp.lz b/gfx/pc.2bpp.lz.2201c1aa similarity index 100% rename from gfx/pc.2bpp.lz rename to gfx/pc.2bpp.lz.2201c1aa diff --git a/gfx/pc.png b/gfx/pc.png new file mode 100644 index 000000000..ce8fed73b Binary files /dev/null and b/gfx/pc.png differ diff --git a/gfx/pc_mail.2bpp b/gfx/pc_mail.2bpp deleted file mode 100644 index 9a6d66ab9..000000000 Binary files a/gfx/pc_mail.2bpp and /dev/null differ diff --git a/gfx/pc_mail.png b/gfx/pc_mail.png new file mode 100644 index 000000000..fd4b2892f Binary files /dev/null and b/gfx/pc_mail.png differ diff --git a/gfx/pokedex/pokedex.2bpp.lz b/gfx/pokedex/pokedex.2bpp.lz.3726dd3f similarity index 100% rename from gfx/pokedex/pokedex.2bpp.lz rename to gfx/pokedex/pokedex.2bpp.lz.3726dd3f diff --git a/gfx/pokedex/pokedex.png b/gfx/pokedex/pokedex.png new file mode 100644 index 000000000..48af514c7 Binary files /dev/null and b/gfx/pokedex/pokedex.png differ diff --git a/gfx/pokedex/select_start.2bpp b/gfx/pokedex/select_start.2bpp deleted file mode 100644 index c223eb635..000000000 --- a/gfx/pokedex/select_start.2bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÿééËˉ‰ÍÍééÿÿÿÿ,,mm,,mmmm$$ÿÿÿÿ‘‘»»»»»»»»››ÿÿÿÿ‘‘»»››ÛÛÛÛ››ÿÿÿÿ±±UUUUUUUUÿÿÿÿ³³±±±±³³··ÿÿ \ No newline at end of file diff --git a/gfx/pokedex/select_start.png b/gfx/pokedex/select_start.png new file mode 100644 index 000000000..efa8d4a46 Binary files /dev/null and b/gfx/pokedex/select_start.png differ diff --git a/gfx/pokedex/sgb.2bpp.lz b/gfx/pokedex/sgb.2bpp.lz.82bc0a7b similarity index 100% rename from gfx/pokedex/sgb.2bpp.lz rename to gfx/pokedex/sgb.2bpp.lz.82bc0a7b diff --git a/gfx/pokedex/sgb.png b/gfx/pokedex/sgb.png new file mode 100644 index 000000000..bbacb114d Binary files /dev/null and b/gfx/pokedex/sgb.png differ diff --git a/gfx/pokedex/slowpoke.2bpp.lz b/gfx/pokedex/slowpoke.2bpp.lz.49a91b42 similarity index 100% rename from gfx/pokedex/slowpoke.2bpp.lz rename to gfx/pokedex/slowpoke.2bpp.lz.49a91b42 diff --git a/gfx/pokedex/slowpoke.png b/gfx/pokedex/slowpoke.png new file mode 100644 index 000000000..5c1909a33 Binary files /dev/null and b/gfx/pokedex/slowpoke.png differ diff --git a/gfx/pokegear/dexmap_nest_icon.2bpp b/gfx/pokegear/dexmap_nest_icon.2bpp deleted file mode 100644 index 48a4938e6..000000000 --- a/gfx/pokegear/dexmap_nest_icon.2bpp +++ /dev/null @@ -1 +0,0 @@ -BBffÿÿ½ÿ™ÿÿÿZZ$$ \ No newline at end of file diff --git a/gfx/pokegear/dexmap_nest_icon.png b/gfx/pokegear/dexmap_nest_icon.png new file mode 100644 index 000000000..f8ffdc82d Binary files /dev/null and b/gfx/pokegear/dexmap_nest_icon.png differ diff --git a/gfx/pokegear/flymap_label_border.2bpp b/gfx/pokegear/flymap_label_border.2bpp deleted file mode 100644 index 671aab1d7..000000000 Binary files a/gfx/pokegear/flymap_label_border.2bpp and /dev/null differ diff --git a/gfx/pokegear/flymap_label_border.png b/gfx/pokegear/flymap_label_border.png new file mode 100644 index 000000000..69818d0e5 Binary files /dev/null and b/gfx/pokegear/flymap_label_border.png differ diff --git a/gfx/shrink1.2bpp.lz b/gfx/shrink1.2bpp.lz.d4443930 similarity index 100% rename from gfx/shrink1.2bpp.lz rename to gfx/shrink1.2bpp.lz.d4443930 diff --git a/gfx/shrink1.png b/gfx/shrink1.png new file mode 100644 index 000000000..6cf5b8077 Binary files /dev/null and b/gfx/shrink1.png differ diff --git a/gfx/shrink2.2bpp.lz b/gfx/shrink2.2bpp.lz.3f58480a similarity index 100% rename from gfx/shrink2.2bpp.lz rename to gfx/shrink2.2bpp.lz.3f58480a diff --git a/gfx/shrink2.png b/gfx/shrink2.png new file mode 100644 index 000000000..276b4e7c7 Binary files /dev/null and b/gfx/shrink2.png differ diff --git a/gfx/slots_1.2bpp.lz b/gfx/slots_1.2bpp.lz.b22ddc13 similarity index 100% rename from gfx/slots_1.2bpp.lz rename to gfx/slots_1.2bpp.lz.b22ddc13 diff --git a/gfx/slots_1.png b/gfx/slots_1.png new file mode 100644 index 000000000..a10340844 Binary files /dev/null and b/gfx/slots_1.png differ diff --git a/gfx/slots_2.2bpp.lz b/gfx/slots_2.2bpp.lz.b28f76e3 similarity index 100% rename from gfx/slots_2.2bpp.lz rename to gfx/slots_2.2bpp.lz.b28f76e3 diff --git a/gfx/slots_2.png b/gfx/slots_2.png new file mode 100644 index 000000000..aa1292ccb Binary files /dev/null and b/gfx/slots_2.png differ diff --git a/gfx/slots_3.2bpp.lz b/gfx/slots_3.2bpp.lz.70c2984c similarity index 100% rename from gfx/slots_3.2bpp.lz rename to gfx/slots_3.2bpp.lz.70c2984c diff --git a/gfx/slots_3.png b/gfx/slots_3.png new file mode 100755 index 000000000..456e9b6bf Binary files /dev/null and b/gfx/slots_3.png differ diff --git a/gfx/special/celebi/1.2bpp b/gfx/special/celebi/1.2bpp deleted file mode 100644 index 6379fc92f..000000000 --- a/gfx/special/celebi/1.2bpp +++ /dev/null @@ -1 +0,0 @@ -00.>  ÇÇd$6óáÏýü&úþþºû_g?83<}__{jn üüððÀ@à ظÈø00 \ No newline at end of file diff --git a/gfx/special/celebi/1.png b/gfx/special/celebi/1.png new file mode 100644 index 000000000..bd07ec8c4 Binary files /dev/null and b/gfx/special/celebi/1.png differ diff --git a/gfx/special/celebi/2.2bpp b/gfx/special/celebi/2.2bpp deleted file mode 100644 index f7c3294d3..000000000 Binary files a/gfx/special/celebi/2.2bpp and /dev/null differ diff --git a/gfx/special/celebi/2.png b/gfx/special/celebi/2.png new file mode 100644 index 000000000..c83a8788a Binary files /dev/null and b/gfx/special/celebi/2.png differ diff --git a/gfx/special/celebi/3.2bpp b/gfx/special/celebi/3.2bpp deleted file mode 100644 index 00cac65a7..000000000 Binary files a/gfx/special/celebi/3.2bpp and /dev/null differ diff --git a/gfx/special/celebi/3.png b/gfx/special/celebi/3.png new file mode 100644 index 000000000..6233fc56d Binary files /dev/null and b/gfx/special/celebi/3.png differ diff --git a/gfx/special/celebi/4.2bpp b/gfx/special/celebi/4.2bpp deleted file mode 100644 index 00cac65a7..000000000 Binary files a/gfx/special/celebi/4.2bpp and /dev/null differ diff --git a/gfx/special/celebi/4.png b/gfx/special/celebi/4.png new file mode 100644 index 000000000..6233fc56d Binary files /dev/null and b/gfx/special/celebi/4.png differ diff --git a/gfx/special/celebi/leaf.2bpp b/gfx/special/celebi/leaf.2bpp deleted file mode 100644 index 1c8a3f9a8..000000000 Binary files a/gfx/special/celebi/leaf.2bpp and /dev/null differ diff --git a/gfx/special/celebi/leaf.png b/gfx/special/celebi/leaf.png new file mode 100644 index 000000000..b10e0cf8c Binary files /dev/null and b/gfx/special/celebi/leaf.png differ diff --git a/gfx/splash/logo.1bpp b/gfx/splash/logo.1bpp deleted file mode 100644 index c59bf6197..000000000 Binary files a/gfx/splash/logo.1bpp and /dev/null differ diff --git a/gfx/splash/logo1.png b/gfx/splash/logo1.png new file mode 100755 index 000000000..1d2d6f479 Binary files /dev/null and b/gfx/splash/logo1.png differ diff --git a/gfx/splash/logo2.png b/gfx/splash/logo2.png new file mode 100755 index 000000000..7038efb54 Binary files /dev/null and b/gfx/splash/logo2.png differ diff --git a/gfx/stats/shiny.2bpp b/gfx/stats/shiny.2bpp deleted file mode 100644 index cfe4e8f9e..000000000 --- a/gfx/stats/shiny.2bpp +++ /dev/null @@ -1 +0,0 @@ -@@ààBB88 \ No newline at end of file diff --git a/gfx/stats/shiny.png b/gfx/stats/shiny.png new file mode 100644 index 000000000..010aeafbf Binary files /dev/null and b/gfx/stats/shiny.png differ diff --git a/gfx/tilesets/00.2bpp.lz b/gfx/tilesets/00.2bpp.lz.0c7e555a similarity index 100% rename from gfx/tilesets/00.2bpp.lz rename to gfx/tilesets/00.2bpp.lz.0c7e555a diff --git a/gfx/tilesets/00.png b/gfx/tilesets/00.png new file mode 100644 index 000000000..0fc2db12f Binary files /dev/null and b/gfx/tilesets/00.png differ diff --git a/gfx/tilesets/01.2bpp.lz b/gfx/tilesets/01.2bpp.lz.0c7e555a similarity index 100% rename from gfx/tilesets/01.2bpp.lz rename to gfx/tilesets/01.2bpp.lz.0c7e555a diff --git a/gfx/tilesets/01.png b/gfx/tilesets/01.png new file mode 100644 index 000000000..0fc2db12f Binary files /dev/null and b/gfx/tilesets/01.png differ diff --git a/gfx/tilesets/02.2bpp.lz b/gfx/tilesets/02.2bpp.lz.391603fb similarity index 100% rename from gfx/tilesets/02.2bpp.lz rename to gfx/tilesets/02.2bpp.lz.391603fb diff --git a/gfx/tilesets/02.png b/gfx/tilesets/02.png new file mode 100644 index 000000000..126573b7b Binary files /dev/null and b/gfx/tilesets/02.png differ diff --git a/gfx/tilesets/03.2bpp.lz b/gfx/tilesets/03.2bpp.lz.a29f5d51 similarity index 100% rename from gfx/tilesets/03.2bpp.lz rename to gfx/tilesets/03.2bpp.lz.a29f5d51 diff --git a/gfx/tilesets/03.png b/gfx/tilesets/03.png new file mode 100644 index 000000000..08b2cbeea Binary files /dev/null and b/gfx/tilesets/03.png differ diff --git a/gfx/tilesets/04.2bpp.lz b/gfx/tilesets/04.2bpp.lz.391603fb similarity index 100% rename from gfx/tilesets/04.2bpp.lz rename to gfx/tilesets/04.2bpp.lz.391603fb diff --git a/gfx/tilesets/04.png b/gfx/tilesets/04.png new file mode 100644 index 000000000..126573b7b Binary files /dev/null and b/gfx/tilesets/04.png differ diff --git a/gfx/tilesets/05.2bpp.lz b/gfx/tilesets/05.2bpp.lz.c848ef13 similarity index 100% rename from gfx/tilesets/05.2bpp.lz rename to gfx/tilesets/05.2bpp.lz.c848ef13 diff --git a/gfx/tilesets/05.png b/gfx/tilesets/05.png new file mode 100644 index 000000000..3ab7b5ce8 Binary files /dev/null and b/gfx/tilesets/05.png differ diff --git a/gfx/tilesets/06.2bpp.lz b/gfx/tilesets/06.2bpp.lz.252cbd8f similarity index 100% rename from gfx/tilesets/06.2bpp.lz rename to gfx/tilesets/06.2bpp.lz.252cbd8f diff --git a/gfx/tilesets/06.png b/gfx/tilesets/06.png new file mode 100644 index 000000000..b49f799d8 Binary files /dev/null and b/gfx/tilesets/06.png differ diff --git a/gfx/tilesets/07.2bpp.lz b/gfx/tilesets/07.2bpp.lz.e1c4014c similarity index 100% rename from gfx/tilesets/07.2bpp.lz rename to gfx/tilesets/07.2bpp.lz.e1c4014c diff --git a/gfx/tilesets/07.png b/gfx/tilesets/07.png new file mode 100644 index 000000000..d4084ebd4 Binary files /dev/null and b/gfx/tilesets/07.png differ diff --git a/gfx/tilesets/08.2bpp.lz b/gfx/tilesets/08.2bpp.lz.f5a55006 similarity index 100% rename from gfx/tilesets/08.2bpp.lz rename to gfx/tilesets/08.2bpp.lz.f5a55006 diff --git a/gfx/tilesets/08.png b/gfx/tilesets/08.png new file mode 100644 index 000000000..b8f2db2d2 Binary files /dev/null and b/gfx/tilesets/08.png differ diff --git a/gfx/tilesets/09.2bpp.lz b/gfx/tilesets/09.2bpp.lz.56b1a405 similarity index 100% rename from gfx/tilesets/09.2bpp.lz rename to gfx/tilesets/09.2bpp.lz.56b1a405 diff --git a/gfx/tilesets/09.png b/gfx/tilesets/09.png new file mode 100644 index 000000000..6990a7d7b Binary files /dev/null and b/gfx/tilesets/09.png differ diff --git a/gfx/tilesets/10.2bpp.lz b/gfx/tilesets/10.2bpp.lz.b8d0f547 similarity index 100% rename from gfx/tilesets/10.2bpp.lz rename to gfx/tilesets/10.2bpp.lz.b8d0f547 diff --git a/gfx/tilesets/10.png b/gfx/tilesets/10.png new file mode 100644 index 000000000..418a068fa Binary files /dev/null and b/gfx/tilesets/10.png differ diff --git a/gfx/tilesets/11.2bpp.lz b/gfx/tilesets/11.2bpp.lz.454cfd8b similarity index 100% rename from gfx/tilesets/11.2bpp.lz rename to gfx/tilesets/11.2bpp.lz.454cfd8b diff --git a/gfx/tilesets/11.png b/gfx/tilesets/11.png new file mode 100644 index 000000000..b72e3f401 Binary files /dev/null and b/gfx/tilesets/11.png differ diff --git a/gfx/tilesets/12.2bpp.lz b/gfx/tilesets/12.2bpp.lz.e2e94f92 similarity index 100% rename from gfx/tilesets/12.2bpp.lz rename to gfx/tilesets/12.2bpp.lz.e2e94f92 diff --git a/gfx/tilesets/12.png b/gfx/tilesets/12.png new file mode 100644 index 000000000..4053283bc Binary files /dev/null and b/gfx/tilesets/12.png differ diff --git a/gfx/tilesets/13.2bpp.lz b/gfx/tilesets/13.2bpp.lz.63b414d4 similarity index 100% rename from gfx/tilesets/13.2bpp.lz rename to gfx/tilesets/13.2bpp.lz.63b414d4 diff --git a/gfx/tilesets/13.png b/gfx/tilesets/13.png new file mode 100644 index 000000000..7dde8574e Binary files /dev/null and b/gfx/tilesets/13.png differ diff --git a/gfx/tilesets/14.2bpp.lz b/gfx/tilesets/14.2bpp.lz.71d29a2f similarity index 100% rename from gfx/tilesets/14.2bpp.lz rename to gfx/tilesets/14.2bpp.lz.71d29a2f diff --git a/gfx/tilesets/14.png b/gfx/tilesets/14.png new file mode 100644 index 000000000..776900638 Binary files /dev/null and b/gfx/tilesets/14.png differ diff --git a/gfx/tilesets/15.2bpp.lz b/gfx/tilesets/15.2bpp.lz.c1f2ed8f similarity index 100% rename from gfx/tilesets/15.2bpp.lz rename to gfx/tilesets/15.2bpp.lz.c1f2ed8f diff --git a/gfx/tilesets/15.png b/gfx/tilesets/15.png new file mode 100644 index 000000000..582b9365d Binary files /dev/null and b/gfx/tilesets/15.png differ diff --git a/gfx/tilesets/16.2bpp.lz b/gfx/tilesets/16.2bpp.lz.dd51d079 similarity index 100% rename from gfx/tilesets/16.2bpp.lz rename to gfx/tilesets/16.2bpp.lz.dd51d079 diff --git a/gfx/tilesets/16.png b/gfx/tilesets/16.png new file mode 100644 index 000000000..3d6f1b511 Binary files /dev/null and b/gfx/tilesets/16.png differ diff --git a/gfx/tilesets/17.2bpp.lz b/gfx/tilesets/17.2bpp.lz.1600ca86 similarity index 100% rename from gfx/tilesets/17.2bpp.lz rename to gfx/tilesets/17.2bpp.lz.1600ca86 diff --git a/gfx/tilesets/17.png b/gfx/tilesets/17.png new file mode 100644 index 000000000..0c148f95d Binary files /dev/null and b/gfx/tilesets/17.png differ diff --git a/gfx/tilesets/18.2bpp.lz b/gfx/tilesets/18.2bpp.lz.93800351 similarity index 100% rename from gfx/tilesets/18.2bpp.lz rename to gfx/tilesets/18.2bpp.lz.93800351 diff --git a/gfx/tilesets/18.png b/gfx/tilesets/18.png new file mode 100644 index 000000000..350c04932 Binary files /dev/null and b/gfx/tilesets/18.png differ diff --git a/gfx/tilesets/19.2bpp.lz b/gfx/tilesets/19.2bpp.lz.0c1544c1 similarity index 100% rename from gfx/tilesets/19.2bpp.lz rename to gfx/tilesets/19.2bpp.lz.0c1544c1 diff --git a/gfx/tilesets/19.png b/gfx/tilesets/19.png new file mode 100644 index 000000000..920ee30ec Binary files /dev/null and b/gfx/tilesets/19.png differ diff --git a/gfx/tilesets/20.2bpp.lz b/gfx/tilesets/20.2bpp.lz.35e51007 similarity index 100% rename from gfx/tilesets/20.2bpp.lz rename to gfx/tilesets/20.2bpp.lz.35e51007 diff --git a/gfx/tilesets/20.png b/gfx/tilesets/20.png new file mode 100644 index 000000000..e46a847b9 Binary files /dev/null and b/gfx/tilesets/20.png differ diff --git a/gfx/tilesets/21.2bpp.lz b/gfx/tilesets/21.2bpp.lz.febbc4ec similarity index 100% rename from gfx/tilesets/21.2bpp.lz rename to gfx/tilesets/21.2bpp.lz.febbc4ec diff --git a/gfx/tilesets/21.png b/gfx/tilesets/21.png new file mode 100644 index 000000000..889b02727 Binary files /dev/null and b/gfx/tilesets/21.png differ diff --git a/gfx/tilesets/22.2bpp.lz b/gfx/tilesets/22.2bpp.lz.467b6a2d similarity index 100% rename from gfx/tilesets/22.2bpp.lz rename to gfx/tilesets/22.2bpp.lz.467b6a2d diff --git a/gfx/tilesets/22.png b/gfx/tilesets/22.png new file mode 100644 index 000000000..1cd57402d Binary files /dev/null and b/gfx/tilesets/22.png differ diff --git a/gfx/tilesets/23.2bpp.lz b/gfx/tilesets/23.2bpp.lz.bc56789c similarity index 100% rename from gfx/tilesets/23.2bpp.lz rename to gfx/tilesets/23.2bpp.lz.bc56789c diff --git a/gfx/tilesets/23.png b/gfx/tilesets/23.png new file mode 100644 index 000000000..268fc998f Binary files /dev/null and b/gfx/tilesets/23.png differ diff --git a/gfx/tilesets/24.2bpp.lz b/gfx/tilesets/24.2bpp.lz.3437812a similarity index 100% rename from gfx/tilesets/24.2bpp.lz rename to gfx/tilesets/24.2bpp.lz.3437812a diff --git a/gfx/tilesets/24.png b/gfx/tilesets/24.png new file mode 100644 index 000000000..0e5bdee7e Binary files /dev/null and b/gfx/tilesets/24.png differ diff --git a/gfx/tilesets/25.2bpp.lz b/gfx/tilesets/25.2bpp.lz.7fcb81d6 similarity index 100% rename from gfx/tilesets/25.2bpp.lz rename to gfx/tilesets/25.2bpp.lz.7fcb81d6 diff --git a/gfx/tilesets/25.png b/gfx/tilesets/25.png new file mode 100644 index 000000000..7a4a5f8eb Binary files /dev/null and b/gfx/tilesets/25.png differ diff --git a/gfx/tilesets/26.2bpp.lz b/gfx/tilesets/26.2bpp.lz.8b42470b similarity index 100% rename from gfx/tilesets/26.2bpp.lz rename to gfx/tilesets/26.2bpp.lz.8b42470b diff --git a/gfx/tilesets/26.png b/gfx/tilesets/26.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/26.png differ diff --git a/gfx/tilesets/27.2bpp.lz b/gfx/tilesets/27.2bpp.lz.27cdd9ad similarity index 100% rename from gfx/tilesets/27.2bpp.lz rename to gfx/tilesets/27.2bpp.lz.27cdd9ad diff --git a/gfx/tilesets/27.png b/gfx/tilesets/27.png new file mode 100644 index 000000000..8d2d32e1f Binary files /dev/null and b/gfx/tilesets/27.png differ diff --git a/gfx/tilesets/28.2bpp.lz b/gfx/tilesets/28.2bpp.lz.cace291c similarity index 100% rename from gfx/tilesets/28.2bpp.lz rename to gfx/tilesets/28.2bpp.lz.cace291c diff --git a/gfx/tilesets/28.png b/gfx/tilesets/28.png new file mode 100644 index 000000000..0a83d2043 Binary files /dev/null and b/gfx/tilesets/28.png differ diff --git a/gfx/tilesets/29.2bpp.lz b/gfx/tilesets/29.2bpp.lz.e23bc89f similarity index 100% rename from gfx/tilesets/29.2bpp.lz rename to gfx/tilesets/29.2bpp.lz.e23bc89f diff --git a/gfx/tilesets/29.png b/gfx/tilesets/29.png new file mode 100644 index 000000000..d70eb53be Binary files /dev/null and b/gfx/tilesets/29.png differ diff --git a/gfx/tilesets/30.2bpp.lz b/gfx/tilesets/30.2bpp.lz.25b9c4b6 similarity index 100% rename from gfx/tilesets/30.2bpp.lz rename to gfx/tilesets/30.2bpp.lz.25b9c4b6 diff --git a/gfx/tilesets/30.png b/gfx/tilesets/30.png new file mode 100644 index 000000000..9dc74c45b Binary files /dev/null and b/gfx/tilesets/30.png differ diff --git a/gfx/tilesets/31.2bpp.lz b/gfx/tilesets/31.2bpp.lz.6b0ac896 similarity index 100% rename from gfx/tilesets/31.2bpp.lz rename to gfx/tilesets/31.2bpp.lz.6b0ac896 diff --git a/gfx/tilesets/31.png b/gfx/tilesets/31.png new file mode 100644 index 000000000..a85cc0394 Binary files /dev/null and b/gfx/tilesets/31.png differ diff --git a/gfx/tilesets/32.2bpp.lz b/gfx/tilesets/32.2bpp.lz.8b42470b similarity index 100% rename from gfx/tilesets/32.2bpp.lz rename to gfx/tilesets/32.2bpp.lz.8b42470b diff --git a/gfx/tilesets/32.png b/gfx/tilesets/32.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/32.png differ diff --git a/gfx/tilesets/33.2bpp.lz b/gfx/tilesets/33.2bpp.lz.8b42470b similarity index 100% rename from gfx/tilesets/33.2bpp.lz rename to gfx/tilesets/33.2bpp.lz.8b42470b diff --git a/gfx/tilesets/33.png b/gfx/tilesets/33.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/33.png differ diff --git a/gfx/tilesets/34.2bpp.lz b/gfx/tilesets/34.2bpp.lz.8b42470b similarity index 100% rename from gfx/tilesets/34.2bpp.lz rename to gfx/tilesets/34.2bpp.lz.8b42470b diff --git a/gfx/tilesets/34.png b/gfx/tilesets/34.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/34.png differ diff --git a/gfx/tilesets/35.2bpp.lz b/gfx/tilesets/35.2bpp.lz.8b42470b similarity index 100% rename from gfx/tilesets/35.2bpp.lz rename to gfx/tilesets/35.2bpp.lz.8b42470b diff --git a/gfx/tilesets/35.png b/gfx/tilesets/35.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/35.png differ diff --git a/gfx/tilesets/36.2bpp.lz b/gfx/tilesets/36.2bpp.lz.8b42470b similarity index 100% rename from gfx/tilesets/36.2bpp.lz rename to gfx/tilesets/36.2bpp.lz.8b42470b diff --git a/gfx/tilesets/36.png b/gfx/tilesets/36.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/36.png differ diff --git a/gfx/tilesets/flower/cgb_1.2bpp b/gfx/tilesets/flower/cgb_1.2bpp deleted file mode 100644 index ffe58b93e..000000000 --- a/gfx/tilesets/flower/cgb_1.2bpp +++ /dev/null @@ -1 +0,0 @@ -¢ M’-mL²A¼²HE0 \ No newline at end of file diff --git a/gfx/tilesets/flower/cgb_1.png b/gfx/tilesets/flower/cgb_1.png new file mode 100644 index 000000000..e3fd2867b Binary files /dev/null and b/gfx/tilesets/flower/cgb_1.png differ diff --git a/gfx/tilesets/flower/cgb_2.2bpp b/gfx/tilesets/flower/cgb_2.2bpp deleted file mode 100644 index 5cf6b583f..000000000 --- a/gfx/tilesets/flower/cgb_2.2bpp +++ /dev/null @@ -1 +0,0 @@ -¢Y$¤Z%Z˜f%Zš$E \ No newline at end of file diff --git a/gfx/tilesets/flower/cgb_2.png b/gfx/tilesets/flower/cgb_2.png new file mode 100644 index 000000000..901e34a1f Binary files /dev/null and b/gfx/tilesets/flower/cgb_2.png differ diff --git a/gfx/tilesets/flower/dmg_1.2bpp b/gfx/tilesets/flower/dmg_1.2bpp deleted file mode 100644 index ec9e9c6d4..000000000 --- a/gfx/tilesets/flower/dmg_1.2bpp +++ /dev/null @@ -1 +0,0 @@ -¢ AŒ! a ’1Œ‚HE0 \ No newline at end of file diff --git a/gfx/tilesets/flower/dmg_1.png b/gfx/tilesets/flower/dmg_1.png new file mode 100644 index 000000000..428514af4 Binary files /dev/null and b/gfx/tilesets/flower/dmg_1.png differ diff --git a/gfx/tilesets/flower/dmg_2.2bpp b/gfx/tilesets/flower/dmg_2.2bpp deleted file mode 100644 index 7bf87eab2..000000000 --- a/gfx/tilesets/flower/dmg_2.2bpp +++ /dev/null @@ -1 +0,0 @@ -¢A$˜BB€fZ‚$E \ No newline at end of file diff --git a/gfx/tilesets/flower/dmg_2.png b/gfx/tilesets/flower/dmg_2.png new file mode 100644 index 000000000..9a5125017 Binary files /dev/null and b/gfx/tilesets/flower/dmg_2.png differ diff --git a/gfx/tilesets/forest-tree/1.2bpp b/gfx/tilesets/forest-tree/1.2bpp deleted file mode 100644 index 73414b5b6..000000000 --- a/gfx/tilesets/forest-tree/1.2bpp +++ /dev/null @@ -1 +0,0 @@ -«W$¬2¾0[LG`íò \ No newline at end of file diff --git a/gfx/tilesets/forest-tree/1.png b/gfx/tilesets/forest-tree/1.png new file mode 100644 index 000000000..231d9f20e Binary files /dev/null and b/gfx/tilesets/forest-tree/1.png differ diff --git a/gfx/tilesets/forest-tree/2.2bpp b/gfx/tilesets/forest-tree/2.2bpp deleted file mode 100644 index 05a566248..000000000 --- a/gfx/tilesets/forest-tree/2.2bpp +++ /dev/null @@ -1,2 +0,0 @@ -«U&ª -:¾(3$nqß° \ No newline at end of file diff --git a/gfx/tilesets/forest-tree/2.png b/gfx/tilesets/forest-tree/2.png new file mode 100644 index 000000000..e3048f53b Binary files /dev/null and b/gfx/tilesets/forest-tree/2.png differ diff --git a/gfx/tilesets/forest-tree/3.2bpp b/gfx/tilesets/forest-tree/3.2bpp deleted file mode 100644 index f74e64652..000000000 Binary files a/gfx/tilesets/forest-tree/3.2bpp and /dev/null differ diff --git a/gfx/tilesets/forest-tree/3.png b/gfx/tilesets/forest-tree/3.png new file mode 100644 index 000000000..0b17d12d3 Binary files /dev/null and b/gfx/tilesets/forest-tree/3.png differ diff --git a/gfx/tilesets/forest-tree/4.2bpp b/gfx/tilesets/forest-tree/4.2bpp deleted file mode 100644 index 3a7284a13..000000000 Binary files a/gfx/tilesets/forest-tree/4.2bpp and /dev/null differ diff --git a/gfx/tilesets/forest-tree/4.png b/gfx/tilesets/forest-tree/4.png new file mode 100644 index 000000000..04ef9f319 Binary files /dev/null and b/gfx/tilesets/forest-tree/4.png differ diff --git a/gfx/tilesets/fountain/1.2bpp b/gfx/tilesets/fountain/1.2bpp deleted file mode 100644 index ce84b04f0..000000000 Binary files a/gfx/tilesets/fountain/1.2bpp and /dev/null differ diff --git a/gfx/tilesets/fountain/1.png b/gfx/tilesets/fountain/1.png new file mode 100644 index 000000000..657a5c455 Binary files /dev/null and b/gfx/tilesets/fountain/1.png differ diff --git a/gfx/tilesets/fountain/2.2bpp b/gfx/tilesets/fountain/2.2bpp deleted file mode 100644 index 402b6c828..000000000 Binary files a/gfx/tilesets/fountain/2.2bpp and /dev/null differ diff --git a/gfx/tilesets/fountain/2.png b/gfx/tilesets/fountain/2.png new file mode 100644 index 000000000..af4652b64 Binary files /dev/null and b/gfx/tilesets/fountain/2.png differ diff --git a/gfx/tilesets/fountain/3.2bpp b/gfx/tilesets/fountain/3.2bpp deleted file mode 100644 index bc15f8b1f..000000000 Binary files a/gfx/tilesets/fountain/3.2bpp and /dev/null differ diff --git a/gfx/tilesets/fountain/3.png b/gfx/tilesets/fountain/3.png new file mode 100644 index 000000000..ed9c492e8 Binary files /dev/null and b/gfx/tilesets/fountain/3.png differ diff --git a/gfx/tilesets/fountain/4.2bpp b/gfx/tilesets/fountain/4.2bpp deleted file mode 100644 index 8a53f417b..000000000 Binary files a/gfx/tilesets/fountain/4.2bpp and /dev/null differ diff --git a/gfx/tilesets/fountain/4.png b/gfx/tilesets/fountain/4.png new file mode 100644 index 000000000..cfc95eea7 Binary files /dev/null and b/gfx/tilesets/fountain/4.png differ diff --git a/gfx/tilesets/fountain/5.2bpp b/gfx/tilesets/fountain/5.2bpp deleted file mode 100644 index 484691f5f..000000000 Binary files a/gfx/tilesets/fountain/5.2bpp and /dev/null differ diff --git a/gfx/tilesets/fountain/5.png b/gfx/tilesets/fountain/5.png new file mode 100644 index 000000000..a8c9475f9 Binary files /dev/null and b/gfx/tilesets/fountain/5.png differ diff --git a/gfx/tilesets/roofs/0.2bpp b/gfx/tilesets/roofs/0.2bpp deleted file mode 100644 index 51650e2e1..000000000 Binary files a/gfx/tilesets/roofs/0.2bpp and /dev/null differ diff --git a/gfx/tilesets/roofs/0.png b/gfx/tilesets/roofs/0.png new file mode 100644 index 000000000..1aa48fb87 Binary files /dev/null and b/gfx/tilesets/roofs/0.png differ diff --git a/gfx/tilesets/roofs/1.2bpp b/gfx/tilesets/roofs/1.2bpp deleted file mode 100644 index eea01d2f2..000000000 Binary files a/gfx/tilesets/roofs/1.2bpp and /dev/null differ diff --git a/gfx/tilesets/roofs/1.png b/gfx/tilesets/roofs/1.png new file mode 100644 index 000000000..1d68754f9 Binary files /dev/null and b/gfx/tilesets/roofs/1.png differ diff --git a/gfx/tilesets/roofs/2.2bpp b/gfx/tilesets/roofs/2.2bpp deleted file mode 100644 index 67db7f991..000000000 Binary files a/gfx/tilesets/roofs/2.2bpp and /dev/null differ diff --git a/gfx/tilesets/roofs/2.png b/gfx/tilesets/roofs/2.png new file mode 100644 index 000000000..b97b8787e Binary files /dev/null and b/gfx/tilesets/roofs/2.png differ diff --git a/gfx/tilesets/roofs/3.2bpp b/gfx/tilesets/roofs/3.2bpp deleted file mode 100644 index 1d88fac5b..000000000 Binary files a/gfx/tilesets/roofs/3.2bpp and /dev/null differ diff --git a/gfx/tilesets/roofs/3.png b/gfx/tilesets/roofs/3.png new file mode 100644 index 000000000..14bc411aa Binary files /dev/null and b/gfx/tilesets/roofs/3.png differ diff --git a/gfx/tilesets/roofs/4.2bpp b/gfx/tilesets/roofs/4.2bpp deleted file mode 100644 index 87590db99..000000000 Binary files a/gfx/tilesets/roofs/4.2bpp and /dev/null differ diff --git a/gfx/tilesets/roofs/4.png b/gfx/tilesets/roofs/4.png new file mode 100644 index 000000000..25bf71048 Binary files /dev/null and b/gfx/tilesets/roofs/4.png differ diff --git a/gfx/tilesets/safari/1.2bpp b/gfx/tilesets/safari/1.2bpp deleted file mode 100644 index d25f1badc..000000000 Binary files a/gfx/tilesets/safari/1.2bpp and /dev/null differ diff --git a/gfx/tilesets/safari/1.png b/gfx/tilesets/safari/1.png new file mode 100644 index 000000000..c5b500ccc Binary files /dev/null and b/gfx/tilesets/safari/1.png differ diff --git a/gfx/tilesets/safari/2.2bpp b/gfx/tilesets/safari/2.2bpp deleted file mode 100644 index bdb3c8cf5..000000000 Binary files a/gfx/tilesets/safari/2.2bpp and /dev/null differ diff --git a/gfx/tilesets/safari/2.png b/gfx/tilesets/safari/2.png new file mode 100644 index 000000000..1512e35ad Binary files /dev/null and b/gfx/tilesets/safari/2.png differ diff --git a/gfx/tilesets/safari/3.2bpp b/gfx/tilesets/safari/3.2bpp deleted file mode 100644 index 2016d2bd6..000000000 Binary files a/gfx/tilesets/safari/3.2bpp and /dev/null differ diff --git a/gfx/tilesets/safari/3.png b/gfx/tilesets/safari/3.png new file mode 100644 index 000000000..449c2a317 Binary files /dev/null and b/gfx/tilesets/safari/3.png differ diff --git a/gfx/tilesets/safari/4.2bpp b/gfx/tilesets/safari/4.2bpp deleted file mode 100644 index e0142c688..000000000 Binary files a/gfx/tilesets/safari/4.2bpp and /dev/null differ diff --git a/gfx/tilesets/safari/4.png b/gfx/tilesets/safari/4.png new file mode 100644 index 000000000..8e4c8e0e5 Binary files /dev/null and b/gfx/tilesets/safari/4.png differ diff --git a/gfx/tilesets/sprout-pillar/1.2bpp b/gfx/tilesets/sprout-pillar/1.2bpp deleted file mode 100644 index 3bb46c953..000000000 --- a/gfx/tilesets/sprout-pillar/1.2bpp +++ /dev/null @@ -1 +0,0 @@ -€ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿÀ_ÿ_ßßßßßà?/ÿ/?ï?¯ï?¯ï?ðÿ÷·_÷—÷ø ÿ ë»Oû›oû \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/1.png b/gfx/tilesets/sprout-pillar/1.png new file mode 100644 index 000000000..c22fb2a13 Binary files /dev/null and b/gfx/tilesets/sprout-pillar/1.png differ diff --git a/gfx/tilesets/sprout-pillar/10.2bpp b/gfx/tilesets/sprout-pillar/10.2bpp deleted file mode 100644 index a1af10a55..000000000 --- a/gfx/tilesets/sprout-pillar/10.2bpp +++ /dev/null @@ -1 +0,0 @@ -?ÿ_ÿ¿ÿ_ÿ¿ÿÿÿÿÿÿÿÿ¯ÿ_ÿ¯ÿ_ÿÿÿÿÿÿÿÿWÿ¯ÿ×ÿ¯ÿÿÿÿÿÿÿ«ÿWÿëÿWÿ¿ÿÿÿÿÿÿUÿ«ÿuÿ«ÿßÿÿÿÿÿ \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/10.png b/gfx/tilesets/sprout-pillar/10.png new file mode 100644 index 000000000..01dbe1afc Binary files /dev/null and b/gfx/tilesets/sprout-pillar/10.png differ diff --git a/gfx/tilesets/sprout-pillar/2.2bpp b/gfx/tilesets/sprout-pillar/2.2bpp deleted file mode 100644 index 08d8cfd74..000000000 --- a/gfx/tilesets/sprout-pillar/2.2bpp +++ /dev/null @@ -1 +0,0 @@ -ðÐÿÐðßðÙößðßðÞñøèÿèøïøéþïøïøîùüôÿôü÷üõþ÷ü÷üöýþúÿúþûþûþûþûþúÿÿýÿýÿýÿýÿýÿýÿýÿ \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/2.png b/gfx/tilesets/sprout-pillar/2.png new file mode 100644 index 000000000..76fae403b Binary files /dev/null and b/gfx/tilesets/sprout-pillar/2.png differ diff --git a/gfx/tilesets/sprout-pillar/3.2bpp b/gfx/tilesets/sprout-pillar/3.2bpp deleted file mode 100644 index e4bb79a49..000000000 --- a/gfx/tilesets/sprout-pillar/3.2bpp +++ /dev/null @@ -1 +0,0 @@ -¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿß_ÿ_ßßßßßï?/ÿ/?ï?¯ï?¯ï?÷ÿ÷·_÷—÷û ÿ ë»Oû›oû \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/3.png b/gfx/tilesets/sprout-pillar/3.png new file mode 100644 index 000000000..80ce4657c Binary files /dev/null and b/gfx/tilesets/sprout-pillar/3.png differ diff --git a/gfx/tilesets/sprout-pillar/4.2bpp b/gfx/tilesets/sprout-pillar/4.2bpp deleted file mode 100644 index 08897f1da..000000000 --- a/gfx/tilesets/sprout-pillar/4.2bpp +++ /dev/null @@ -1 +0,0 @@ -ßðØ÷ÐðßðÙößðßðÞñïøèÿèøïøéþïøïøîù÷üôÿôü÷üõþ÷ü÷üöýûþúÿúþûþûþûþûþúÿýÿýÿýÿýÿýÿýÿýÿýÿ \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/4.png b/gfx/tilesets/sprout-pillar/4.png new file mode 100644 index 000000000..9d523c4bc Binary files /dev/null and b/gfx/tilesets/sprout-pillar/4.png differ diff --git a/gfx/tilesets/sprout-pillar/5.2bpp b/gfx/tilesets/sprout-pillar/5.2bpp deleted file mode 100644 index f66926bab..000000000 --- a/gfx/tilesets/sprout-pillar/5.2bpp +++ /dev/null @@ -1 +0,0 @@ -¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿß_ÿ_ÿßÿßÿßÿßÿßÿï?/ÿoÿ¯ÿïÿïÿïÿïÿ÷ÿWÿ·ÿ÷ÿ÷ÿ÷ÿ÷ÿû ÿ[ÿ«ÿûÿûÿûÿûÿ \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/5.png b/gfx/tilesets/sprout-pillar/5.png new file mode 100644 index 000000000..b7796c8d6 Binary files /dev/null and b/gfx/tilesets/sprout-pillar/5.png differ diff --git a/gfx/tilesets/sprout-pillar/6.2bpp b/gfx/tilesets/sprout-pillar/6.2bpp deleted file mode 100644 index 5021b1c1f..000000000 --- a/gfx/tilesets/sprout-pillar/6.2bpp +++ /dev/null @@ -1 +0,0 @@ -ßðØÿÕÿÚÿßÿßÿßÿßÿïøèÿíÿêÿïÿïÿïÿïÿ÷üôÿõÿöÿ÷ÿ÷ÿ÷ÿ÷ÿûþúÿûÿúÿûÿûÿûÿûÿýÿýÿýÿýÿýÿýÿýÿýÿ \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/6.png b/gfx/tilesets/sprout-pillar/6.png new file mode 100644 index 000000000..0ca0e5936 Binary files /dev/null and b/gfx/tilesets/sprout-pillar/6.png differ diff --git a/gfx/tilesets/sprout-pillar/7.2bpp b/gfx/tilesets/sprout-pillar/7.2bpp deleted file mode 100644 index 59d6876aa..000000000 --- a/gfx/tilesets/sprout-pillar/7.2bpp +++ /dev/null @@ -1 +0,0 @@ -€ÿ‚ý¢Ý ß€ÿ„û„û€ÿÀÿÁþÑîÐïÀÿÂýÂýÀÿàÿàÿè÷è÷àÿáþáþàÿðÿðÿôûôûðÿðÿðÿðÿøÿøÿúýúýøÿøÿøÿøÿ \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/7.png b/gfx/tilesets/sprout-pillar/7.png new file mode 100644 index 000000000..3aa4b4e94 Binary files /dev/null and b/gfx/tilesets/sprout-pillar/7.png differ diff --git a/gfx/tilesets/sprout-pillar/8.2bpp b/gfx/tilesets/sprout-pillar/8.2bpp deleted file mode 100644 index bb22068b8..000000000 --- a/gfx/tilesets/sprout-pillar/8.2bpp +++ /dev/null @@ -1 +0,0 @@ -ÿ?ß?ßÿÿ_¿_¿ÿÿïïÿÿ/ß/ßÿÿ÷÷ÿÿïïÿÿûûÿÿ ÷ ÷ÿÿýýÿÿûûÿ \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/8.png b/gfx/tilesets/sprout-pillar/8.png new file mode 100644 index 000000000..e81475618 Binary files /dev/null and b/gfx/tilesets/sprout-pillar/8.png differ diff --git a/gfx/tilesets/sprout-pillar/9.2bpp b/gfx/tilesets/sprout-pillar/9.2bpp deleted file mode 100644 index 1c206fb79..000000000 --- a/gfx/tilesets/sprout-pillar/9.2bpp +++ /dev/null @@ -1 +0,0 @@ - ÿÅÿªÿÝÿêÿÝÿÿÿÿÿÐÿâÿÕÿîÿõÿîÿÿÿÿÿèÿñÿêÿ÷ÿúÿ÷ÿÿÿÿÿôÿøÿõÿûÿýÿûÿÿÿÿÿúÿüÿúÿýÿþÿýÿÿÿÿÿ \ No newline at end of file diff --git a/gfx/tilesets/sprout-pillar/9.png b/gfx/tilesets/sprout-pillar/9.png new file mode 100644 index 000000000..da74607be Binary files /dev/null and b/gfx/tilesets/sprout-pillar/9.png differ diff --git a/gfx/tilesets/water.2bpp b/gfx/tilesets/water.2bpp deleted file mode 100644 index a6e9f6ac9..000000000 Binary files a/gfx/tilesets/water.2bpp and /dev/null differ diff --git a/gfx/tilesets/water.png b/gfx/tilesets/water.png new file mode 100644 index 000000000..0aa2640c9 Binary files /dev/null and b/gfx/tilesets/water.png differ diff --git a/gfx/tilesets/whirlpool/1.2bpp b/gfx/tilesets/whirlpool/1.2bpp deleted file mode 100644 index 0a58c6b23..000000000 Binary files a/gfx/tilesets/whirlpool/1.2bpp and /dev/null differ diff --git a/gfx/tilesets/whirlpool/1.png b/gfx/tilesets/whirlpool/1.png new file mode 100644 index 000000000..4641dbc0d Binary files /dev/null and b/gfx/tilesets/whirlpool/1.png differ diff --git a/gfx/tilesets/whirlpool/2.2bpp b/gfx/tilesets/whirlpool/2.2bpp deleted file mode 100644 index e1f841cf9..000000000 Binary files a/gfx/tilesets/whirlpool/2.2bpp and /dev/null differ diff --git a/gfx/tilesets/whirlpool/2.png b/gfx/tilesets/whirlpool/2.png new file mode 100644 index 000000000..ce5424053 Binary files /dev/null and b/gfx/tilesets/whirlpool/2.png differ diff --git a/gfx/tilesets/whirlpool/3.2bpp b/gfx/tilesets/whirlpool/3.2bpp deleted file mode 100644 index 9cdec8335..000000000 Binary files a/gfx/tilesets/whirlpool/3.2bpp and /dev/null differ diff --git a/gfx/tilesets/whirlpool/3.png b/gfx/tilesets/whirlpool/3.png new file mode 100644 index 000000000..55b629440 Binary files /dev/null and b/gfx/tilesets/whirlpool/3.png differ diff --git a/gfx/tilesets/whirlpool/4.2bpp b/gfx/tilesets/whirlpool/4.2bpp deleted file mode 100644 index 414acce03..000000000 Binary files a/gfx/tilesets/whirlpool/4.2bpp and /dev/null differ diff --git a/gfx/tilesets/whirlpool/4.png b/gfx/tilesets/whirlpool/4.png new file mode 100644 index 000000000..2175c5957 Binary files /dev/null and b/gfx/tilesets/whirlpool/4.png differ diff --git a/gfx/title/crystal.w48.interleave.2bpp.lz b/gfx/title/crystal.2bpp.lz.cd5aabdd similarity index 100% rename from gfx/title/crystal.w48.interleave.2bpp.lz rename to gfx/title/crystal.2bpp.lz.cd5aabdd diff --git a/gfx/title/crystal.png b/gfx/title/crystal.png new file mode 100644 index 000000000..6f430cf1f Binary files /dev/null and b/gfx/title/crystal.png differ diff --git a/gfx/title/logo.w160.t4.2bpp.lz b/gfx/title/logo.2bpp.lz.f22013e3 similarity index 100% rename from gfx/title/logo.w160.t4.2bpp.lz rename to gfx/title/logo.2bpp.lz.f22013e3 diff --git a/gfx/title/logo.png b/gfx/title/logo.png new file mode 100644 index 000000000..2bfff59c9 Binary files /dev/null and b/gfx/title/logo.png differ diff --git a/gfx/title/old_bg.2bpp b/gfx/title/old_bg.2bpp deleted file mode 100644 index 0f2375ec2..000000000 Binary files a/gfx/title/old_bg.2bpp and /dev/null differ diff --git a/gfx/title/old_bg.png b/gfx/title/old_bg.png new file mode 100644 index 000000000..2b6d5db20 Binary files /dev/null and b/gfx/title/old_bg.png differ diff --git a/gfx/title/old_fg.2bpp b/gfx/title/old_fg.2bpp deleted file mode 100644 index 5e291ac33..000000000 Binary files a/gfx/title/old_fg.2bpp and /dev/null differ diff --git a/gfx/title/old_fg.png b/gfx/title/old_fg.png new file mode 100644 index 000000000..1a7351d58 Binary files /dev/null and b/gfx/title/old_fg.png differ diff --git a/gfx/title/suicune.w128.2bpp.lz b/gfx/title/suicune.2bpp.lz.30e490d0 similarity index 100% rename from gfx/title/suicune.w128.2bpp.lz rename to gfx/title/suicune.2bpp.lz.30e490d0 diff --git a/gfx/title/suicune.png b/gfx/title/suicune.png new file mode 100644 index 000000000..074a8ebf7 Binary files /dev/null and b/gfx/title/suicune.png differ diff --git a/gfx/trade/arrow.2bpp b/gfx/trade/arrow.2bpp deleted file mode 100644 index 637ea13c9..000000000 Binary files a/gfx/trade/arrow.2bpp and /dev/null differ diff --git a/gfx/trade/arrow.png b/gfx/trade/arrow.png new file mode 100644 index 000000000..b740048ec Binary files /dev/null and b/gfx/trade/arrow.png differ diff --git a/gfx/trade/ball.2bpp b/gfx/trade/ball.2bpp deleted file mode 100644 index b90cac274..000000000 Binary files a/gfx/trade/ball.2bpp and /dev/null differ diff --git a/gfx/trade/ball.png b/gfx/trade/ball.png new file mode 100755 index 000000000..4d3477bb6 Binary files /dev/null and b/gfx/trade/ball.png differ diff --git a/gfx/trade/bubble.2bpp b/gfx/trade/bubble.2bpp deleted file mode 100644 index c4a7abf4f..000000000 Binary files a/gfx/trade/bubble.2bpp and /dev/null differ diff --git a/gfx/trade/bubble.png b/gfx/trade/bubble.png new file mode 100644 index 000000000..a6b17ebe7 Binary files /dev/null and b/gfx/trade/bubble.png differ diff --git a/gfx/trade/cable.2bpp b/gfx/trade/cable.2bpp deleted file mode 100644 index 1f9974e99..000000000 Binary files a/gfx/trade/cable.2bpp and /dev/null differ diff --git a/gfx/trade/cable.png b/gfx/trade/cable.png new file mode 100644 index 000000000..d06d8a877 Binary files /dev/null and b/gfx/trade/cable.png differ diff --git a/gfx/trade/game_boy.2bpp.lz b/gfx/trade/game_boy.2bpp.lz.71a5f644 similarity index 100% rename from gfx/trade/game_boy.2bpp.lz rename to gfx/trade/game_boy.2bpp.lz.71a5f644 diff --git a/gfx/trade/game_boy.png b/gfx/trade/game_boy.png new file mode 100644 index 000000000..64c92260c Binary files /dev/null and b/gfx/trade/game_boy.png differ diff --git a/gfx/trade/poof.2bpp b/gfx/trade/poof.2bpp deleted file mode 100644 index c50e69e68..000000000 Binary files a/gfx/trade/poof.2bpp and /dev/null differ diff --git a/gfx/trade/poof.png b/gfx/trade/poof.png new file mode 100644 index 000000000..1b09874ba Binary files /dev/null and b/gfx/trade/poof.png differ diff --git a/gfx/trainers/beauty.2bpp.lz b/gfx/trainers/beauty.2bpp.lz.c1c13787 similarity index 100% rename from gfx/trainers/beauty.2bpp.lz rename to gfx/trainers/beauty.2bpp.lz.c1c13787 diff --git a/gfx/trainers/beauty.pal b/gfx/trainers/beauty.pal deleted file mode 100644 index 7183a0502..000000000 --- a/gfx/trainers/beauty.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 24, 17, 11 - RGB 08, 09, 17 - diff --git a/gfx/trainers/beauty.png b/gfx/trainers/beauty.png new file mode 100644 index 000000000..bb4831290 Binary files /dev/null and b/gfx/trainers/beauty.png differ diff --git a/gfx/trainers/biker.2bpp.lz b/gfx/trainers/biker.2bpp.lz.cb40f7cd similarity index 100% rename from gfx/trainers/biker.2bpp.lz rename to gfx/trainers/biker.2bpp.lz.cb40f7cd diff --git a/gfx/trainers/biker.pal b/gfx/trainers/biker.pal deleted file mode 100644 index bfffe557d..000000000 --- a/gfx/trainers/biker.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 20, 17, 09 - RGB 04, 03, 10 - diff --git a/gfx/trainers/biker.png b/gfx/trainers/biker.png new file mode 100644 index 000000000..7bd4c84a6 Binary files /dev/null and b/gfx/trainers/biker.png differ diff --git a/gfx/trainers/bird_keeper.2bpp.lz b/gfx/trainers/bird_keeper.2bpp.lz.1e56954c similarity index 100% rename from gfx/trainers/bird_keeper.2bpp.lz rename to gfx/trainers/bird_keeper.2bpp.lz.1e56954c diff --git a/gfx/trainers/bird_keeper.pal b/gfx/trainers/bird_keeper.pal deleted file mode 100644 index ca0407a3b..000000000 --- a/gfx/trainers/bird_keeper.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 22, 17 - RGB 06, 12, 26 - diff --git a/gfx/trainers/bird_keeper.png b/gfx/trainers/bird_keeper.png new file mode 100644 index 000000000..de938ad2b Binary files /dev/null and b/gfx/trainers/bird_keeper.png differ diff --git a/gfx/trainers/blackbelt_t.2bpp.lz b/gfx/trainers/blackbelt_t.2bpp.lz.4ef2481c similarity index 100% rename from gfx/trainers/blackbelt_t.2bpp.lz rename to gfx/trainers/blackbelt_t.2bpp.lz.4ef2481c diff --git a/gfx/trainers/blackbelt_t.pal b/gfx/trainers/blackbelt_t.pal deleted file mode 100644 index 59ea02844..000000000 --- a/gfx/trainers/blackbelt_t.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 26, 15, 08 - RGB 13, 10, 12 - diff --git a/gfx/trainers/blackbelt_t.png b/gfx/trainers/blackbelt_t.png new file mode 100644 index 000000000..5d84fa8de Binary files /dev/null and b/gfx/trainers/blackbelt_t.png differ diff --git a/gfx/trainers/blaine.2bpp.lz b/gfx/trainers/blaine.2bpp.lz.00a3b6f5 similarity index 100% rename from gfx/trainers/blaine.2bpp.lz rename to gfx/trainers/blaine.2bpp.lz.00a3b6f5 diff --git a/gfx/trainers/blaine.pal b/gfx/trainers/blaine.pal deleted file mode 100644 index 90f3a381f..000000000 --- a/gfx/trainers/blaine.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 20, 16 - RGB 07, 11, 12 - diff --git a/gfx/trainers/blaine.png b/gfx/trainers/blaine.png new file mode 100644 index 000000000..1afc558fd Binary files /dev/null and b/gfx/trainers/blaine.png differ diff --git a/gfx/trainers/blue.2bpp.lz b/gfx/trainers/blue.2bpp.lz.9fdbab8f similarity index 100% rename from gfx/trainers/blue.2bpp.lz rename to gfx/trainers/blue.2bpp.lz.9fdbab8f diff --git a/gfx/trainers/blue.pal b/gfx/trainers/blue.pal deleted file mode 100644 index ce6b3f1d7..000000000 --- a/gfx/trainers/blue.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 24, 08 - RGB 12, 09, 19 - diff --git a/gfx/trainers/blue.png b/gfx/trainers/blue.png new file mode 100644 index 000000000..76a1e81af Binary files /dev/null and b/gfx/trainers/blue.png differ diff --git a/gfx/trainers/boarder.2bpp.lz b/gfx/trainers/boarder.2bpp.lz.5d6881a8 similarity index 100% rename from gfx/trainers/boarder.2bpp.lz rename to gfx/trainers/boarder.2bpp.lz.5d6881a8 diff --git a/gfx/trainers/boarder.pal b/gfx/trainers/boarder.pal deleted file mode 100644 index 4fb9af5e1..000000000 --- a/gfx/trainers/boarder.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 24, 19, 07 - RGB 13, 10, 19 - diff --git a/gfx/trainers/boarder.png b/gfx/trainers/boarder.png new file mode 100644 index 000000000..a8174e9a5 Binary files /dev/null and b/gfx/trainers/boarder.png differ diff --git a/gfx/trainers/brock.2bpp.lz b/gfx/trainers/brock.2bpp.lz.5bdeb7bf similarity index 100% rename from gfx/trainers/brock.2bpp.lz rename to gfx/trainers/brock.2bpp.lz.5bdeb7bf diff --git a/gfx/trainers/brock.pal b/gfx/trainers/brock.pal deleted file mode 100644 index f5a1b0c06..000000000 --- a/gfx/trainers/brock.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 18, 14 - RGB 14, 07, 10 - diff --git a/gfx/trainers/brock.png b/gfx/trainers/brock.png new file mode 100644 index 000000000..0aea8a946 Binary files /dev/null and b/gfx/trainers/brock.png differ diff --git a/gfx/trainers/bruno.2bpp.lz b/gfx/trainers/bruno.2bpp.lz.22f3c222 similarity index 100% rename from gfx/trainers/bruno.2bpp.lz rename to gfx/trainers/bruno.2bpp.lz.22f3c222 diff --git a/gfx/trainers/bruno.pal b/gfx/trainers/bruno.pal deleted file mode 100644 index 41408a91d..000000000 --- a/gfx/trainers/bruno.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 17, 12 - RGB 08, 10, 12 - diff --git a/gfx/trainers/bruno.png b/gfx/trainers/bruno.png new file mode 100644 index 000000000..c8a003eea Binary files /dev/null and b/gfx/trainers/bruno.png differ diff --git a/gfx/trainers/bug_catcher.2bpp.lz b/gfx/trainers/bug_catcher.2bpp.lz.43144f97 similarity index 100% rename from gfx/trainers/bug_catcher.2bpp.lz rename to gfx/trainers/bug_catcher.2bpp.lz.43144f97 diff --git a/gfx/trainers/bug_catcher.pal b/gfx/trainers/bug_catcher.pal deleted file mode 100644 index 8e4df4219..000000000 --- a/gfx/trainers/bug_catcher.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 27, 17, 10 - RGB 06, 10, 18 - diff --git a/gfx/trainers/bug_catcher.png b/gfx/trainers/bug_catcher.png new file mode 100644 index 000000000..a1c065d20 Binary files /dev/null and b/gfx/trainers/bug_catcher.png differ diff --git a/gfx/trainers/bugsy.2bpp.lz b/gfx/trainers/bugsy.2bpp.lz.c070450d similarity index 100% rename from gfx/trainers/bugsy.2bpp.lz rename to gfx/trainers/bugsy.2bpp.lz.c070450d diff --git a/gfx/trainers/bugsy.pal b/gfx/trainers/bugsy.pal deleted file mode 100644 index 1743f663b..000000000 --- a/gfx/trainers/bugsy.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 26, 18, 15 - RGB 13, 21, 06 - diff --git a/gfx/trainers/bugsy.png b/gfx/trainers/bugsy.png new file mode 100644 index 000000000..8b1f89537 Binary files /dev/null and b/gfx/trainers/bugsy.png differ diff --git a/gfx/trainers/burglar.2bpp.lz b/gfx/trainers/burglar.2bpp.lz.e063f42e similarity index 100% rename from gfx/trainers/burglar.2bpp.lz rename to gfx/trainers/burglar.2bpp.lz.e063f42e diff --git a/gfx/trainers/burglar.pal b/gfx/trainers/burglar.pal deleted file mode 100644 index cfcdd144f..000000000 --- a/gfx/trainers/burglar.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 28, 16, 09 - RGB 12, 04, 23 - diff --git a/gfx/trainers/burglar.png b/gfx/trainers/burglar.png new file mode 100644 index 000000000..241eaa2dc Binary files /dev/null and b/gfx/trainers/burglar.png differ diff --git a/gfx/trainers/cal.2bpp.lz b/gfx/trainers/cal.2bpp.lz.aac54a14 similarity index 100% rename from gfx/trainers/cal.2bpp.lz rename to gfx/trainers/cal.2bpp.lz.aac54a14 diff --git a/gfx/trainers/cal.pal b/gfx/trainers/cal.pal deleted file mode 100644 index 92101c5e3..000000000 --- a/gfx/trainers/cal.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 18, 12 - RGB 22, 09, 05 - diff --git a/gfx/trainers/cal.png b/gfx/trainers/cal.png new file mode 100644 index 000000000..31a38cc54 Binary files /dev/null and b/gfx/trainers/cal.png differ diff --git a/gfx/trainers/camper.2bpp.lz b/gfx/trainers/camper.2bpp.lz.cc2357ea similarity index 100% rename from gfx/trainers/camper.2bpp.lz rename to gfx/trainers/camper.2bpp.lz.cc2357ea diff --git a/gfx/trainers/camper.pal b/gfx/trainers/camper.pal deleted file mode 100644 index 13a083c68..000000000 --- a/gfx/trainers/camper.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 19, 08 - RGB 15, 25, 02 - diff --git a/gfx/trainers/camper.png b/gfx/trainers/camper.png new file mode 100644 index 000000000..72e043eea Binary files /dev/null and b/gfx/trainers/camper.png differ diff --git a/gfx/trainers/champion.2bpp.lz b/gfx/trainers/champion.2bpp.lz.0175f5ea similarity index 100% rename from gfx/trainers/champion.2bpp.lz rename to gfx/trainers/champion.2bpp.lz.0175f5ea diff --git a/gfx/trainers/champion.pal b/gfx/trainers/champion.pal deleted file mode 100644 index 3dee1efef..000000000 --- a/gfx/trainers/champion.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 29, 19, 15 - RGB 21, 09, 05 - diff --git a/gfx/trainers/champion.png b/gfx/trainers/champion.png new file mode 100644 index 000000000..02494e748 Binary files /dev/null and b/gfx/trainers/champion.png differ diff --git a/gfx/trainers/chuck.2bpp.lz b/gfx/trainers/chuck.2bpp.lz.cab13edd similarity index 100% rename from gfx/trainers/chuck.2bpp.lz rename to gfx/trainers/chuck.2bpp.lz.cab13edd diff --git a/gfx/trainers/chuck.pal b/gfx/trainers/chuck.pal deleted file mode 100644 index 9616829dc..000000000 --- a/gfx/trainers/chuck.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 16, 12 - RGB 12, 08, 08 - diff --git a/gfx/trainers/chuck.png b/gfx/trainers/chuck.png new file mode 100644 index 000000000..a7504f87a Binary files /dev/null and b/gfx/trainers/chuck.png differ diff --git a/gfx/trainers/clair.2bpp.lz b/gfx/trainers/clair.2bpp.lz.a1771075 similarity index 100% rename from gfx/trainers/clair.2bpp.lz rename to gfx/trainers/clair.2bpp.lz.a1771075 diff --git a/gfx/trainers/clair.pal b/gfx/trainers/clair.pal deleted file mode 100644 index 616598fee..000000000 --- a/gfx/trainers/clair.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 27, 18, 12 - RGB 08, 11, 16 - diff --git a/gfx/trainers/clair.png b/gfx/trainers/clair.png new file mode 100644 index 000000000..0a8ca2a58 Binary files /dev/null and b/gfx/trainers/clair.png differ diff --git a/gfx/trainers/cooltrainer_f.2bpp.lz b/gfx/trainers/cooltrainer_f.2bpp.lz.6fb1e652 similarity index 100% rename from gfx/trainers/cooltrainer_f.2bpp.lz rename to gfx/trainers/cooltrainer_f.2bpp.lz.6fb1e652 diff --git a/gfx/trainers/cooltrainer_f.pal b/gfx/trainers/cooltrainer_f.pal deleted file mode 100644 index bdeefabf8..000000000 --- a/gfx/trainers/cooltrainer_f.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 26, 18, 15 - RGB 22, 09, 03 - diff --git a/gfx/trainers/cooltrainer_f.png b/gfx/trainers/cooltrainer_f.png new file mode 100644 index 000000000..9547ba377 Binary files /dev/null and b/gfx/trainers/cooltrainer_f.png differ diff --git a/gfx/trainers/cooltrainer_m.2bpp.lz b/gfx/trainers/cooltrainer_m.2bpp.lz.0aa81882 similarity index 100% rename from gfx/trainers/cooltrainer_m.2bpp.lz rename to gfx/trainers/cooltrainer_m.2bpp.lz.0aa81882 diff --git a/gfx/trainers/cooltrainer_m.pal b/gfx/trainers/cooltrainer_m.pal deleted file mode 100644 index bdeefabf8..000000000 --- a/gfx/trainers/cooltrainer_m.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 26, 18, 15 - RGB 22, 09, 03 - diff --git a/gfx/trainers/cooltrainer_m.png b/gfx/trainers/cooltrainer_m.png new file mode 100644 index 000000000..9a6620b45 Binary files /dev/null and b/gfx/trainers/cooltrainer_m.png differ diff --git a/gfx/trainers/erika.2bpp.lz b/gfx/trainers/erika.2bpp.lz.58985f01 similarity index 100% rename from gfx/trainers/erika.2bpp.lz rename to gfx/trainers/erika.2bpp.lz.58985f01 diff --git a/gfx/trainers/erika.pal b/gfx/trainers/erika.pal deleted file mode 100644 index e8de9b43d..000000000 --- a/gfx/trainers/erika.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 18, 13 - RGB 07, 15, 08 - diff --git a/gfx/trainers/erika.png b/gfx/trainers/erika.png new file mode 100644 index 000000000..9b1c282dd Binary files /dev/null and b/gfx/trainers/erika.png differ diff --git a/gfx/trainers/executive_f.2bpp.lz b/gfx/trainers/executive_f.2bpp.lz.c8b5dc9c similarity index 100% rename from gfx/trainers/executive_f.2bpp.lz rename to gfx/trainers/executive_f.2bpp.lz.c8b5dc9c diff --git a/gfx/trainers/executive_f.pal b/gfx/trainers/executive_f.pal deleted file mode 100644 index 36ec86f8e..000000000 --- a/gfx/trainers/executive_f.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 22, 17 - RGB 19, 05, 12 - diff --git a/gfx/trainers/executive_f.png b/gfx/trainers/executive_f.png new file mode 100644 index 000000000..ec1419758 Binary files /dev/null and b/gfx/trainers/executive_f.png differ diff --git a/gfx/trainers/executive_m.2bpp.lz b/gfx/trainers/executive_m.2bpp.lz.211746a6 similarity index 100% rename from gfx/trainers/executive_m.2bpp.lz rename to gfx/trainers/executive_m.2bpp.lz.211746a6 diff --git a/gfx/trainers/executive_m.pal b/gfx/trainers/executive_m.pal deleted file mode 100644 index 66e0a46c9..000000000 --- a/gfx/trainers/executive_m.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 17, 05 - RGB 14, 05, 14 - diff --git a/gfx/trainers/executive_m.png b/gfx/trainers/executive_m.png new file mode 100644 index 000000000..e88db5a78 Binary files /dev/null and b/gfx/trainers/executive_m.png differ diff --git a/gfx/trainers/falkner.2bpp.lz b/gfx/trainers/falkner.2bpp.lz.6ec6bbaf similarity index 100% rename from gfx/trainers/falkner.2bpp.lz rename to gfx/trainers/falkner.2bpp.lz.6ec6bbaf diff --git a/gfx/trainers/falkner.pal b/gfx/trainers/falkner.pal deleted file mode 100644 index ddc5262ba..000000000 --- a/gfx/trainers/falkner.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 27, 17, 14 - RGB 07, 05, 31 - diff --git a/gfx/trainers/falkner.png b/gfx/trainers/falkner.png new file mode 100644 index 000000000..244352fd7 Binary files /dev/null and b/gfx/trainers/falkner.png differ diff --git a/gfx/trainers/firebreather.2bpp.lz b/gfx/trainers/firebreather.2bpp.lz.a790feb1 similarity index 100% rename from gfx/trainers/firebreather.2bpp.lz rename to gfx/trainers/firebreather.2bpp.lz.a790feb1 diff --git a/gfx/trainers/firebreather.pal b/gfx/trainers/firebreather.pal deleted file mode 100644 index b051224dd..000000000 --- a/gfx/trainers/firebreather.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 27, 17, 11 - RGB 25, 05, 12 - diff --git a/gfx/trainers/firebreather.png b/gfx/trainers/firebreather.png new file mode 100644 index 000000000..d838c3a58 Binary files /dev/null and b/gfx/trainers/firebreather.png differ diff --git a/gfx/trainers/fisher.2bpp.lz b/gfx/trainers/fisher.2bpp.lz.95bfbfd6 similarity index 100% rename from gfx/trainers/fisher.2bpp.lz rename to gfx/trainers/fisher.2bpp.lz.95bfbfd6 diff --git a/gfx/trainers/fisher.pal b/gfx/trainers/fisher.pal deleted file mode 100644 index 9d0657111..000000000 --- a/gfx/trainers/fisher.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 17, 13 - RGB 07, 12, 15 - diff --git a/gfx/trainers/fisher.png b/gfx/trainers/fisher.png new file mode 100644 index 000000000..a39f10d57 Binary files /dev/null and b/gfx/trainers/fisher.png differ diff --git a/gfx/trainers/gentleman.2bpp.lz b/gfx/trainers/gentleman.2bpp.lz.d3d78e00 similarity index 100% rename from gfx/trainers/gentleman.2bpp.lz rename to gfx/trainers/gentleman.2bpp.lz.d3d78e00 diff --git a/gfx/trainers/gentleman.pal b/gfx/trainers/gentleman.pal deleted file mode 100644 index c6faa0d33..000000000 --- a/gfx/trainers/gentleman.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 16, 12 - RGB 09, 09, 15 - diff --git a/gfx/trainers/gentleman.png b/gfx/trainers/gentleman.png new file mode 100644 index 000000000..2ae2eaf1c Binary files /dev/null and b/gfx/trainers/gentleman.png differ diff --git a/gfx/trainers/grunt_f.2bpp.lz b/gfx/trainers/grunt_f.2bpp.lz.522aecd7 similarity index 100% rename from gfx/trainers/grunt_f.2bpp.lz rename to gfx/trainers/grunt_f.2bpp.lz.522aecd7 diff --git a/gfx/trainers/grunt_f.pal b/gfx/trainers/grunt_f.pal deleted file mode 100644 index 746132411..000000000 --- a/gfx/trainers/grunt_f.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 19, 13 - RGB 19, 06, 08 - diff --git a/gfx/trainers/grunt_f.png b/gfx/trainers/grunt_f.png new file mode 100644 index 000000000..8c69953f7 Binary files /dev/null and b/gfx/trainers/grunt_f.png differ diff --git a/gfx/trainers/grunt_m.2bpp.lz b/gfx/trainers/grunt_m.2bpp.lz.916e09d2 similarity index 100% rename from gfx/trainers/grunt_m.2bpp.lz rename to gfx/trainers/grunt_m.2bpp.lz.916e09d2 diff --git a/gfx/trainers/grunt_m.pal b/gfx/trainers/grunt_m.pal deleted file mode 100644 index f7dc95d8f..000000000 --- a/gfx/trainers/grunt_m.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 29, 17, 15 - RGB 20, 08, 05 - diff --git a/gfx/trainers/grunt_m.png b/gfx/trainers/grunt_m.png new file mode 100644 index 000000000..909b25225 Binary files /dev/null and b/gfx/trainers/grunt_m.png differ diff --git a/gfx/trainers/guitarist.2bpp.lz b/gfx/trainers/guitarist.2bpp.lz.be5a9b71 similarity index 100% rename from gfx/trainers/guitarist.2bpp.lz rename to gfx/trainers/guitarist.2bpp.lz.be5a9b71 diff --git a/gfx/trainers/guitarist.pal b/gfx/trainers/guitarist.pal deleted file mode 100644 index d5c88a3bd..000000000 --- a/gfx/trainers/guitarist.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 22, 19 - RGB 31, 08, 05 - diff --git a/gfx/trainers/guitarist.png b/gfx/trainers/guitarist.png new file mode 100644 index 000000000..2fac74bd5 Binary files /dev/null and b/gfx/trainers/guitarist.png differ diff --git a/gfx/trainers/hiker.2bpp.lz b/gfx/trainers/hiker.2bpp.lz.07a4e386 similarity index 100% rename from gfx/trainers/hiker.2bpp.lz rename to gfx/trainers/hiker.2bpp.lz.07a4e386 diff --git a/gfx/trainers/hiker.pal b/gfx/trainers/hiker.pal deleted file mode 100644 index 8d0cb5c4c..000000000 --- a/gfx/trainers/hiker.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 23, 15, 09 - RGB 13, 08, 23 - diff --git a/gfx/trainers/hiker.png b/gfx/trainers/hiker.png new file mode 100644 index 000000000..ff1712cbc Binary files /dev/null and b/gfx/trainers/hiker.png differ diff --git a/gfx/trainers/janine.2bpp.lz b/gfx/trainers/janine.2bpp.lz.5350f3ce similarity index 100% rename from gfx/trainers/janine.2bpp.lz rename to gfx/trainers/janine.2bpp.lz.5350f3ce diff --git a/gfx/trainers/janine.pal b/gfx/trainers/janine.pal deleted file mode 100644 index e958004cb..000000000 --- a/gfx/trainers/janine.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 18, 15 - RGB 15, 08, 23 - diff --git a/gfx/trainers/janine.png b/gfx/trainers/janine.png new file mode 100644 index 000000000..4e041f1aa Binary files /dev/null and b/gfx/trainers/janine.png differ diff --git a/gfx/trainers/jasmine.2bpp.lz b/gfx/trainers/jasmine.2bpp.lz.dcd58308 similarity index 100% rename from gfx/trainers/jasmine.2bpp.lz rename to gfx/trainers/jasmine.2bpp.lz.dcd58308 diff --git a/gfx/trainers/jasmine.pal b/gfx/trainers/jasmine.pal deleted file mode 100644 index 352d95673..000000000 --- a/gfx/trainers/jasmine.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 26, 18, 10 - RGB 16, 09, 11 - diff --git a/gfx/trainers/jasmine.png b/gfx/trainers/jasmine.png new file mode 100644 index 000000000..25a7a9b5e Binary files /dev/null and b/gfx/trainers/jasmine.png differ diff --git a/gfx/trainers/juggler.2bpp.lz b/gfx/trainers/juggler.2bpp.lz.2d7625ba similarity index 100% rename from gfx/trainers/juggler.2bpp.lz rename to gfx/trainers/juggler.2bpp.lz.2d7625ba diff --git a/gfx/trainers/juggler.pal b/gfx/trainers/juggler.pal deleted file mode 100644 index ffee98b09..000000000 --- a/gfx/trainers/juggler.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 26, 15, 10 - RGB 09, 06, 31 - diff --git a/gfx/trainers/juggler.png b/gfx/trainers/juggler.png new file mode 100644 index 000000000..90001c3ce Binary files /dev/null and b/gfx/trainers/juggler.png differ diff --git a/gfx/trainers/karen.2bpp.lz b/gfx/trainers/karen.2bpp.lz.7fc3d941 similarity index 100% rename from gfx/trainers/karen.2bpp.lz rename to gfx/trainers/karen.2bpp.lz.7fc3d941 diff --git a/gfx/trainers/karen.pal b/gfx/trainers/karen.pal deleted file mode 100644 index 0eeb5fa2d..000000000 --- a/gfx/trainers/karen.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 18, 14 - RGB 21, 08, 07 - diff --git a/gfx/trainers/karen.png b/gfx/trainers/karen.png new file mode 100644 index 000000000..46081bdae Binary files /dev/null and b/gfx/trainers/karen.png differ diff --git a/gfx/trainers/kimono_girl.2bpp.lz b/gfx/trainers/kimono_girl.2bpp.lz.e8833d48 similarity index 100% rename from gfx/trainers/kimono_girl.2bpp.lz rename to gfx/trainers/kimono_girl.2bpp.lz.e8833d48 diff --git a/gfx/trainers/kimono_girl.pal b/gfx/trainers/kimono_girl.pal deleted file mode 100644 index 334b11d21..000000000 --- a/gfx/trainers/kimono_girl.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 29, 19, 15 - RGB 26, 09, 06 - diff --git a/gfx/trainers/kimono_girl.png b/gfx/trainers/kimono_girl.png new file mode 100644 index 000000000..8f55ab1b2 Binary files /dev/null and b/gfx/trainers/kimono_girl.png differ diff --git a/gfx/trainers/koga.2bpp.lz b/gfx/trainers/koga.2bpp.lz.7a066020 similarity index 100% rename from gfx/trainers/koga.2bpp.lz rename to gfx/trainers/koga.2bpp.lz.7a066020 diff --git a/gfx/trainers/koga.pal b/gfx/trainers/koga.pal deleted file mode 100644 index 096b1e131..000000000 --- a/gfx/trainers/koga.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 27, 18, 14 - RGB 12, 07, 13 - diff --git a/gfx/trainers/koga.png b/gfx/trainers/koga.png new file mode 100644 index 000000000..ed77f264c Binary files /dev/null and b/gfx/trainers/koga.png differ diff --git a/gfx/trainers/lass.2bpp.lz b/gfx/trainers/lass.2bpp.lz.e3726508 similarity index 100% rename from gfx/trainers/lass.2bpp.lz rename to gfx/trainers/lass.2bpp.lz.e3726508 diff --git a/gfx/trainers/lass.pal b/gfx/trainers/lass.pal deleted file mode 100644 index 1ca3149dc..000000000 --- a/gfx/trainers/lass.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 17, 06 - RGB 13, 08, 25 - diff --git a/gfx/trainers/lass.png b/gfx/trainers/lass.png new file mode 100644 index 000000000..18e375a21 Binary files /dev/null and b/gfx/trainers/lass.png differ diff --git a/gfx/trainers/lt_surge.2bpp.lz b/gfx/trainers/lt_surge.2bpp.lz.4ac586d0 similarity index 100% rename from gfx/trainers/lt_surge.2bpp.lz rename to gfx/trainers/lt_surge.2bpp.lz.4ac586d0 diff --git a/gfx/trainers/lt_surge.pal b/gfx/trainers/lt_surge.pal deleted file mode 100644 index 6243fae58..000000000 --- a/gfx/trainers/lt_surge.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 17, 14 - RGB 09, 14, 10 - diff --git a/gfx/trainers/lt_surge.png b/gfx/trainers/lt_surge.png new file mode 100644 index 000000000..44e7db6dc Binary files /dev/null and b/gfx/trainers/lt_surge.png differ diff --git a/gfx/trainers/medium.2bpp.lz b/gfx/trainers/medium.2bpp.lz.db642b9e similarity index 100% rename from gfx/trainers/medium.2bpp.lz rename to gfx/trainers/medium.2bpp.lz.db642b9e diff --git a/gfx/trainers/medium.pal b/gfx/trainers/medium.pal deleted file mode 100644 index e06b66f39..000000000 --- a/gfx/trainers/medium.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 17, 12 - RGB 09, 09, 14 - diff --git a/gfx/trainers/medium.png b/gfx/trainers/medium.png new file mode 100644 index 000000000..4828a771d Binary files /dev/null and b/gfx/trainers/medium.png differ diff --git a/gfx/trainers/misty.2bpp.lz b/gfx/trainers/misty.2bpp.lz.2ded1a10 similarity index 100% rename from gfx/trainers/misty.2bpp.lz rename to gfx/trainers/misty.2bpp.lz.2ded1a10 diff --git a/gfx/trainers/misty.pal b/gfx/trainers/misty.pal deleted file mode 100644 index aab4b0849..000000000 --- a/gfx/trainers/misty.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 29, 19, 16 - RGB 20, 10, 05 - diff --git a/gfx/trainers/misty.png b/gfx/trainers/misty.png new file mode 100644 index 000000000..64768409a Binary files /dev/null and b/gfx/trainers/misty.png differ diff --git a/gfx/trainers/morty.2bpp.lz b/gfx/trainers/morty.2bpp.lz.aec5773b similarity index 100% rename from gfx/trainers/morty.2bpp.lz rename to gfx/trainers/morty.2bpp.lz.aec5773b diff --git a/gfx/trainers/morty.pal b/gfx/trainers/morty.pal deleted file mode 100644 index 736d93ba7..000000000 --- a/gfx/trainers/morty.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 29, 17, 12 - RGB 12, 07, 22 - diff --git a/gfx/trainers/morty.png b/gfx/trainers/morty.png new file mode 100644 index 000000000..7f817e1a2 Binary files /dev/null and b/gfx/trainers/morty.png differ diff --git a/gfx/trainers/mysticalman.2bpp.lz b/gfx/trainers/mysticalman.2bpp.lz.35d01215 similarity index 100% rename from gfx/trainers/mysticalman.2bpp.lz rename to gfx/trainers/mysticalman.2bpp.lz.35d01215 diff --git a/gfx/trainers/mysticalman.pal b/gfx/trainers/mysticalman.pal deleted file mode 100644 index 7e95414ae..000000000 --- a/gfx/trainers/mysticalman.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 28, 20, 12 - RGB 16, 07, 16 - diff --git a/gfx/trainers/mysticalman.png b/gfx/trainers/mysticalman.png new file mode 100644 index 000000000..aac6bf026 Binary files /dev/null and b/gfx/trainers/mysticalman.png differ diff --git a/gfx/trainers/oak.2bpp.lz b/gfx/trainers/oak.2bpp.lz.91a27df3 similarity index 100% rename from gfx/trainers/oak.2bpp.lz rename to gfx/trainers/oak.2bpp.lz.91a27df3 diff --git a/gfx/trainers/oak.pal b/gfx/trainers/oak.pal deleted file mode 100644 index a4be7ff97..000000000 --- a/gfx/trainers/oak.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 24, 19, 11 - RGB 13, 16, 00 - diff --git a/gfx/trainers/oak.png b/gfx/trainers/oak.png new file mode 100644 index 000000000..4b4fab1a3 Binary files /dev/null and b/gfx/trainers/oak.png differ diff --git a/gfx/trainers/officer.2bpp.lz b/gfx/trainers/officer.2bpp.lz.630b057a similarity index 100% rename from gfx/trainers/officer.2bpp.lz rename to gfx/trainers/officer.2bpp.lz.630b057a diff --git a/gfx/trainers/officer.pal b/gfx/trainers/officer.pal deleted file mode 100644 index a14a47917..000000000 --- a/gfx/trainers/officer.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 24, 08 - RGB 12, 09, 19 - diff --git a/gfx/trainers/officer.png b/gfx/trainers/officer.png new file mode 100644 index 000000000..a5afe293a Binary files /dev/null and b/gfx/trainers/officer.png differ diff --git a/gfx/trainers/picnicker.2bpp.lz b/gfx/trainers/picnicker.2bpp.lz.6842b86a similarity index 100% rename from gfx/trainers/picnicker.2bpp.lz rename to gfx/trainers/picnicker.2bpp.lz.6842b86a diff --git a/gfx/trainers/picnicker.pal b/gfx/trainers/picnicker.pal deleted file mode 100644 index d0eec39f9..000000000 --- a/gfx/trainers/picnicker.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 19, 08 - RGB 10, 20, 02 - diff --git a/gfx/trainers/picnicker.png b/gfx/trainers/picnicker.png new file mode 100644 index 000000000..0721244f0 Binary files /dev/null and b/gfx/trainers/picnicker.png differ diff --git a/gfx/trainers/pokefan_f.2bpp.lz b/gfx/trainers/pokefan_f.2bpp.lz.9cbd3f20 similarity index 100% rename from gfx/trainers/pokefan_f.2bpp.lz rename to gfx/trainers/pokefan_f.2bpp.lz.9cbd3f20 diff --git a/gfx/trainers/pokefan_f.pal b/gfx/trainers/pokefan_f.pal deleted file mode 100644 index 57d1b94cf..000000000 --- a/gfx/trainers/pokefan_f.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 17, 14 - RGB 15, 04, 15 - diff --git a/gfx/trainers/pokefan_f.png b/gfx/trainers/pokefan_f.png new file mode 100644 index 000000000..0bf45ace6 Binary files /dev/null and b/gfx/trainers/pokefan_f.png differ diff --git a/gfx/trainers/pokefan_m.2bpp.lz b/gfx/trainers/pokefan_m.2bpp.lz.5bc5a3e1 similarity index 100% rename from gfx/trainers/pokefan_m.2bpp.lz rename to gfx/trainers/pokefan_m.2bpp.lz.5bc5a3e1 diff --git a/gfx/trainers/pokefan_m.pal b/gfx/trainers/pokefan_m.pal deleted file mode 100644 index 601ed4ae9..000000000 --- a/gfx/trainers/pokefan_m.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 29, 19, 13 - RGB 21, 08, 08 - diff --git a/gfx/trainers/pokefan_m.png b/gfx/trainers/pokefan_m.png new file mode 100644 index 000000000..d8cc8fc8e Binary files /dev/null and b/gfx/trainers/pokefan_m.png differ diff --git a/gfx/trainers/pokemaniac.2bpp.lz b/gfx/trainers/pokemaniac.2bpp.lz.786c5fce similarity index 100% rename from gfx/trainers/pokemaniac.2bpp.lz rename to gfx/trainers/pokemaniac.2bpp.lz.786c5fce diff --git a/gfx/trainers/pokemaniac.pal b/gfx/trainers/pokemaniac.pal deleted file mode 100644 index f8e224ab8..000000000 --- a/gfx/trainers/pokemaniac.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 28, 20, 13 - RGB 13, 05, 18 - diff --git a/gfx/trainers/pokemaniac.png b/gfx/trainers/pokemaniac.png new file mode 100644 index 000000000..8ab470877 Binary files /dev/null and b/gfx/trainers/pokemaniac.png differ diff --git a/gfx/trainers/pryce.2bpp.lz b/gfx/trainers/pryce.2bpp.lz.1a98cae8 similarity index 100% rename from gfx/trainers/pryce.2bpp.lz rename to gfx/trainers/pryce.2bpp.lz.1a98cae8 diff --git a/gfx/trainers/pryce.pal b/gfx/trainers/pryce.pal deleted file mode 100644 index ca319f05a..000000000 --- a/gfx/trainers/pryce.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 18, 16 - RGB 12, 09, 08 - diff --git a/gfx/trainers/pryce.png b/gfx/trainers/pryce.png new file mode 100644 index 000000000..2953fe32d Binary files /dev/null and b/gfx/trainers/pryce.png differ diff --git a/gfx/trainers/psychic_t.2bpp.lz b/gfx/trainers/psychic_t.2bpp.lz.ecd603f4 similarity index 100% rename from gfx/trainers/psychic_t.2bpp.lz rename to gfx/trainers/psychic_t.2bpp.lz.ecd603f4 diff --git a/gfx/trainers/psychic_t.pal b/gfx/trainers/psychic_t.pal deleted file mode 100644 index e19c4d817..000000000 --- a/gfx/trainers/psychic_t.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 22, 17 - RGB 10, 12, 19 - diff --git a/gfx/trainers/psychic_t.png b/gfx/trainers/psychic_t.png new file mode 100644 index 000000000..897c8385e Binary files /dev/null and b/gfx/trainers/psychic_t.png differ diff --git a/gfx/trainers/red.2bpp.lz b/gfx/trainers/red.2bpp.lz.51104ac6 similarity index 100% rename from gfx/trainers/red.2bpp.lz rename to gfx/trainers/red.2bpp.lz.51104ac6 diff --git a/gfx/trainers/red.pal b/gfx/trainers/red.pal deleted file mode 100644 index 3ebf35fb7..000000000 --- a/gfx/trainers/red.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 28, 18, 17 - RGB 22, 07, 08 - diff --git a/gfx/trainers/red.png b/gfx/trainers/red.png new file mode 100644 index 000000000..bd6d4a37d Binary files /dev/null and b/gfx/trainers/red.png differ diff --git a/gfx/trainers/rival1.2bpp.lz b/gfx/trainers/rival1.2bpp.lz.e43b32ef similarity index 100% rename from gfx/trainers/rival1.2bpp.lz rename to gfx/trainers/rival1.2bpp.lz.e43b32ef diff --git a/gfx/trainers/rival1.pal b/gfx/trainers/rival1.pal deleted file mode 100644 index 190dc92e0..000000000 --- a/gfx/trainers/rival1.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 27, 18, 07 - RGB 26, 04, 09 - diff --git a/gfx/trainers/rival1.png b/gfx/trainers/rival1.png new file mode 100644 index 000000000..60e29553d Binary files /dev/null and b/gfx/trainers/rival1.png differ diff --git a/gfx/trainers/rival2.2bpp.lz b/gfx/trainers/rival2.2bpp.lz.562de263 similarity index 100% rename from gfx/trainers/rival2.2bpp.lz rename to gfx/trainers/rival2.2bpp.lz.562de263 diff --git a/gfx/trainers/rival2.pal b/gfx/trainers/rival2.pal deleted file mode 100644 index 190dc92e0..000000000 --- a/gfx/trainers/rival2.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 27, 18, 07 - RGB 26, 04, 09 - diff --git a/gfx/trainers/rival2.png b/gfx/trainers/rival2.png new file mode 100644 index 000000000..b3f0ec48e Binary files /dev/null and b/gfx/trainers/rival2.png differ diff --git a/gfx/trainers/sabrina.2bpp.lz b/gfx/trainers/sabrina.2bpp.lz.d09a2b46 similarity index 100% rename from gfx/trainers/sabrina.2bpp.lz rename to gfx/trainers/sabrina.2bpp.lz.d09a2b46 diff --git a/gfx/trainers/sabrina.pal b/gfx/trainers/sabrina.pal deleted file mode 100644 index 950be6902..000000000 --- a/gfx/trainers/sabrina.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 22, 17 - RGB 24, 07, 09 - diff --git a/gfx/trainers/sabrina.png b/gfx/trainers/sabrina.png new file mode 100644 index 000000000..815768c83 Binary files /dev/null and b/gfx/trainers/sabrina.png differ diff --git a/gfx/trainers/sage.2bpp.lz b/gfx/trainers/sage.2bpp.lz.2038324b similarity index 100% rename from gfx/trainers/sage.2bpp.lz rename to gfx/trainers/sage.2bpp.lz.2038324b diff --git a/gfx/trainers/sage.pal b/gfx/trainers/sage.pal deleted file mode 100644 index d61b39ec3..000000000 --- a/gfx/trainers/sage.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 22, 17 - RGB 08, 08, 20 - diff --git a/gfx/trainers/sage.png b/gfx/trainers/sage.png new file mode 100644 index 000000000..df7e3e4f4 Binary files /dev/null and b/gfx/trainers/sage.png differ diff --git a/gfx/trainers/sailor.2bpp.lz b/gfx/trainers/sailor.2bpp.lz.0f7f3386 similarity index 100% rename from gfx/trainers/sailor.2bpp.lz rename to gfx/trainers/sailor.2bpp.lz.0f7f3386 diff --git a/gfx/trainers/sailor.pal b/gfx/trainers/sailor.pal deleted file mode 100644 index 33b3c02b1..000000000 --- a/gfx/trainers/sailor.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 24, 14, 07 - RGB 03, 07, 13 - diff --git a/gfx/trainers/sailor.png b/gfx/trainers/sailor.png new file mode 100644 index 000000000..09dee6b73 Binary files /dev/null and b/gfx/trainers/sailor.png differ diff --git a/gfx/trainers/schoolboy.2bpp.lz b/gfx/trainers/schoolboy.2bpp.lz.6d26b31b similarity index 100% rename from gfx/trainers/schoolboy.2bpp.lz rename to gfx/trainers/schoolboy.2bpp.lz.6d26b31b diff --git a/gfx/trainers/schoolboy.pal b/gfx/trainers/schoolboy.pal deleted file mode 100644 index 5ba665e79..000000000 --- a/gfx/trainers/schoolboy.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 16, 11 - RGB 13, 10, 24 - diff --git a/gfx/trainers/schoolboy.png b/gfx/trainers/schoolboy.png new file mode 100644 index 000000000..3c154e6d5 Binary files /dev/null and b/gfx/trainers/schoolboy.png differ diff --git a/gfx/trainers/scientist.2bpp.lz b/gfx/trainers/scientist.2bpp.lz.2ef10474 similarity index 100% rename from gfx/trainers/scientist.2bpp.lz rename to gfx/trainers/scientist.2bpp.lz.2ef10474 diff --git a/gfx/trainers/scientist.pal b/gfx/trainers/scientist.pal deleted file mode 100644 index 0661e50e8..000000000 --- a/gfx/trainers/scientist.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 24, 19, 11 - RGB 10, 13, 17 - diff --git a/gfx/trainers/scientist.png b/gfx/trainers/scientist.png new file mode 100644 index 000000000..3ba33aef4 Binary files /dev/null and b/gfx/trainers/scientist.png differ diff --git a/gfx/trainers/skier.2bpp.lz b/gfx/trainers/skier.2bpp.lz.399d4240 similarity index 100% rename from gfx/trainers/skier.2bpp.lz rename to gfx/trainers/skier.2bpp.lz.399d4240 diff --git a/gfx/trainers/skier.pal b/gfx/trainers/skier.pal deleted file mode 100644 index 9201ca909..000000000 --- a/gfx/trainers/skier.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 28, 19, 15 - RGB 24, 06, 14 - diff --git a/gfx/trainers/skier.png b/gfx/trainers/skier.png new file mode 100644 index 000000000..7f9466f1a Binary files /dev/null and b/gfx/trainers/skier.png differ diff --git a/gfx/trainers/super_nerd.2bpp.lz b/gfx/trainers/super_nerd.2bpp.lz.c5362664 similarity index 100% rename from gfx/trainers/super_nerd.2bpp.lz rename to gfx/trainers/super_nerd.2bpp.lz.c5362664 diff --git a/gfx/trainers/super_nerd.pal b/gfx/trainers/super_nerd.pal deleted file mode 100644 index 862d4e21e..000000000 --- a/gfx/trainers/super_nerd.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 30, 22, 17 - RGB 11, 09, 10 - diff --git a/gfx/trainers/super_nerd.png b/gfx/trainers/super_nerd.png new file mode 100644 index 000000000..8636f2262 Binary files /dev/null and b/gfx/trainers/super_nerd.png differ diff --git a/gfx/trainers/swimmer_f.2bpp.lz b/gfx/trainers/swimmer_f.2bpp.lz.c60d0ad6 similarity index 100% rename from gfx/trainers/swimmer_f.2bpp.lz rename to gfx/trainers/swimmer_f.2bpp.lz.c60d0ad6 diff --git a/gfx/trainers/swimmer_f.pal b/gfx/trainers/swimmer_f.pal deleted file mode 100644 index 6bddcbcc3..000000000 --- a/gfx/trainers/swimmer_f.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 25, 16, 05 - RGB 06, 14, 04 - diff --git a/gfx/trainers/swimmer_f.png b/gfx/trainers/swimmer_f.png new file mode 100644 index 000000000..affef5f5e Binary files /dev/null and b/gfx/trainers/swimmer_f.png differ diff --git a/gfx/trainers/swimmer_m.2bpp.lz b/gfx/trainers/swimmer_m.2bpp.lz.2c1a716e similarity index 100% rename from gfx/trainers/swimmer_m.2bpp.lz rename to gfx/trainers/swimmer_m.2bpp.lz.2c1a716e diff --git a/gfx/trainers/swimmer_m.pal b/gfx/trainers/swimmer_m.pal deleted file mode 100644 index 164d2166b..000000000 --- a/gfx/trainers/swimmer_m.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 03, 04, 09 - RGB 21, 13, 01 - diff --git a/gfx/trainers/swimmer_m.png b/gfx/trainers/swimmer_m.png new file mode 100644 index 000000000..2c0442385 Binary files /dev/null and b/gfx/trainers/swimmer_m.png differ diff --git a/gfx/trainers/teacher.2bpp.lz b/gfx/trainers/teacher.2bpp.lz.1d131210 similarity index 100% rename from gfx/trainers/teacher.2bpp.lz rename to gfx/trainers/teacher.2bpp.lz.1d131210 diff --git a/gfx/trainers/teacher.pal b/gfx/trainers/teacher.pal deleted file mode 100644 index a614be34c..000000000 --- a/gfx/trainers/teacher.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 20, 16 - RGB 08, 11, 07 - diff --git a/gfx/trainers/teacher.png b/gfx/trainers/teacher.png new file mode 100644 index 000000000..d9e1b25cd Binary files /dev/null and b/gfx/trainers/teacher.png differ diff --git a/gfx/trainers/twins.2bpp.lz b/gfx/trainers/twins.2bpp.lz.462fd733 similarity index 100% rename from gfx/trainers/twins.2bpp.lz rename to gfx/trainers/twins.2bpp.lz.462fd733 diff --git a/gfx/trainers/twins.pal b/gfx/trainers/twins.pal deleted file mode 100644 index 47792418b..000000000 --- a/gfx/trainers/twins.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 31, 22, 08 - RGB 28, 03, 21 - diff --git a/gfx/trainers/twins.png b/gfx/trainers/twins.png new file mode 100644 index 000000000..4726f9599 Binary files /dev/null and b/gfx/trainers/twins.png differ diff --git a/gfx/trainers/whitney.2bpp.lz b/gfx/trainers/whitney.2bpp.lz.dcb46ea6 similarity index 100% rename from gfx/trainers/whitney.2bpp.lz rename to gfx/trainers/whitney.2bpp.lz.dcb46ea6 diff --git a/gfx/trainers/whitney.pal b/gfx/trainers/whitney.pal deleted file mode 100644 index a51af5fda..000000000 --- a/gfx/trainers/whitney.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 28, 18, 09 - RGB 21, 07, 02 - diff --git a/gfx/trainers/whitney.png b/gfx/trainers/whitney.png new file mode 100644 index 000000000..b9b4aa497 Binary files /dev/null and b/gfx/trainers/whitney.png differ diff --git a/gfx/trainers/will.2bpp.lz b/gfx/trainers/will.2bpp.lz.842af358 similarity index 100% rename from gfx/trainers/will.2bpp.lz rename to gfx/trainers/will.2bpp.lz.842af358 diff --git a/gfx/trainers/will.pal b/gfx/trainers/will.pal deleted file mode 100644 index d27fd8069..000000000 --- a/gfx/trainers/will.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 23, 15, 09 - RGB 26, 04, 02 - diff --git a/gfx/trainers/will.png b/gfx/trainers/will.png new file mode 100644 index 000000000..599f7cce8 Binary files /dev/null and b/gfx/trainers/will.png differ diff --git a/gfx/trainers/youngster.2bpp.lz b/gfx/trainers/youngster.2bpp.lz.4bef139d similarity index 100% rename from gfx/trainers/youngster.2bpp.lz rename to gfx/trainers/youngster.2bpp.lz.4bef139d diff --git a/gfx/trainers/youngster.pal b/gfx/trainers/youngster.pal deleted file mode 100644 index a330d692f..000000000 --- a/gfx/trainers/youngster.pal +++ /dev/null @@ -1,4 +0,0 @@ - - RGB 28, 20, 09 - RGB 09, 12, 23 - diff --git a/gfx/trainers/youngster.png b/gfx/trainers/youngster.png new file mode 100644 index 000000000..9b6d96eea Binary files /dev/null and b/gfx/trainers/youngster.png differ diff --git a/gfx/unknown/011cb7.2bpp b/gfx/unknown/011cb7.2bpp deleted file mode 100644 index 5046cc61a..000000000 Binary files a/gfx/unknown/011cb7.2bpp and /dev/null differ diff --git a/gfx/unknown/011cb7.png b/gfx/unknown/011cb7.png new file mode 100644 index 000000000..36935ab82 Binary files /dev/null and b/gfx/unknown/011cb7.png differ diff --git a/gfx/unknown/011cc7.2bpp b/gfx/unknown/011cc7.2bpp deleted file mode 100644 index 852606f98..000000000 Binary files a/gfx/unknown/011cc7.2bpp and /dev/null differ diff --git a/gfx/unknown/011cc7.png b/gfx/unknown/011cc7.png new file mode 100644 index 000000000..a0429a3ad Binary files /dev/null and b/gfx/unknown/011cc7.png differ diff --git a/gfx/unknown/011e5d.1bpp b/gfx/unknown/011e5d.1bpp deleted file mode 100644 index 7bbee183b..000000000 --- a/gfx/unknown/011e5d.1bpp +++ /dev/null @@ -1 +0,0 @@ -ðÀðÎý  \ No newline at end of file diff --git a/gfx/unknown/011e5d.png b/gfx/unknown/011e5d.png new file mode 100644 index 000000000..c8e132b92 Binary files /dev/null and b/gfx/unknown/011e5d.png differ diff --git a/gfx/unknown/011e65.1bpp b/gfx/unknown/011e65.1bpp deleted file mode 100644 index 9713c883a..000000000 Binary files a/gfx/unknown/011e65.1bpp and /dev/null differ diff --git a/gfx/unknown/011e65.png b/gfx/unknown/011e65.png new file mode 100644 index 000000000..a34e82bf1 Binary files /dev/null and b/gfx/unknown/011e65.png differ diff --git a/gfx/unknown/011e6d.1bpp b/gfx/unknown/011e6d.1bpp deleted file mode 100644 index 3da14ecbe..000000000 Binary files a/gfx/unknown/011e6d.1bpp and /dev/null differ diff --git a/gfx/unknown/011e6d.png b/gfx/unknown/011e6d.png new file mode 100644 index 000000000..e92cd4d6a Binary files /dev/null and b/gfx/unknown/011e6d.png differ diff --git a/gfx/unknown/0123fc.2bpp b/gfx/unknown/0123fc.2bpp deleted file mode 100644 index 1314e8c42..000000000 Binary files a/gfx/unknown/0123fc.2bpp and /dev/null differ diff --git a/gfx/unknown/0123fc.png b/gfx/unknown/0123fc.png new file mode 100644 index 000000000..dbf513487 Binary files /dev/null and b/gfx/unknown/0123fc.png differ diff --git a/gfx/unknown/016d9c.1bpp b/gfx/unknown/016d9c.1bpp deleted file mode 100644 index e24d140c4..000000000 Binary files a/gfx/unknown/016d9c.1bpp and /dev/null differ diff --git a/gfx/unknown/016d9c.png b/gfx/unknown/016d9c.png new file mode 100644 index 000000000..56252c423 Binary files /dev/null and b/gfx/unknown/016d9c.png differ diff --git a/gfx/unknown/016da4.1bpp b/gfx/unknown/016da4.1bpp deleted file mode 100644 index fc6de6973..000000000 Binary files a/gfx/unknown/016da4.1bpp and /dev/null differ diff --git a/gfx/unknown/016da4.png b/gfx/unknown/016da4.png new file mode 100644 index 000000000..8ce07a03c Binary files /dev/null and b/gfx/unknown/016da4.png differ diff --git a/gfx/unknown/017393.2bpp b/gfx/unknown/017393.2bpp deleted file mode 100644 index 4fc77ac3e..000000000 --- a/gfx/unknown/017393.2bpp +++ /dev/null @@ -1 +0,0 @@ -  @@?1AÿÿƒÿÃ~~<< \ No newline at end of file diff --git a/gfx/unknown/017393.png b/gfx/unknown/017393.png new file mode 100644 index 000000000..e45921e1f Binary files /dev/null and b/gfx/unknown/017393.png differ diff --git a/gfx/unknown/029f54.2bpp b/gfx/unknown/029f54.2bpp deleted file mode 100644 index 4baf48889..000000000 Binary files a/gfx/unknown/029f54.2bpp and /dev/null differ diff --git a/gfx/unknown/029f54.png b/gfx/unknown/029f54.png new file mode 100644 index 000000000..d3ac169fc Binary files /dev/null and b/gfx/unknown/029f54.png differ diff --git a/gfx/unknown/0488c3.2bpp b/gfx/unknown/0488c3.2bpp deleted file mode 100644 index 6b869ba80..000000000 Binary files a/gfx/unknown/0488c3.2bpp and /dev/null differ diff --git a/gfx/unknown/0488c3.png b/gfx/unknown/0488c3.png new file mode 100644 index 000000000..e8b43de99 Binary files /dev/null and b/gfx/unknown/0488c3.png differ diff --git a/gfx/unknown/0488cb.2bpp b/gfx/unknown/0488cb.2bpp deleted file mode 100644 index c48668de6..000000000 Binary files a/gfx/unknown/0488cb.2bpp and /dev/null differ diff --git a/gfx/unknown/0488cb.png b/gfx/unknown/0488cb.png new file mode 100644 index 000000000..9eaaadd2d Binary files /dev/null and b/gfx/unknown/0488cb.png differ diff --git a/gfx/unknown/049c0c.2bpp b/gfx/unknown/049c0c.2bpp deleted file mode 100644 index 6aa4815e3..000000000 Binary files a/gfx/unknown/049c0c.2bpp and /dev/null differ diff --git a/gfx/unknown/049c0c.png b/gfx/unknown/049c0c.png new file mode 100644 index 000000000..ae6cba38d Binary files /dev/null and b/gfx/unknown/049c0c.png differ diff --git a/gfx/unknown/08940b.2bpp b/gfx/unknown/08940b.2bpp deleted file mode 100644 index 215a5536e..000000000 Binary files a/gfx/unknown/08940b.2bpp and /dev/null differ diff --git a/gfx/unknown/08940b.png b/gfx/unknown/08940b.png new file mode 100644 index 000000000..108be31b9 Binary files /dev/null and b/gfx/unknown/08940b.png differ diff --git a/gfx/unknown/08c893.2bpp b/gfx/unknown/08c893.2bpp deleted file mode 100644 index 9aeb905ce..000000000 Binary files a/gfx/unknown/08c893.2bpp and /dev/null differ diff --git a/gfx/unknown/08c893.png b/gfx/unknown/08c893.png new file mode 100644 index 000000000..4cbb595f7 Binary files /dev/null and b/gfx/unknown/08c893.png differ diff --git a/gfx/unknown/0908fb.2bpp b/gfx/unknown/0908fb.2bpp deleted file mode 100644 index 8663f7de5..000000000 --- a/gfx/unknown/0908fb.2bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÿÿÿÿÿÿÿ \ No newline at end of file diff --git a/gfx/unknown/0908fb.png b/gfx/unknown/0908fb.png new file mode 100644 index 000000000..e2bd6299c Binary files /dev/null and b/gfx/unknown/0908fb.png differ diff --git a/gfx/unknown/090903.2bpp b/gfx/unknown/090903.2bpp deleted file mode 100644 index 6b869ba80..000000000 Binary files a/gfx/unknown/090903.2bpp and /dev/null differ diff --git a/gfx/unknown/090903.png b/gfx/unknown/090903.png new file mode 100644 index 000000000..d8cfc7f3f Binary files /dev/null and b/gfx/unknown/090903.png differ diff --git a/gfx/unknown/09090b.2bpp b/gfx/unknown/09090b.2bpp deleted file mode 100644 index c48668de6..000000000 Binary files a/gfx/unknown/09090b.2bpp and /dev/null differ diff --git a/gfx/unknown/09090b.png b/gfx/unknown/09090b.png new file mode 100644 index 000000000..33803e197 Binary files /dev/null and b/gfx/unknown/09090b.png differ diff --git a/gfx/unknown/0e0cdb.2bpp.lz b/gfx/unknown/0e0cdb.2bpp.lz.53679db7 similarity index 100% rename from gfx/unknown/0e0cdb.2bpp.lz rename to gfx/unknown/0e0cdb.2bpp.lz.53679db7 diff --git a/gfx/unknown/0e0cdb.png b/gfx/unknown/0e0cdb.png new file mode 100644 index 000000000..227450963 Binary files /dev/null and b/gfx/unknown/0e0cdb.png differ diff --git a/gfx/unknown/0e0cf6.2bpp b/gfx/unknown/0e0cf6.2bpp deleted file mode 100644 index 0e7c66a32..000000000 --- a/gfx/unknown/0e0cf6.2bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÿÿÿ½ÿ½ÿ½ÿ½ÿÿÿ \ No newline at end of file diff --git a/gfx/unknown/0e0cf6.png b/gfx/unknown/0e0cf6.png new file mode 100644 index 000000000..ac5885644 Binary files /dev/null and b/gfx/unknown/0e0cf6.png differ diff --git a/gfx/unknown/0e0d06.2bpp b/gfx/unknown/0e0d06.2bpp deleted file mode 100644 index 18497c4fe..000000000 --- a/gfx/unknown/0e0d06.2bpp +++ /dev/null @@ -1 +0,0 @@ -ÿÿÿÃÃÃÃÿÿÿ \ No newline at end of file diff --git a/gfx/unknown/0e0d06.png b/gfx/unknown/0e0d06.png new file mode 100644 index 000000000..cea1577ef Binary files /dev/null and b/gfx/unknown/0e0d06.png differ diff --git a/gfx/unknown/0e0d16.2bpp.lz b/gfx/unknown/0e0d16.2bpp.lz.86f267e8 similarity index 100% rename from gfx/unknown/0e0d16.2bpp.lz rename to gfx/unknown/0e0d16.2bpp.lz.86f267e8 diff --git a/gfx/unknown/0e0d16.png b/gfx/unknown/0e0d16.png new file mode 100644 index 000000000..ab3c6594f Binary files /dev/null and b/gfx/unknown/0e0d16.png differ diff --git a/gfx/unknown/0e0ea8.2bpp.lz b/gfx/unknown/0e0ea8.2bpp.lz.6a6c671d similarity index 100% rename from gfx/unknown/0e0ea8.2bpp.lz rename to gfx/unknown/0e0ea8.2bpp.lz.6a6c671d diff --git a/gfx/unknown/0e0ea8.png b/gfx/unknown/0e0ea8.png new file mode 100755 index 000000000..531417385 Binary files /dev/null and b/gfx/unknown/0e0ea8.png differ diff --git a/gfx/unknown/0e2221.2bpp.lz b/gfx/unknown/0e2221.2bpp.lz.821ba441 similarity index 100% rename from gfx/unknown/0e2221.2bpp.lz rename to gfx/unknown/0e2221.2bpp.lz.821ba441 diff --git a/gfx/unknown/0e2221.png b/gfx/unknown/0e2221.png new file mode 100644 index 000000000..e0f1d3256 Binary files /dev/null and b/gfx/unknown/0e2221.png differ diff --git a/gfx/unknown/0f89b0.2bpp b/gfx/unknown/0f89b0.2bpp deleted file mode 100644 index b53cb7234..000000000 Binary files a/gfx/unknown/0f89b0.2bpp and /dev/null differ diff --git a/gfx/unknown/0f89b0.png b/gfx/unknown/0f89b0.png new file mode 100644 index 000000000..151704af5 Binary files /dev/null and b/gfx/unknown/0f89b0.png differ diff --git a/gfx/unknown/0f8aa0.2bpp b/gfx/unknown/0f8aa0.2bpp deleted file mode 100644 index 1260c40be..000000000 Binary files a/gfx/unknown/0f8aa0.2bpp and /dev/null differ diff --git a/gfx/unknown/0f8aa0.png b/gfx/unknown/0f8aa0.png new file mode 100644 index 000000000..252bdd990 Binary files /dev/null and b/gfx/unknown/0f8aa0.png differ diff --git a/gfx/unknown/0f8ea4.2bpp b/gfx/unknown/0f8ea4.2bpp deleted file mode 100644 index 93e0572a7..000000000 Binary files a/gfx/unknown/0f8ea4.2bpp and /dev/null differ diff --git a/gfx/unknown/0f8ea4.png b/gfx/unknown/0f8ea4.png new file mode 100644 index 000000000..6eeb69b11 Binary files /dev/null and b/gfx/unknown/0f8ea4.png differ diff --git a/gfx/unknown/0f8f34.png b/gfx/unknown/0f8f34.png new file mode 100644 index 000000000..e02b91ce2 Binary files /dev/null and b/gfx/unknown/0f8f34.png differ diff --git a/gfx/unknown/0f8f34.w64.1bpp b/gfx/unknown/0f8f34.w64.1bpp deleted file mode 100644 index 7209b2608..000000000 Binary files a/gfx/unknown/0f8f34.w64.1bpp and /dev/null differ diff --git a/gfx/unknown/0f9424.2bpp b/gfx/unknown/0f9424.2bpp deleted file mode 100644 index de5e58609..000000000 Binary files a/gfx/unknown/0f9424.2bpp and /dev/null differ diff --git a/gfx/unknown/0f9424.png b/gfx/unknown/0f9424.png new file mode 100644 index 000000000..6f2b957f0 Binary files /dev/null and b/gfx/unknown/0f9424.png differ diff --git a/gfx/unknown/0fbbbb.2bpp b/gfx/unknown/0fbbbb.2bpp deleted file mode 100644 index fba5d65c7..000000000 Binary files a/gfx/unknown/0fbbbb.2bpp and /dev/null differ diff --git a/gfx/unknown/0fbbbb.png b/gfx/unknown/0fbbbb.png new file mode 100644 index 000000000..60f319eb3 Binary files /dev/null and b/gfx/unknown/0fbbbb.png differ diff --git a/gfx/unknown/1032a2.2bpp b/gfx/unknown/1032a2.2bpp deleted file mode 100644 index 36d29b975..000000000 Binary files a/gfx/unknown/1032a2.2bpp and /dev/null differ diff --git a/gfx/unknown/1032a2.png b/gfx/unknown/1032a2.png new file mode 100644 index 000000000..cdf1bd118 Binary files /dev/null and b/gfx/unknown/1032a2.png differ diff --git a/gfx/unknown/106514.2bpp b/gfx/unknown/106514.2bpp deleted file mode 100644 index ee0c829d2..000000000 Binary files a/gfx/unknown/106514.2bpp and /dev/null differ diff --git a/gfx/unknown/106514.png b/gfx/unknown/106514.png new file mode 100644 index 000000000..faadc6f9c Binary files /dev/null and b/gfx/unknown/106514.png differ diff --git a/gfx/unknown/1065ad.2bpp b/gfx/unknown/1065ad.2bpp deleted file mode 100644 index b2bc8cc56..000000000 Binary files a/gfx/unknown/1065ad.2bpp and /dev/null differ diff --git a/gfx/unknown/1065ad.png b/gfx/unknown/1065ad.png new file mode 100644 index 000000000..106c712dd Binary files /dev/null and b/gfx/unknown/1065ad.png differ diff --git a/gfx/unknown/106dad.png b/gfx/unknown/106dad.png new file mode 100644 index 000000000..726178132 Binary files /dev/null and b/gfx/unknown/106dad.png differ diff --git a/gfx/unknown/108d27.2bpp.lz b/gfx/unknown/108d27.2bpp.lz.eef1e11d similarity index 100% rename from gfx/unknown/108d27.2bpp.lz rename to gfx/unknown/108d27.2bpp.lz.eef1e11d diff --git a/gfx/unknown/108d27.png b/gfx/unknown/108d27.png new file mode 100644 index 000000000..db774bf28 Binary files /dev/null and b/gfx/unknown/108d27.png differ diff --git a/gfx/unknown/108da7.2bpp.lz b/gfx/unknown/108da7.2bpp.lz.aad8592b similarity index 100% rename from gfx/unknown/108da7.2bpp.lz rename to gfx/unknown/108da7.2bpp.lz.aad8592b diff --git a/gfx/unknown/108da7.png b/gfx/unknown/108da7.png new file mode 100644 index 000000000..da41217d8 Binary files /dev/null and b/gfx/unknown/108da7.png differ diff --git a/gfx/unknown/108fe7.tilemap b/gfx/unknown/108fe7.tilemap new file mode 100644 index 000000000..bb67a49f4 Binary files /dev/null and b/gfx/unknown/108fe7.tilemap differ diff --git a/gfx/unknown/108fe7.tilemap.lz b/gfx/unknown/108fe7.tilemap.lz.12882d37 similarity index 100% rename from gfx/unknown/108fe7.tilemap.lz rename to gfx/unknown/108fe7.tilemap.lz.12882d37 diff --git a/gfx/unknown/1090a7.tilemap b/gfx/unknown/1090a7.tilemap new file mode 100644 index 000000000..6f4843dde Binary files /dev/null and b/gfx/unknown/1090a7.tilemap differ diff --git a/gfx/unknown/1090a7.tilemap.lz b/gfx/unknown/1090a7.tilemap.lz.ea4f2cbe similarity index 100% rename from gfx/unknown/1090a7.tilemap.lz rename to gfx/unknown/1090a7.tilemap.lz.ea4f2cbe diff --git a/gfx/unknown/1091c7.2bpp b/gfx/unknown/1091c7.2bpp deleted file mode 100644 index bc36edc73..000000000 Binary files a/gfx/unknown/1091c7.2bpp and /dev/null differ diff --git a/gfx/unknown/1091c7.png b/gfx/unknown/1091c7.png new file mode 100644 index 000000000..8def47f76 Binary files /dev/null and b/gfx/unknown/1091c7.png differ diff --git a/gfx/unknown/1092c7.2bpp b/gfx/unknown/1092c7.2bpp deleted file mode 100644 index 05db6cf13..000000000 Binary files a/gfx/unknown/1092c7.2bpp and /dev/null differ diff --git a/gfx/unknown/1092c7.png b/gfx/unknown/1092c7.png new file mode 100644 index 000000000..d48a5ee51 Binary files /dev/null and b/gfx/unknown/1092c7.png differ diff --git a/gfx/unknown/11601a.2bpp b/gfx/unknown/11601a.2bpp deleted file mode 100644 index 02dafd2f7..000000000 Binary files a/gfx/unknown/11601a.2bpp and /dev/null differ diff --git a/gfx/unknown/11601a.png b/gfx/unknown/11601a.png new file mode 100644 index 000000000..a6a7598f8 Binary files /dev/null and b/gfx/unknown/11601a.png differ diff --git a/gfx/unknown/16c173.2bpp b/gfx/unknown/16c173.2bpp deleted file mode 100644 index eba6e28f3..000000000 Binary files a/gfx/unknown/16c173.2bpp and /dev/null differ diff --git a/gfx/unknown/16c173.png b/gfx/unknown/16c173.png new file mode 100755 index 000000000..d54b68cdf Binary files /dev/null and b/gfx/unknown/16c173.png differ diff --git a/gfx/unknown/16cca3.2bpp b/gfx/unknown/16cca3.2bpp deleted file mode 100644 index 487a2556d..000000000 Binary files a/gfx/unknown/16cca3.2bpp and /dev/null differ diff --git a/gfx/unknown/16cca3.png b/gfx/unknown/16cca3.png new file mode 100644 index 000000000..d5ad353d8 Binary files /dev/null and b/gfx/unknown/16cca3.png differ diff --git a/gfx/unknown/16cfc1.2bpp b/gfx/unknown/16cfc1.2bpp deleted file mode 100644 index cc9b9a87e..000000000 Binary files a/gfx/unknown/16cfc1.2bpp and /dev/null differ diff --git a/gfx/unknown/16cfc1.png b/gfx/unknown/16cfc1.png new file mode 100644 index 000000000..390b107fd Binary files /dev/null and b/gfx/unknown/16cfc1.png differ diff --git a/gfx/unknown/170d16.2bpp.lz b/gfx/unknown/170d16.2bpp.lz.5d6d2ad4 similarity index 100% rename from gfx/unknown/170d16.2bpp.lz rename to gfx/unknown/170d16.2bpp.lz.5d6d2ad4 diff --git a/gfx/unknown/170d16.png b/gfx/unknown/170d16.png new file mode 100644 index 000000000..2832fdb6a Binary files /dev/null and b/gfx/unknown/170d16.png differ diff --git a/gfx/unknown/1715a4.2bpp.lz b/gfx/unknown/1715a4.2bpp.lz.3eaf004f similarity index 100% rename from gfx/unknown/1715a4.2bpp.lz rename to gfx/unknown/1715a4.2bpp.lz.3eaf004f diff --git a/gfx/unknown/1715a4.png b/gfx/unknown/1715a4.png new file mode 100644 index 000000000..3e1c0bb46 Binary files /dev/null and b/gfx/unknown/1715a4.png differ diff --git a/gfx/unknown/1715a4_nonmatching.png b/gfx/unknown/1715a4_nonmatching.png new file mode 100755 index 000000000..44ea166ef Binary files /dev/null and b/gfx/unknown/1715a4_nonmatching.png differ diff --git a/gfx/unknown/171848.2bpp b/gfx/unknown/171848.2bpp deleted file mode 100644 index fee9b216e..000000000 Binary files a/gfx/unknown/171848.2bpp and /dev/null differ diff --git a/gfx/unknown/171848.png b/gfx/unknown/171848.png new file mode 100644 index 000000000..f0c0f64e9 Binary files /dev/null and b/gfx/unknown/171848.png differ diff --git a/gfx/unknown/171db1.2bpp b/gfx/unknown/171db1.2bpp deleted file mode 100644 index 78d4e0a31..000000000 Binary files a/gfx/unknown/171db1.2bpp and /dev/null differ diff --git a/gfx/unknown/171db1.png b/gfx/unknown/171db1.png new file mode 100644 index 000000000..1c32d2bda Binary files /dev/null and b/gfx/unknown/171db1.png differ diff --git a/gfx/unknown/172f1f.2bpp b/gfx/unknown/172f1f.2bpp deleted file mode 100644 index 55a3c7521..000000000 Binary files a/gfx/unknown/172f1f.2bpp and /dev/null differ diff --git a/gfx/unknown/172f1f.png b/gfx/unknown/172f1f.png new file mode 100644 index 000000000..0e324906d Binary files /dev/null and b/gfx/unknown/172f1f.png differ diff --git a/gfx/unknown/17afa5.2bpp b/gfx/unknown/17afa5.2bpp deleted file mode 100644 index 3c0795de0..000000000 Binary files a/gfx/unknown/17afa5.2bpp and /dev/null differ diff --git a/gfx/unknown/17afa5.png b/gfx/unknown/17afa5.png new file mode 100644 index 000000000..fc6459040 Binary files /dev/null and b/gfx/unknown/17afa5.png differ diff --git a/gfx/unknown/17eb7e.2bpp b/gfx/unknown/17eb7e.2bpp deleted file mode 100644 index 15320a0c1..000000000 Binary files a/gfx/unknown/17eb7e.2bpp and /dev/null differ diff --git a/gfx/unknown/17eb7e.png b/gfx/unknown/17eb7e.png new file mode 100644 index 000000000..3a4a6bd4b Binary files /dev/null and b/gfx/unknown/17eb7e.png differ diff --git a/gfx/unknown/1dd805.2bpp.lz b/gfx/unknown/1dd805.2bpp.lz.7b56f7e5 similarity index 100% rename from gfx/unknown/1dd805.2bpp.lz rename to gfx/unknown/1dd805.2bpp.lz.7b56f7e5 diff --git a/gfx/unknown/1dd805.png b/gfx/unknown/1dd805.png new file mode 100644 index 000000000..768bbf913 Binary files /dev/null and b/gfx/unknown/1dd805.png differ diff --git a/gfx/unown_puzzle/aerodactyl.2bpp.lz b/gfx/unown_puzzle/aerodactyl.2bpp.lz.f546fb5e similarity index 100% rename from gfx/unown_puzzle/aerodactyl.2bpp.lz rename to gfx/unown_puzzle/aerodactyl.2bpp.lz.f546fb5e diff --git a/gfx/unown_puzzle/aerodactyl.png b/gfx/unown_puzzle/aerodactyl.png new file mode 100644 index 000000000..c7b37bbbb Binary files /dev/null and b/gfx/unown_puzzle/aerodactyl.png differ diff --git a/gfx/unown_puzzle/cursor.2bpp b/gfx/unown_puzzle/cursor.2bpp deleted file mode 100644 index dc42cfc79..000000000 Binary files a/gfx/unown_puzzle/cursor.2bpp and /dev/null differ diff --git a/gfx/unown_puzzle/cursor.png b/gfx/unown_puzzle/cursor.png new file mode 100644 index 000000000..c10b810fe Binary files /dev/null and b/gfx/unown_puzzle/cursor.png differ diff --git a/gfx/unown_puzzle/hooh.2bpp.lz b/gfx/unown_puzzle/hooh.2bpp.lz.e440a572 similarity index 100% rename from gfx/unown_puzzle/hooh.2bpp.lz rename to gfx/unown_puzzle/hooh.2bpp.lz.e440a572 diff --git a/gfx/unown_puzzle/hooh.png b/gfx/unown_puzzle/hooh.png new file mode 100644 index 000000000..bb8be6cfa Binary files /dev/null and b/gfx/unown_puzzle/hooh.png differ diff --git a/gfx/unown_puzzle/kabuto.2bpp.lz b/gfx/unown_puzzle/kabuto.2bpp.lz.0ed9882d similarity index 100% rename from gfx/unown_puzzle/kabuto.2bpp.lz rename to gfx/unown_puzzle/kabuto.2bpp.lz.0ed9882d diff --git a/gfx/unown_puzzle/kabuto.png b/gfx/unown_puzzle/kabuto.png new file mode 100644 index 000000000..823401cc5 Binary files /dev/null and b/gfx/unown_puzzle/kabuto.png differ diff --git a/gfx/unown_puzzle/omanyte.2bpp.lz b/gfx/unown_puzzle/omanyte.2bpp.lz.27bfcbde similarity index 100% rename from gfx/unown_puzzle/omanyte.2bpp.lz rename to gfx/unown_puzzle/omanyte.2bpp.lz.27bfcbde diff --git a/gfx/unown_puzzle/omanyte.png b/gfx/unown_puzzle/omanyte.png new file mode 100644 index 000000000..83ba6774f Binary files /dev/null and b/gfx/unown_puzzle/omanyte.png differ diff --git a/gfx/unown_puzzle/start_cancel.2bpp.lz b/gfx/unown_puzzle/start_cancel.2bpp.lz.e07fe7bd similarity index 100% rename from gfx/unown_puzzle/start_cancel.2bpp.lz rename to gfx/unown_puzzle/start_cancel.2bpp.lz.e07fe7bd diff --git a/gfx/unown_puzzle/start_cancel.png b/gfx/unown_puzzle/start_cancel.png new file mode 100644 index 000000000..66455dccb Binary files /dev/null and b/gfx/unown_puzzle/start_cancel.png differ diff --git a/gfx/unown_puzzle/tile_borders.2bpp b/gfx/unown_puzzle/tile_borders.2bpp deleted file mode 100644 index 570244c82..000000000 Binary files a/gfx/unown_puzzle/tile_borders.2bpp and /dev/null differ diff --git a/gfx/unown_puzzle/tile_borders.png b/gfx/unown_puzzle/tile_borders.png new file mode 100644 index 000000000..8706905f7 Binary files /dev/null and b/gfx/unown_puzzle/tile_borders.png differ diff --git a/main.asm b/main.asm index 693bec2f4..3d7199a46 100644 --- a/main.asm +++ b/main.asm @@ -1178,10 +1178,10 @@ INCLUDE "engine/wildmons.asm" INCLUDE "battle/link_result.asm" ChrisBackpic: ; 2ba1a -INCBIN "gfx/misc/player.6x6.2bpp.lz" +INCBIN "gfx/misc/player.2bpp.lz" DudeBackpic: ; 2bbaa -INCBIN "gfx/misc/dude.6x6.2bpp.lz" +INCBIN "gfx/misc/dude.2bpp.lz" SECTION "bankB", ROMX, BANK[$B] @@ -4664,7 +4664,7 @@ Unknown_53d84: ; unreferenced UnknownEggPic:: ; 53d9c ; Another egg pic. This is shifted up a few pixels. -INCBIN "gfx/misc/unknown_egg.5x5.2bpp.lz" +INCBIN "gfx/misc/unknown_egg.2bpp.lz" SECTION "bank19", ROMX, BANK[$19] @@ -4857,10 +4857,10 @@ GetCardPic: ; 8833e ret ChrisCardPic: ; 88365 -INCBIN "gfx/misc/chris_card.5x7.2bpp" +INCBIN "gfx/misc/chris_card.2bpp" KrisCardPic: ; 88595 -INCBIN "gfx/misc/kris_card.5x7.2bpp" +INCBIN "gfx/misc/kris_card.2bpp" CardGFX: ; 887c5 INCBIN "gfx/misc/trainer_card.2bpp" @@ -4943,10 +4943,10 @@ DrawIntroPlayerPic: ; 88874 ret ChrisPic: ; 888a9 -INCBIN "gfx/misc/chris.7x7.2bpp" +INCBIN "gfx/misc/chris.2bpp" KrisPic: ; 88bb9 -INCBIN "gfx/misc/kris.7x7.2bpp" +INCBIN "gfx/misc/kris.2bpp" GetKrisBackpic: ; 88ec9 ; Kris's backpic is uncompressed. @@ -4957,7 +4957,7 @@ GetKrisBackpic: ; 88ec9 ret KrisBackpic: ; 88ed6 -INCBIN "gfx/misc/kris_back.6x6.2bpp" +INCBIN "gfx/misc/kris_back.2bpp" String_89116: db "-----@" diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm index cae976a1c..f4b3eba8b 100644 --- a/misc/gbc_only.asm +++ b/misc/gbc_only.asm @@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38 GBCOnlyGFX: ; 4eb76 -INCBIN "gfx/misc/gbc_only.w112.2bpp.lz" +INCBIN "gfx/misc/gbc_only.2bpp.lz" ; 4f0bc diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index 331242d88..ff661b1bc 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -1116,16 +1116,18 @@ INCBIN "gfx/unknown/106514.2bpp" LoadOverworldFont:: ; 106594 - ld de, .bgfont + ld de, .font ld hl, VTiles1 - lb bc, BANK(.bgfont), $80 + lb bc, BANK(.font), $80 call Get2bpp - ld de, .bgfont + $80 tiles + ld de, .space ld hl, VTiles2 tile $7f - lb bc, BANK(.bgfont), 1 + lb bc, BANK(.space), 1 call Get2bpp ret ; 1065ad -.bgfont +.font INCBIN "gfx/unknown/1065ad.2bpp" +.space +INCBIN "gfx/unknown/106dad.2bpp" diff --git a/tools/Makefile b/tools/Makefile index 4a04027fc..57a4d84ce 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,13 +1,16 @@ .PHONY: all +CFLAGS := -std=c99 + all: \ lzcomp \ png_dimensions \ scan_includes \ palette \ pokemon_animation \ - pokemon_animation_graphics + pokemon_animation_graphics \ + gfx @: %: %.c - $(CC) -o $@ $< + $(CC) $(CFLAGS) -o $@ $< diff --git a/tools/common.h b/tools/common.h new file mode 100644 index 000000000..bc877ccb9 --- /dev/null +++ b/tools/common.h @@ -0,0 +1,37 @@ +#ifndef GUARD_COMMON_H +#define GUARD_COMMON_H + +int __getopt_long_i__; +#define getopt_long(c, v, s, l) getopt_long(c, v, s, l, &__getopt_long_i__) + +FILE *fopen_verbose(char *filename, char *mode) { + FILE *f = fopen(filename, mode); + if (!f) { + fprintf(stderr, "Could not open file: \"%s\"\n", filename); + } + return f; +} + +uint8_t *read_u8(char *filename, int *size) { + FILE *f = fopen_verbose(filename, "rb"); + if (!f) { + exit(1); + } + fseek(f, 0, SEEK_END); + *size = ftell(f); + rewind(f); + uint8_t *data = malloc(*size); + fread(data, 1, *size, f); + fclose(f); + return data; +} + +void write_u8(char *filename, uint8_t *data, int size) { + FILE *f = fopen_verbose(filename, "wb"); + if (f) { + fwrite(data, 1, size, f); + fclose(f); + } +} + +#endif // GUARD_COMMON_H diff --git a/tools/gfx.c b/tools/gfx.c new file mode 100644 index 000000000..0e6864e91 --- /dev/null +++ b/tools/gfx.c @@ -0,0 +1,271 @@ +#include +#include +#include +#include +#include +#include + +#include "common.h" + +static void usage(void) { + fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [-w width] [-d depth] [-h] [-o outfile] infile\n"); +} + +static void error(char *message) { + fprintf(stderr, message); + fprintf(stderr, "\n"); +} + +struct Options { + int trim_whitespace; + int remove_whitespace; + int help; + char *outfile; + int depth; + int interleave; + int width; + int remove_duplicates; + int keep_whitespace; + int remove_xflip; + int remove_yflip; +}; + +struct Options Options = { + .depth = 2, +}; + +void get_args(int argc, char *argv[]) { + struct option long_options[] = { + {"remove-whitespace", no_argument, &Options.remove_whitespace, 1}, + {"trim-whitespace", no_argument, &Options.trim_whitespace, 1}, + {"interleave", no_argument, &Options.interleave, 1}, + {"remove-duplicates", no_argument, &Options.remove_duplicates, 1}, + {"keep-whitespace", no_argument, &Options.keep_whitespace, 1}, + {"remove-xflip", no_argument, &Options.remove_xflip, 1}, + {"remove-yflip", no_argument, &Options.remove_yflip, 1}, + {"width", required_argument, 0, 'w'}, + {"depth", required_argument, 0, 'd'}, + {"help", no_argument, 0, 'h'}, + {0} + }; + for (int opt = 0; opt != -1;) { + switch (opt = getopt_long(argc, argv, "ho:d:", long_options)) { + case 'h': + Options.help = true; + break; + case 'o': + Options.outfile = optarg; + break; + case 'd': + Options.depth = strtoul(optarg, NULL, 0); + break; + case 'w': + Options.width = strtoul(optarg, NULL, 0); + break; + case 0: + case -1: + break; + default: + usage(); + exit(1); + break; + } + } +} + +struct Graphic { + int size; + uint8_t *data; +}; + +bool is_whitespace(uint8_t *tile, int tile_size) { + uint8_t WHITESPACE = 0; + for (int i = 0; i < tile_size; i++) { + if (tile[i] != WHITESPACE) { + return false; + } + } + return true; +} + +void trim_whitespace(struct Graphic *graphic) { + int tile_size = Options.depth * 8; + for (int i = graphic->size - tile_size; i > 0; i -= tile_size) { + if (is_whitespace(&graphic->data[i], tile_size)) { + graphic->size = i; + } else { + break; + } + } +} + +void remove_whitespace(struct Graphic *graphic) { + int tile_size = Options.depth * 8; + if (Options.interleave) tile_size *= 2; + int i = 0; + for (int j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (is_whitespace(&graphic->data[j], tile_size)) { + j += tile_size; + } + if (j >= graphic->size) { + break; + } + if (j > i) { + memcpy(&graphic->data[i], &graphic->data[j], tile_size); + } + } + graphic->size = i; +} + +bool tile_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles) { + for (int i = 0; i < num_tiles; i++) { + bool match = true; + for (int j = 0; j < tile_size; j++) { + if (tile[j] != tiles[i * tile_size + j]) { + match = false; + } + } + if (match) { + return true; + } + } + return false; +} + +void remove_duplicates(struct Graphic *graphic) { + int tile_size = Options.depth * 8; + if (Options.interleave) tile_size *= 2; + int num_tiles = 0; + for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) { + if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) { + break; + } + j += tile_size; + } + if (j >= graphic->size) { + break; + } + if (j > i) { + memcpy(&graphic->data[i], &graphic->data[j], tile_size); + } + num_tiles++; + } + graphic->size = num_tiles * tile_size; +} + +bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) { + uint8_t *flip = calloc(tile_size, 1); + int half_size = tile_size / 2; + for (int i = 0; i < tile_size; i++) { + int byte = i; + if (yflip) { + byte = tile_size - 1 - (i ^ 1); + if (Options.interleave && i < half_size) { + byte = half_size - 1 - (i ^ 1); + } + } + if (xflip) { + for (int bit = 0; bit < 8; bit++) { + flip[byte] |= ((tile[i] >> bit) & 1) << (7 - bit); + } + } else { + flip[byte] = tile[i]; + } + } + if (tile_exists(flip, tiles, tile_size, num_tiles)) { + return true; + } + return false; +} + +void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) { + int tile_size = Options.depth * 8; + if (Options.interleave) tile_size *= 2; + int num_tiles = 0; + for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) { + if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) { + break; + } + j += tile_size; + } + if (j >= graphic->size) { + break; + } + if (j > i) { + memcpy(&graphic->data[i], &graphic->data[j], tile_size); + } + num_tiles++; + } + graphic->size = num_tiles * tile_size; +} + +void interleave(struct Graphic *graphic, int width) { + int tile_size = Options.depth * 8; + int width_tiles = width / 8; + int num_tiles = graphic->size / tile_size; + uint8_t *interleaved = malloc(graphic->size); + for (int i = 0; i < num_tiles; i++) { + int tile = i * 2; + int row = i / width_tiles; + tile -= width_tiles * row; + if (row % 2) { + tile -= width_tiles; + tile += 1; + } + memcpy(&interleaved[tile * tile_size], &graphic->data[i * tile_size], tile_size); + } + graphic->size = num_tiles * tile_size; + memcpy(graphic->data, interleaved, graphic->size); + free(interleaved); +} + + +int main(int argc, char *argv[]) { + get_args(argc, argv); + argc -= optind; + argv += optind; + if (Options.help) { + usage(); + return 0; + } + if (argc < 1) { + usage(); + exit(1); + } + char *infile = argv[0]; + struct Graphic graphic; + graphic.data = read_u8(infile, &graphic.size); + if (Options.trim_whitespace) { + trim_whitespace(&graphic); + } + if (Options.interleave) { + if (!Options.width) { + error("interleave: must set --width to a nonzero value"); + usage(); + exit(1); + } + interleave(&graphic, Options.width); + } + if (Options.remove_duplicates) { + remove_duplicates(&graphic); + } + if (Options.remove_xflip) { + remove_flip(&graphic, true, false); + } + if (Options.remove_yflip) { + remove_flip(&graphic, false, true); + } + if (Options.remove_xflip && Options.remove_yflip) { + remove_flip(&graphic, true, true); + } + if (Options.remove_whitespace) { + remove_whitespace(&graphic); + } + if (Options.outfile) { + write_u8(Options.outfile, graphic.data, graphic.size); + } + free(graphic.data); + return 0; +} diff --git a/tools/palette.c b/tools/palette.c index c1beb40e4..39837a096 100644 --- a/tools/palette.c +++ b/tools/palette.c @@ -3,6 +3,7 @@ #include #include #include +#include void usage(void) { printf("Usage: palette palfile\n"); diff --git a/tools/pokemon_animation.c b/tools/pokemon_animation.c index 835160c24..0728788ec 100644 --- a/tools/pokemon_animation.c +++ b/tools/pokemon_animation.c @@ -4,6 +4,7 @@ #include #include #include +#include struct Frame { uint8_t* data;