diff --git a/data/sprites/official/arrghus.1.zspr b/data/sprites/official/arrghus.2.zspr
similarity index 98%
rename from data/sprites/official/arrghus.1.zspr
rename to data/sprites/official/arrghus.2.zspr
index fd2eb5e4cd..2064009d3c 100644
Binary files a/data/sprites/official/arrghus.1.zspr and b/data/sprites/official/arrghus.2.zspr differ
diff --git a/data/sprites/official/bigkey.1.zspr b/data/sprites/official/bigkey.1.zspr
new file mode 100644
index 0000000000..eab4854e38
Binary files /dev/null and b/data/sprites/official/bigkey.1.zspr differ
diff --git a/data/sprites/official/blacksmithlink.1.zspr b/data/sprites/official/blacksmithlink.1.zspr
new file mode 100644
index 0000000000..e9aeb31aa3
Binary files /dev/null and b/data/sprites/official/blacksmithlink.1.zspr differ
diff --git a/data/sprites/official/bob.1.zspr b/data/sprites/official/bob.1.zspr
new file mode 100644
index 0000000000..25fc041084
Binary files /dev/null and b/data/sprites/official/bob.1.zspr differ
diff --git a/data/sprites/official/boo.1.zspr b/data/sprites/official/boo-two.1.zspr
similarity index 100%
rename from data/sprites/official/boo.1.zspr
rename to data/sprites/official/boo-two.1.zspr
diff --git a/data/sprites/official/boo.2.zspr b/data/sprites/official/boo.2.zspr
new file mode 100644
index 0000000000..24c74bde23
Binary files /dev/null and b/data/sprites/official/boo.2.zspr differ
diff --git a/data/sprites/official/broccoli.1.zspr b/data/sprites/official/broccoli.1.zspr
new file mode 100644
index 0000000000..e335df01e4
Binary files /dev/null and b/data/sprites/official/broccoli.1.zspr differ
diff --git a/data/sprites/official/boy.1.zspr b/data/sprites/official/bsboy.1.zspr
similarity index 100%
rename from data/sprites/official/boy.1.zspr
rename to data/sprites/official/bsboy.1.zspr
diff --git a/data/sprites/official/girl.1.zspr b/data/sprites/official/bsgirl.1.zspr
similarity index 100%
rename from data/sprites/official/girl.1.zspr
rename to data/sprites/official/bsgirl.1.zspr
diff --git a/data/sprites/official/cheepcheep.1.zspr b/data/sprites/official/cheepcheep.1.zspr
new file mode 100644
index 0000000000..a49545f208
Binary files /dev/null and b/data/sprites/official/cheepcheep.1.zspr differ
diff --git a/data/sprites/official/conker.1.zspr b/data/sprites/official/conker.1.zspr
new file mode 100644
index 0000000000..121d523330
Binary files /dev/null and b/data/sprites/official/conker.1.zspr differ
diff --git a/data/sprites/official/cursor.1.zspr b/data/sprites/official/cursor.1.zspr
new file mode 100644
index 0000000000..45bc973919
Binary files /dev/null and b/data/sprites/official/cursor.1.zspr differ
diff --git a/data/sprites/official/darkzora.1.zspr b/data/sprites/official/darkzora.2.zspr
similarity index 98%
rename from data/sprites/official/darkzora.1.zspr
rename to data/sprites/official/darkzora.2.zspr
index 0540f4d915..fbb15c69f9 100644
Binary files a/data/sprites/official/darkzora.1.zspr and b/data/sprites/official/darkzora.2.zspr differ
diff --git a/data/sprites/official/froglink.1.zspr b/data/sprites/official/froglink.2.zspr
similarity index 96%
rename from data/sprites/official/froglink.1.zspr
rename to data/sprites/official/froglink.2.zspr
index b249832265..1932df067a 100644
Binary files a/data/sprites/official/froglink.1.zspr and b/data/sprites/official/froglink.2.zspr differ
diff --git a/data/sprites/official/garfield.1.zspr b/data/sprites/official/garfield.2.zspr
similarity index 94%
rename from data/sprites/official/garfield.1.zspr
rename to data/sprites/official/garfield.2.zspr
index e28c170617..6ca890e850 100644
Binary files a/data/sprites/official/garfield.1.zspr and b/data/sprites/official/garfield.2.zspr differ
diff --git a/data/sprites/official/hyruleknight.1.zspr b/data/sprites/official/hyruleknight.1.zspr
new file mode 100644
index 0000000000..a8815bc373
Binary files /dev/null and b/data/sprites/official/hyruleknight.1.zspr differ
diff --git a/data/sprites/official/jogurt.1.zspr b/data/sprites/official/jogurt.1.zspr
new file mode 100644
index 0000000000..b229060c69
Binary files /dev/null and b/data/sprites/official/jogurt.1.zspr differ
diff --git a/data/sprites/official/linkhatcolor.1.zspr b/data/sprites/official/linkhatcolor.1.zspr
new file mode 100644
index 0000000000..af53898dbc
Binary files /dev/null and b/data/sprites/official/linkhatcolor.1.zspr differ
diff --git a/data/sprites/official/linktuniccolor.1.zspr b/data/sprites/official/linktuniccolor.1.zspr
new file mode 100644
index 0000000000..305a9f8f9d
Binary files /dev/null and b/data/sprites/official/linktuniccolor.1.zspr differ
diff --git a/data/sprites/official/mangalink.1.zspr b/data/sprites/official/mangalink.1.zspr
new file mode 100644
index 0000000000..adb57b9991
Binary files /dev/null and b/data/sprites/official/mangalink.1.zspr differ
diff --git a/data/sprites/official/maplequeen.1.zspr b/data/sprites/official/maplequeen.2.zspr
similarity index 98%
rename from data/sprites/official/maplequeen.1.zspr
rename to data/sprites/official/maplequeen.2.zspr
index e26032a0ea..35b7deeca8 100644
Binary files a/data/sprites/official/maplequeen.1.zspr and b/data/sprites/official/maplequeen.2.zspr differ
diff --git a/data/sprites/official/mario-classic.1.zspr b/data/sprites/official/mario-classic.2.zspr
similarity index 99%
rename from data/sprites/official/mario-classic.1.zspr
rename to data/sprites/official/mario-classic.2.zspr
index 60ea7f94af..6443e32749 100644
Binary files a/data/sprites/official/mario-classic.1.zspr and b/data/sprites/official/mario-classic.2.zspr differ
diff --git a/data/sprites/official/mariocappy.1.zspr b/data/sprites/official/mariocappy.1.zspr
new file mode 100644
index 0000000000..b888396d2f
Binary files /dev/null and b/data/sprites/official/mariocappy.1.zspr differ
diff --git a/data/sprites/official/missingno.1.zspr b/data/sprites/official/missingno.1.zspr
new file mode 100644
index 0000000000..68e61b9b02
Binary files /dev/null and b/data/sprites/official/missingno.1.zspr differ
diff --git a/data/sprites/official/mog.1.zspr b/data/sprites/official/mog.2.zspr
similarity index 99%
rename from data/sprites/official/mog.1.zspr
rename to data/sprites/official/mog.2.zspr
index 2ef1dfc008..a6ed2225ec 100644
Binary files a/data/sprites/official/mog.1.zspr and b/data/sprites/official/mog.2.zspr differ
diff --git a/data/sprites/official/navi.1.zspr b/data/sprites/official/navi.1.zspr
new file mode 100644
index 0000000000..4621bf4a04
Binary files /dev/null and b/data/sprites/official/navi.1.zspr differ
diff --git a/data/sprites/official/neslink.1.zspr b/data/sprites/official/neslink.1.zspr
new file mode 100644
index 0000000000..805b316263
Binary files /dev/null and b/data/sprites/official/neslink.1.zspr differ
diff --git a/data/sprites/official/oldman.1.zspr b/data/sprites/official/oldman.2.zspr
similarity index 98%
rename from data/sprites/official/oldman.1.zspr
rename to data/sprites/official/oldman.2.zspr
index 1a45e5c7d3..1d47cdacc9 100644
Binary files a/data/sprites/official/oldman.1.zspr and b/data/sprites/official/oldman.2.zspr differ
diff --git a/data/sprites/official/pikachu.1.zspr b/data/sprites/official/pikachu.1.zspr
new file mode 100644
index 0000000000..0b8a88c48b
Binary files /dev/null and b/data/sprites/official/pikachu.1.zspr differ
diff --git a/data/sprites/official/pinkribbonlink.1.zspr b/data/sprites/official/pinkribbonlink.2.zspr
similarity index 99%
rename from data/sprites/official/pinkribbonlink.1.zspr
rename to data/sprites/official/pinkribbonlink.2.zspr
index 5e0fc9077c..ba516f1854 100644
Binary files a/data/sprites/official/pinkribbonlink.1.zspr and b/data/sprites/official/pinkribbonlink.2.zspr differ
diff --git a/data/sprites/official/santalink.1.zspr b/data/sprites/official/santalink.2.zspr
similarity index 99%
rename from data/sprites/official/santalink.1.zspr
rename to data/sprites/official/santalink.2.zspr
index 2495f0c0e0..0e78fedb34 100644
Binary files a/data/sprites/official/santalink.1.zspr and b/data/sprites/official/santalink.2.zspr differ
diff --git a/data/sprites/official/shadowsaku.1.zspr b/data/sprites/official/shadowsaku.2.zspr
similarity index 98%
rename from data/sprites/official/shadowsaku.1.zspr
rename to data/sprites/official/shadowsaku.2.zspr
index 427017553b..8972f9f266 100644
Binary files a/data/sprites/official/shadowsaku.1.zspr and b/data/sprites/official/shadowsaku.2.zspr differ
diff --git a/data/sprites/official/soldiersprite.1.zspr b/data/sprites/official/soldiersprite.1.zspr
new file mode 100644
index 0000000000..d5e8ee356d
Binary files /dev/null and b/data/sprites/official/soldiersprite.1.zspr differ
diff --git a/data/sprites/official/squirtle.1.zspr b/data/sprites/official/squirtle.1.zspr
new file mode 100644
index 0000000000..274bf1c760
Binary files /dev/null and b/data/sprites/official/squirtle.1.zspr differ
diff --git a/data/sprites/official/superbunny.1.zspr b/data/sprites/official/superbunny.2.zspr
similarity index 98%
rename from data/sprites/official/superbunny.1.zspr
rename to data/sprites/official/superbunny.2.zspr
index f55713692c..b842d1c35f 100644
Binary files a/data/sprites/official/superbunny.1.zspr and b/data/sprites/official/superbunny.2.zspr differ
diff --git a/data/sprites/official/supermeatboy.1.zspr b/data/sprites/official/supermeatboy.1.zspr
new file mode 100644
index 0000000000..ad4368bb5f
Binary files /dev/null and b/data/sprites/official/supermeatboy.1.zspr differ
diff --git a/data/sprites/official/terra.1.zspr b/data/sprites/official/terra.1.zspr
new file mode 100644
index 0000000000..e24ca87aad
Binary files /dev/null and b/data/sprites/official/terra.1.zspr differ
diff --git a/data/sprites/official/tile.1.zspr b/data/sprites/official/tile.1.zspr
deleted file mode 100644
index 98820f9ebb..0000000000
Binary files a/data/sprites/official/tile.1.zspr and /dev/null differ
diff --git a/data/sprites/official/tile.2.zspr b/data/sprites/official/tile.2.zspr
new file mode 100644
index 0000000000..38332bb06f
Binary files /dev/null and b/data/sprites/official/tile.2.zspr differ
diff --git a/data/sprites/official/toad.1.zspr b/data/sprites/official/toad.2.zspr
similarity index 98%
rename from data/sprites/official/toad.1.zspr
rename to data/sprites/official/toad.2.zspr
index a051ed9ec4..6abca2d71e 100644
Binary files a/data/sprites/official/toad.1.zspr and b/data/sprites/official/toad.2.zspr differ
diff --git a/data/sprites/official/trogdor.1.zspr b/data/sprites/official/trogdor.1.zspr
new file mode 100644
index 0000000000..b37191acc3
Binary files /dev/null and b/data/sprites/official/trogdor.1.zspr differ
diff --git a/data/sprites/official/wizzrobe.1.zspr b/data/sprites/official/wizzrobe.2.zspr
similarity index 98%
rename from data/sprites/official/wizzrobe.1.zspr
rename to data/sprites/official/wizzrobe.2.zspr
index f8938bdeb3..f79195d239 100644
Binary files a/data/sprites/official/wizzrobe.1.zspr and b/data/sprites/official/wizzrobe.2.zspr differ
diff --git a/data/sprites/official/zora.1.zspr b/data/sprites/official/zora.1.zspr
deleted file mode 100644
index ca41792125..0000000000
Binary files a/data/sprites/official/zora.1.zspr and /dev/null differ
diff --git a/data/sprites/official/zora.2.zspr b/data/sprites/official/zora.2.zspr
new file mode 100644
index 0000000000..1ca568e113
Binary files /dev/null and b/data/sprites/official/zora.2.zspr differ