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/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/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.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.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.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.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.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