diff --git a/data/sprites/official/toadette.1.zspr b/data/sprites/official/Toadette.2.zspr
similarity index 98%
rename from data/sprites/official/toadette.1.zspr
rename to data/sprites/official/Toadette.2.zspr
index f503b383f2..8c6498b2d7 100644
Binary files a/data/sprites/official/toadette.1.zspr and b/data/sprites/official/Toadette.2.zspr differ
diff --git a/data/sprites/official/abigail.1.zspr b/data/sprites/official/abigail.1.zspr
new file mode 100644
index 0000000000..526990c5ef
Binary files /dev/null and b/data/sprites/official/abigail.1.zspr differ
diff --git a/data/sprites/official/alice.1.zspr b/data/sprites/official/alice.1.zspr
new file mode 100644
index 0000000000..4c673acd71
Binary files /dev/null and b/data/sprites/official/alice.1.zspr differ
diff --git a/data/sprites/official/bandit.1.zspr b/data/sprites/official/bandit.1.zspr
new file mode 100644
index 0000000000..5b3288f80d
Binary files /dev/null and b/data/sprites/official/bandit.1.zspr differ
diff --git a/data/sprites/official/batman.1.zspr b/data/sprites/official/batman.1.zspr
new file mode 100644
index 0000000000..a4a1e9c0ef
Binary files /dev/null and b/data/sprites/official/batman.1.zspr differ
diff --git a/data/sprites/official/birb.1.zspr b/data/sprites/official/birb.1.zspr
new file mode 100644
index 0000000000..d6d86bb688
Binary files /dev/null and b/data/sprites/official/birb.1.zspr differ
diff --git a/data/sprites/official/blackmage.1.zspr b/data/sprites/official/blackmage.1.zspr
new file mode 100644
index 0000000000..d9b5628852
Binary files /dev/null and b/data/sprites/official/blackmage.1.zspr differ
diff --git a/data/sprites/official/blossom.1.zspr b/data/sprites/official/blossom.1.zspr
new file mode 100644
index 0000000000..57f4918c55
Binary files /dev/null and b/data/sprites/official/blossom.1.zspr differ
diff --git a/data/sprites/official/bottle_o_goo.1.zspr b/data/sprites/official/bottle_o_goo.1.zspr
new file mode 100644
index 0000000000..28ca1f9b69
Binary files /dev/null and b/data/sprites/official/bottle_o_goo.1.zspr differ
diff --git a/data/sprites/official/bowser.1.zspr b/data/sprites/official/bowser.1.zspr
new file mode 100644
index 0000000000..1cc256d8c3
Binary files /dev/null and b/data/sprites/official/bowser.1.zspr differ
diff --git a/data/sprites/official/branch.1.zspr b/data/sprites/official/branch.1.zspr
new file mode 100644
index 0000000000..b79264183b
Binary files /dev/null and b/data/sprites/official/branch.1.zspr differ
diff --git a/data/sprites/official/bubbles.1.zspr b/data/sprites/official/bubbles.1.zspr
new file mode 100644
index 0000000000..bbba3b7546
Binary files /dev/null and b/data/sprites/official/bubbles.1.zspr differ
diff --git a/data/sprites/official/bullet_bill.1.zspr b/data/sprites/official/bullet_bill.1.zspr
new file mode 100644
index 0000000000..5b561b9eee
Binary files /dev/null and b/data/sprites/official/bullet_bill.1.zspr differ
diff --git a/data/sprites/official/buttercup.1.zspr b/data/sprites/official/buttercup.1.zspr
new file mode 100644
index 0000000000..bd066c2743
Binary files /dev/null and b/data/sprites/official/buttercup.1.zspr differ
diff --git a/data/sprites/official/clyde.1.zspr b/data/sprites/official/clyde.1.zspr
new file mode 100644
index 0000000000..b590a2ef91
Binary files /dev/null and b/data/sprites/official/clyde.1.zspr differ
diff --git a/data/sprites/official/cucco.1.zspr b/data/sprites/official/cucco.1.zspr
new file mode 100644
index 0000000000..f237de4ab0
Binary files /dev/null and b/data/sprites/official/cucco.1.zspr differ
diff --git a/data/sprites/official/drake.1.zspr b/data/sprites/official/drake.1.zspr
new file mode 100644
index 0000000000..1be94a7567
Binary files /dev/null and b/data/sprites/official/drake.1.zspr differ
diff --git a/data/sprites/official/ezlo.1.zspr b/data/sprites/official/ezlo.1.zspr
new file mode 100644
index 0000000000..54596847db
Binary files /dev/null and b/data/sprites/official/ezlo.1.zspr differ
diff --git a/data/sprites/official/finny_bear.1.zspr b/data/sprites/official/finny_bear.1.zspr
new file mode 100644
index 0000000000..9c3a530b10
Binary files /dev/null and b/data/sprites/official/finny_bear.1.zspr differ
diff --git a/data/sprites/official/fish_floodgate.1.zspr b/data/sprites/official/fish_floodgate.1.zspr
new file mode 100644
index 0000000000..86684e7d8e
Binary files /dev/null and b/data/sprites/official/fish_floodgate.1.zspr differ
diff --git a/data/sprites/official/frisk.1.zspr b/data/sprites/official/frisk.1.zspr
new file mode 100644
index 0000000000..d521cae391
Binary files /dev/null and b/data/sprites/official/frisk.1.zspr differ
diff --git a/data/sprites/official/gamer.1.zspr b/data/sprites/official/gamer.1.zspr
new file mode 100644
index 0000000000..9f78d894f7
Binary files /dev/null and b/data/sprites/official/gamer.1.zspr differ
diff --git a/data/sprites/official/garnet.1.zspr b/data/sprites/official/garnet.1.zspr
new file mode 100644
index 0000000000..858497c76f
Binary files /dev/null and b/data/sprites/official/garnet.1.zspr differ
diff --git a/data/sprites/official/garomaster.1.zspr b/data/sprites/official/garomaster.1.zspr
new file mode 100644
index 0000000000..65b9959d47
Binary files /dev/null and b/data/sprites/official/garomaster.1.zspr differ
diff --git a/data/sprites/official/gobli.1.zspr b/data/sprites/official/gobli.1.zspr
new file mode 100644
index 0000000000..51dd119269
Binary files /dev/null and b/data/sprites/official/gobli.1.zspr differ
diff --git a/data/sprites/official/grandpoobear.1.zspr b/data/sprites/official/grandpoobear.2.zspr
similarity index 99%
rename from data/sprites/official/grandpoobear.1.zspr
rename to data/sprites/official/grandpoobear.2.zspr
index 857265f9ac..7266368034 100644
Binary files a/data/sprites/official/grandpoobear.1.zspr and b/data/sprites/official/grandpoobear.2.zspr differ
diff --git a/data/sprites/official/hardhat_beetle.1.zspr b/data/sprites/official/hardhat_beetle.1.zspr
new file mode 100644
index 0000000000..80b63af16f
Binary files /dev/null and b/data/sprites/official/hardhat_beetle.1.zspr differ
diff --git a/data/sprites/official/hello_kitty.1.zspr b/data/sprites/official/hello_kitty.1.zspr
new file mode 100644
index 0000000000..a2f5df063a
Binary files /dev/null and b/data/sprites/official/hello_kitty.1.zspr differ
diff --git a/data/sprites/official/hint_tile.1.zspr b/data/sprites/official/hint_tile.1.zspr
new file mode 100644
index 0000000000..9cfd7e90ce
Binary files /dev/null and b/data/sprites/official/hint_tile.1.zspr differ
diff --git a/data/sprites/official/ibazly.1.zspr b/data/sprites/official/ibazly.1.zspr
new file mode 100644
index 0000000000..01114c9e01
Binary files /dev/null and b/data/sprites/official/ibazly.1.zspr differ
diff --git a/data/sprites/official/informant_woman.1.zspr b/data/sprites/official/informant_woman.1.zspr
new file mode 100644
index 0000000000..6465a0e9f3
Binary files /dev/null and b/data/sprites/official/informant_woman.1.zspr differ
diff --git a/data/sprites/official/jason_frudnick.1.zspr b/data/sprites/official/jason_frudnick.1.zspr
new file mode 100644
index 0000000000..2411759c2a
Binary files /dev/null and b/data/sprites/official/jason_frudnick.1.zspr differ
diff --git a/data/sprites/official/kenny_mccormick.1.zspr b/data/sprites/official/kenny_mccormick.1.zspr
new file mode 100644
index 0000000000..c66a74a586
Binary files /dev/null and b/data/sprites/official/kenny_mccormick.1.zspr differ
diff --git a/data/sprites/official/king_gothalion.1.zspr b/data/sprites/official/king_gothalion.1.zspr
new file mode 100644
index 0000000000..65c73f04d4
Binary files /dev/null and b/data/sprites/official/king_gothalion.1.zspr differ
diff --git a/data/sprites/official/lily.1.zspr b/data/sprites/official/lily.1.zspr
new file mode 100644
index 0000000000..5cb5d2aa9a
Binary files /dev/null and b/data/sprites/official/lily.1.zspr differ
diff --git a/data/sprites/official/locke_merchant.1.zspr b/data/sprites/official/locke_merchant.1.zspr
new file mode 100644
index 0000000000..bfd87c7da6
Binary files /dev/null and b/data/sprites/official/locke_merchant.1.zspr differ
diff --git a/data/sprites/official/lucario.1.zspr b/data/sprites/official/lucario.1.zspr
new file mode 100644
index 0000000000..44ce395e48
Binary files /dev/null and b/data/sprites/official/lucario.1.zspr differ
diff --git a/data/sprites/official/marin.1.zspr b/data/sprites/official/marin.1.zspr
new file mode 100644
index 0000000000..51c27bb698
Binary files /dev/null and b/data/sprites/official/marin.1.zspr differ
diff --git a/data/sprites/official/mario_tanooki.1.zspr b/data/sprites/official/mario_tanooki.1.zspr
new file mode 100644
index 0000000000..255350dd8c
Binary files /dev/null and b/data/sprites/official/mario_tanooki.1.zspr differ
diff --git a/data/sprites/official/medallions.1.zspr b/data/sprites/official/medallions.1.zspr
new file mode 100644
index 0000000000..dc4b04d170
Binary files /dev/null and b/data/sprites/official/medallions.1.zspr differ
diff --git a/data/sprites/official/medli.1.zspr b/data/sprites/official/medli.1.zspr
new file mode 100644
index 0000000000..59284a366d
Binary files /dev/null and b/data/sprites/official/medli.1.zspr differ
diff --git a/data/sprites/official/mikejones.1.zspr b/data/sprites/official/mikejones.1.zspr
new file mode 100644
index 0000000000..6b83b72cd8
Binary files /dev/null and b/data/sprites/official/mikejones.1.zspr differ
diff --git a/data/sprites/official/minish_link.1.zspr b/data/sprites/official/minish_link.1.zspr
new file mode 100644
index 0000000000..4b342c1acb
Binary files /dev/null and b/data/sprites/official/minish_link.1.zspr differ
diff --git a/data/sprites/official/moosh.1.zspr b/data/sprites/official/moosh.1.zspr
new file mode 100644
index 0000000000..0a1e167ae2
Binary files /dev/null and b/data/sprites/official/moosh.1.zspr differ
diff --git a/data/sprites/official/nia.1.zspr b/data/sprites/official/nia.1.zspr
new file mode 100644
index 0000000000..5d01ba4bd8
Binary files /dev/null and b/data/sprites/official/nia.1.zspr differ
diff --git a/data/sprites/official/paula.1.zspr b/data/sprites/official/paula.1.zspr
new file mode 100644
index 0000000000..657752ea29
Binary files /dev/null and b/data/sprites/official/paula.1.zspr differ
diff --git a/data/sprites/official/peach.1.zspr b/data/sprites/official/peach.1.zspr
new file mode 100644
index 0000000000..7973f95299
Binary files /dev/null and b/data/sprites/official/peach.1.zspr differ
diff --git a/data/sprites/official/pete.1.zspr b/data/sprites/official/pete.1.zspr
new file mode 100644
index 0000000000..a3135615bb
Binary files /dev/null and b/data/sprites/official/pete.1.zspr differ
diff --git a/data/sprites/official/poppy.1.zspr b/data/sprites/official/poppy.1.zspr
new file mode 100644
index 0000000000..80d4ca69ef
Binary files /dev/null and b/data/sprites/official/poppy.1.zspr differ
diff --git a/data/sprites/official/powerpuff_girl.1.zspr b/data/sprites/official/powerpuff_girl.1.zspr
new file mode 100644
index 0000000000..fbf3c69467
Binary files /dev/null and b/data/sprites/official/powerpuff_girl.1.zspr differ
diff --git a/data/sprites/official/pridelink.1.zspr b/data/sprites/official/pridelink.2.zspr
similarity index 99%
rename from data/sprites/official/pridelink.1.zspr
rename to data/sprites/official/pridelink.2.zspr
index 310a6b7565..662310133a 100644
Binary files a/data/sprites/official/pridelink.1.zspr and b/data/sprites/official/pridelink.2.zspr differ
diff --git a/data/sprites/official/primm.1.zspr b/data/sprites/official/primm.1.zspr
new file mode 100644
index 0000000000..e9ff2d0566
Binary files /dev/null and b/data/sprites/official/primm.1.zspr differ
diff --git a/data/sprites/official/rick.1.zspr b/data/sprites/official/rick.1.zspr
new file mode 100644
index 0000000000..93a163f669
Binary files /dev/null and b/data/sprites/official/rick.1.zspr differ
diff --git a/data/sprites/official/rocko.1.zspr b/data/sprites/official/rocko.1.zspr
new file mode 100644
index 0000000000..ab34f63576
Binary files /dev/null and b/data/sprites/official/rocko.1.zspr differ
diff --git a/data/sprites/official/rottytops.1.zspr b/data/sprites/official/rottytops.1.zspr
new file mode 100644
index 0000000000..d4007ffbd5
Binary files /dev/null and b/data/sprites/official/rottytops.1.zspr differ
diff --git a/data/sprites/official/samus_classic.1.zspr b/data/sprites/official/samus_classic.1.zspr
new file mode 100644
index 0000000000..6559e25ce6
Binary files /dev/null and b/data/sprites/official/samus_classic.1.zspr differ
diff --git a/data/sprites/official/sevens1ns.1.zspr b/data/sprites/official/sevens1ns.1.zspr
new file mode 100644
index 0000000000..d59a1b529f
Binary files /dev/null and b/data/sprites/official/sevens1ns.1.zspr differ
diff --git a/data/sprites/official/shadow.1.zspr b/data/sprites/official/shadow.1.zspr
new file mode 100644
index 0000000000..fcd0d49b60
Binary files /dev/null and b/data/sprites/official/shadow.1.zspr differ
diff --git a/data/sprites/official/solaire.1.zspr b/data/sprites/official/solaire.1.zspr
new file mode 100644
index 0000000000..e216a7d922
Binary files /dev/null and b/data/sprites/official/solaire.1.zspr differ
diff --git a/data/sprites/official/sora_kh1.1.zspr b/data/sprites/official/sora_kh1.1.zspr
new file mode 100644
index 0000000000..e77c922d20
Binary files /dev/null and b/data/sprites/official/sora_kh1.1.zspr differ
diff --git a/data/sprites/official/stalfos.1.zspr b/data/sprites/official/stalfos.1.zspr
new file mode 100644
index 0000000000..d4787a3b03
Binary files /dev/null and b/data/sprites/official/stalfos.1.zspr differ
diff --git a/data/sprites/official/stick_man.1.zspr b/data/sprites/official/stick_man.1.zspr
new file mode 100644
index 0000000000..b891586f4b
Binary files /dev/null and b/data/sprites/official/stick_man.1.zspr differ
diff --git a/data/sprites/official/superbomb.1.zspr b/data/sprites/official/superbomb.1.zspr
new file mode 100644
index 0000000000..1ed38ae3ec
Binary files /dev/null and b/data/sprites/official/superbomb.1.zspr differ
diff --git a/data/sprites/official/tetra.1.zspr b/data/sprites/official/tetra.1.zspr
new file mode 100644
index 0000000000..77525f08a9
Binary files /dev/null and b/data/sprites/official/tetra.1.zspr differ
diff --git a/data/sprites/official/toadette_captain.1.zspr b/data/sprites/official/toadette_captain.1.zspr
new file mode 100644
index 0000000000..e69f74a71c
Binary files /dev/null and b/data/sprites/official/toadette_captain.1.zspr differ
diff --git a/data/sprites/official/two_faced.1.zspr b/data/sprites/official/two_faced.1.zspr
new file mode 100644
index 0000000000..d504c321ad
Binary files /dev/null and b/data/sprites/official/two_faced.1.zspr differ
diff --git a/data/sprites/official/wario.1.zspr b/data/sprites/official/wario.1.zspr
new file mode 100644
index 0000000000..f1a5aab774
Binary files /dev/null and b/data/sprites/official/wario.1.zspr differ
diff --git a/data/sprites/official/yoshi.1.zspr b/data/sprites/official/yoshi.1.zspr
new file mode 100644
index 0000000000..189ea3901d
Binary files /dev/null and b/data/sprites/official/yoshi.1.zspr differ
diff --git a/data/sprites/official/zebraunicorn.1.zspr b/data/sprites/official/zebraunicorn.1.zspr
new file mode 100644
index 0000000000..c06130ff7a
Binary files /dev/null and b/data/sprites/official/zebraunicorn.1.zspr differ