diff --git a/src/afd/sprites-canonical/front/0000-000-Missingno..png b/newsrc/afd/0.png similarity index 100% rename from src/afd/sprites-canonical/front/0000-000-Missingno..png rename to newsrc/afd/0.png diff --git a/src/afd/sprites-canonical/back/0000-000-Missingno..png b/newsrc/afd/0b.png similarity index 100% rename from src/afd/sprites-canonical/back/0000-000-Missingno..png rename to newsrc/afd/0b.png diff --git a/src/afd/sprites-canonical/back-shiny/0000-000-Missingno..png b/newsrc/afd/0bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0000-000-Missingno..png rename to newsrc/afd/0bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0000-000-Missingno..png b/newsrc/afd/0s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0000-000-Missingno..png rename to newsrc/afd/0s.png diff --git a/src/afd/sprites-canonical/front/0313-000-Volbeat.png b/newsrc/afd/10016.png similarity index 100% rename from src/afd/sprites-canonical/front/0313-000-Volbeat.png rename to newsrc/afd/10016.png diff --git a/src/afd/sprites-canonical/back/0313-000-Volbeat.png b/newsrc/afd/10016b.png similarity index 100% rename from src/afd/sprites-canonical/back/0313-000-Volbeat.png rename to newsrc/afd/10016b.png diff --git a/src/afd/sprites-canonical/back-shiny/0313-000-Volbeat.png b/newsrc/afd/10016bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0313-000-Volbeat.png rename to newsrc/afd/10016bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0313-000-Volbeat.png b/newsrc/afd/10016s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0313-000-Volbeat.png rename to newsrc/afd/10016s.png diff --git a/src/afd/sprites-canonical/front/0314-000-Illumise.png b/newsrc/afd/10048.png similarity index 100% rename from src/afd/sprites-canonical/front/0314-000-Illumise.png rename to newsrc/afd/10048.png diff --git a/src/afd/sprites-canonical/back/0314-000-Illumise.png b/newsrc/afd/10048b.png similarity index 100% rename from src/afd/sprites-canonical/back/0314-000-Illumise.png rename to newsrc/afd/10048b.png diff --git a/src/afd/sprites-canonical/back-shiny/0314-000-Illumise.png b/newsrc/afd/10048bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0314-000-Illumise.png rename to newsrc/afd/10048bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0314-000-Illumise.png b/newsrc/afd/10048s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0314-000-Illumise.png rename to newsrc/afd/10048s.png diff --git a/src/afd/sprites-canonical/front/0315-000-Roselia.png b/newsrc/afd/10080.png similarity index 100% rename from src/afd/sprites-canonical/front/0315-000-Roselia.png rename to newsrc/afd/10080.png diff --git a/src/afd/sprites-canonical/back/0315-000-Roselia.png b/newsrc/afd/10080b.png similarity index 100% rename from src/afd/sprites-canonical/back/0315-000-Roselia.png rename to newsrc/afd/10080b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0315-000-Roselia-Female.png b/newsrc/afd/10080bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0315-000-Roselia-Female.png rename to newsrc/afd/10080bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0315-000-Roselia-Female.png b/newsrc/afd/10080bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0315-000-Roselia-Female.png rename to newsrc/afd/10080bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0315-000-Roselia.png b/newsrc/afd/10080bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0315-000-Roselia.png rename to newsrc/afd/10080bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0315-000-Roselia-Female.png b/newsrc/afd/10080f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0315-000-Roselia-Female.png rename to newsrc/afd/10080f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0315-000-Roselia-Female.png b/newsrc/afd/10080fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0315-000-Roselia-Female.png rename to newsrc/afd/10080fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0315-000-Roselia.png b/newsrc/afd/10080s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0315-000-Roselia.png rename to newsrc/afd/10080s.png diff --git a/src/afd/sprites-canonical/front/0316-000-Gulpin.png b/newsrc/afd/10112.png similarity index 100% rename from src/afd/sprites-canonical/front/0316-000-Gulpin.png rename to newsrc/afd/10112.png diff --git a/src/afd/sprites-canonical/back/0316-000-Gulpin.png b/newsrc/afd/10112b.png similarity index 100% rename from src/afd/sprites-canonical/back/0316-000-Gulpin.png rename to newsrc/afd/10112b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0316-000-Gulpin-Female.png b/newsrc/afd/10112bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0316-000-Gulpin-Female.png rename to newsrc/afd/10112bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0316-000-Gulpin-Female.png b/newsrc/afd/10112bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0316-000-Gulpin-Female.png rename to newsrc/afd/10112bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0316-000-Gulpin.png b/newsrc/afd/10112bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0316-000-Gulpin.png rename to newsrc/afd/10112bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0316-000-Gulpin-Female.png b/newsrc/afd/10112f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0316-000-Gulpin-Female.png rename to newsrc/afd/10112f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0316-000-Gulpin-Female.png b/newsrc/afd/10112fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0316-000-Gulpin-Female.png rename to newsrc/afd/10112fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0316-000-Gulpin.png b/newsrc/afd/10112s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0316-000-Gulpin.png rename to newsrc/afd/10112s.png diff --git a/src/afd/sprites-canonical/front/0317-000-Swalot.png b/newsrc/afd/10144.png similarity index 100% rename from src/afd/sprites-canonical/front/0317-000-Swalot.png rename to newsrc/afd/10144.png diff --git a/src/afd/sprites-canonical/back/0317-000-Swalot.png b/newsrc/afd/10144b.png similarity index 100% rename from src/afd/sprites-canonical/back/0317-000-Swalot.png rename to newsrc/afd/10144b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0317-000-Swalot-Female.png b/newsrc/afd/10144bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0317-000-Swalot-Female.png rename to newsrc/afd/10144bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0317-000-Swalot-Female.png b/newsrc/afd/10144bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0317-000-Swalot-Female.png rename to newsrc/afd/10144bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0317-000-Swalot.png b/newsrc/afd/10144bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0317-000-Swalot.png rename to newsrc/afd/10144bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0317-000-Swalot-Female.png b/newsrc/afd/10144f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0317-000-Swalot-Female.png rename to newsrc/afd/10144f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0317-000-Swalot-Female.png b/newsrc/afd/10144fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0317-000-Swalot-Female.png rename to newsrc/afd/10144fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0317-000-Swalot.png b/newsrc/afd/10144s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0317-000-Swalot.png rename to newsrc/afd/10144s.png diff --git a/src/afd/sprites-canonical/front/0318-000-Carvanha.png b/newsrc/afd/10176.png similarity index 100% rename from src/afd/sprites-canonical/front/0318-000-Carvanha.png rename to newsrc/afd/10176.png diff --git a/src/afd/sprites-canonical/back/0318-000-Carvanha.png b/newsrc/afd/10176b.png similarity index 100% rename from src/afd/sprites-canonical/back/0318-000-Carvanha.png rename to newsrc/afd/10176b.png diff --git a/src/afd/sprites-canonical/back-shiny/0318-000-Carvanha.png b/newsrc/afd/10176bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0318-000-Carvanha.png rename to newsrc/afd/10176bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0318-000-Carvanha.png b/newsrc/afd/10176s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0318-000-Carvanha.png rename to newsrc/afd/10176s.png diff --git a/src/afd/sprites-canonical/front/0319-000-Sharpedo.png b/newsrc/afd/10208.png similarity index 100% rename from src/afd/sprites-canonical/front/0319-000-Sharpedo.png rename to newsrc/afd/10208.png diff --git a/src/afd/sprites-canonical/back/0319-000-Sharpedo.png b/newsrc/afd/10208b.png similarity index 100% rename from src/afd/sprites-canonical/back/0319-000-Sharpedo.png rename to newsrc/afd/10208b.png diff --git a/src/afd/sprites-canonical/back-shiny/0319-000-Sharpedo.png b/newsrc/afd/10208bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0319-000-Sharpedo.png rename to newsrc/afd/10208bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0319-000-Sharpedo.png b/newsrc/afd/10208s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0319-000-Sharpedo.png rename to newsrc/afd/10208s.png diff --git a/src/afd/sprites-canonical/front-shiny/0319-420-Sharpedo-Mega.png b/newsrc/afd/10209.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0319-420-Sharpedo-Mega.png rename to newsrc/afd/10209.png diff --git a/src/afd/sprites-canonical/back-shiny/0319-420-Sharpedo-Mega.png b/newsrc/afd/10209b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0319-420-Sharpedo-Mega.png rename to newsrc/afd/10209b.png diff --git a/src/afd/sprites-canonical/back/0319-420-Sharpedo-Mega.png b/newsrc/afd/10209bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0319-420-Sharpedo-Mega.png rename to newsrc/afd/10209bs.png diff --git a/src/afd/sprites-canonical/front/0319-420-Sharpedo-Mega.png b/newsrc/afd/10209s.png similarity index 100% rename from src/afd/sprites-canonical/front/0319-420-Sharpedo-Mega.png rename to newsrc/afd/10209s.png diff --git a/src/afd/sprites-canonical/front/0032-000-Nidoran~M.png b/newsrc/afd/1024.png similarity index 100% rename from src/afd/sprites-canonical/front/0032-000-Nidoran~M.png rename to newsrc/afd/1024.png diff --git a/src/afd/sprites-canonical/front/0320-000-Wailmer.png b/newsrc/afd/10240.png similarity index 100% rename from src/afd/sprites-canonical/front/0320-000-Wailmer.png rename to newsrc/afd/10240.png diff --git a/src/afd/sprites-canonical/back/0320-000-Wailmer.png b/newsrc/afd/10240b.png similarity index 100% rename from src/afd/sprites-canonical/back/0320-000-Wailmer.png rename to newsrc/afd/10240b.png diff --git a/src/afd/sprites-canonical/back-shiny/0320-000-Wailmer.png b/newsrc/afd/10240bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0320-000-Wailmer.png rename to newsrc/afd/10240bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0320-000-Wailmer.png b/newsrc/afd/10240s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0320-000-Wailmer.png rename to newsrc/afd/10240s.png diff --git a/src/afd/sprites-canonical/back/0032-000-Nidoran~M.png b/newsrc/afd/1024b.png similarity index 100% rename from src/afd/sprites-canonical/back/0032-000-Nidoran~M.png rename to newsrc/afd/1024b.png diff --git a/src/afd/sprites-canonical/back-shiny/0032-000-Nidoran~M.png b/newsrc/afd/1024bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0032-000-Nidoran~M.png rename to newsrc/afd/1024bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0032-000-Nidoran~M.png b/newsrc/afd/1024s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0032-000-Nidoran~M.png rename to newsrc/afd/1024s.png diff --git a/src/afd/sprites-canonical/front/0321-000-Wailord.png b/newsrc/afd/10272.png similarity index 100% rename from src/afd/sprites-canonical/front/0321-000-Wailord.png rename to newsrc/afd/10272.png diff --git a/src/afd/sprites-canonical/back/0321-000-Wailord.png b/newsrc/afd/10272b.png similarity index 100% rename from src/afd/sprites-canonical/back/0321-000-Wailord.png rename to newsrc/afd/10272b.png diff --git a/src/afd/sprites-canonical/back-shiny/0321-000-Wailord.png b/newsrc/afd/10272bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0321-000-Wailord.png rename to newsrc/afd/10272bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0321-000-Wailord.png b/newsrc/afd/10272s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0321-000-Wailord.png rename to newsrc/afd/10272s.png diff --git a/src/afd/sprites-canonical/front/0322-000-Numel.png b/newsrc/afd/10304.png similarity index 100% rename from src/afd/sprites-canonical/front/0322-000-Numel.png rename to newsrc/afd/10304.png diff --git a/src/afd/sprites-canonical/back/0322-000-Numel.png b/newsrc/afd/10304b.png similarity index 100% rename from src/afd/sprites-canonical/back/0322-000-Numel.png rename to newsrc/afd/10304b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0322-000-Numel-Female.png b/newsrc/afd/10304bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0322-000-Numel-Female.png rename to newsrc/afd/10304bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0322-000-Numel-Female.png b/newsrc/afd/10304bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0322-000-Numel-Female.png rename to newsrc/afd/10304bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0322-000-Numel.png b/newsrc/afd/10304bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0322-000-Numel.png rename to newsrc/afd/10304bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0322-000-Numel-Female.png b/newsrc/afd/10304f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0322-000-Numel-Female.png rename to newsrc/afd/10304f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0322-000-Numel-Female.png b/newsrc/afd/10304fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0322-000-Numel-Female.png rename to newsrc/afd/10304fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0322-000-Numel.png b/newsrc/afd/10304s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0322-000-Numel.png rename to newsrc/afd/10304s.png diff --git a/src/afd/sprites-canonical/front/0323-000-Camerupt.png b/newsrc/afd/10336.png similarity index 100% rename from src/afd/sprites-canonical/front/0323-000-Camerupt.png rename to newsrc/afd/10336.png diff --git a/src/afd/sprites-canonical/back/0323-000-Camerupt.png b/newsrc/afd/10336b.png similarity index 100% rename from src/afd/sprites-canonical/back/0323-000-Camerupt.png rename to newsrc/afd/10336b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0323-000-Camerupt-Female.png b/newsrc/afd/10336bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0323-000-Camerupt-Female.png rename to newsrc/afd/10336bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0323-000-Camerupt-Female.png b/newsrc/afd/10336bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0323-000-Camerupt-Female.png rename to newsrc/afd/10336bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0323-000-Camerupt.png b/newsrc/afd/10336bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0323-000-Camerupt.png rename to newsrc/afd/10336bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0323-000-Camerupt-Female.png b/newsrc/afd/10336f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0323-000-Camerupt-Female.png rename to newsrc/afd/10336f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0323-000-Camerupt-Female.png b/newsrc/afd/10336fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0323-000-Camerupt-Female.png rename to newsrc/afd/10336fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0323-000-Camerupt.png b/newsrc/afd/10336s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0323-000-Camerupt.png rename to newsrc/afd/10336s.png diff --git a/src/afd/sprites-canonical/back/0323-420-Camerupt-Mega.png b/newsrc/afd/10337.png similarity index 100% rename from src/afd/sprites-canonical/back/0323-420-Camerupt-Mega.png rename to newsrc/afd/10337.png diff --git a/src/afd/sprites-canonical/front/0323-420-Camerupt-Mega.png b/newsrc/afd/10337b.png similarity index 100% rename from src/afd/sprites-canonical/front/0323-420-Camerupt-Mega.png rename to newsrc/afd/10337b.png diff --git a/src/afd/sprites-canonical/back-shiny/0323-420-Camerupt-Mega.png b/newsrc/afd/10337bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0323-420-Camerupt-Mega.png rename to newsrc/afd/10337bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0323-420-Camerupt-Mega.png b/newsrc/afd/10337s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0323-420-Camerupt-Mega.png rename to newsrc/afd/10337s.png diff --git a/src/afd/sprites-canonical/front/0324-000-Torkoal.png b/newsrc/afd/10368.png similarity index 100% rename from src/afd/sprites-canonical/front/0324-000-Torkoal.png rename to newsrc/afd/10368.png diff --git a/src/afd/sprites-canonical/back/0324-000-Torkoal.png b/newsrc/afd/10368b.png similarity index 100% rename from src/afd/sprites-canonical/back/0324-000-Torkoal.png rename to newsrc/afd/10368b.png diff --git a/src/afd/sprites-canonical/back-shiny/0324-000-Torkoal.png b/newsrc/afd/10368bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0324-000-Torkoal.png rename to newsrc/afd/10368bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0324-000-Torkoal.png b/newsrc/afd/10368s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0324-000-Torkoal.png rename to newsrc/afd/10368s.png diff --git a/src/afd/sprites-canonical/front/0325-000-Spoink.png b/newsrc/afd/10400.png similarity index 100% rename from src/afd/sprites-canonical/front/0325-000-Spoink.png rename to newsrc/afd/10400.png diff --git a/src/afd/sprites-canonical/back/0325-000-Spoink.png b/newsrc/afd/10400b.png similarity index 100% rename from src/afd/sprites-canonical/back/0325-000-Spoink.png rename to newsrc/afd/10400b.png diff --git a/src/afd/sprites-canonical/back-shiny/0325-000-Spoink.png b/newsrc/afd/10400bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0325-000-Spoink.png rename to newsrc/afd/10400bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0325-000-Spoink.png b/newsrc/afd/10400s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0325-000-Spoink.png rename to newsrc/afd/10400s.png diff --git a/src/afd/sprites-canonical/front/0326-000-Grumpig.png b/newsrc/afd/10432.png similarity index 100% rename from src/afd/sprites-canonical/front/0326-000-Grumpig.png rename to newsrc/afd/10432.png diff --git a/src/afd/sprites-canonical/back/0326-000-Grumpig.png b/newsrc/afd/10432b.png similarity index 100% rename from src/afd/sprites-canonical/back/0326-000-Grumpig.png rename to newsrc/afd/10432b.png diff --git a/src/afd/sprites-canonical/back-shiny/0326-000-Grumpig.png b/newsrc/afd/10432bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0326-000-Grumpig.png rename to newsrc/afd/10432bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0326-000-Grumpig.png b/newsrc/afd/10432s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0326-000-Grumpig.png rename to newsrc/afd/10432s.png diff --git a/src/afd/sprites-canonical/front/0327-000-Spinda.png b/newsrc/afd/10464.png similarity index 100% rename from src/afd/sprites-canonical/front/0327-000-Spinda.png rename to newsrc/afd/10464.png diff --git a/src/afd/sprites-canonical/back/0327-000-Spinda.png b/newsrc/afd/10464b.png similarity index 100% rename from src/afd/sprites-canonical/back/0327-000-Spinda.png rename to newsrc/afd/10464b.png diff --git a/src/afd/sprites-canonical/back-shiny/0327-000-Spinda.png b/newsrc/afd/10464bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0327-000-Spinda.png rename to newsrc/afd/10464bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0327-000-Spinda.png b/newsrc/afd/10464s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0327-000-Spinda.png rename to newsrc/afd/10464s.png diff --git a/src/afd/sprites-canonical/front/0328-000-Trapinch.png b/newsrc/afd/10496.png similarity index 100% rename from src/afd/sprites-canonical/front/0328-000-Trapinch.png rename to newsrc/afd/10496.png diff --git a/src/afd/sprites-canonical/back/0328-000-Trapinch.png b/newsrc/afd/10496b.png similarity index 100% rename from src/afd/sprites-canonical/back/0328-000-Trapinch.png rename to newsrc/afd/10496b.png diff --git a/src/afd/sprites-canonical/back-shiny/0328-000-Trapinch.png b/newsrc/afd/10496bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0328-000-Trapinch.png rename to newsrc/afd/10496bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0328-000-Trapinch.png b/newsrc/afd/10496s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0328-000-Trapinch.png rename to newsrc/afd/10496s.png diff --git a/src/afd/sprites-canonical/front/0329-000-Vibrava.png b/newsrc/afd/10528.png similarity index 100% rename from src/afd/sprites-canonical/front/0329-000-Vibrava.png rename to newsrc/afd/10528.png diff --git a/src/afd/sprites-canonical/back/0329-000-Vibrava.png b/newsrc/afd/10528b.png similarity index 100% rename from src/afd/sprites-canonical/back/0329-000-Vibrava.png rename to newsrc/afd/10528b.png diff --git a/src/afd/sprites-canonical/back-shiny/0329-000-Vibrava.png b/newsrc/afd/10528bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0329-000-Vibrava.png rename to newsrc/afd/10528bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0329-000-Vibrava.png b/newsrc/afd/10528s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0329-000-Vibrava.png rename to newsrc/afd/10528s.png diff --git a/src/afd/sprites-canonical/front/0033-000-Nidorino.png b/newsrc/afd/1056.png similarity index 100% rename from src/afd/sprites-canonical/front/0033-000-Nidorino.png rename to newsrc/afd/1056.png diff --git a/src/afd/sprites-canonical/front/0330-000-Flygon.png b/newsrc/afd/10560.png similarity index 100% rename from src/afd/sprites-canonical/front/0330-000-Flygon.png rename to newsrc/afd/10560.png diff --git a/src/afd/sprites-canonical/back/0330-000-Flygon.png b/newsrc/afd/10560b.png similarity index 100% rename from src/afd/sprites-canonical/back/0330-000-Flygon.png rename to newsrc/afd/10560b.png diff --git a/src/afd/sprites-canonical/back-shiny/0330-000-Flygon.png b/newsrc/afd/10560bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0330-000-Flygon.png rename to newsrc/afd/10560bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0330-000-Flygon.png b/newsrc/afd/10560s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0330-000-Flygon.png rename to newsrc/afd/10560s.png diff --git a/src/afd/sprites-canonical/back/0033-000-Nidorino.png b/newsrc/afd/1056b.png similarity index 100% rename from src/afd/sprites-canonical/back/0033-000-Nidorino.png rename to newsrc/afd/1056b.png diff --git a/src/afd/sprites-canonical/back-shiny/0033-000-Nidorino.png b/newsrc/afd/1056bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0033-000-Nidorino.png rename to newsrc/afd/1056bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0033-000-Nidorino.png b/newsrc/afd/1056s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0033-000-Nidorino.png rename to newsrc/afd/1056s.png diff --git a/src/afd/sprites-canonical/front/0331-000-Cacnea.png b/newsrc/afd/10592.png similarity index 100% rename from src/afd/sprites-canonical/front/0331-000-Cacnea.png rename to newsrc/afd/10592.png diff --git a/src/afd/sprites-canonical/back/0331-000-Cacnea.png b/newsrc/afd/10592b.png similarity index 100% rename from src/afd/sprites-canonical/back/0331-000-Cacnea.png rename to newsrc/afd/10592b.png diff --git a/src/afd/sprites-canonical/back-shiny/0331-000-Cacnea.png b/newsrc/afd/10592bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0331-000-Cacnea.png rename to newsrc/afd/10592bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0331-000-Cacnea.png b/newsrc/afd/10592s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0331-000-Cacnea.png rename to newsrc/afd/10592s.png diff --git a/src/afd/sprites-canonical/front/0332-000-Cacturne.png b/newsrc/afd/10624.png similarity index 100% rename from src/afd/sprites-canonical/front/0332-000-Cacturne.png rename to newsrc/afd/10624.png diff --git a/src/afd/sprites-canonical/back/0332-000-Cacturne.png b/newsrc/afd/10624b.png similarity index 100% rename from src/afd/sprites-canonical/back/0332-000-Cacturne.png rename to newsrc/afd/10624b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0332-000-Cacturne-Female.png b/newsrc/afd/10624bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0332-000-Cacturne-Female.png rename to newsrc/afd/10624bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0332-000-Cacturne-Female.png b/newsrc/afd/10624bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0332-000-Cacturne-Female.png rename to newsrc/afd/10624bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0332-000-Cacturne.png b/newsrc/afd/10624bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0332-000-Cacturne.png rename to newsrc/afd/10624bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0332-000-Cacturne-Female.png b/newsrc/afd/10624f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0332-000-Cacturne-Female.png rename to newsrc/afd/10624f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0332-000-Cacturne-Female.png b/newsrc/afd/10624fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0332-000-Cacturne-Female.png rename to newsrc/afd/10624fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0332-000-Cacturne.png b/newsrc/afd/10624s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0332-000-Cacturne.png rename to newsrc/afd/10624s.png diff --git a/src/afd/sprites-canonical/front/0333-000-Swablu.png b/newsrc/afd/10656.png similarity index 100% rename from src/afd/sprites-canonical/front/0333-000-Swablu.png rename to newsrc/afd/10656.png diff --git a/src/afd/sprites-canonical/back/0333-000-Swablu.png b/newsrc/afd/10656b.png similarity index 100% rename from src/afd/sprites-canonical/back/0333-000-Swablu.png rename to newsrc/afd/10656b.png diff --git a/src/afd/sprites-canonical/back-shiny/0333-000-Swablu.png b/newsrc/afd/10656bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0333-000-Swablu.png rename to newsrc/afd/10656bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0333-000-Swablu.png b/newsrc/afd/10656s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0333-000-Swablu.png rename to newsrc/afd/10656s.png diff --git a/src/afd/sprites-canonical/front/0334-000-Altaria.png b/newsrc/afd/10688.png similarity index 100% rename from src/afd/sprites-canonical/front/0334-000-Altaria.png rename to newsrc/afd/10688.png diff --git a/src/afd/sprites-canonical/back/0334-000-Altaria.png b/newsrc/afd/10688b.png similarity index 100% rename from src/afd/sprites-canonical/back/0334-000-Altaria.png rename to newsrc/afd/10688b.png diff --git a/src/afd/sprites-canonical/back-shiny/0334-000-Altaria.png b/newsrc/afd/10688bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0334-000-Altaria.png rename to newsrc/afd/10688bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0334-000-Altaria.png b/newsrc/afd/10688s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0334-000-Altaria.png rename to newsrc/afd/10688s.png diff --git a/src/afd/sprites-canonical/front/0334-420-Altaria-Mega.png b/newsrc/afd/10689.png similarity index 100% rename from src/afd/sprites-canonical/front/0334-420-Altaria-Mega.png rename to newsrc/afd/10689.png diff --git a/src/afd/sprites-canonical/back/0334-420-Altaria-Mega.png b/newsrc/afd/10689b.png similarity index 100% rename from src/afd/sprites-canonical/back/0334-420-Altaria-Mega.png rename to newsrc/afd/10689b.png diff --git a/src/afd/sprites-canonical/back-shiny/0334-420-Altaria-Mega.png b/newsrc/afd/10689bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0334-420-Altaria-Mega.png rename to newsrc/afd/10689bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0334-420-Altaria-Mega.png b/newsrc/afd/10689s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0334-420-Altaria-Mega.png rename to newsrc/afd/10689s.png diff --git a/src/afd/sprites-canonical/front/0335-000-Zangoose.png b/newsrc/afd/10720.png similarity index 100% rename from src/afd/sprites-canonical/front/0335-000-Zangoose.png rename to newsrc/afd/10720.png diff --git a/src/afd/sprites-canonical/back/0335-000-Zangoose.png b/newsrc/afd/10720b.png similarity index 100% rename from src/afd/sprites-canonical/back/0335-000-Zangoose.png rename to newsrc/afd/10720b.png diff --git a/src/afd/sprites-canonical/back-shiny/0335-000-Zangoose.png b/newsrc/afd/10720bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0335-000-Zangoose.png rename to newsrc/afd/10720bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0335-000-Zangoose.png b/newsrc/afd/10720s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0335-000-Zangoose.png rename to newsrc/afd/10720s.png diff --git a/src/afd/sprites-canonical/front/0336-000-Seviper.png b/newsrc/afd/10752.png similarity index 100% rename from src/afd/sprites-canonical/front/0336-000-Seviper.png rename to newsrc/afd/10752.png diff --git a/src/afd/sprites-canonical/back/0336-000-Seviper.png b/newsrc/afd/10752b.png similarity index 100% rename from src/afd/sprites-canonical/back/0336-000-Seviper.png rename to newsrc/afd/10752b.png diff --git a/src/afd/sprites-canonical/back-shiny/0336-000-Seviper.png b/newsrc/afd/10752bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0336-000-Seviper.png rename to newsrc/afd/10752bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0336-000-Seviper.png b/newsrc/afd/10752s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0336-000-Seviper.png rename to newsrc/afd/10752s.png diff --git a/src/afd/sprites-canonical/front/0337-000-Lunatone.png b/newsrc/afd/10784.png similarity index 100% rename from src/afd/sprites-canonical/front/0337-000-Lunatone.png rename to newsrc/afd/10784.png diff --git a/src/afd/sprites-canonical/back/0337-000-Lunatone.png b/newsrc/afd/10784b.png similarity index 100% rename from src/afd/sprites-canonical/back/0337-000-Lunatone.png rename to newsrc/afd/10784b.png diff --git a/src/afd/sprites-canonical/back-shiny/0337-000-Lunatone.png b/newsrc/afd/10784bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0337-000-Lunatone.png rename to newsrc/afd/10784bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0337-000-Lunatone.png b/newsrc/afd/10784s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0337-000-Lunatone.png rename to newsrc/afd/10784s.png diff --git a/src/afd/sprites-canonical/front/0338-000-Solrock.png b/newsrc/afd/10816.png similarity index 100% rename from src/afd/sprites-canonical/front/0338-000-Solrock.png rename to newsrc/afd/10816.png diff --git a/src/afd/sprites-canonical/back/0338-000-Solrock.png b/newsrc/afd/10816b.png similarity index 100% rename from src/afd/sprites-canonical/back/0338-000-Solrock.png rename to newsrc/afd/10816b.png diff --git a/src/afd/sprites-canonical/back-shiny/0338-000-Solrock.png b/newsrc/afd/10816bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0338-000-Solrock.png rename to newsrc/afd/10816bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0338-000-Solrock.png b/newsrc/afd/10816s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0338-000-Solrock.png rename to newsrc/afd/10816s.png diff --git a/src/afd/sprites-canonical/front/0339-000-Barboach.png b/newsrc/afd/10848.png similarity index 100% rename from src/afd/sprites-canonical/front/0339-000-Barboach.png rename to newsrc/afd/10848.png diff --git a/src/afd/sprites-canonical/back/0339-000-Barboach.png b/newsrc/afd/10848b.png similarity index 100% rename from src/afd/sprites-canonical/back/0339-000-Barboach.png rename to newsrc/afd/10848b.png diff --git a/src/afd/sprites-canonical/back-shiny/0339-000-Barboach.png b/newsrc/afd/10848bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0339-000-Barboach.png rename to newsrc/afd/10848bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0339-000-Barboach.png b/newsrc/afd/10848s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0339-000-Barboach.png rename to newsrc/afd/10848s.png diff --git a/src/afd/sprites-canonical/front/0034-000-Nidoking.png b/newsrc/afd/1088.png similarity index 100% rename from src/afd/sprites-canonical/front/0034-000-Nidoking.png rename to newsrc/afd/1088.png diff --git a/src/afd/sprites-canonical/front/0340-000-Whiscash.png b/newsrc/afd/10880.png similarity index 100% rename from src/afd/sprites-canonical/front/0340-000-Whiscash.png rename to newsrc/afd/10880.png diff --git a/src/afd/sprites-canonical/back/0340-000-Whiscash.png b/newsrc/afd/10880b.png similarity index 100% rename from src/afd/sprites-canonical/back/0340-000-Whiscash.png rename to newsrc/afd/10880b.png diff --git a/src/afd/sprites-canonical/back-shiny/0340-000-Whiscash.png b/newsrc/afd/10880bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0340-000-Whiscash.png rename to newsrc/afd/10880bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0340-000-Whiscash.png b/newsrc/afd/10880s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0340-000-Whiscash.png rename to newsrc/afd/10880s.png diff --git a/src/afd/sprites-canonical/back/0034-000-Nidoking.png b/newsrc/afd/1088b.png similarity index 100% rename from src/afd/sprites-canonical/back/0034-000-Nidoking.png rename to newsrc/afd/1088b.png diff --git a/src/afd/sprites-canonical/back-shiny/0034-000-Nidoking.png b/newsrc/afd/1088bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0034-000-Nidoking.png rename to newsrc/afd/1088bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0034-000-Nidoking.png b/newsrc/afd/1088s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0034-000-Nidoking.png rename to newsrc/afd/1088s.png diff --git a/src/afd/sprites-canonical/front/0341-000-Corphish.png b/newsrc/afd/10912.png similarity index 100% rename from src/afd/sprites-canonical/front/0341-000-Corphish.png rename to newsrc/afd/10912.png diff --git a/src/afd/sprites-canonical/back/0341-000-Corphish.png b/newsrc/afd/10912b.png similarity index 100% rename from src/afd/sprites-canonical/back/0341-000-Corphish.png rename to newsrc/afd/10912b.png diff --git a/src/afd/sprites-canonical/back-shiny/0341-000-Corphish.png b/newsrc/afd/10912bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0341-000-Corphish.png rename to newsrc/afd/10912bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0341-000-Corphish.png b/newsrc/afd/10912s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0341-000-Corphish.png rename to newsrc/afd/10912s.png diff --git a/src/afd/sprites-canonical/front/0342-000-Crawdaunt.png b/newsrc/afd/10944.png similarity index 100% rename from src/afd/sprites-canonical/front/0342-000-Crawdaunt.png rename to newsrc/afd/10944.png diff --git a/src/afd/sprites-canonical/back/0342-000-Crawdaunt.png b/newsrc/afd/10944b.png similarity index 100% rename from src/afd/sprites-canonical/back/0342-000-Crawdaunt.png rename to newsrc/afd/10944b.png diff --git a/src/afd/sprites-canonical/back-shiny/0342-000-Crawdaunt.png b/newsrc/afd/10944bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0342-000-Crawdaunt.png rename to newsrc/afd/10944bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0342-000-Crawdaunt.png b/newsrc/afd/10944s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0342-000-Crawdaunt.png rename to newsrc/afd/10944s.png diff --git a/src/afd/sprites-canonical/front/0343-000-Baltoy.png b/newsrc/afd/10976.png similarity index 100% rename from src/afd/sprites-canonical/front/0343-000-Baltoy.png rename to newsrc/afd/10976.png diff --git a/src/afd/sprites-canonical/back/0343-000-Baltoy.png b/newsrc/afd/10976b.png similarity index 100% rename from src/afd/sprites-canonical/back/0343-000-Baltoy.png rename to newsrc/afd/10976b.png diff --git a/src/afd/sprites-canonical/back-shiny/0343-000-Baltoy.png b/newsrc/afd/10976bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0343-000-Baltoy.png rename to newsrc/afd/10976bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0343-000-Baltoy.png b/newsrc/afd/10976s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0343-000-Baltoy.png rename to newsrc/afd/10976s.png diff --git a/src/afd/sprites-canonical/front/0344-000-Claydol.png b/newsrc/afd/11008.png similarity index 100% rename from src/afd/sprites-canonical/front/0344-000-Claydol.png rename to newsrc/afd/11008.png diff --git a/src/afd/sprites-canonical/back/0344-000-Claydol.png b/newsrc/afd/11008b.png similarity index 100% rename from src/afd/sprites-canonical/back/0344-000-Claydol.png rename to newsrc/afd/11008b.png diff --git a/src/afd/sprites-canonical/back-shiny/0344-000-Claydol.png b/newsrc/afd/11008bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0344-000-Claydol.png rename to newsrc/afd/11008bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0344-000-Claydol.png b/newsrc/afd/11008s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0344-000-Claydol.png rename to newsrc/afd/11008s.png diff --git a/src/afd/sprites-canonical/front/0345-000-Lileep.png b/newsrc/afd/11040.png similarity index 100% rename from src/afd/sprites-canonical/front/0345-000-Lileep.png rename to newsrc/afd/11040.png diff --git a/src/afd/sprites-canonical/back/0345-000-Lileep.png b/newsrc/afd/11040b.png similarity index 100% rename from src/afd/sprites-canonical/back/0345-000-Lileep.png rename to newsrc/afd/11040b.png diff --git a/src/afd/sprites-canonical/back-shiny/0345-000-Lileep.png b/newsrc/afd/11040bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0345-000-Lileep.png rename to newsrc/afd/11040bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0345-000-Lileep.png b/newsrc/afd/11040s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0345-000-Lileep.png rename to newsrc/afd/11040s.png diff --git a/src/afd/sprites-canonical/front/0346-000-Cradily.png b/newsrc/afd/11072.png similarity index 100% rename from src/afd/sprites-canonical/front/0346-000-Cradily.png rename to newsrc/afd/11072.png diff --git a/src/afd/sprites-canonical/back/0346-000-Cradily.png b/newsrc/afd/11072b.png similarity index 100% rename from src/afd/sprites-canonical/back/0346-000-Cradily.png rename to newsrc/afd/11072b.png diff --git a/src/afd/sprites-canonical/back-shiny/0346-000-Cradily.png b/newsrc/afd/11072bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0346-000-Cradily.png rename to newsrc/afd/11072bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0346-000-Cradily.png b/newsrc/afd/11072s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0346-000-Cradily.png rename to newsrc/afd/11072s.png diff --git a/src/afd/sprites-canonical/front/0347-000-Anorith.png b/newsrc/afd/11104.png similarity index 100% rename from src/afd/sprites-canonical/front/0347-000-Anorith.png rename to newsrc/afd/11104.png diff --git a/src/afd/sprites-canonical/back/0347-000-Anorith.png b/newsrc/afd/11104b.png similarity index 100% rename from src/afd/sprites-canonical/back/0347-000-Anorith.png rename to newsrc/afd/11104b.png diff --git a/src/afd/sprites-canonical/back-shiny/0347-000-Anorith.png b/newsrc/afd/11104bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0347-000-Anorith.png rename to newsrc/afd/11104bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0347-000-Anorith.png b/newsrc/afd/11104s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0347-000-Anorith.png rename to newsrc/afd/11104s.png diff --git a/src/afd/sprites-canonical/front/0348-000-Armaldo.png b/newsrc/afd/11136.png similarity index 100% rename from src/afd/sprites-canonical/front/0348-000-Armaldo.png rename to newsrc/afd/11136.png diff --git a/src/afd/sprites-canonical/back/0348-000-Armaldo.png b/newsrc/afd/11136b.png similarity index 100% rename from src/afd/sprites-canonical/back/0348-000-Armaldo.png rename to newsrc/afd/11136b.png diff --git a/src/afd/sprites-canonical/back-shiny/0348-000-Armaldo.png b/newsrc/afd/11136bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0348-000-Armaldo.png rename to newsrc/afd/11136bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0348-000-Armaldo.png b/newsrc/afd/11136s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0348-000-Armaldo.png rename to newsrc/afd/11136s.png diff --git a/src/afd/sprites-canonical/front/0349-000-Feebas.png b/newsrc/afd/11168.png similarity index 100% rename from src/afd/sprites-canonical/front/0349-000-Feebas.png rename to newsrc/afd/11168.png diff --git a/src/afd/sprites-canonical/back/0349-000-Feebas.png b/newsrc/afd/11168b.png similarity index 100% rename from src/afd/sprites-canonical/back/0349-000-Feebas.png rename to newsrc/afd/11168b.png diff --git a/src/afd/sprites-canonical/back-shiny/0349-000-Feebas.png b/newsrc/afd/11168bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0349-000-Feebas.png rename to newsrc/afd/11168bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0349-000-Feebas.png b/newsrc/afd/11168s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0349-000-Feebas.png rename to newsrc/afd/11168s.png diff --git a/src/afd/sprites-canonical/front/0035-000-Clefairy.png b/newsrc/afd/1120.png similarity index 100% rename from src/afd/sprites-canonical/front/0035-000-Clefairy.png rename to newsrc/afd/1120.png diff --git a/src/afd/sprites-canonical/front/0350-000-Milotic.png b/newsrc/afd/11200.png similarity index 100% rename from src/afd/sprites-canonical/front/0350-000-Milotic.png rename to newsrc/afd/11200.png diff --git a/src/afd/sprites-canonical/back/0350-000-Milotic.png b/newsrc/afd/11200b.png similarity index 100% rename from src/afd/sprites-canonical/back/0350-000-Milotic.png rename to newsrc/afd/11200b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0350-000-Milotic-Female.png b/newsrc/afd/11200bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0350-000-Milotic-Female.png rename to newsrc/afd/11200bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0350-000-Milotic-Female.png b/newsrc/afd/11200bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0350-000-Milotic-Female.png rename to newsrc/afd/11200bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0350-000-Milotic.png b/newsrc/afd/11200bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0350-000-Milotic.png rename to newsrc/afd/11200bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0350-000-Milotic-Female.png b/newsrc/afd/11200f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0350-000-Milotic-Female.png rename to newsrc/afd/11200f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0350-000-Milotic-Female.png b/newsrc/afd/11200fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0350-000-Milotic-Female.png rename to newsrc/afd/11200fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0350-000-Milotic.png b/newsrc/afd/11200s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0350-000-Milotic.png rename to newsrc/afd/11200s.png diff --git a/src/afd/sprites-canonical/back/0035-000-Clefairy.png b/newsrc/afd/1120b.png similarity index 100% rename from src/afd/sprites-canonical/back/0035-000-Clefairy.png rename to newsrc/afd/1120b.png diff --git a/src/afd/sprites-canonical/back-shiny/0035-000-Clefairy.png b/newsrc/afd/1120bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0035-000-Clefairy.png rename to newsrc/afd/1120bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0035-000-Clefairy.png b/newsrc/afd/1120s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0035-000-Clefairy.png rename to newsrc/afd/1120s.png diff --git a/src/afd/sprites-canonical/front/0351-000-Castform.png b/newsrc/afd/11232.png similarity index 100% rename from src/afd/sprites-canonical/front/0351-000-Castform.png rename to newsrc/afd/11232.png diff --git a/src/afd/sprites-canonical/back/0351-000-Castform.png b/newsrc/afd/11232b.png similarity index 100% rename from src/afd/sprites-canonical/back/0351-000-Castform.png rename to newsrc/afd/11232b.png diff --git a/src/afd/sprites-canonical/back-shiny/0351-000-Castform.png b/newsrc/afd/11232bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0351-000-Castform.png rename to newsrc/afd/11232bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0351-000-Castform.png b/newsrc/afd/11232s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0351-000-Castform.png rename to newsrc/afd/11232s.png diff --git a/src/afd/sprites-canonical/front-shiny/0351-420-Castform-Sunny.png b/newsrc/afd/11233.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0351-420-Castform-Sunny.png rename to newsrc/afd/11233.png diff --git a/src/afd/sprites-canonical/back-shiny/0351-420-Castform-Sunny.png b/newsrc/afd/11233b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0351-420-Castform-Sunny.png rename to newsrc/afd/11233b.png diff --git a/src/afd/sprites-canonical/back/0351-420-Castform-Sunny.png b/newsrc/afd/11233bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0351-420-Castform-Sunny.png rename to newsrc/afd/11233bs.png diff --git a/src/afd/sprites-canonical/front/0351-420-Castform-Sunny.png b/newsrc/afd/11233s.png similarity index 100% rename from src/afd/sprites-canonical/front/0351-420-Castform-Sunny.png rename to newsrc/afd/11233s.png diff --git a/src/afd/sprites-canonical/front-shiny/0351-420-Castform-Rainy.png b/newsrc/afd/11234.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0351-420-Castform-Rainy.png rename to newsrc/afd/11234.png diff --git a/src/afd/sprites-canonical/back-shiny/0351-420-Castform-Rainy.png b/newsrc/afd/11234b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0351-420-Castform-Rainy.png rename to newsrc/afd/11234b.png diff --git a/src/afd/sprites-canonical/back/0351-420-Castform-Rainy.png b/newsrc/afd/11234bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0351-420-Castform-Rainy.png rename to newsrc/afd/11234bs.png diff --git a/src/afd/sprites-canonical/front/0351-420-Castform-Rainy.png b/newsrc/afd/11234s.png similarity index 100% rename from src/afd/sprites-canonical/front/0351-420-Castform-Rainy.png rename to newsrc/afd/11234s.png diff --git a/src/afd/sprites-canonical/front-shiny/0351-420-Castform-Snowy.png b/newsrc/afd/11235.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0351-420-Castform-Snowy.png rename to newsrc/afd/11235.png diff --git a/src/afd/sprites-canonical/back-shiny/0351-420-Castform-Snowy.png b/newsrc/afd/11235b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0351-420-Castform-Snowy.png rename to newsrc/afd/11235b.png diff --git a/src/afd/sprites-canonical/back/0351-420-Castform-Snowy.png b/newsrc/afd/11235bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0351-420-Castform-Snowy.png rename to newsrc/afd/11235bs.png diff --git a/src/afd/sprites-canonical/front/0351-420-Castform-Snowy.png b/newsrc/afd/11235s.png similarity index 100% rename from src/afd/sprites-canonical/front/0351-420-Castform-Snowy.png rename to newsrc/afd/11235s.png diff --git a/src/afd/sprites-canonical/front/0352-000-Kecleon.png b/newsrc/afd/11264.png similarity index 100% rename from src/afd/sprites-canonical/front/0352-000-Kecleon.png rename to newsrc/afd/11264.png diff --git a/src/afd/sprites-canonical/back/0352-000-Kecleon.png b/newsrc/afd/11264b.png similarity index 100% rename from src/afd/sprites-canonical/back/0352-000-Kecleon.png rename to newsrc/afd/11264b.png diff --git a/src/afd/sprites-canonical/back-shiny/0352-000-Kecleon.png b/newsrc/afd/11264bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0352-000-Kecleon.png rename to newsrc/afd/11264bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0352-000-Kecleon.png b/newsrc/afd/11264s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0352-000-Kecleon.png rename to newsrc/afd/11264s.png diff --git a/src/afd/sprites-canonical/front/0353-000-Shuppet.png b/newsrc/afd/11296.png similarity index 100% rename from src/afd/sprites-canonical/front/0353-000-Shuppet.png rename to newsrc/afd/11296.png diff --git a/src/afd/sprites-canonical/back/0353-000-Shuppet.png b/newsrc/afd/11296b.png similarity index 100% rename from src/afd/sprites-canonical/back/0353-000-Shuppet.png rename to newsrc/afd/11296b.png diff --git a/src/afd/sprites-canonical/back-shiny/0353-000-Shuppet.png b/newsrc/afd/11296bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0353-000-Shuppet.png rename to newsrc/afd/11296bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0353-000-Shuppet.png b/newsrc/afd/11296s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0353-000-Shuppet.png rename to newsrc/afd/11296s.png diff --git a/src/afd/sprites-canonical/front/0354-000-Banette.png b/newsrc/afd/11328.png similarity index 100% rename from src/afd/sprites-canonical/front/0354-000-Banette.png rename to newsrc/afd/11328.png diff --git a/src/afd/sprites-canonical/back/0354-000-Banette.png b/newsrc/afd/11328b.png similarity index 100% rename from src/afd/sprites-canonical/back/0354-000-Banette.png rename to newsrc/afd/11328b.png diff --git a/src/afd/sprites-canonical/back-shiny/0354-000-Banette.png b/newsrc/afd/11328bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0354-000-Banette.png rename to newsrc/afd/11328bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0354-000-Banette.png b/newsrc/afd/11328s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0354-000-Banette.png rename to newsrc/afd/11328s.png diff --git a/src/afd/sprites-canonical/front/0354-420-Banette-Mega.png b/newsrc/afd/11329.png similarity index 100% rename from src/afd/sprites-canonical/front/0354-420-Banette-Mega.png rename to newsrc/afd/11329.png diff --git a/src/afd/sprites-canonical/back/0354-420-Banette-Mega.png b/newsrc/afd/11329b.png similarity index 100% rename from src/afd/sprites-canonical/back/0354-420-Banette-Mega.png rename to newsrc/afd/11329b.png diff --git a/src/afd/sprites-canonical/back-shiny/0354-420-Banette-Mega.png b/newsrc/afd/11329bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0354-420-Banette-Mega.png rename to newsrc/afd/11329bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0354-420-Banette-Mega.png b/newsrc/afd/11329s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0354-420-Banette-Mega.png rename to newsrc/afd/11329s.png diff --git a/src/afd/sprites-canonical/front/0355-000-Duskull.png b/newsrc/afd/11360.png similarity index 100% rename from src/afd/sprites-canonical/front/0355-000-Duskull.png rename to newsrc/afd/11360.png diff --git a/src/afd/sprites-canonical/back/0355-000-Duskull.png b/newsrc/afd/11360b.png similarity index 100% rename from src/afd/sprites-canonical/back/0355-000-Duskull.png rename to newsrc/afd/11360b.png diff --git a/src/afd/sprites-canonical/back-shiny/0355-000-Duskull.png b/newsrc/afd/11360bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0355-000-Duskull.png rename to newsrc/afd/11360bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0355-000-Duskull.png b/newsrc/afd/11360s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0355-000-Duskull.png rename to newsrc/afd/11360s.png diff --git a/src/afd/sprites-canonical/front/0356-000-Dusclops.png b/newsrc/afd/11392.png similarity index 100% rename from src/afd/sprites-canonical/front/0356-000-Dusclops.png rename to newsrc/afd/11392.png diff --git a/src/afd/sprites-canonical/back/0356-000-Dusclops.png b/newsrc/afd/11392b.png similarity index 100% rename from src/afd/sprites-canonical/back/0356-000-Dusclops.png rename to newsrc/afd/11392b.png diff --git a/src/afd/sprites-canonical/back-shiny/0356-000-Dusclops.png b/newsrc/afd/11392bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0356-000-Dusclops.png rename to newsrc/afd/11392bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0356-000-Dusclops.png b/newsrc/afd/11392s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0356-000-Dusclops.png rename to newsrc/afd/11392s.png diff --git a/src/afd/sprites-canonical/front/0357-000-Tropius.png b/newsrc/afd/11424.png similarity index 100% rename from src/afd/sprites-canonical/front/0357-000-Tropius.png rename to newsrc/afd/11424.png diff --git a/src/afd/sprites-canonical/back/0357-000-Tropius.png b/newsrc/afd/11424b.png similarity index 100% rename from src/afd/sprites-canonical/back/0357-000-Tropius.png rename to newsrc/afd/11424b.png diff --git a/src/afd/sprites-canonical/back-shiny/0357-000-Tropius.png b/newsrc/afd/11424bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0357-000-Tropius.png rename to newsrc/afd/11424bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0357-000-Tropius.png b/newsrc/afd/11424s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0357-000-Tropius.png rename to newsrc/afd/11424s.png diff --git a/src/afd/sprites-canonical/front/0358-000-Chimecho.png b/newsrc/afd/11456.png similarity index 100% rename from src/afd/sprites-canonical/front/0358-000-Chimecho.png rename to newsrc/afd/11456.png diff --git a/src/afd/sprites-canonical/back/0358-000-Chimecho.png b/newsrc/afd/11456b.png similarity index 100% rename from src/afd/sprites-canonical/back/0358-000-Chimecho.png rename to newsrc/afd/11456b.png diff --git a/src/afd/sprites-canonical/back-shiny/0358-000-Chimecho.png b/newsrc/afd/11456bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0358-000-Chimecho.png rename to newsrc/afd/11456bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0358-000-Chimecho.png b/newsrc/afd/11456s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0358-000-Chimecho.png rename to newsrc/afd/11456s.png diff --git a/src/afd/sprites-canonical/front/0359-000-Absol.png b/newsrc/afd/11488.png similarity index 100% rename from src/afd/sprites-canonical/front/0359-000-Absol.png rename to newsrc/afd/11488.png diff --git a/src/afd/sprites-canonical/back/0359-000-Absol.png b/newsrc/afd/11488b.png similarity index 100% rename from src/afd/sprites-canonical/back/0359-000-Absol.png rename to newsrc/afd/11488b.png diff --git a/src/afd/sprites-canonical/back-shiny/0359-000-Absol.png b/newsrc/afd/11488bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0359-000-Absol.png rename to newsrc/afd/11488bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0359-000-Absol.png b/newsrc/afd/11488s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0359-000-Absol.png rename to newsrc/afd/11488s.png diff --git a/src/afd/sprites-canonical/front/0359-420-Absol-Mega.png b/newsrc/afd/11489.png similarity index 100% rename from src/afd/sprites-canonical/front/0359-420-Absol-Mega.png rename to newsrc/afd/11489.png diff --git a/src/afd/sprites-canonical/back/0359-420-Absol-Mega.png b/newsrc/afd/11489b.png similarity index 100% rename from src/afd/sprites-canonical/back/0359-420-Absol-Mega.png rename to newsrc/afd/11489b.png diff --git a/src/afd/sprites-canonical/back-shiny/0359-420-Absol-Mega.png b/newsrc/afd/11489bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0359-420-Absol-Mega.png rename to newsrc/afd/11489bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0359-420-Absol-Mega.png b/newsrc/afd/11489s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0359-420-Absol-Mega.png rename to newsrc/afd/11489s.png diff --git a/src/afd/sprites-canonical/front/0036-000-Clefable.png b/newsrc/afd/1152.png similarity index 100% rename from src/afd/sprites-canonical/front/0036-000-Clefable.png rename to newsrc/afd/1152.png diff --git a/src/afd/sprites-canonical/front/0360-000-Wynaut.png b/newsrc/afd/11520.png similarity index 100% rename from src/afd/sprites-canonical/front/0360-000-Wynaut.png rename to newsrc/afd/11520.png diff --git a/src/afd/sprites-canonical/back/0360-000-Wynaut.png b/newsrc/afd/11520b.png similarity index 100% rename from src/afd/sprites-canonical/back/0360-000-Wynaut.png rename to newsrc/afd/11520b.png diff --git a/src/afd/sprites-canonical/back-shiny/0360-000-Wynaut.png b/newsrc/afd/11520bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0360-000-Wynaut.png rename to newsrc/afd/11520bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0360-000-Wynaut.png b/newsrc/afd/11520s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0360-000-Wynaut.png rename to newsrc/afd/11520s.png diff --git a/src/afd/sprites-canonical/back/0036-000-Clefable.png b/newsrc/afd/1152b.png similarity index 100% rename from src/afd/sprites-canonical/back/0036-000-Clefable.png rename to newsrc/afd/1152b.png diff --git a/src/afd/sprites-canonical/back-shiny/0036-000-Clefable.png b/newsrc/afd/1152bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0036-000-Clefable.png rename to newsrc/afd/1152bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0036-000-Clefable.png b/newsrc/afd/1152s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0036-000-Clefable.png rename to newsrc/afd/1152s.png diff --git a/src/afd/sprites-canonical/front/0361-000-Snorunt.png b/newsrc/afd/11552.png similarity index 100% rename from src/afd/sprites-canonical/front/0361-000-Snorunt.png rename to newsrc/afd/11552.png diff --git a/src/afd/sprites-canonical/back/0361-000-Snorunt.png b/newsrc/afd/11552b.png similarity index 100% rename from src/afd/sprites-canonical/back/0361-000-Snorunt.png rename to newsrc/afd/11552b.png diff --git a/src/afd/sprites-canonical/front/0362-000-Glalie.png b/newsrc/afd/11584.png similarity index 100% rename from src/afd/sprites-canonical/front/0362-000-Glalie.png rename to newsrc/afd/11584.png diff --git a/src/afd/sprites-canonical/back/0362-000-Glalie.png b/newsrc/afd/11584b.png similarity index 100% rename from src/afd/sprites-canonical/back/0362-000-Glalie.png rename to newsrc/afd/11584b.png diff --git a/src/afd/sprites-canonical/back-shiny/0362-000-Glalie.png b/newsrc/afd/11584bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0362-000-Glalie.png rename to newsrc/afd/11584bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0362-000-Glalie.png b/newsrc/afd/11584s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0362-000-Glalie.png rename to newsrc/afd/11584s.png diff --git a/src/afd/sprites-canonical/front/0363-000-Spheal.png b/newsrc/afd/11616.png similarity index 100% rename from src/afd/sprites-canonical/front/0363-000-Spheal.png rename to newsrc/afd/11616.png diff --git a/src/afd/sprites-canonical/back/0363-000-Spheal.png b/newsrc/afd/11616b.png similarity index 100% rename from src/afd/sprites-canonical/back/0363-000-Spheal.png rename to newsrc/afd/11616b.png diff --git a/src/afd/sprites-canonical/back-shiny/0363-000-Spheal.png b/newsrc/afd/11616bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0363-000-Spheal.png rename to newsrc/afd/11616bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0363-000-Spheal.png b/newsrc/afd/11616s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0363-000-Spheal.png rename to newsrc/afd/11616s.png diff --git a/src/afd/sprites-canonical/front/0364-000-Sealeo.png b/newsrc/afd/11648.png similarity index 100% rename from src/afd/sprites-canonical/front/0364-000-Sealeo.png rename to newsrc/afd/11648.png diff --git a/src/afd/sprites-canonical/back/0364-000-Sealeo.png b/newsrc/afd/11648b.png similarity index 100% rename from src/afd/sprites-canonical/back/0364-000-Sealeo.png rename to newsrc/afd/11648b.png diff --git a/src/afd/sprites-canonical/back-shiny/0364-000-Sealeo.png b/newsrc/afd/11648bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0364-000-Sealeo.png rename to newsrc/afd/11648bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0364-000-Sealeo.png b/newsrc/afd/11648s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0364-000-Sealeo.png rename to newsrc/afd/11648s.png diff --git a/src/afd/sprites-canonical/front/0365-000-Walrein.png b/newsrc/afd/11680.png similarity index 100% rename from src/afd/sprites-canonical/front/0365-000-Walrein.png rename to newsrc/afd/11680.png diff --git a/src/afd/sprites-canonical/back/0365-000-Walrein.png b/newsrc/afd/11680b.png similarity index 100% rename from src/afd/sprites-canonical/back/0365-000-Walrein.png rename to newsrc/afd/11680b.png diff --git a/src/afd/sprites-canonical/back-shiny/0365-000-Walrein.png b/newsrc/afd/11680bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0365-000-Walrein.png rename to newsrc/afd/11680bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0365-000-Walrein.png b/newsrc/afd/11680s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0365-000-Walrein.png rename to newsrc/afd/11680s.png diff --git a/src/afd/sprites-canonical/front/0366-000-Clamperl.png b/newsrc/afd/11712.png similarity index 100% rename from src/afd/sprites-canonical/front/0366-000-Clamperl.png rename to newsrc/afd/11712.png diff --git a/src/afd/sprites-canonical/back/0366-000-Clamperl.png b/newsrc/afd/11712b.png similarity index 100% rename from src/afd/sprites-canonical/back/0366-000-Clamperl.png rename to newsrc/afd/11712b.png diff --git a/src/afd/sprites-canonical/back-shiny/0366-000-Clamperl.png b/newsrc/afd/11712bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0366-000-Clamperl.png rename to newsrc/afd/11712bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0366-000-Clamperl.png b/newsrc/afd/11712s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0366-000-Clamperl.png rename to newsrc/afd/11712s.png diff --git a/src/afd/sprites-canonical/front/0367-000-Huntail.png b/newsrc/afd/11744.png similarity index 100% rename from src/afd/sprites-canonical/front/0367-000-Huntail.png rename to newsrc/afd/11744.png diff --git a/src/afd/sprites-canonical/back/0367-000-Huntail.png b/newsrc/afd/11744b.png similarity index 100% rename from src/afd/sprites-canonical/back/0367-000-Huntail.png rename to newsrc/afd/11744b.png diff --git a/src/afd/sprites-canonical/back-shiny/0367-000-Huntail.png b/newsrc/afd/11744bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0367-000-Huntail.png rename to newsrc/afd/11744bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0367-000-Huntail.png b/newsrc/afd/11744s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0367-000-Huntail.png rename to newsrc/afd/11744s.png diff --git a/src/afd/sprites-canonical/front/0368-000-Gorebyss.png b/newsrc/afd/11776.png similarity index 100% rename from src/afd/sprites-canonical/front/0368-000-Gorebyss.png rename to newsrc/afd/11776.png diff --git a/src/afd/sprites-canonical/back/0368-000-Gorebyss.png b/newsrc/afd/11776b.png similarity index 100% rename from src/afd/sprites-canonical/back/0368-000-Gorebyss.png rename to newsrc/afd/11776b.png diff --git a/src/afd/sprites-canonical/back-shiny/0368-000-Gorebyss.png b/newsrc/afd/11776bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0368-000-Gorebyss.png rename to newsrc/afd/11776bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0368-000-Gorebyss.png b/newsrc/afd/11776s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0368-000-Gorebyss.png rename to newsrc/afd/11776s.png diff --git a/src/afd/sprites-canonical/front/0369-000-Relicanth.png b/newsrc/afd/11808.png similarity index 100% rename from src/afd/sprites-canonical/front/0369-000-Relicanth.png rename to newsrc/afd/11808.png diff --git a/src/afd/sprites-canonical/back/0369-000-Relicanth.png b/newsrc/afd/11808b.png similarity index 100% rename from src/afd/sprites-canonical/back/0369-000-Relicanth.png rename to newsrc/afd/11808b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0369-000-Relicanth-Female.png b/newsrc/afd/11808bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0369-000-Relicanth-Female.png rename to newsrc/afd/11808bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0369-000-Relicanth-Female.png b/newsrc/afd/11808bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0369-000-Relicanth-Female.png rename to newsrc/afd/11808bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0369-000-Relicanth.png b/newsrc/afd/11808bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0369-000-Relicanth.png rename to newsrc/afd/11808bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0369-000-Relicanth-Female.png b/newsrc/afd/11808f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0369-000-Relicanth-Female.png rename to newsrc/afd/11808f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0369-000-Relicanth-Female.png b/newsrc/afd/11808fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0369-000-Relicanth-Female.png rename to newsrc/afd/11808fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0369-000-Relicanth.png b/newsrc/afd/11808s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0369-000-Relicanth.png rename to newsrc/afd/11808s.png diff --git a/src/afd/sprites-canonical/front/0037-000-Vulpix.png b/newsrc/afd/1184.png similarity index 100% rename from src/afd/sprites-canonical/front/0037-000-Vulpix.png rename to newsrc/afd/1184.png diff --git a/src/afd/sprites-canonical/front/0370-000-Luvdisc.png b/newsrc/afd/11840.png similarity index 100% rename from src/afd/sprites-canonical/front/0370-000-Luvdisc.png rename to newsrc/afd/11840.png diff --git a/src/afd/sprites-canonical/back/0370-000-Luvdisc.png b/newsrc/afd/11840b.png similarity index 100% rename from src/afd/sprites-canonical/back/0370-000-Luvdisc.png rename to newsrc/afd/11840b.png diff --git a/src/afd/sprites-canonical/back-shiny/0370-000-Luvdisc.png b/newsrc/afd/11840bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0370-000-Luvdisc.png rename to newsrc/afd/11840bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0370-000-Luvdisc.png b/newsrc/afd/11840s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0370-000-Luvdisc.png rename to newsrc/afd/11840s.png diff --git a/src/afd/sprites-canonical/back/0037-000-Vulpix.png b/newsrc/afd/1184b.png similarity index 100% rename from src/afd/sprites-canonical/back/0037-000-Vulpix.png rename to newsrc/afd/1184b.png diff --git a/src/afd/sprites-canonical/back-shiny/0037-000-Vulpix.png b/newsrc/afd/1184bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0037-000-Vulpix.png rename to newsrc/afd/1184bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0037-000-Vulpix.png b/newsrc/afd/1184s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0037-000-Vulpix.png rename to newsrc/afd/1184s.png diff --git a/src/afd/sprites-canonical/front/0037-420-Vulpix-Alola.png b/newsrc/afd/1185.png similarity index 100% rename from src/afd/sprites-canonical/front/0037-420-Vulpix-Alola.png rename to newsrc/afd/1185.png diff --git a/src/afd/sprites-canonical/back/0037-420-Vulpix-Alola.png b/newsrc/afd/1185b.png similarity index 100% rename from src/afd/sprites-canonical/back/0037-420-Vulpix-Alola.png rename to newsrc/afd/1185b.png diff --git a/src/afd/sprites-canonical/back-shiny/0037-420-Vulpix-Alola.png b/newsrc/afd/1185bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0037-420-Vulpix-Alola.png rename to newsrc/afd/1185bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0037-420-Vulpix-Alola.png b/newsrc/afd/1185s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0037-420-Vulpix-Alola.png rename to newsrc/afd/1185s.png diff --git a/src/afd/sprites-canonical/front/0371-000-Bagon.png b/newsrc/afd/11872.png similarity index 100% rename from src/afd/sprites-canonical/front/0371-000-Bagon.png rename to newsrc/afd/11872.png diff --git a/src/afd/sprites-canonical/back/0371-000-Bagon.png b/newsrc/afd/11872b.png similarity index 100% rename from src/afd/sprites-canonical/back/0371-000-Bagon.png rename to newsrc/afd/11872b.png diff --git a/src/afd/sprites-canonical/back-shiny/0371-000-Bagon.png b/newsrc/afd/11872bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0371-000-Bagon.png rename to newsrc/afd/11872bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0371-000-Bagon.png b/newsrc/afd/11872s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0371-000-Bagon.png rename to newsrc/afd/11872s.png diff --git a/src/afd/sprites-canonical/front/0372-000-Shelgon.png b/newsrc/afd/11904.png similarity index 100% rename from src/afd/sprites-canonical/front/0372-000-Shelgon.png rename to newsrc/afd/11904.png diff --git a/src/afd/sprites-canonical/back/0372-000-Shelgon.png b/newsrc/afd/11904b.png similarity index 100% rename from src/afd/sprites-canonical/back/0372-000-Shelgon.png rename to newsrc/afd/11904b.png diff --git a/src/afd/sprites-canonical/back-shiny/0372-000-Shelgon.png b/newsrc/afd/11904bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0372-000-Shelgon.png rename to newsrc/afd/11904bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0372-000-Shelgon.png b/newsrc/afd/11904s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0372-000-Shelgon.png rename to newsrc/afd/11904s.png diff --git a/src/afd/sprites-canonical/front/0373-000-Salamence.png b/newsrc/afd/11936.png similarity index 100% rename from src/afd/sprites-canonical/front/0373-000-Salamence.png rename to newsrc/afd/11936.png diff --git a/src/afd/sprites-canonical/back/0373-000-Salamence.png b/newsrc/afd/11936b.png similarity index 100% rename from src/afd/sprites-canonical/back/0373-000-Salamence.png rename to newsrc/afd/11936b.png diff --git a/src/afd/sprites-canonical/back-shiny/0373-000-Salamence.png b/newsrc/afd/11936bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0373-000-Salamence.png rename to newsrc/afd/11936bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0373-000-Salamence.png b/newsrc/afd/11936s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0373-000-Salamence.png rename to newsrc/afd/11936s.png diff --git a/src/afd/sprites-canonical/front/0373-420-Salamence-Mega.png b/newsrc/afd/11937.png similarity index 100% rename from src/afd/sprites-canonical/front/0373-420-Salamence-Mega.png rename to newsrc/afd/11937.png diff --git a/src/afd/sprites-canonical/back/0373-420-Salamence-Mega.png b/newsrc/afd/11937b.png similarity index 100% rename from src/afd/sprites-canonical/back/0373-420-Salamence-Mega.png rename to newsrc/afd/11937b.png diff --git a/src/afd/sprites-canonical/back-shiny/0373-420-Salamence-Mega.png b/newsrc/afd/11937bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0373-420-Salamence-Mega.png rename to newsrc/afd/11937bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0373-420-Salamence-Mega.png b/newsrc/afd/11937s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0373-420-Salamence-Mega.png rename to newsrc/afd/11937s.png diff --git a/src/afd/sprites-canonical/front/0374-000-Beldum.png b/newsrc/afd/11968.png similarity index 100% rename from src/afd/sprites-canonical/front/0374-000-Beldum.png rename to newsrc/afd/11968.png diff --git a/src/afd/sprites-canonical/back/0374-000-Beldum.png b/newsrc/afd/11968b.png similarity index 100% rename from src/afd/sprites-canonical/back/0374-000-Beldum.png rename to newsrc/afd/11968b.png diff --git a/src/afd/sprites-canonical/back-shiny/0374-000-Beldum.png b/newsrc/afd/11968bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0374-000-Beldum.png rename to newsrc/afd/11968bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0374-000-Beldum.png b/newsrc/afd/11968s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0374-000-Beldum.png rename to newsrc/afd/11968s.png diff --git a/src/afd/sprites-canonical/front/0375-000-Metang.png b/newsrc/afd/12000.png similarity index 100% rename from src/afd/sprites-canonical/front/0375-000-Metang.png rename to newsrc/afd/12000.png diff --git a/src/afd/sprites-canonical/back/0375-000-Metang.png b/newsrc/afd/12000b.png similarity index 100% rename from src/afd/sprites-canonical/back/0375-000-Metang.png rename to newsrc/afd/12000b.png diff --git a/src/afd/sprites-canonical/back-shiny/0375-000-Metang.png b/newsrc/afd/12000bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0375-000-Metang.png rename to newsrc/afd/12000bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0375-000-Metang.png b/newsrc/afd/12000s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0375-000-Metang.png rename to newsrc/afd/12000s.png diff --git a/src/afd/sprites-canonical/front/0376-000-Metagross.png b/newsrc/afd/12032.png similarity index 100% rename from src/afd/sprites-canonical/front/0376-000-Metagross.png rename to newsrc/afd/12032.png diff --git a/src/afd/sprites-canonical/back/0376-000-Metagross.png b/newsrc/afd/12032b.png similarity index 100% rename from src/afd/sprites-canonical/back/0376-000-Metagross.png rename to newsrc/afd/12032b.png diff --git a/src/afd/sprites-canonical/back-shiny/0376-000-Metagross.png b/newsrc/afd/12032bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0376-000-Metagross.png rename to newsrc/afd/12032bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0376-000-Metagross.png b/newsrc/afd/12032s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0376-000-Metagross.png rename to newsrc/afd/12032s.png diff --git a/src/afd/sprites-canonical/front/0376-420-Metagross-Mega.png b/newsrc/afd/12033.png similarity index 100% rename from src/afd/sprites-canonical/front/0376-420-Metagross-Mega.png rename to newsrc/afd/12033.png diff --git a/src/afd/sprites-canonical/back/0376-420-Metagross-Mega.png b/newsrc/afd/12033b.png similarity index 100% rename from src/afd/sprites-canonical/back/0376-420-Metagross-Mega.png rename to newsrc/afd/12033b.png diff --git a/src/afd/sprites-canonical/back-shiny/0376-420-Metagross-Mega.png b/newsrc/afd/12033bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0376-420-Metagross-Mega.png rename to newsrc/afd/12033bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0376-420-Metagross-Mega.png b/newsrc/afd/12033s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0376-420-Metagross-Mega.png rename to newsrc/afd/12033s.png diff --git a/src/afd/sprites-canonical/front/0377-000-Regirock.png b/newsrc/afd/12064.png similarity index 100% rename from src/afd/sprites-canonical/front/0377-000-Regirock.png rename to newsrc/afd/12064.png diff --git a/src/afd/sprites-canonical/back/0377-000-Regirock.png b/newsrc/afd/12064b.png similarity index 100% rename from src/afd/sprites-canonical/back/0377-000-Regirock.png rename to newsrc/afd/12064b.png diff --git a/src/afd/sprites-canonical/back-shiny/0377-000-Regirock.png b/newsrc/afd/12064bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0377-000-Regirock.png rename to newsrc/afd/12064bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0377-000-Regirock.png b/newsrc/afd/12064s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0377-000-Regirock.png rename to newsrc/afd/12064s.png diff --git a/src/afd/sprites-canonical/front/0378-000-Regice.png b/newsrc/afd/12096.png similarity index 100% rename from src/afd/sprites-canonical/front/0378-000-Regice.png rename to newsrc/afd/12096.png diff --git a/src/afd/sprites-canonical/back/0378-000-Regice.png b/newsrc/afd/12096b.png similarity index 100% rename from src/afd/sprites-canonical/back/0378-000-Regice.png rename to newsrc/afd/12096b.png diff --git a/src/afd/sprites-canonical/back-shiny/0378-000-Regice.png b/newsrc/afd/12096bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0378-000-Regice.png rename to newsrc/afd/12096bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0378-000-Regice.png b/newsrc/afd/12096s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0378-000-Regice.png rename to newsrc/afd/12096s.png diff --git a/src/afd/sprites-canonical/front/0379-000-Registeel.png b/newsrc/afd/12128.png similarity index 100% rename from src/afd/sprites-canonical/front/0379-000-Registeel.png rename to newsrc/afd/12128.png diff --git a/src/afd/sprites-canonical/back/0379-000-Registeel.png b/newsrc/afd/12128b.png similarity index 100% rename from src/afd/sprites-canonical/back/0379-000-Registeel.png rename to newsrc/afd/12128b.png diff --git a/src/afd/sprites-canonical/back-shiny/0379-000-Registeel.png b/newsrc/afd/12128bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0379-000-Registeel.png rename to newsrc/afd/12128bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0379-000-Registeel.png b/newsrc/afd/12128s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0379-000-Registeel.png rename to newsrc/afd/12128s.png diff --git a/src/afd/sprites-canonical/front/0038-000-Ninetales.png b/newsrc/afd/1216.png similarity index 100% rename from src/afd/sprites-canonical/front/0038-000-Ninetales.png rename to newsrc/afd/1216.png diff --git a/src/afd/sprites-canonical/front/0380-000-Latias.png b/newsrc/afd/12160.png similarity index 100% rename from src/afd/sprites-canonical/front/0380-000-Latias.png rename to newsrc/afd/12160.png diff --git a/src/afd/sprites-canonical/back/0380-000-Latias.png b/newsrc/afd/12160b.png similarity index 100% rename from src/afd/sprites-canonical/back/0380-000-Latias.png rename to newsrc/afd/12160b.png diff --git a/src/afd/sprites-canonical/back-shiny/0380-000-Latias.png b/newsrc/afd/12160bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0380-000-Latias.png rename to newsrc/afd/12160bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0380-000-Latias.png b/newsrc/afd/12160s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0380-000-Latias.png rename to newsrc/afd/12160s.png diff --git a/src/afd/sprites-canonical/front/0380-420-Latias-Mega.png b/newsrc/afd/12161.png similarity index 100% rename from src/afd/sprites-canonical/front/0380-420-Latias-Mega.png rename to newsrc/afd/12161.png diff --git a/src/afd/sprites-canonical/back/0380-420-Latias-Mega.png b/newsrc/afd/12161b.png similarity index 100% rename from src/afd/sprites-canonical/back/0380-420-Latias-Mega.png rename to newsrc/afd/12161b.png diff --git a/src/afd/sprites-canonical/back-shiny/0380-420-Latias-Mega.png b/newsrc/afd/12161bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0380-420-Latias-Mega.png rename to newsrc/afd/12161bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0380-420-Latias-Mega.png b/newsrc/afd/12161s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0380-420-Latias-Mega.png rename to newsrc/afd/12161s.png diff --git a/src/afd/sprites-canonical/back/0038-000-Ninetales.png b/newsrc/afd/1216b.png similarity index 100% rename from src/afd/sprites-canonical/back/0038-000-Ninetales.png rename to newsrc/afd/1216b.png diff --git a/src/afd/sprites-canonical/front/0038-420-Ninetales-Alola.png b/newsrc/afd/1217.png similarity index 100% rename from src/afd/sprites-canonical/front/0038-420-Ninetales-Alola.png rename to newsrc/afd/1217.png diff --git a/src/afd/sprites-canonical/back/0038-420-Ninetales-Alola.png b/newsrc/afd/1217b.png similarity index 100% rename from src/afd/sprites-canonical/back/0038-420-Ninetales-Alola.png rename to newsrc/afd/1217b.png diff --git a/src/afd/sprites-canonical/back-shiny/0038-420-Ninetales-Alola.png b/newsrc/afd/1217bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0038-420-Ninetales-Alola.png rename to newsrc/afd/1217bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0038-420-Ninetales-Alola.png b/newsrc/afd/1217s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0038-420-Ninetales-Alola.png rename to newsrc/afd/1217s.png diff --git a/src/afd/sprites-canonical/front/0381-000-Latios.png b/newsrc/afd/12192.png similarity index 100% rename from src/afd/sprites-canonical/front/0381-000-Latios.png rename to newsrc/afd/12192.png diff --git a/src/afd/sprites-canonical/back/0381-000-Latios.png b/newsrc/afd/12192b.png similarity index 100% rename from src/afd/sprites-canonical/back/0381-000-Latios.png rename to newsrc/afd/12192b.png diff --git a/src/afd/sprites-canonical/back-shiny/0381-000-Latios.png b/newsrc/afd/12192bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0381-000-Latios.png rename to newsrc/afd/12192bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0381-000-Latios.png b/newsrc/afd/12192s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0381-000-Latios.png rename to newsrc/afd/12192s.png diff --git a/src/afd/sprites-canonical/front/0381-420-Latios-Mega.png b/newsrc/afd/12193.png similarity index 100% rename from src/afd/sprites-canonical/front/0381-420-Latios-Mega.png rename to newsrc/afd/12193.png diff --git a/src/afd/sprites-canonical/back/0381-420-Latios-Mega.png b/newsrc/afd/12193b.png similarity index 100% rename from src/afd/sprites-canonical/back/0381-420-Latios-Mega.png rename to newsrc/afd/12193b.png diff --git a/src/afd/sprites-canonical/back-shiny/0381-420-Latios-Mega.png b/newsrc/afd/12193bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0381-420-Latios-Mega.png rename to newsrc/afd/12193bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0381-420-Latios-Mega.png b/newsrc/afd/12193s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0381-420-Latios-Mega.png rename to newsrc/afd/12193s.png diff --git a/src/afd/sprites-canonical/front/0382-000-Kyogre.png b/newsrc/afd/12224.png similarity index 100% rename from src/afd/sprites-canonical/front/0382-000-Kyogre.png rename to newsrc/afd/12224.png diff --git a/src/afd/sprites-canonical/back/0382-000-Kyogre.png b/newsrc/afd/12224b.png similarity index 100% rename from src/afd/sprites-canonical/back/0382-000-Kyogre.png rename to newsrc/afd/12224b.png diff --git a/src/afd/sprites-canonical/back-shiny/0382-000-Kyogre.png b/newsrc/afd/12224bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0382-000-Kyogre.png rename to newsrc/afd/12224bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0382-000-Kyogre.png b/newsrc/afd/12224s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0382-000-Kyogre.png rename to newsrc/afd/12224s.png diff --git a/src/afd/sprites-canonical/front/0382-420-Kyogre-Primal.png b/newsrc/afd/12225.png similarity index 100% rename from src/afd/sprites-canonical/front/0382-420-Kyogre-Primal.png rename to newsrc/afd/12225.png diff --git a/src/afd/sprites-canonical/back/0382-420-Kyogre-Primal.png b/newsrc/afd/12225b.png similarity index 100% rename from src/afd/sprites-canonical/back/0382-420-Kyogre-Primal.png rename to newsrc/afd/12225b.png diff --git a/src/afd/sprites-canonical/back-shiny/0382-420-Kyogre-Primal.png b/newsrc/afd/12225bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0382-420-Kyogre-Primal.png rename to newsrc/afd/12225bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0382-420-Kyogre-Primal.png b/newsrc/afd/12225s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0382-420-Kyogre-Primal.png rename to newsrc/afd/12225s.png diff --git a/src/afd/sprites-canonical/front/0383-000-Groudon.png b/newsrc/afd/12256.png similarity index 100% rename from src/afd/sprites-canonical/front/0383-000-Groudon.png rename to newsrc/afd/12256.png diff --git a/src/afd/sprites-canonical/back/0383-000-Groudon.png b/newsrc/afd/12256b.png similarity index 100% rename from src/afd/sprites-canonical/back/0383-000-Groudon.png rename to newsrc/afd/12256b.png diff --git a/src/afd/sprites-canonical/back-shiny/0383-000-Groudon.png b/newsrc/afd/12256bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0383-000-Groudon.png rename to newsrc/afd/12256bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0383-000-Groudon.png b/newsrc/afd/12256s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0383-000-Groudon.png rename to newsrc/afd/12256s.png diff --git a/src/afd/sprites-canonical/front/0383-420-Groudon-Primal.png b/newsrc/afd/12257.png similarity index 100% rename from src/afd/sprites-canonical/front/0383-420-Groudon-Primal.png rename to newsrc/afd/12257.png diff --git a/src/afd/sprites-canonical/back/0383-420-Groudon-Primal.png b/newsrc/afd/12257b.png similarity index 100% rename from src/afd/sprites-canonical/back/0383-420-Groudon-Primal.png rename to newsrc/afd/12257b.png diff --git a/src/afd/sprites-canonical/back-shiny/0383-420-Groudon-Primal.png b/newsrc/afd/12257bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0383-420-Groudon-Primal.png rename to newsrc/afd/12257bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0383-420-Groudon-Primal.png b/newsrc/afd/12257s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0383-420-Groudon-Primal.png rename to newsrc/afd/12257s.png diff --git a/src/afd/sprites-canonical/front/0384-000-Rayquaza.png b/newsrc/afd/12288.png similarity index 100% rename from src/afd/sprites-canonical/front/0384-000-Rayquaza.png rename to newsrc/afd/12288.png diff --git a/src/afd/sprites-canonical/back/0384-000-Rayquaza.png b/newsrc/afd/12288b.png similarity index 100% rename from src/afd/sprites-canonical/back/0384-000-Rayquaza.png rename to newsrc/afd/12288b.png diff --git a/src/afd/sprites-canonical/back-shiny/0384-000-Rayquaza.png b/newsrc/afd/12288bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0384-000-Rayquaza.png rename to newsrc/afd/12288bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0384-000-Rayquaza.png b/newsrc/afd/12288s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0384-000-Rayquaza.png rename to newsrc/afd/12288s.png diff --git a/src/afd/sprites-canonical/front/0384-420-Rayquaza-Mega.png b/newsrc/afd/12289.png similarity index 100% rename from src/afd/sprites-canonical/front/0384-420-Rayquaza-Mega.png rename to newsrc/afd/12289.png diff --git a/src/afd/sprites-canonical/back/0384-420-Rayquaza-Mega.png b/newsrc/afd/12289b.png similarity index 100% rename from src/afd/sprites-canonical/back/0384-420-Rayquaza-Mega.png rename to newsrc/afd/12289b.png diff --git a/src/afd/sprites-canonical/back-shiny/0384-420-Rayquaza-Mega.png b/newsrc/afd/12289bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0384-420-Rayquaza-Mega.png rename to newsrc/afd/12289bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0384-420-Rayquaza-Mega.png b/newsrc/afd/12289s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0384-420-Rayquaza-Mega.png rename to newsrc/afd/12289s.png diff --git a/src/afd/sprites-canonical/front/0385-000-Jirachi.png b/newsrc/afd/12320.png similarity index 100% rename from src/afd/sprites-canonical/front/0385-000-Jirachi.png rename to newsrc/afd/12320.png diff --git a/src/afd/sprites-canonical/back/0385-000-Jirachi.png b/newsrc/afd/12320b.png similarity index 100% rename from src/afd/sprites-canonical/back/0385-000-Jirachi.png rename to newsrc/afd/12320b.png diff --git a/src/afd/sprites-canonical/back-shiny/0385-000-Jirachi.png b/newsrc/afd/12320bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0385-000-Jirachi.png rename to newsrc/afd/12320bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0385-000-Jirachi.png b/newsrc/afd/12320s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0385-000-Jirachi.png rename to newsrc/afd/12320s.png diff --git a/src/afd/sprites-canonical/front/0386-000-Deoxys.png b/newsrc/afd/12352.png similarity index 100% rename from src/afd/sprites-canonical/front/0386-000-Deoxys.png rename to newsrc/afd/12352.png diff --git a/src/afd/sprites-canonical/back/0386-000-Deoxys.png b/newsrc/afd/12352b.png similarity index 100% rename from src/afd/sprites-canonical/back/0386-000-Deoxys.png rename to newsrc/afd/12352b.png diff --git a/src/afd/sprites-canonical/back-shiny/0386-000-Deoxys.png b/newsrc/afd/12352bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0386-000-Deoxys.png rename to newsrc/afd/12352bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0386-000-Deoxys.png b/newsrc/afd/12352s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0386-000-Deoxys.png rename to newsrc/afd/12352s.png diff --git a/src/afd/sprites-canonical/front/0386-420-Deoxys-Attack.png b/newsrc/afd/12353.png similarity index 100% rename from src/afd/sprites-canonical/front/0386-420-Deoxys-Attack.png rename to newsrc/afd/12353.png diff --git a/src/afd/sprites-canonical/back/0386-420-Deoxys-Attack.png b/newsrc/afd/12353b.png similarity index 100% rename from src/afd/sprites-canonical/back/0386-420-Deoxys-Attack.png rename to newsrc/afd/12353b.png diff --git a/src/afd/sprites-canonical/back-shiny/0386-420-Deoxys-Attack.png b/newsrc/afd/12353bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0386-420-Deoxys-Attack.png rename to newsrc/afd/12353bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0386-420-Deoxys-Attack.png b/newsrc/afd/12353s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0386-420-Deoxys-Attack.png rename to newsrc/afd/12353s.png diff --git a/src/afd/sprites-canonical/front/0386-420-Deoxys-Defense.png b/newsrc/afd/12354.png similarity index 100% rename from src/afd/sprites-canonical/front/0386-420-Deoxys-Defense.png rename to newsrc/afd/12354.png diff --git a/src/afd/sprites-canonical/back/0386-420-Deoxys-Defense.png b/newsrc/afd/12354b.png similarity index 100% rename from src/afd/sprites-canonical/back/0386-420-Deoxys-Defense.png rename to newsrc/afd/12354b.png diff --git a/src/afd/sprites-canonical/back-shiny/0386-420-Deoxys-Defense.png b/newsrc/afd/12354bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0386-420-Deoxys-Defense.png rename to newsrc/afd/12354bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0386-420-Deoxys-Defense.png b/newsrc/afd/12354s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0386-420-Deoxys-Defense.png rename to newsrc/afd/12354s.png diff --git a/src/afd/sprites-canonical/front/0386-420-Deoxys-Speed.png b/newsrc/afd/12355.png similarity index 100% rename from src/afd/sprites-canonical/front/0386-420-Deoxys-Speed.png rename to newsrc/afd/12355.png diff --git a/src/afd/sprites-canonical/back/0386-420-Deoxys-Speed.png b/newsrc/afd/12355b.png similarity index 100% rename from src/afd/sprites-canonical/back/0386-420-Deoxys-Speed.png rename to newsrc/afd/12355b.png diff --git a/src/afd/sprites-canonical/back-shiny/0386-420-Deoxys-Speed.png b/newsrc/afd/12355bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0386-420-Deoxys-Speed.png rename to newsrc/afd/12355bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0386-420-Deoxys-Speed.png b/newsrc/afd/12355s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0386-420-Deoxys-Speed.png rename to newsrc/afd/12355s.png diff --git a/src/afd/sprites-canonical/front/0387-000-Turtwig.png b/newsrc/afd/12384.png similarity index 100% rename from src/afd/sprites-canonical/front/0387-000-Turtwig.png rename to newsrc/afd/12384.png diff --git a/src/afd/sprites-canonical/back/0387-000-Turtwig.png b/newsrc/afd/12384b.png similarity index 100% rename from src/afd/sprites-canonical/back/0387-000-Turtwig.png rename to newsrc/afd/12384b.png diff --git a/src/afd/sprites-canonical/back-shiny/0387-000-Turtwig.png b/newsrc/afd/12384bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0387-000-Turtwig.png rename to newsrc/afd/12384bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0387-000-Turtwig.png b/newsrc/afd/12384s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0387-000-Turtwig.png rename to newsrc/afd/12384s.png diff --git a/src/afd/sprites-canonical/front/0388-000-Grotle.png b/newsrc/afd/12416.png similarity index 100% rename from src/afd/sprites-canonical/front/0388-000-Grotle.png rename to newsrc/afd/12416.png diff --git a/src/afd/sprites-canonical/back/0388-000-Grotle.png b/newsrc/afd/12416b.png similarity index 100% rename from src/afd/sprites-canonical/back/0388-000-Grotle.png rename to newsrc/afd/12416b.png diff --git a/src/afd/sprites-canonical/back-shiny/0388-000-Grotle.png b/newsrc/afd/12416bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0388-000-Grotle.png rename to newsrc/afd/12416bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0388-000-Grotle.png b/newsrc/afd/12416s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0388-000-Grotle.png rename to newsrc/afd/12416s.png diff --git a/src/afd/sprites-canonical/front/0389-000-Torterra.png b/newsrc/afd/12448.png similarity index 100% rename from src/afd/sprites-canonical/front/0389-000-Torterra.png rename to newsrc/afd/12448.png diff --git a/src/afd/sprites-canonical/back/0389-000-Torterra.png b/newsrc/afd/12448b.png similarity index 100% rename from src/afd/sprites-canonical/back/0389-000-Torterra.png rename to newsrc/afd/12448b.png diff --git a/src/afd/sprites-canonical/back-shiny/0389-000-Torterra.png b/newsrc/afd/12448bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0389-000-Torterra.png rename to newsrc/afd/12448bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0389-000-Torterra.png b/newsrc/afd/12448s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0389-000-Torterra.png rename to newsrc/afd/12448s.png diff --git a/src/afd/sprites-canonical/front/0039-000-Jigglypuff.png b/newsrc/afd/1248.png similarity index 100% rename from src/afd/sprites-canonical/front/0039-000-Jigglypuff.png rename to newsrc/afd/1248.png diff --git a/src/afd/sprites-canonical/front/0390-000-Chimchar.png b/newsrc/afd/12480.png similarity index 100% rename from src/afd/sprites-canonical/front/0390-000-Chimchar.png rename to newsrc/afd/12480.png diff --git a/src/afd/sprites-canonical/back/0390-000-Chimchar.png b/newsrc/afd/12480b.png similarity index 100% rename from src/afd/sprites-canonical/back/0390-000-Chimchar.png rename to newsrc/afd/12480b.png diff --git a/src/afd/sprites-canonical/back-shiny/0390-000-Chimchar.png b/newsrc/afd/12480bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0390-000-Chimchar.png rename to newsrc/afd/12480bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0390-000-Chimchar.png b/newsrc/afd/12480s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0390-000-Chimchar.png rename to newsrc/afd/12480s.png diff --git a/src/afd/sprites-canonical/back/0039-000-Jigglypuff.png b/newsrc/afd/1248b.png similarity index 100% rename from src/afd/sprites-canonical/back/0039-000-Jigglypuff.png rename to newsrc/afd/1248b.png diff --git a/src/afd/sprites-canonical/back-shiny/0039-000-Jigglypuff.png b/newsrc/afd/1248bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0039-000-Jigglypuff.png rename to newsrc/afd/1248bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0039-000-Jigglypuff.png b/newsrc/afd/1248s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0039-000-Jigglypuff.png rename to newsrc/afd/1248s.png diff --git a/src/afd/sprites-canonical/front/0391-000-Monferno.png b/newsrc/afd/12512.png similarity index 100% rename from src/afd/sprites-canonical/front/0391-000-Monferno.png rename to newsrc/afd/12512.png diff --git a/src/afd/sprites-canonical/back/0391-000-Monferno.png b/newsrc/afd/12512b.png similarity index 100% rename from src/afd/sprites-canonical/back/0391-000-Monferno.png rename to newsrc/afd/12512b.png diff --git a/src/afd/sprites-canonical/back-shiny/0391-000-Monferno.png b/newsrc/afd/12512bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0391-000-Monferno.png rename to newsrc/afd/12512bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0391-000-Monferno.png b/newsrc/afd/12512s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0391-000-Monferno.png rename to newsrc/afd/12512s.png diff --git a/src/afd/sprites-canonical/front/0392-000-Infernape.png b/newsrc/afd/12544.png similarity index 100% rename from src/afd/sprites-canonical/front/0392-000-Infernape.png rename to newsrc/afd/12544.png diff --git a/src/afd/sprites-canonical/back/0392-000-Infernape.png b/newsrc/afd/12544b.png similarity index 100% rename from src/afd/sprites-canonical/back/0392-000-Infernape.png rename to newsrc/afd/12544b.png diff --git a/src/afd/sprites-canonical/back-shiny/0392-000-Infernape.png b/newsrc/afd/12544bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0392-000-Infernape.png rename to newsrc/afd/12544bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0392-000-Infernape.png b/newsrc/afd/12544s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0392-000-Infernape.png rename to newsrc/afd/12544s.png diff --git a/src/afd/sprites-canonical/front/0393-000-Piplup.png b/newsrc/afd/12576.png similarity index 100% rename from src/afd/sprites-canonical/front/0393-000-Piplup.png rename to newsrc/afd/12576.png diff --git a/src/afd/sprites-canonical/back/0393-000-Piplup.png b/newsrc/afd/12576b.png similarity index 100% rename from src/afd/sprites-canonical/back/0393-000-Piplup.png rename to newsrc/afd/12576b.png diff --git a/src/afd/sprites-canonical/back-shiny/0393-000-Piplup.png b/newsrc/afd/12576bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0393-000-Piplup.png rename to newsrc/afd/12576bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0393-000-Piplup.png b/newsrc/afd/12576s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0393-000-Piplup.png rename to newsrc/afd/12576s.png diff --git a/src/afd/sprites-canonical/front/0394-000-Prinplup.png b/newsrc/afd/12608.png similarity index 100% rename from src/afd/sprites-canonical/front/0394-000-Prinplup.png rename to newsrc/afd/12608.png diff --git a/src/afd/sprites-canonical/back/0394-000-Prinplup.png b/newsrc/afd/12608b.png similarity index 100% rename from src/afd/sprites-canonical/back/0394-000-Prinplup.png rename to newsrc/afd/12608b.png diff --git a/src/afd/sprites-canonical/back-shiny/0394-000-Prinplup.png b/newsrc/afd/12608bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0394-000-Prinplup.png rename to newsrc/afd/12608bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0394-000-Prinplup.png b/newsrc/afd/12608s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0394-000-Prinplup.png rename to newsrc/afd/12608s.png diff --git a/src/afd/sprites-canonical/front/0395-000-Empoleon.png b/newsrc/afd/12640.png similarity index 100% rename from src/afd/sprites-canonical/front/0395-000-Empoleon.png rename to newsrc/afd/12640.png diff --git a/src/afd/sprites-canonical/back/0395-000-Empoleon.png b/newsrc/afd/12640b.png similarity index 100% rename from src/afd/sprites-canonical/back/0395-000-Empoleon.png rename to newsrc/afd/12640b.png diff --git a/src/afd/sprites-canonical/back-shiny/0395-000-Empoleon.png b/newsrc/afd/12640bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0395-000-Empoleon.png rename to newsrc/afd/12640bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0395-000-Empoleon.png b/newsrc/afd/12640s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0395-000-Empoleon.png rename to newsrc/afd/12640s.png diff --git a/src/afd/sprites-canonical/front/0396-000-Starly.png b/newsrc/afd/12672.png similarity index 100% rename from src/afd/sprites-canonical/front/0396-000-Starly.png rename to newsrc/afd/12672.png diff --git a/src/afd/sprites-canonical/back/0396-000-Starly.png b/newsrc/afd/12672b.png similarity index 100% rename from src/afd/sprites-canonical/back/0396-000-Starly.png rename to newsrc/afd/12672b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0396-000-Starly-Female.png b/newsrc/afd/12672bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0396-000-Starly-Female.png rename to newsrc/afd/12672bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0396-000-Starly-Female.png b/newsrc/afd/12672bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0396-000-Starly-Female.png rename to newsrc/afd/12672bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0396-000-Starly.png b/newsrc/afd/12672bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0396-000-Starly.png rename to newsrc/afd/12672bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0396-000-Starly-Female.png b/newsrc/afd/12672f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0396-000-Starly-Female.png rename to newsrc/afd/12672f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0396-000-Starly-Female.png b/newsrc/afd/12672fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0396-000-Starly-Female.png rename to newsrc/afd/12672fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0396-000-Starly.png b/newsrc/afd/12672s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0396-000-Starly.png rename to newsrc/afd/12672s.png diff --git a/src/afd/sprites-canonical/front/0397-000-Staravia.png b/newsrc/afd/12704.png similarity index 100% rename from src/afd/sprites-canonical/front/0397-000-Staravia.png rename to newsrc/afd/12704.png diff --git a/src/afd/sprites-canonical/back/0397-000-Staravia.png b/newsrc/afd/12704b.png similarity index 100% rename from src/afd/sprites-canonical/back/0397-000-Staravia.png rename to newsrc/afd/12704b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0397-000-Staravia-Female.png b/newsrc/afd/12704bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0397-000-Staravia-Female.png rename to newsrc/afd/12704bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0397-000-Staravia-Female.png b/newsrc/afd/12704bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0397-000-Staravia-Female.png rename to newsrc/afd/12704bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0397-000-Staravia.png b/newsrc/afd/12704bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0397-000-Staravia.png rename to newsrc/afd/12704bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0397-000-Staravia-Female.png b/newsrc/afd/12704f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0397-000-Staravia-Female.png rename to newsrc/afd/12704f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0397-000-Staravia-Female.png b/newsrc/afd/12704fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0397-000-Staravia-Female.png rename to newsrc/afd/12704fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0397-000-Staravia.png b/newsrc/afd/12704s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0397-000-Staravia.png rename to newsrc/afd/12704s.png diff --git a/src/afd/sprites-canonical/front/0398-000-Staraptor.png b/newsrc/afd/12736.png similarity index 100% rename from src/afd/sprites-canonical/front/0398-000-Staraptor.png rename to newsrc/afd/12736.png diff --git a/src/afd/sprites-canonical/back/0398-000-Staraptor.png b/newsrc/afd/12736b.png similarity index 100% rename from src/afd/sprites-canonical/back/0398-000-Staraptor.png rename to newsrc/afd/12736b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0398-000-Staraptor-Female.png b/newsrc/afd/12736bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0398-000-Staraptor-Female.png rename to newsrc/afd/12736bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0398-000-Staraptor-Female.png b/newsrc/afd/12736bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0398-000-Staraptor-Female.png rename to newsrc/afd/12736bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0398-000-Staraptor.png b/newsrc/afd/12736bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0398-000-Staraptor.png rename to newsrc/afd/12736bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0398-000-Staraptor-Female.png b/newsrc/afd/12736f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0398-000-Staraptor-Female.png rename to newsrc/afd/12736f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0398-000-Staraptor-Female.png b/newsrc/afd/12736fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0398-000-Staraptor-Female.png rename to newsrc/afd/12736fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0398-000-Staraptor.png b/newsrc/afd/12736s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0398-000-Staraptor.png rename to newsrc/afd/12736s.png diff --git a/src/afd/sprites-canonical/front/0399-000-Bidoof.png b/newsrc/afd/12768.png similarity index 100% rename from src/afd/sprites-canonical/front/0399-000-Bidoof.png rename to newsrc/afd/12768.png diff --git a/src/afd/sprites-canonical/back/0399-000-Bidoof.png b/newsrc/afd/12768b.png similarity index 100% rename from src/afd/sprites-canonical/back/0399-000-Bidoof.png rename to newsrc/afd/12768b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0399-000-Bidoof-Female.png b/newsrc/afd/12768bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0399-000-Bidoof-Female.png rename to newsrc/afd/12768bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0399-000-Bidoof-Female.png b/newsrc/afd/12768bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0399-000-Bidoof-Female.png rename to newsrc/afd/12768bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0399-000-Bidoof.png b/newsrc/afd/12768bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0399-000-Bidoof.png rename to newsrc/afd/12768bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0399-000-Bidoof-Female.png b/newsrc/afd/12768f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0399-000-Bidoof-Female.png rename to newsrc/afd/12768f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0399-000-Bidoof-Female.png b/newsrc/afd/12768fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0399-000-Bidoof-Female.png rename to newsrc/afd/12768fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0399-000-Bidoof.png b/newsrc/afd/12768s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0399-000-Bidoof.png rename to newsrc/afd/12768s.png diff --git a/src/afd/sprites-canonical/front/0004-000-Charmander.png b/newsrc/afd/128.png similarity index 100% rename from src/afd/sprites-canonical/front/0004-000-Charmander.png rename to newsrc/afd/128.png diff --git a/src/afd/sprites-canonical/front/0040-000-Wigglytuff.png b/newsrc/afd/1280.png similarity index 100% rename from src/afd/sprites-canonical/front/0040-000-Wigglytuff.png rename to newsrc/afd/1280.png diff --git a/src/afd/sprites-canonical/front/0400-000-Bibarel.png b/newsrc/afd/12800.png similarity index 100% rename from src/afd/sprites-canonical/front/0400-000-Bibarel.png rename to newsrc/afd/12800.png diff --git a/src/afd/sprites-canonical/back/0400-000-Bibarel.png b/newsrc/afd/12800b.png similarity index 100% rename from src/afd/sprites-canonical/back/0400-000-Bibarel.png rename to newsrc/afd/12800b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0400-000-Bibarel-Female.png b/newsrc/afd/12800bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0400-000-Bibarel-Female.png rename to newsrc/afd/12800bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0400-000-Bibarel-Female.png b/newsrc/afd/12800bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0400-000-Bibarel-Female.png rename to newsrc/afd/12800bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0400-000-Bibarel.png b/newsrc/afd/12800bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0400-000-Bibarel.png rename to newsrc/afd/12800bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0400-000-Bibarel-Female.png b/newsrc/afd/12800f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0400-000-Bibarel-Female.png rename to newsrc/afd/12800f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0400-000-Bibarel-Female.png b/newsrc/afd/12800fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0400-000-Bibarel-Female.png rename to newsrc/afd/12800fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0400-000-Bibarel.png b/newsrc/afd/12800s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0400-000-Bibarel.png rename to newsrc/afd/12800s.png diff --git a/src/afd/sprites-canonical/back/0040-000-Wigglytuff.png b/newsrc/afd/1280b.png similarity index 100% rename from src/afd/sprites-canonical/back/0040-000-Wigglytuff.png rename to newsrc/afd/1280b.png diff --git a/src/afd/sprites-canonical/back-shiny/0040-000-Wigglytuff.png b/newsrc/afd/1280bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0040-000-Wigglytuff.png rename to newsrc/afd/1280bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0040-000-Wigglytuff.png b/newsrc/afd/1280s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0040-000-Wigglytuff.png rename to newsrc/afd/1280s.png diff --git a/src/afd/sprites-canonical/front/0401-000-Kricketot.png b/newsrc/afd/12832.png similarity index 100% rename from src/afd/sprites-canonical/front/0401-000-Kricketot.png rename to newsrc/afd/12832.png diff --git a/src/afd/sprites-canonical/back/0401-000-Kricketot.png b/newsrc/afd/12832b.png similarity index 100% rename from src/afd/sprites-canonical/back/0401-000-Kricketot.png rename to newsrc/afd/12832b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0401-000-Kricketot-Female.png b/newsrc/afd/12832bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0401-000-Kricketot-Female.png rename to newsrc/afd/12832bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0401-000-Kricketot-Female.png b/newsrc/afd/12832bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0401-000-Kricketot-Female.png rename to newsrc/afd/12832bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0401-000-Kricketot.png b/newsrc/afd/12832bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0401-000-Kricketot.png rename to newsrc/afd/12832bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0401-000-Kricketot-Female.png b/newsrc/afd/12832f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0401-000-Kricketot-Female.png rename to newsrc/afd/12832f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0401-000-Kricketot-Female.png b/newsrc/afd/12832fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0401-000-Kricketot-Female.png rename to newsrc/afd/12832fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0401-000-Kricketot.png b/newsrc/afd/12832s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0401-000-Kricketot.png rename to newsrc/afd/12832s.png diff --git a/src/afd/sprites-canonical/front/0402-000-Kricketune.png b/newsrc/afd/12864.png similarity index 100% rename from src/afd/sprites-canonical/front/0402-000-Kricketune.png rename to newsrc/afd/12864.png diff --git a/src/afd/sprites-canonical/back/0402-000-Kricketune.png b/newsrc/afd/12864b.png similarity index 100% rename from src/afd/sprites-canonical/back/0402-000-Kricketune.png rename to newsrc/afd/12864b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0402-000-Kricketune-Female.png b/newsrc/afd/12864bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0402-000-Kricketune-Female.png rename to newsrc/afd/12864bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0402-000-Kricketune-Female.png b/newsrc/afd/12864bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0402-000-Kricketune-Female.png rename to newsrc/afd/12864bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0402-000-Kricketune.png b/newsrc/afd/12864bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0402-000-Kricketune.png rename to newsrc/afd/12864bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0402-000-Kricketune-Female.png b/newsrc/afd/12864f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0402-000-Kricketune-Female.png rename to newsrc/afd/12864f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0402-000-Kricketune-Female.png b/newsrc/afd/12864fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0402-000-Kricketune-Female.png rename to newsrc/afd/12864fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0402-000-Kricketune.png b/newsrc/afd/12864s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0402-000-Kricketune.png rename to newsrc/afd/12864s.png diff --git a/src/afd/sprites-canonical/front/0403-000-Shinx.png b/newsrc/afd/12896.png similarity index 100% rename from src/afd/sprites-canonical/front/0403-000-Shinx.png rename to newsrc/afd/12896.png diff --git a/src/afd/sprites-canonical/back/0403-000-Shinx.png b/newsrc/afd/12896b.png similarity index 100% rename from src/afd/sprites-canonical/back/0403-000-Shinx.png rename to newsrc/afd/12896b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0403-000-Shinx-Female.png b/newsrc/afd/12896bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0403-000-Shinx-Female.png rename to newsrc/afd/12896bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0403-000-Shinx-Female.png b/newsrc/afd/12896bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0403-000-Shinx-Female.png rename to newsrc/afd/12896bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0403-000-Shinx.png b/newsrc/afd/12896bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0403-000-Shinx.png rename to newsrc/afd/12896bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0403-000-Shinx-Female.png b/newsrc/afd/12896f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0403-000-Shinx-Female.png rename to newsrc/afd/12896f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0403-000-Shinx-Female.png b/newsrc/afd/12896fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0403-000-Shinx-Female.png rename to newsrc/afd/12896fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0403-000-Shinx.png b/newsrc/afd/12896s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0403-000-Shinx.png rename to newsrc/afd/12896s.png diff --git a/src/afd/sprites-canonical/back/0004-000-Charmander.png b/newsrc/afd/128b.png similarity index 100% rename from src/afd/sprites-canonical/back/0004-000-Charmander.png rename to newsrc/afd/128b.png diff --git a/src/afd/sprites-canonical/back-shiny/0004-000-Charmander.png b/newsrc/afd/128bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0004-000-Charmander.png rename to newsrc/afd/128bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0004-000-Charmander.png b/newsrc/afd/128s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0004-000-Charmander.png rename to newsrc/afd/128s.png diff --git a/src/afd/sprites-canonical/front/0404-000-Luxio.png b/newsrc/afd/12928.png similarity index 100% rename from src/afd/sprites-canonical/front/0404-000-Luxio.png rename to newsrc/afd/12928.png diff --git a/src/afd/sprites-canonical/back/0404-000-Luxio.png b/newsrc/afd/12928b.png similarity index 100% rename from src/afd/sprites-canonical/back/0404-000-Luxio.png rename to newsrc/afd/12928b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0404-000-Luxio-Female.png b/newsrc/afd/12928bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0404-000-Luxio-Female.png rename to newsrc/afd/12928bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0404-000-Luxio-Female.png b/newsrc/afd/12928bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0404-000-Luxio-Female.png rename to newsrc/afd/12928bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0404-000-Luxio.png b/newsrc/afd/12928bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0404-000-Luxio.png rename to newsrc/afd/12928bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0404-000-Luxio-Female.png b/newsrc/afd/12928f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0404-000-Luxio-Female.png rename to newsrc/afd/12928f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0404-000-Luxio-Female.png b/newsrc/afd/12928fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0404-000-Luxio-Female.png rename to newsrc/afd/12928fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0404-000-Luxio.png b/newsrc/afd/12928s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0404-000-Luxio.png rename to newsrc/afd/12928s.png diff --git a/src/afd/sprites-canonical/front/0405-000-Luxray.png b/newsrc/afd/12960.png similarity index 100% rename from src/afd/sprites-canonical/front/0405-000-Luxray.png rename to newsrc/afd/12960.png diff --git a/src/afd/sprites-canonical/back/0405-000-Luxray.png b/newsrc/afd/12960b.png similarity index 100% rename from src/afd/sprites-canonical/back/0405-000-Luxray.png rename to newsrc/afd/12960b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0405-000-Luxray-Female.png b/newsrc/afd/12960bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0405-000-Luxray-Female.png rename to newsrc/afd/12960bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0405-000-Luxray-Female.png b/newsrc/afd/12960bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0405-000-Luxray-Female.png rename to newsrc/afd/12960bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0405-000-Luxray.png b/newsrc/afd/12960bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0405-000-Luxray.png rename to newsrc/afd/12960bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0405-000-Luxray-Female.png b/newsrc/afd/12960f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0405-000-Luxray-Female.png rename to newsrc/afd/12960f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0405-000-Luxray-Female.png b/newsrc/afd/12960fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0405-000-Luxray-Female.png rename to newsrc/afd/12960fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0405-000-Luxray.png b/newsrc/afd/12960s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0405-000-Luxray.png rename to newsrc/afd/12960s.png diff --git a/src/afd/sprites-canonical/front/0406-000-Budew.gif b/newsrc/afd/12992.gif similarity index 100% rename from src/afd/sprites-canonical/front/0406-000-Budew.gif rename to newsrc/afd/12992.gif diff --git a/src/afd/sprites-canonical/back/0406-000-Budew.png b/newsrc/afd/12992b.png similarity index 100% rename from src/afd/sprites-canonical/back/0406-000-Budew.png rename to newsrc/afd/12992b.png diff --git a/src/afd/sprites-canonical/back-shiny/0406-000-Budew.png b/newsrc/afd/12992bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0406-000-Budew.png rename to newsrc/afd/12992bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0406-000-Budew.gif b/newsrc/afd/12992s.gif similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0406-000-Budew.gif rename to newsrc/afd/12992s.gif diff --git a/src/afd/sprites-canonical/front/0407-000-Roserade.png b/newsrc/afd/13024.png similarity index 100% rename from src/afd/sprites-canonical/front/0407-000-Roserade.png rename to newsrc/afd/13024.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0407-000-Roserade-Female.png b/newsrc/afd/13024b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0407-000-Roserade-Female.png rename to newsrc/afd/13024b.png diff --git a/src/afd/sprites-canonical/back/0407-000-Roserade.png b/newsrc/afd/13024bf.png similarity index 100% rename from src/afd/sprites-canonical/back/0407-000-Roserade.png rename to newsrc/afd/13024bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0407-000-Roserade-Female.png b/newsrc/afd/13024bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0407-000-Roserade-Female.png rename to newsrc/afd/13024bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0407-000-Roserade.png b/newsrc/afd/13024bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0407-000-Roserade.png rename to newsrc/afd/13024bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0407-000-Roserade-Female.png b/newsrc/afd/13024f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0407-000-Roserade-Female.png rename to newsrc/afd/13024f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0407-000-Roserade-Female.png b/newsrc/afd/13024fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0407-000-Roserade-Female.png rename to newsrc/afd/13024fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0407-000-Roserade.png b/newsrc/afd/13024s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0407-000-Roserade.png rename to newsrc/afd/13024s.png diff --git a/src/afd/sprites-canonical/front/0408-000-Cranidos.png b/newsrc/afd/13056.png similarity index 100% rename from src/afd/sprites-canonical/front/0408-000-Cranidos.png rename to newsrc/afd/13056.png diff --git a/src/afd/sprites-canonical/back/0408-000-Cranidos.png b/newsrc/afd/13056b.png similarity index 100% rename from src/afd/sprites-canonical/back/0408-000-Cranidos.png rename to newsrc/afd/13056b.png diff --git a/src/afd/sprites-canonical/front/0409-000-Rampardos.png b/newsrc/afd/13088.png similarity index 100% rename from src/afd/sprites-canonical/front/0409-000-Rampardos.png rename to newsrc/afd/13088.png diff --git a/src/afd/sprites-canonical/back/0409-000-Rampardos.png b/newsrc/afd/13088b.png similarity index 100% rename from src/afd/sprites-canonical/back/0409-000-Rampardos.png rename to newsrc/afd/13088b.png diff --git a/src/afd/sprites-canonical/back-shiny/0409-000-Rampardos.png b/newsrc/afd/13088bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0409-000-Rampardos.png rename to newsrc/afd/13088bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0409-000-Rampardos.png b/newsrc/afd/13088s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0409-000-Rampardos.png rename to newsrc/afd/13088s.png diff --git a/src/afd/sprites-canonical/front/0041-000-Zubat.png b/newsrc/afd/1312.png similarity index 100% rename from src/afd/sprites-canonical/front/0041-000-Zubat.png rename to newsrc/afd/1312.png diff --git a/src/afd/sprites-canonical/front/0410-000-Shieldon.png b/newsrc/afd/13120.png similarity index 100% rename from src/afd/sprites-canonical/front/0410-000-Shieldon.png rename to newsrc/afd/13120.png diff --git a/src/afd/sprites-canonical/back/0410-000-Shieldon.png b/newsrc/afd/13120b.png similarity index 100% rename from src/afd/sprites-canonical/back/0410-000-Shieldon.png rename to newsrc/afd/13120b.png diff --git a/src/afd/sprites-canonical/back-shiny/0410-000-Shieldon.png b/newsrc/afd/13120bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0410-000-Shieldon.png rename to newsrc/afd/13120bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0410-000-Shieldon.png b/newsrc/afd/13120s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0410-000-Shieldon.png rename to newsrc/afd/13120s.png diff --git a/src/afd/sprites-canonical/back/0041-000-Zubat.png b/newsrc/afd/1312b.png similarity index 100% rename from src/afd/sprites-canonical/back/0041-000-Zubat.png rename to newsrc/afd/1312b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0041-000-Zubat-Female.png b/newsrc/afd/1312bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0041-000-Zubat-Female.png rename to newsrc/afd/1312bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0041-000-Zubat-Female.png b/newsrc/afd/1312bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0041-000-Zubat-Female.png rename to newsrc/afd/1312bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0041-000-Zubat.png b/newsrc/afd/1312bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0041-000-Zubat.png rename to newsrc/afd/1312bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0041-000-Zubat-Female.png b/newsrc/afd/1312f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0041-000-Zubat-Female.png rename to newsrc/afd/1312f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0041-000-Zubat-Female.png b/newsrc/afd/1312fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0041-000-Zubat-Female.png rename to newsrc/afd/1312fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0041-000-Zubat.png b/newsrc/afd/1312s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0041-000-Zubat.png rename to newsrc/afd/1312s.png diff --git a/src/afd/sprites-canonical/front/0411-000-Bastiodon.png b/newsrc/afd/13152.png similarity index 100% rename from src/afd/sprites-canonical/front/0411-000-Bastiodon.png rename to newsrc/afd/13152.png diff --git a/src/afd/sprites-canonical/back/0411-000-Bastiodon.png b/newsrc/afd/13152b.png similarity index 100% rename from src/afd/sprites-canonical/back/0411-000-Bastiodon.png rename to newsrc/afd/13152b.png diff --git a/src/afd/sprites-canonical/back-shiny/0411-000-Bastiodon.png b/newsrc/afd/13152bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0411-000-Bastiodon.png rename to newsrc/afd/13152bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0411-000-Bastiodon.png b/newsrc/afd/13152s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0411-000-Bastiodon.png rename to newsrc/afd/13152s.png diff --git a/src/afd/sprites-canonical/front/0412-000-Burmy.png b/newsrc/afd/13184.png similarity index 100% rename from src/afd/sprites-canonical/front/0412-000-Burmy.png rename to newsrc/afd/13184.png diff --git a/src/afd/sprites-canonical/back/0412-000-Burmy.png b/newsrc/afd/13184b.png similarity index 100% rename from src/afd/sprites-canonical/back/0412-000-Burmy.png rename to newsrc/afd/13184b.png diff --git a/src/afd/sprites-canonical/back-shiny/0412-000-Burmy.png b/newsrc/afd/13184bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0412-000-Burmy.png rename to newsrc/afd/13184bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0412-000-Burmy.png b/newsrc/afd/13184s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0412-000-Burmy.png rename to newsrc/afd/13184s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0412-420-Burmy-Sandy.png b/newsrc/afd/13185.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0412-420-Burmy-Sandy.png rename to newsrc/afd/13185.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0412-420-Burmy-Sandy.png b/newsrc/afd/13185b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0412-420-Burmy-Sandy.png rename to newsrc/afd/13185b.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0412-420-Burmy-Sandy.png b/newsrc/afd/13185bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0412-420-Burmy-Sandy.png rename to newsrc/afd/13185bs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0412-420-Burmy-Sandy.png b/newsrc/afd/13185s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0412-420-Burmy-Sandy.png rename to newsrc/afd/13185s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0412-420-Burmy-Trash.png b/newsrc/afd/13186.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0412-420-Burmy-Trash.png rename to newsrc/afd/13186.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0412-420-Burmy-Trash.png b/newsrc/afd/13186b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0412-420-Burmy-Trash.png rename to newsrc/afd/13186b.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0412-420-Burmy-Trash.png b/newsrc/afd/13186bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0412-420-Burmy-Trash.png rename to newsrc/afd/13186bs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0412-420-Burmy-Trash.png b/newsrc/afd/13186s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0412-420-Burmy-Trash.png rename to newsrc/afd/13186s.png diff --git a/src/afd/sprites-canonical/front/0413-000-Wormadam.png b/newsrc/afd/13216.png similarity index 100% rename from src/afd/sprites-canonical/front/0413-000-Wormadam.png rename to newsrc/afd/13216.png diff --git a/src/afd/sprites-canonical/back/0413-000-Wormadam.png b/newsrc/afd/13216b.png similarity index 100% rename from src/afd/sprites-canonical/back/0413-000-Wormadam.png rename to newsrc/afd/13216b.png diff --git a/src/afd/sprites-canonical/back-shiny/0413-000-Wormadam.png b/newsrc/afd/13216bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0413-000-Wormadam.png rename to newsrc/afd/13216bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0413-000-Wormadam.png b/newsrc/afd/13216s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0413-000-Wormadam.png rename to newsrc/afd/13216s.png diff --git a/src/afd/sprites-canonical/front/0413-420-Wormadam-Sandy.png b/newsrc/afd/13217.png similarity index 100% rename from src/afd/sprites-canonical/front/0413-420-Wormadam-Sandy.png rename to newsrc/afd/13217.png diff --git a/src/afd/sprites-canonical/back/0413-420-Wormadam-Sandy.png b/newsrc/afd/13217b.png similarity index 100% rename from src/afd/sprites-canonical/back/0413-420-Wormadam-Sandy.png rename to newsrc/afd/13217b.png diff --git a/src/afd/sprites-canonical/back-shiny/0413-420-Wormadam-Sandy.png b/newsrc/afd/13217bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0413-420-Wormadam-Sandy.png rename to newsrc/afd/13217bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0413-420-Wormadam-Sandy.png b/newsrc/afd/13217s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0413-420-Wormadam-Sandy.png rename to newsrc/afd/13217s.png diff --git a/src/afd/sprites-canonical/front/0413-420-Wormadam-Trash.png b/newsrc/afd/13218.png similarity index 100% rename from src/afd/sprites-canonical/front/0413-420-Wormadam-Trash.png rename to newsrc/afd/13218.png diff --git a/src/afd/sprites-canonical/back/0413-420-Wormadam-Trash.png b/newsrc/afd/13218b.png similarity index 100% rename from src/afd/sprites-canonical/back/0413-420-Wormadam-Trash.png rename to newsrc/afd/13218b.png diff --git a/src/afd/sprites-canonical/back-shiny/0413-420-Wormadam-Trash.png b/newsrc/afd/13218bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0413-420-Wormadam-Trash.png rename to newsrc/afd/13218bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0413-420-Wormadam-Trash.png b/newsrc/afd/13218s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0413-420-Wormadam-Trash.png rename to newsrc/afd/13218s.png diff --git a/src/afd/sprites-canonical/front/0414-000-Mothim.png b/newsrc/afd/13248.png similarity index 100% rename from src/afd/sprites-canonical/front/0414-000-Mothim.png rename to newsrc/afd/13248.png diff --git a/src/afd/sprites-canonical/back/0414-000-Mothim.png b/newsrc/afd/13248b.png similarity index 100% rename from src/afd/sprites-canonical/back/0414-000-Mothim.png rename to newsrc/afd/13248b.png diff --git a/src/afd/sprites-canonical/back-shiny/0414-000-Mothim.png b/newsrc/afd/13248bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0414-000-Mothim.png rename to newsrc/afd/13248bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0414-000-Mothim.png b/newsrc/afd/13248s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0414-000-Mothim.png rename to newsrc/afd/13248s.png diff --git a/src/afd/sprites-canonical/front/0415-000-Combee.png b/newsrc/afd/13280.png similarity index 100% rename from src/afd/sprites-canonical/front/0415-000-Combee.png rename to newsrc/afd/13280.png diff --git a/src/afd/sprites-canonical/back/0415-000-Combee.png b/newsrc/afd/13280b.png similarity index 100% rename from src/afd/sprites-canonical/back/0415-000-Combee.png rename to newsrc/afd/13280b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0415-000-Combee-Female.png b/newsrc/afd/13280bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0415-000-Combee-Female.png rename to newsrc/afd/13280bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0415-000-Combee-Female.png b/newsrc/afd/13280bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0415-000-Combee-Female.png rename to newsrc/afd/13280bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0415-000-Combee.png b/newsrc/afd/13280bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0415-000-Combee.png rename to newsrc/afd/13280bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0415-000-Combee-Female.png b/newsrc/afd/13280f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0415-000-Combee-Female.png rename to newsrc/afd/13280f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0415-000-Combee-Female.png b/newsrc/afd/13280fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0415-000-Combee-Female.png rename to newsrc/afd/13280fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0415-000-Combee.png b/newsrc/afd/13280s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0415-000-Combee.png rename to newsrc/afd/13280s.png diff --git a/src/afd/sprites-canonical/front/0416-000-Vespiquen.png b/newsrc/afd/13312.png similarity index 100% rename from src/afd/sprites-canonical/front/0416-000-Vespiquen.png rename to newsrc/afd/13312.png diff --git a/src/afd/sprites-canonical/back/0416-000-Vespiquen.png b/newsrc/afd/13312b.png similarity index 100% rename from src/afd/sprites-canonical/back/0416-000-Vespiquen.png rename to newsrc/afd/13312b.png diff --git a/src/afd/sprites-canonical/back-shiny/0416-000-Vespiquen.png b/newsrc/afd/13312bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0416-000-Vespiquen.png rename to newsrc/afd/13312bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0416-000-Vespiquen.png b/newsrc/afd/13312s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0416-000-Vespiquen.png rename to newsrc/afd/13312s.png diff --git a/src/afd/sprites-canonical/front/0417-000-Pachirisu.png b/newsrc/afd/13344.png similarity index 100% rename from src/afd/sprites-canonical/front/0417-000-Pachirisu.png rename to newsrc/afd/13344.png diff --git a/src/afd/sprites-canonical/back/0417-000-Pachirisu.png b/newsrc/afd/13344b.png similarity index 100% rename from src/afd/sprites-canonical/back/0417-000-Pachirisu.png rename to newsrc/afd/13344b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0417-000-Pachirisu-Female.png b/newsrc/afd/13344bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0417-000-Pachirisu-Female.png rename to newsrc/afd/13344bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0417-000-Pachirisu-Female.png b/newsrc/afd/13344bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0417-000-Pachirisu-Female.png rename to newsrc/afd/13344bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0417-000-Pachirisu.png b/newsrc/afd/13344bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0417-000-Pachirisu.png rename to newsrc/afd/13344bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0417-000-Pachirisu-Female.png b/newsrc/afd/13344f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0417-000-Pachirisu-Female.png rename to newsrc/afd/13344f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0417-000-Pachirisu-Female.png b/newsrc/afd/13344fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0417-000-Pachirisu-Female.png rename to newsrc/afd/13344fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0417-000-Pachirisu.png b/newsrc/afd/13344s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0417-000-Pachirisu.png rename to newsrc/afd/13344s.png diff --git a/src/afd/sprites-canonical/front/0418-000-Buizel.png b/newsrc/afd/13376.png similarity index 100% rename from src/afd/sprites-canonical/front/0418-000-Buizel.png rename to newsrc/afd/13376.png diff --git a/src/afd/sprites-canonical/back/0418-000-Buizel.png b/newsrc/afd/13376b.png similarity index 100% rename from src/afd/sprites-canonical/back/0418-000-Buizel.png rename to newsrc/afd/13376b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0418-000-Buizel-Female.png b/newsrc/afd/13376bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0418-000-Buizel-Female.png rename to newsrc/afd/13376bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0418-000-Buizel-Female.png b/newsrc/afd/13376bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0418-000-Buizel-Female.png rename to newsrc/afd/13376bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0418-000-Buizel.png b/newsrc/afd/13376bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0418-000-Buizel.png rename to newsrc/afd/13376bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0418-000-Buizel-Female.png b/newsrc/afd/13376f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0418-000-Buizel-Female.png rename to newsrc/afd/13376f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0418-000-Buizel-Female.png b/newsrc/afd/13376fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0418-000-Buizel-Female.png rename to newsrc/afd/13376fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0418-000-Buizel.png b/newsrc/afd/13376s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0418-000-Buizel.png rename to newsrc/afd/13376s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0419-000-Floatzel-Female.png b/newsrc/afd/13408.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0419-000-Floatzel-Female.png rename to newsrc/afd/13408.png diff --git a/src/afd/sprites-canonical/back/0419-000-Floatzel.png b/newsrc/afd/13408b.png similarity index 100% rename from src/afd/sprites-canonical/back/0419-000-Floatzel.png rename to newsrc/afd/13408b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0419-000-Floatzel-Female.png b/newsrc/afd/13408bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0419-000-Floatzel-Female.png rename to newsrc/afd/13408bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0419-000-Floatzel-Female.png b/newsrc/afd/13408bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0419-000-Floatzel-Female.png rename to newsrc/afd/13408bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0419-000-Floatzel.png b/newsrc/afd/13408bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0419-000-Floatzel.png rename to newsrc/afd/13408bs.png diff --git a/src/afd/sprites-canonical/front/0419-000-Floatzel.png b/newsrc/afd/13408f.png similarity index 100% rename from src/afd/sprites-canonical/front/0419-000-Floatzel.png rename to newsrc/afd/13408f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0419-000-Floatzel-Female.png b/newsrc/afd/13408fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0419-000-Floatzel-Female.png rename to newsrc/afd/13408fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0419-000-Floatzel.png b/newsrc/afd/13408s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0419-000-Floatzel.png rename to newsrc/afd/13408s.png diff --git a/src/afd/sprites-canonical/front/0042-000-Golbat.png b/newsrc/afd/1344.png similarity index 100% rename from src/afd/sprites-canonical/front/0042-000-Golbat.png rename to newsrc/afd/1344.png diff --git a/src/afd/sprites-canonical/front/0420-000-Cherubi.png b/newsrc/afd/13440.png similarity index 100% rename from src/afd/sprites-canonical/front/0420-000-Cherubi.png rename to newsrc/afd/13440.png diff --git a/src/afd/sprites-canonical/back/0420-000-Cherubi.png b/newsrc/afd/13440b.png similarity index 100% rename from src/afd/sprites-canonical/back/0420-000-Cherubi.png rename to newsrc/afd/13440b.png diff --git a/src/afd/sprites-canonical/back-shiny/0420-000-Cherubi.png b/newsrc/afd/13440bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0420-000-Cherubi.png rename to newsrc/afd/13440bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0420-000-Cherubi.png b/newsrc/afd/13440s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0420-000-Cherubi.png rename to newsrc/afd/13440s.png diff --git a/src/afd/sprites-canonical/back/0042-000-Golbat.png b/newsrc/afd/1344b.png similarity index 100% rename from src/afd/sprites-canonical/back/0042-000-Golbat.png rename to newsrc/afd/1344b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0042-000-Golbat-Female.png b/newsrc/afd/1344bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0042-000-Golbat-Female.png rename to newsrc/afd/1344bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0042-000-Golbat-Female.png b/newsrc/afd/1344bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0042-000-Golbat-Female.png rename to newsrc/afd/1344bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0042-000-Golbat.png b/newsrc/afd/1344bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0042-000-Golbat.png rename to newsrc/afd/1344bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0042-000-Golbat-Female.png b/newsrc/afd/1344f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0042-000-Golbat-Female.png rename to newsrc/afd/1344f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0042-000-Golbat-Female.png b/newsrc/afd/1344fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0042-000-Golbat-Female.png rename to newsrc/afd/1344fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0042-000-Golbat.png b/newsrc/afd/1344s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0042-000-Golbat.png rename to newsrc/afd/1344s.png diff --git a/src/afd/sprites-canonical/front/0421-000-Cherrim.png b/newsrc/afd/13472.png similarity index 100% rename from src/afd/sprites-canonical/front/0421-000-Cherrim.png rename to newsrc/afd/13472.png diff --git a/src/afd/sprites-canonical/back/0421-000-Cherrim.png b/newsrc/afd/13472b.png similarity index 100% rename from src/afd/sprites-canonical/back/0421-000-Cherrim.png rename to newsrc/afd/13472b.png diff --git a/src/afd/sprites-canonical/back-shiny/0421-000-Cherrim.png b/newsrc/afd/13472bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0421-000-Cherrim.png rename to newsrc/afd/13472bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0421-000-Cherrim.png b/newsrc/afd/13472s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0421-000-Cherrim.png rename to newsrc/afd/13472s.png diff --git a/src/afd/sprites-canonical/front/0421-420-Cherrim-Sunshine.png b/newsrc/afd/13473.png similarity index 100% rename from src/afd/sprites-canonical/front/0421-420-Cherrim-Sunshine.png rename to newsrc/afd/13473.png diff --git a/src/afd/sprites-canonical/back/0421-420-Cherrim-Sunshine.png b/newsrc/afd/13473b.png similarity index 100% rename from src/afd/sprites-canonical/back/0421-420-Cherrim-Sunshine.png rename to newsrc/afd/13473b.png diff --git a/src/afd/sprites-canonical/back-shiny/0421-420-Cherrim-Sunshine.png b/newsrc/afd/13473bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0421-420-Cherrim-Sunshine.png rename to newsrc/afd/13473bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0421-420-Cherrim-Sunshine.png b/newsrc/afd/13473s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0421-420-Cherrim-Sunshine.png rename to newsrc/afd/13473s.png diff --git a/src/afd/sprites-canonical/front/0422-000-Shellos.png b/newsrc/afd/13504.png similarity index 100% rename from src/afd/sprites-canonical/front/0422-000-Shellos.png rename to newsrc/afd/13504.png diff --git a/src/afd/sprites-canonical/back/0422-000-Shellos.png b/newsrc/afd/13504b.png similarity index 100% rename from src/afd/sprites-canonical/back/0422-000-Shellos.png rename to newsrc/afd/13504b.png diff --git a/src/afd/sprites-canonical/back-shiny/0422-000-Shellos.png b/newsrc/afd/13504bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0422-000-Shellos.png rename to newsrc/afd/13504bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0422-000-Shellos.png b/newsrc/afd/13504s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0422-000-Shellos.png rename to newsrc/afd/13504s.png diff --git a/src/afd/sprites-canonical/front/0423-000-Gastrodon.png b/newsrc/afd/13536.png similarity index 100% rename from src/afd/sprites-canonical/front/0423-000-Gastrodon.png rename to newsrc/afd/13536.png diff --git a/src/afd/sprites-canonical/back/0423-000-Gastrodon.png b/newsrc/afd/13536b.png similarity index 100% rename from src/afd/sprites-canonical/back/0423-000-Gastrodon.png rename to newsrc/afd/13536b.png diff --git a/src/afd/sprites-canonical/back-shiny/0423-000-Gastrodon.png b/newsrc/afd/13536bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0423-000-Gastrodon.png rename to newsrc/afd/13536bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0423-000-Gastrodon.png b/newsrc/afd/13536s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0423-000-Gastrodon.png rename to newsrc/afd/13536s.png diff --git a/src/afd/sprites-canonical/front/0424-000-Ambipom.png b/newsrc/afd/13568.png similarity index 100% rename from src/afd/sprites-canonical/front/0424-000-Ambipom.png rename to newsrc/afd/13568.png diff --git a/src/afd/sprites-canonical/back/0424-000-Ambipom.png b/newsrc/afd/13568b.png similarity index 100% rename from src/afd/sprites-canonical/back/0424-000-Ambipom.png rename to newsrc/afd/13568b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0424-000-Ambipom-Female.png b/newsrc/afd/13568bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0424-000-Ambipom-Female.png rename to newsrc/afd/13568bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0424-000-Ambipom-Female.png b/newsrc/afd/13568bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0424-000-Ambipom-Female.png rename to newsrc/afd/13568bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0424-000-Ambipom.png b/newsrc/afd/13568bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0424-000-Ambipom.png rename to newsrc/afd/13568bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0424-000-Ambipom-Female.png b/newsrc/afd/13568f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0424-000-Ambipom-Female.png rename to newsrc/afd/13568f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0424-000-Ambipom-Female.png b/newsrc/afd/13568fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0424-000-Ambipom-Female.png rename to newsrc/afd/13568fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0424-000-Ambipom.png b/newsrc/afd/13568s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0424-000-Ambipom.png rename to newsrc/afd/13568s.png diff --git a/src/afd/sprites-canonical/front/0425-000-Drifloon.png b/newsrc/afd/13600.png similarity index 100% rename from src/afd/sprites-canonical/front/0425-000-Drifloon.png rename to newsrc/afd/13600.png diff --git a/src/afd/sprites-canonical/back/0425-000-Drifloon.png b/newsrc/afd/13600b.png similarity index 100% rename from src/afd/sprites-canonical/back/0425-000-Drifloon.png rename to newsrc/afd/13600b.png diff --git a/src/afd/sprites-canonical/back-shiny/0425-000-Drifloon.png b/newsrc/afd/13600bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0425-000-Drifloon.png rename to newsrc/afd/13600bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0425-000-Drifloon.png b/newsrc/afd/13600s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0425-000-Drifloon.png rename to newsrc/afd/13600s.png diff --git a/src/afd/sprites-canonical/front/0426-000-Drifblim.png b/newsrc/afd/13632.png similarity index 100% rename from src/afd/sprites-canonical/front/0426-000-Drifblim.png rename to newsrc/afd/13632.png diff --git a/src/afd/sprites-canonical/back/0426-000-Drifblim.png b/newsrc/afd/13632b.png similarity index 100% rename from src/afd/sprites-canonical/back/0426-000-Drifblim.png rename to newsrc/afd/13632b.png diff --git a/src/afd/sprites-canonical/back-shiny/0426-000-Drifblim.png b/newsrc/afd/13632bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0426-000-Drifblim.png rename to newsrc/afd/13632bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0426-000-Drifblim.png b/newsrc/afd/13632s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0426-000-Drifblim.png rename to newsrc/afd/13632s.png diff --git a/src/afd/sprites-canonical/front/0427-000-Buneary.png b/newsrc/afd/13664.png similarity index 100% rename from src/afd/sprites-canonical/front/0427-000-Buneary.png rename to newsrc/afd/13664.png diff --git a/src/afd/sprites-canonical/back/0427-000-Buneary.png b/newsrc/afd/13664b.png similarity index 100% rename from src/afd/sprites-canonical/back/0427-000-Buneary.png rename to newsrc/afd/13664b.png diff --git a/src/afd/sprites-canonical/back-shiny/0427-000-Buneary.png b/newsrc/afd/13664bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0427-000-Buneary.png rename to newsrc/afd/13664bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0427-000-Buneary.png b/newsrc/afd/13664s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0427-000-Buneary.png rename to newsrc/afd/13664s.png diff --git a/src/afd/sprites-canonical/front/0428-000-Lopunny.png b/newsrc/afd/13696.png similarity index 100% rename from src/afd/sprites-canonical/front/0428-000-Lopunny.png rename to newsrc/afd/13696.png diff --git a/src/afd/sprites-canonical/back/0428-000-Lopunny.png b/newsrc/afd/13696b.png similarity index 100% rename from src/afd/sprites-canonical/back/0428-000-Lopunny.png rename to newsrc/afd/13696b.png diff --git a/src/afd/sprites-canonical/back-shiny/0428-000-Lopunny.png b/newsrc/afd/13696bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0428-000-Lopunny.png rename to newsrc/afd/13696bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0428-000-Lopunny.png b/newsrc/afd/13696s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0428-000-Lopunny.png rename to newsrc/afd/13696s.png diff --git a/src/afd/sprites-canonical/front/0428-420-Lopunny-Mega.png b/newsrc/afd/13697.png similarity index 100% rename from src/afd/sprites-canonical/front/0428-420-Lopunny-Mega.png rename to newsrc/afd/13697.png diff --git a/src/afd/sprites-canonical/back-shiny/0428-420-Lopunny-Mega.png b/newsrc/afd/13697b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0428-420-Lopunny-Mega.png rename to newsrc/afd/13697b.png diff --git a/src/afd/sprites-canonical/back/0428-420-Lopunny-Mega.png b/newsrc/afd/13697bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0428-420-Lopunny-Mega.png rename to newsrc/afd/13697bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0428-420-Lopunny-Mega.png b/newsrc/afd/13697s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0428-420-Lopunny-Mega.png rename to newsrc/afd/13697s.png diff --git a/src/afd/sprites-canonical/front/0429-000-Mismagius.png b/newsrc/afd/13728.png similarity index 100% rename from src/afd/sprites-canonical/front/0429-000-Mismagius.png rename to newsrc/afd/13728.png diff --git a/src/afd/sprites-canonical/back/0429-000-Mismagius.png b/newsrc/afd/13728b.png similarity index 100% rename from src/afd/sprites-canonical/back/0429-000-Mismagius.png rename to newsrc/afd/13728b.png diff --git a/src/afd/sprites-canonical/back-shiny/0429-000-Mismagius.png b/newsrc/afd/13728bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0429-000-Mismagius.png rename to newsrc/afd/13728bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0429-000-Mismagius.png b/newsrc/afd/13728s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0429-000-Mismagius.png rename to newsrc/afd/13728s.png diff --git a/src/afd/sprites-canonical/front/0043-000-Oddish.png b/newsrc/afd/1376.png similarity index 100% rename from src/afd/sprites-canonical/front/0043-000-Oddish.png rename to newsrc/afd/1376.png diff --git a/src/afd/sprites-canonical/front/0430-000-Honchkrow.png b/newsrc/afd/13760.png similarity index 100% rename from src/afd/sprites-canonical/front/0430-000-Honchkrow.png rename to newsrc/afd/13760.png diff --git a/src/afd/sprites-canonical/back/0430-000-Honchkrow.png b/newsrc/afd/13760b.png similarity index 100% rename from src/afd/sprites-canonical/back/0430-000-Honchkrow.png rename to newsrc/afd/13760b.png diff --git a/src/afd/sprites-canonical/back-shiny/0430-000-Honchkrow.png b/newsrc/afd/13760bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0430-000-Honchkrow.png rename to newsrc/afd/13760bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0430-000-Honchkrow.png b/newsrc/afd/13760s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0430-000-Honchkrow.png rename to newsrc/afd/13760s.png diff --git a/src/afd/sprites-canonical/back/0043-000-Oddish.png b/newsrc/afd/1376b.png similarity index 100% rename from src/afd/sprites-canonical/back/0043-000-Oddish.png rename to newsrc/afd/1376b.png diff --git a/src/afd/sprites-canonical/back-shiny/0043-000-Oddish.png b/newsrc/afd/1376bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0043-000-Oddish.png rename to newsrc/afd/1376bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0043-000-Oddish.png b/newsrc/afd/1376s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0043-000-Oddish.png rename to newsrc/afd/1376s.png diff --git a/src/afd/sprites-canonical/front/0431-000-Glameow.png b/newsrc/afd/13792.png similarity index 100% rename from src/afd/sprites-canonical/front/0431-000-Glameow.png rename to newsrc/afd/13792.png diff --git a/src/afd/sprites-canonical/back/0431-000-Glameow.png b/newsrc/afd/13792b.png similarity index 100% rename from src/afd/sprites-canonical/back/0431-000-Glameow.png rename to newsrc/afd/13792b.png diff --git a/src/afd/sprites-canonical/back-shiny/0431-000-Glameow.png b/newsrc/afd/13792bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0431-000-Glameow.png rename to newsrc/afd/13792bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0431-000-Glameow.png b/newsrc/afd/13792s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0431-000-Glameow.png rename to newsrc/afd/13792s.png diff --git a/src/afd/sprites-canonical/front/0432-000-Purugly.png b/newsrc/afd/13824.png similarity index 100% rename from src/afd/sprites-canonical/front/0432-000-Purugly.png rename to newsrc/afd/13824.png diff --git a/src/afd/sprites-canonical/back/0432-000-Purugly.png b/newsrc/afd/13824b.png similarity index 100% rename from src/afd/sprites-canonical/back/0432-000-Purugly.png rename to newsrc/afd/13824b.png diff --git a/src/afd/sprites-canonical/back-shiny/0432-000-Purugly.png b/newsrc/afd/13824bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0432-000-Purugly.png rename to newsrc/afd/13824bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0432-000-Purugly.png b/newsrc/afd/13824s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0432-000-Purugly.png rename to newsrc/afd/13824s.png diff --git a/src/afd/sprites-canonical/front/0433-000-Chingling.png b/newsrc/afd/13856.png similarity index 100% rename from src/afd/sprites-canonical/front/0433-000-Chingling.png rename to newsrc/afd/13856.png diff --git a/src/afd/sprites-canonical/back/0433-000-Chingling.png b/newsrc/afd/13856b.png similarity index 100% rename from src/afd/sprites-canonical/back/0433-000-Chingling.png rename to newsrc/afd/13856b.png diff --git a/src/afd/sprites-canonical/back-shiny/0433-000-Chingling.png b/newsrc/afd/13856bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0433-000-Chingling.png rename to newsrc/afd/13856bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0433-000-Chingling.png b/newsrc/afd/13856s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0433-000-Chingling.png rename to newsrc/afd/13856s.png diff --git a/src/afd/sprites-canonical/front/0434-000-Stunky.png b/newsrc/afd/13888.png similarity index 100% rename from src/afd/sprites-canonical/front/0434-000-Stunky.png rename to newsrc/afd/13888.png diff --git a/src/afd/sprites-canonical/back/0434-000-Stunky.png b/newsrc/afd/13888b.png similarity index 100% rename from src/afd/sprites-canonical/back/0434-000-Stunky.png rename to newsrc/afd/13888b.png diff --git a/src/afd/sprites-canonical/back-shiny/0434-000-Stunky.png b/newsrc/afd/13888bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0434-000-Stunky.png rename to newsrc/afd/13888bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0434-000-Stunky.png b/newsrc/afd/13888s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0434-000-Stunky.png rename to newsrc/afd/13888s.png diff --git a/src/afd/sprites-canonical/front/0435-000-Skuntank.png b/newsrc/afd/13920.png similarity index 100% rename from src/afd/sprites-canonical/front/0435-000-Skuntank.png rename to newsrc/afd/13920.png diff --git a/src/afd/sprites-canonical/back/0435-000-Skuntank.png b/newsrc/afd/13920b.png similarity index 100% rename from src/afd/sprites-canonical/back/0435-000-Skuntank.png rename to newsrc/afd/13920b.png diff --git a/src/afd/sprites-canonical/front/0436-000-Bronzor.png b/newsrc/afd/13952.png similarity index 100% rename from src/afd/sprites-canonical/front/0436-000-Bronzor.png rename to newsrc/afd/13952.png diff --git a/src/afd/sprites-canonical/back/0436-000-Bronzor.png b/newsrc/afd/13952b.png similarity index 100% rename from src/afd/sprites-canonical/back/0436-000-Bronzor.png rename to newsrc/afd/13952b.png diff --git a/src/afd/sprites-canonical/back-shiny/0436-000-Bronzor.png b/newsrc/afd/13952bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0436-000-Bronzor.png rename to newsrc/afd/13952bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0436-000-Bronzor.png b/newsrc/afd/13952s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0436-000-Bronzor.png rename to newsrc/afd/13952s.png diff --git a/src/afd/sprites-canonical/front/0437-000-Bronzong.png b/newsrc/afd/13984.png similarity index 100% rename from src/afd/sprites-canonical/front/0437-000-Bronzong.png rename to newsrc/afd/13984.png diff --git a/src/afd/sprites-canonical/back/0437-000-Bronzong.png b/newsrc/afd/13984b.png similarity index 100% rename from src/afd/sprites-canonical/back/0437-000-Bronzong.png rename to newsrc/afd/13984b.png diff --git a/src/afd/sprites-canonical/back-shiny/0437-000-Bronzong.png b/newsrc/afd/13984bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0437-000-Bronzong.png rename to newsrc/afd/13984bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0437-000-Bronzong.png b/newsrc/afd/13984s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0437-000-Bronzong.png rename to newsrc/afd/13984s.png diff --git a/src/afd/sprites-canonical/front/0438-000-Bonsly.png b/newsrc/afd/14016.png similarity index 100% rename from src/afd/sprites-canonical/front/0438-000-Bonsly.png rename to newsrc/afd/14016.png diff --git a/src/afd/sprites-canonical/back/0438-000-Bonsly.png b/newsrc/afd/14016b.png similarity index 100% rename from src/afd/sprites-canonical/back/0438-000-Bonsly.png rename to newsrc/afd/14016b.png diff --git a/src/afd/sprites-canonical/back-shiny/0438-000-Bonsly.png b/newsrc/afd/14016bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0438-000-Bonsly.png rename to newsrc/afd/14016bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0438-000-Bonsly.png b/newsrc/afd/14016s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0438-000-Bonsly.png rename to newsrc/afd/14016s.png diff --git a/src/afd/sprites-canonical/front/0439-000-Mime_Jr..png b/newsrc/afd/14048.png similarity index 100% rename from src/afd/sprites-canonical/front/0439-000-Mime_Jr..png rename to newsrc/afd/14048.png diff --git a/src/afd/sprites-canonical/back/0439-000-Mime_Jr..png b/newsrc/afd/14048b.png similarity index 100% rename from src/afd/sprites-canonical/back/0439-000-Mime_Jr..png rename to newsrc/afd/14048b.png diff --git a/src/afd/sprites-canonical/back-shiny/0439-000-Mime_Jr..png b/newsrc/afd/14048bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0439-000-Mime_Jr..png rename to newsrc/afd/14048bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0439-000-Mime_Jr..png b/newsrc/afd/14048s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0439-000-Mime_Jr..png rename to newsrc/afd/14048s.png diff --git a/src/afd/sprites-canonical/front/0044-000-Gloom.png b/newsrc/afd/1408.png similarity index 100% rename from src/afd/sprites-canonical/front/0044-000-Gloom.png rename to newsrc/afd/1408.png diff --git a/src/afd/sprites-canonical/front/0440-000-Happiny.png b/newsrc/afd/14080.png similarity index 100% rename from src/afd/sprites-canonical/front/0440-000-Happiny.png rename to newsrc/afd/14080.png diff --git a/src/afd/sprites-canonical/back/0440-000-Happiny.png b/newsrc/afd/14080b.png similarity index 100% rename from src/afd/sprites-canonical/back/0440-000-Happiny.png rename to newsrc/afd/14080b.png diff --git a/src/afd/sprites-canonical/back-shiny/0440-000-Happiny.png b/newsrc/afd/14080bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0440-000-Happiny.png rename to newsrc/afd/14080bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0440-000-Happiny.png b/newsrc/afd/14080s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0440-000-Happiny.png rename to newsrc/afd/14080s.png diff --git a/src/afd/sprites-canonical/back/0044-000-Gloom.png b/newsrc/afd/1408b.png similarity index 100% rename from src/afd/sprites-canonical/back/0044-000-Gloom.png rename to newsrc/afd/1408b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0044-000-Gloom-Female.png b/newsrc/afd/1408bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0044-000-Gloom-Female.png rename to newsrc/afd/1408bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0044-000-Gloom-Female.png b/newsrc/afd/1408bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0044-000-Gloom-Female.png rename to newsrc/afd/1408bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0044-000-Gloom.png b/newsrc/afd/1408bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0044-000-Gloom.png rename to newsrc/afd/1408bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0044-000-Gloom-Female.png b/newsrc/afd/1408f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0044-000-Gloom-Female.png rename to newsrc/afd/1408f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0044-000-Gloom-Female.png b/newsrc/afd/1408fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0044-000-Gloom-Female.png rename to newsrc/afd/1408fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0044-000-Gloom.png b/newsrc/afd/1408s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0044-000-Gloom.png rename to newsrc/afd/1408s.png diff --git a/src/afd/sprites-canonical/front/0441-000-Chatot.png b/newsrc/afd/14112.png similarity index 100% rename from src/afd/sprites-canonical/front/0441-000-Chatot.png rename to newsrc/afd/14112.png diff --git a/src/afd/sprites-canonical/back/0441-000-Chatot.png b/newsrc/afd/14112b.png similarity index 100% rename from src/afd/sprites-canonical/back/0441-000-Chatot.png rename to newsrc/afd/14112b.png diff --git a/src/afd/sprites-canonical/back-shiny/0441-000-Chatot.png b/newsrc/afd/14112bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0441-000-Chatot.png rename to newsrc/afd/14112bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0441-000-Chatot.png b/newsrc/afd/14112s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0441-000-Chatot.png rename to newsrc/afd/14112s.png diff --git a/src/afd/sprites-canonical/front/0442-000-Spiritomb.png b/newsrc/afd/14144.png similarity index 100% rename from src/afd/sprites-canonical/front/0442-000-Spiritomb.png rename to newsrc/afd/14144.png diff --git a/src/afd/sprites-canonical/back/0442-000-Spiritomb.png b/newsrc/afd/14144b.png similarity index 100% rename from src/afd/sprites-canonical/back/0442-000-Spiritomb.png rename to newsrc/afd/14144b.png diff --git a/src/afd/sprites-canonical/back-shiny/0442-000-Spiritomb.png b/newsrc/afd/14144bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0442-000-Spiritomb.png rename to newsrc/afd/14144bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0442-000-Spiritomb.png b/newsrc/afd/14144s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0442-000-Spiritomb.png rename to newsrc/afd/14144s.png diff --git a/src/afd/sprites-canonical/front/0443-000-Gible.png b/newsrc/afd/14176.png similarity index 100% rename from src/afd/sprites-canonical/front/0443-000-Gible.png rename to newsrc/afd/14176.png diff --git a/src/afd/sprites-canonical/back/0443-000-Gible.png b/newsrc/afd/14176b.png similarity index 100% rename from src/afd/sprites-canonical/back/0443-000-Gible.png rename to newsrc/afd/14176b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0443-000-Gible-Female.png b/newsrc/afd/14176bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0443-000-Gible-Female.png rename to newsrc/afd/14176bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0443-000-Gible-Female.png b/newsrc/afd/14176bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0443-000-Gible-Female.png rename to newsrc/afd/14176bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0443-000-Gible.png b/newsrc/afd/14176bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0443-000-Gible.png rename to newsrc/afd/14176bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0443-000-Gible-Female.png b/newsrc/afd/14176f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0443-000-Gible-Female.png rename to newsrc/afd/14176f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0443-000-Gible-Female.png b/newsrc/afd/14176fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0443-000-Gible-Female.png rename to newsrc/afd/14176fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0443-000-Gible.png b/newsrc/afd/14176s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0443-000-Gible.png rename to newsrc/afd/14176s.png diff --git a/src/afd/sprites-canonical/front/0444-000-Gabite.png b/newsrc/afd/14208.png similarity index 100% rename from src/afd/sprites-canonical/front/0444-000-Gabite.png rename to newsrc/afd/14208.png diff --git a/src/afd/sprites-canonical/back/0444-000-Gabite.png b/newsrc/afd/14208b.png similarity index 100% rename from src/afd/sprites-canonical/back/0444-000-Gabite.png rename to newsrc/afd/14208b.png diff --git a/src/afd/sprites-canonical/back-shiny/0444-000-Gabite.png b/newsrc/afd/14208bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0444-000-Gabite.png rename to newsrc/afd/14208bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0444-000-Gabite.png b/newsrc/afd/14208s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0444-000-Gabite.png rename to newsrc/afd/14208s.png diff --git a/src/afd/sprites-canonical/front/0445-000-Garchomp.png b/newsrc/afd/14240.png similarity index 100% rename from src/afd/sprites-canonical/front/0445-000-Garchomp.png rename to newsrc/afd/14240.png diff --git a/src/afd/sprites-canonical/back/0445-000-Garchomp.png b/newsrc/afd/14240b.png similarity index 100% rename from src/afd/sprites-canonical/back/0445-000-Garchomp.png rename to newsrc/afd/14240b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0445-000-Garchomp-Female.png b/newsrc/afd/14240bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0445-000-Garchomp-Female.png rename to newsrc/afd/14240bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0445-000-Garchomp-Female.png b/newsrc/afd/14240bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0445-000-Garchomp-Female.png rename to newsrc/afd/14240bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0445-000-Garchomp.png b/newsrc/afd/14240bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0445-000-Garchomp.png rename to newsrc/afd/14240bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0445-000-Garchomp-Female.png b/newsrc/afd/14240f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0445-000-Garchomp-Female.png rename to newsrc/afd/14240f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0445-000-Garchomp-Female.png b/newsrc/afd/14240fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0445-000-Garchomp-Female.png rename to newsrc/afd/14240fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0445-000-Garchomp.png b/newsrc/afd/14240s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0445-000-Garchomp.png rename to newsrc/afd/14240s.png diff --git a/src/afd/sprites-canonical/front/0445-420-Garchomp-Mega.png b/newsrc/afd/14241.png similarity index 100% rename from src/afd/sprites-canonical/front/0445-420-Garchomp-Mega.png rename to newsrc/afd/14241.png diff --git a/src/afd/sprites-canonical/back/0445-420-Garchomp-Mega.png b/newsrc/afd/14241b.png similarity index 100% rename from src/afd/sprites-canonical/back/0445-420-Garchomp-Mega.png rename to newsrc/afd/14241b.png diff --git a/src/afd/sprites-canonical/back-shiny/0445-420-Garchomp-Mega.png b/newsrc/afd/14241bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0445-420-Garchomp-Mega.png rename to newsrc/afd/14241bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0445-420-Garchomp-Mega.png b/newsrc/afd/14241s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0445-420-Garchomp-Mega.png rename to newsrc/afd/14241s.png diff --git a/src/afd/sprites-canonical/front/0446-000-Munchlax.png b/newsrc/afd/14272.png similarity index 100% rename from src/afd/sprites-canonical/front/0446-000-Munchlax.png rename to newsrc/afd/14272.png diff --git a/src/afd/sprites-canonical/back/0446-000-Munchlax.png b/newsrc/afd/14272b.png similarity index 100% rename from src/afd/sprites-canonical/back/0446-000-Munchlax.png rename to newsrc/afd/14272b.png diff --git a/src/afd/sprites-canonical/back-shiny/0446-000-Munchlax.png b/newsrc/afd/14272bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0446-000-Munchlax.png rename to newsrc/afd/14272bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0446-000-Munchlax.png b/newsrc/afd/14272s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0446-000-Munchlax.png rename to newsrc/afd/14272s.png diff --git a/src/afd/sprites-canonical/front/0447-000-Riolu.png b/newsrc/afd/14304.png similarity index 100% rename from src/afd/sprites-canonical/front/0447-000-Riolu.png rename to newsrc/afd/14304.png diff --git a/src/afd/sprites-canonical/back/0447-000-Riolu.png b/newsrc/afd/14304b.png similarity index 100% rename from src/afd/sprites-canonical/back/0447-000-Riolu.png rename to newsrc/afd/14304b.png diff --git a/src/afd/sprites-canonical/back-shiny/0447-000-Riolu.png b/newsrc/afd/14304bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0447-000-Riolu.png rename to newsrc/afd/14304bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0447-000-Riolu.png b/newsrc/afd/14304s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0447-000-Riolu.png rename to newsrc/afd/14304s.png diff --git a/src/afd/sprites-canonical/front/0448-000-Lucario.png b/newsrc/afd/14336.png similarity index 100% rename from src/afd/sprites-canonical/front/0448-000-Lucario.png rename to newsrc/afd/14336.png diff --git a/src/afd/sprites-canonical/back/0448-000-Lucario.png b/newsrc/afd/14336b.png similarity index 100% rename from src/afd/sprites-canonical/back/0448-000-Lucario.png rename to newsrc/afd/14336b.png diff --git a/src/afd/sprites-canonical/back-shiny/0448-000-Lucario.png b/newsrc/afd/14336bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0448-000-Lucario.png rename to newsrc/afd/14336bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0448-000-Lucario.png b/newsrc/afd/14336s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0448-000-Lucario.png rename to newsrc/afd/14336s.png diff --git a/src/afd/sprites-canonical/front/0448-420-Lucario-Mega.png b/newsrc/afd/14337.png similarity index 100% rename from src/afd/sprites-canonical/front/0448-420-Lucario-Mega.png rename to newsrc/afd/14337.png diff --git a/src/afd/sprites-canonical/back/0448-420-Lucario-Mega.png b/newsrc/afd/14337b.png similarity index 100% rename from src/afd/sprites-canonical/back/0448-420-Lucario-Mega.png rename to newsrc/afd/14337b.png diff --git a/src/afd/sprites-canonical/back-shiny/0448-420-Lucario-Mega.png b/newsrc/afd/14337bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0448-420-Lucario-Mega.png rename to newsrc/afd/14337bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0448-420-Lucario-Mega.png b/newsrc/afd/14337s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0448-420-Lucario-Mega.png rename to newsrc/afd/14337s.png diff --git a/src/afd/sprites-canonical/front/0449-000-Hippopotas.png b/newsrc/afd/14368.png similarity index 100% rename from src/afd/sprites-canonical/front/0449-000-Hippopotas.png rename to newsrc/afd/14368.png diff --git a/src/afd/sprites-canonical/back/0449-000-Hippopotas.png b/newsrc/afd/14368b.png similarity index 100% rename from src/afd/sprites-canonical/back/0449-000-Hippopotas.png rename to newsrc/afd/14368b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0449-000-Hippopotas-Female.png b/newsrc/afd/14368bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0449-000-Hippopotas-Female.png rename to newsrc/afd/14368bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0449-000-Hippopotas-Female.png b/newsrc/afd/14368bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0449-000-Hippopotas-Female.png rename to newsrc/afd/14368bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0449-000-Hippopotas.png b/newsrc/afd/14368bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0449-000-Hippopotas.png rename to newsrc/afd/14368bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0449-000-Hippopotas-Female.png b/newsrc/afd/14368f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0449-000-Hippopotas-Female.png rename to newsrc/afd/14368f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0449-000-Hippopotas-Female.png b/newsrc/afd/14368fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0449-000-Hippopotas-Female.png rename to newsrc/afd/14368fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0449-000-Hippopotas.png b/newsrc/afd/14368s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0449-000-Hippopotas.png rename to newsrc/afd/14368s.png diff --git a/src/afd/sprites-canonical/front/0045-000-Vileplume.png b/newsrc/afd/1440.png similarity index 100% rename from src/afd/sprites-canonical/front/0045-000-Vileplume.png rename to newsrc/afd/1440.png diff --git a/src/afd/sprites-canonical/front/0450-000-Hippowdon.png b/newsrc/afd/14400.png similarity index 100% rename from src/afd/sprites-canonical/front/0450-000-Hippowdon.png rename to newsrc/afd/14400.png diff --git a/src/afd/sprites-canonical/back/0450-000-Hippowdon.png b/newsrc/afd/14400b.png similarity index 100% rename from src/afd/sprites-canonical/back/0450-000-Hippowdon.png rename to newsrc/afd/14400b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0450-000-Hippowdon-Female.png b/newsrc/afd/14400bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0450-000-Hippowdon-Female.png rename to newsrc/afd/14400bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0450-000-Hippowdon-Female.png b/newsrc/afd/14400bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0450-000-Hippowdon-Female.png rename to newsrc/afd/14400bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0450-000-Hippowdon.png b/newsrc/afd/14400bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0450-000-Hippowdon.png rename to newsrc/afd/14400bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0450-000-Hippowdon-Female.png b/newsrc/afd/14400f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0450-000-Hippowdon-Female.png rename to newsrc/afd/14400f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0450-000-Hippowdon-Female.png b/newsrc/afd/14400fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0450-000-Hippowdon-Female.png rename to newsrc/afd/14400fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0450-000-Hippowdon.png b/newsrc/afd/14400s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0450-000-Hippowdon.png rename to newsrc/afd/14400s.png diff --git a/src/afd/sprites-canonical/back/0045-000-Vileplume.png b/newsrc/afd/1440b.png similarity index 100% rename from src/afd/sprites-canonical/back/0045-000-Vileplume.png rename to newsrc/afd/1440b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0045-000-Vileplume-Female.png b/newsrc/afd/1440bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0045-000-Vileplume-Female.png rename to newsrc/afd/1440bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0045-000-Vileplume-Female.png b/newsrc/afd/1440bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0045-000-Vileplume-Female.png rename to newsrc/afd/1440bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0045-000-Vileplume.png b/newsrc/afd/1440bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0045-000-Vileplume.png rename to newsrc/afd/1440bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0045-000-Vileplume-Female.png b/newsrc/afd/1440f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0045-000-Vileplume-Female.png rename to newsrc/afd/1440f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0045-000-Vileplume-Female.png b/newsrc/afd/1440fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0045-000-Vileplume-Female.png rename to newsrc/afd/1440fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0045-000-Vileplume.png b/newsrc/afd/1440s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0045-000-Vileplume.png rename to newsrc/afd/1440s.png diff --git a/src/afd/sprites-canonical/front/0451-000-Skorupi.png b/newsrc/afd/14432.png similarity index 100% rename from src/afd/sprites-canonical/front/0451-000-Skorupi.png rename to newsrc/afd/14432.png diff --git a/src/afd/sprites-canonical/back/0451-000-Skorupi.png b/newsrc/afd/14432b.png similarity index 100% rename from src/afd/sprites-canonical/back/0451-000-Skorupi.png rename to newsrc/afd/14432b.png diff --git a/src/afd/sprites-canonical/back-shiny/0451-000-Skorupi.png b/newsrc/afd/14432bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0451-000-Skorupi.png rename to newsrc/afd/14432bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0451-000-Skorupi.png b/newsrc/afd/14432s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0451-000-Skorupi.png rename to newsrc/afd/14432s.png diff --git a/src/afd/sprites-canonical/front/0452-000-Drapion.png b/newsrc/afd/14464.png similarity index 100% rename from src/afd/sprites-canonical/front/0452-000-Drapion.png rename to newsrc/afd/14464.png diff --git a/src/afd/sprites-canonical/back/0452-000-Drapion.png b/newsrc/afd/14464b.png similarity index 100% rename from src/afd/sprites-canonical/back/0452-000-Drapion.png rename to newsrc/afd/14464b.png diff --git a/src/afd/sprites-canonical/back-shiny/0452-000-Drapion.png b/newsrc/afd/14464bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0452-000-Drapion.png rename to newsrc/afd/14464bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0452-000-Drapion.png b/newsrc/afd/14464s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0452-000-Drapion.png rename to newsrc/afd/14464s.png diff --git a/src/afd/sprites-canonical/front/0453-000-Croagunk.png b/newsrc/afd/14496.png similarity index 100% rename from src/afd/sprites-canonical/front/0453-000-Croagunk.png rename to newsrc/afd/14496.png diff --git a/src/afd/sprites-canonical/back/0453-000-Croagunk.png b/newsrc/afd/14496b.png similarity index 100% rename from src/afd/sprites-canonical/back/0453-000-Croagunk.png rename to newsrc/afd/14496b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0453-000-Croagunk-Female.png b/newsrc/afd/14496bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0453-000-Croagunk-Female.png rename to newsrc/afd/14496bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0453-000-Croagunk-Female.png b/newsrc/afd/14496bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0453-000-Croagunk-Female.png rename to newsrc/afd/14496bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0453-000-Croagunk.png b/newsrc/afd/14496bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0453-000-Croagunk.png rename to newsrc/afd/14496bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0453-000-Croagunk-Female.png b/newsrc/afd/14496f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0453-000-Croagunk-Female.png rename to newsrc/afd/14496f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0453-000-Croagunk-Female.png b/newsrc/afd/14496fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0453-000-Croagunk-Female.png rename to newsrc/afd/14496fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0453-000-Croagunk.png b/newsrc/afd/14496s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0453-000-Croagunk.png rename to newsrc/afd/14496s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0454-000-Toxicroak-Female.png b/newsrc/afd/14528.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0454-000-Toxicroak-Female.png rename to newsrc/afd/14528.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0454-000-Toxicroak-Female.png b/newsrc/afd/14528b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0454-000-Toxicroak-Female.png rename to newsrc/afd/14528b.png diff --git a/src/afd/sprites-canonical/back/0454-000-Toxicroak.png b/newsrc/afd/14528bf.png similarity index 100% rename from src/afd/sprites-canonical/back/0454-000-Toxicroak.png rename to newsrc/afd/14528bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0454-000-Toxicroak-Female.png b/newsrc/afd/14528bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0454-000-Toxicroak-Female.png rename to newsrc/afd/14528bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0454-000-Toxicroak.png b/newsrc/afd/14528bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0454-000-Toxicroak.png rename to newsrc/afd/14528bs.png diff --git a/src/afd/sprites-canonical/front/0454-000-Toxicroak.png b/newsrc/afd/14528f.png similarity index 100% rename from src/afd/sprites-canonical/front/0454-000-Toxicroak.png rename to newsrc/afd/14528f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0454-000-Toxicroak-Female.png b/newsrc/afd/14528fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0454-000-Toxicroak-Female.png rename to newsrc/afd/14528fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0454-000-Toxicroak.png b/newsrc/afd/14528s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0454-000-Toxicroak.png rename to newsrc/afd/14528s.png diff --git a/src/afd/sprites-canonical/front/0455-000-Carnivine.png b/newsrc/afd/14560.png similarity index 100% rename from src/afd/sprites-canonical/front/0455-000-Carnivine.png rename to newsrc/afd/14560.png diff --git a/src/afd/sprites-canonical/back/0455-000-Carnivine.png b/newsrc/afd/14560b.png similarity index 100% rename from src/afd/sprites-canonical/back/0455-000-Carnivine.png rename to newsrc/afd/14560b.png diff --git a/src/afd/sprites-canonical/back-shiny/0455-000-Carnivine.png b/newsrc/afd/14560bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0455-000-Carnivine.png rename to newsrc/afd/14560bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0455-000-Carnivine.png b/newsrc/afd/14560s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0455-000-Carnivine.png rename to newsrc/afd/14560s.png diff --git a/src/afd/sprites-canonical/front/0456-000-Finneon.png b/newsrc/afd/14592.png similarity index 100% rename from src/afd/sprites-canonical/front/0456-000-Finneon.png rename to newsrc/afd/14592.png diff --git a/src/afd/sprites-canonical/back/0456-000-Finneon.png b/newsrc/afd/14592b.png similarity index 100% rename from src/afd/sprites-canonical/back/0456-000-Finneon.png rename to newsrc/afd/14592b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0456-000-Finneon-Female.png b/newsrc/afd/14592bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0456-000-Finneon-Female.png rename to newsrc/afd/14592bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0456-000-Finneon-Female.png b/newsrc/afd/14592bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0456-000-Finneon-Female.png rename to newsrc/afd/14592bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0456-000-Finneon.png b/newsrc/afd/14592bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0456-000-Finneon.png rename to newsrc/afd/14592bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0456-000-Finneon-Female.png b/newsrc/afd/14592f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0456-000-Finneon-Female.png rename to newsrc/afd/14592f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0456-000-Finneon-Female.png b/newsrc/afd/14592fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0456-000-Finneon-Female.png rename to newsrc/afd/14592fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0456-000-Finneon.png b/newsrc/afd/14592s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0456-000-Finneon.png rename to newsrc/afd/14592s.png diff --git a/src/afd/sprites-canonical/front/0457-000-Lumineon.png b/newsrc/afd/14624.png similarity index 100% rename from src/afd/sprites-canonical/front/0457-000-Lumineon.png rename to newsrc/afd/14624.png diff --git a/src/afd/sprites-canonical/back/0457-000-Lumineon.png b/newsrc/afd/14624b.png similarity index 100% rename from src/afd/sprites-canonical/back/0457-000-Lumineon.png rename to newsrc/afd/14624b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0457-000-Lumineon-Female.png b/newsrc/afd/14624bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0457-000-Lumineon-Female.png rename to newsrc/afd/14624bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0457-000-Lumineon-Female.png b/newsrc/afd/14624bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0457-000-Lumineon-Female.png rename to newsrc/afd/14624bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0457-000-Lumineon.png b/newsrc/afd/14624bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0457-000-Lumineon.png rename to newsrc/afd/14624bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0457-000-Lumineon-Female.png b/newsrc/afd/14624f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0457-000-Lumineon-Female.png rename to newsrc/afd/14624f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0457-000-Lumineon-Female.png b/newsrc/afd/14624fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0457-000-Lumineon-Female.png rename to newsrc/afd/14624fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0457-000-Lumineon.png b/newsrc/afd/14624s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0457-000-Lumineon.png rename to newsrc/afd/14624s.png diff --git a/src/afd/sprites-canonical/front/0458-000-Mantyke.png b/newsrc/afd/14656.png similarity index 100% rename from src/afd/sprites-canonical/front/0458-000-Mantyke.png rename to newsrc/afd/14656.png diff --git a/src/afd/sprites-canonical/back/0458-000-Mantyke.png b/newsrc/afd/14656b.png similarity index 100% rename from src/afd/sprites-canonical/back/0458-000-Mantyke.png rename to newsrc/afd/14656b.png diff --git a/src/afd/sprites-canonical/back-shiny/0458-000-Mantyke.png b/newsrc/afd/14656bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0458-000-Mantyke.png rename to newsrc/afd/14656bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0458-000-Mantyke.png b/newsrc/afd/14656s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0458-000-Mantyke.png rename to newsrc/afd/14656s.png diff --git a/src/afd/sprites-canonical/front/0459-000-Snover.png b/newsrc/afd/14688.png similarity index 100% rename from src/afd/sprites-canonical/front/0459-000-Snover.png rename to newsrc/afd/14688.png diff --git a/src/afd/sprites-canonical/back/0459-000-Snover.png b/newsrc/afd/14688b.png similarity index 100% rename from src/afd/sprites-canonical/back/0459-000-Snover.png rename to newsrc/afd/14688b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0459-000-Snover-Female.png b/newsrc/afd/14688bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0459-000-Snover-Female.png rename to newsrc/afd/14688bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0459-000-Snover-Female.png b/newsrc/afd/14688bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0459-000-Snover-Female.png rename to newsrc/afd/14688bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0459-000-Snover.png b/newsrc/afd/14688bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0459-000-Snover.png rename to newsrc/afd/14688bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0459-000-Snover-Female.png b/newsrc/afd/14688f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0459-000-Snover-Female.png rename to newsrc/afd/14688f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0459-000-Snover-Female.png b/newsrc/afd/14688fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0459-000-Snover-Female.png rename to newsrc/afd/14688fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0459-000-Snover.png b/newsrc/afd/14688s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0459-000-Snover.png rename to newsrc/afd/14688s.png diff --git a/src/afd/sprites-canonical/front/0046-000-Paras.png b/newsrc/afd/1472.png similarity index 100% rename from src/afd/sprites-canonical/front/0046-000-Paras.png rename to newsrc/afd/1472.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0460-000-Abomasnow-Female.png b/newsrc/afd/14720.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0460-000-Abomasnow-Female.png rename to newsrc/afd/14720.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0460-000-Abomasnow-Female.png b/newsrc/afd/14720b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0460-000-Abomasnow-Female.png rename to newsrc/afd/14720b.png diff --git a/src/afd/sprites-canonical/back/0460-000-Abomasnow.png b/newsrc/afd/14720bf.png similarity index 100% rename from src/afd/sprites-canonical/back/0460-000-Abomasnow.png rename to newsrc/afd/14720bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0460-000-Abomasnow-Female.png b/newsrc/afd/14720bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0460-000-Abomasnow-Female.png rename to newsrc/afd/14720bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0460-000-Abomasnow.png b/newsrc/afd/14720bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0460-000-Abomasnow.png rename to newsrc/afd/14720bs.png diff --git a/src/afd/sprites-canonical/front/0460-000-Abomasnow.png b/newsrc/afd/14720f.png similarity index 100% rename from src/afd/sprites-canonical/front/0460-000-Abomasnow.png rename to newsrc/afd/14720f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0460-000-Abomasnow-Female.png b/newsrc/afd/14720fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0460-000-Abomasnow-Female.png rename to newsrc/afd/14720fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0460-000-Abomasnow.png b/newsrc/afd/14720s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0460-000-Abomasnow.png rename to newsrc/afd/14720s.png diff --git a/src/afd/sprites-canonical/front/0460-420-Abomasnow-Mega.png b/newsrc/afd/14721.png similarity index 100% rename from src/afd/sprites-canonical/front/0460-420-Abomasnow-Mega.png rename to newsrc/afd/14721.png diff --git a/src/afd/sprites-canonical/back/0460-420-Abomasnow-Mega.png b/newsrc/afd/14721b.png similarity index 100% rename from src/afd/sprites-canonical/back/0460-420-Abomasnow-Mega.png rename to newsrc/afd/14721b.png diff --git a/src/afd/sprites-canonical/back-shiny/0460-420-Abomasnow-Mega.png b/newsrc/afd/14721bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0460-420-Abomasnow-Mega.png rename to newsrc/afd/14721bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0460-420-Abomasnow-Mega.png b/newsrc/afd/14721s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0460-420-Abomasnow-Mega.png rename to newsrc/afd/14721s.png diff --git a/src/afd/sprites-canonical/back/0046-000-Paras.png b/newsrc/afd/1472b.png similarity index 100% rename from src/afd/sprites-canonical/back/0046-000-Paras.png rename to newsrc/afd/1472b.png diff --git a/src/afd/sprites-canonical/back-shiny/0046-000-Paras.png b/newsrc/afd/1472bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0046-000-Paras.png rename to newsrc/afd/1472bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0046-000-Paras.png b/newsrc/afd/1472s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0046-000-Paras.png rename to newsrc/afd/1472s.png diff --git a/src/afd/sprites-canonical/front/0461-000-Weavile.png b/newsrc/afd/14752.png similarity index 100% rename from src/afd/sprites-canonical/front/0461-000-Weavile.png rename to newsrc/afd/14752.png diff --git a/src/afd/sprites-canonical/back/0461-000-Weavile.png b/newsrc/afd/14752b.png similarity index 100% rename from src/afd/sprites-canonical/back/0461-000-Weavile.png rename to newsrc/afd/14752b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0461-000-Weavile-Female.png b/newsrc/afd/14752bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0461-000-Weavile-Female.png rename to newsrc/afd/14752bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0461-000-Weavile-Female.png b/newsrc/afd/14752bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0461-000-Weavile-Female.png rename to newsrc/afd/14752bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0461-000-Weavile.png b/newsrc/afd/14752bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0461-000-Weavile.png rename to newsrc/afd/14752bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0461-000-Weavile-Female.png b/newsrc/afd/14752f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0461-000-Weavile-Female.png rename to newsrc/afd/14752f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0461-000-Weavile-Female.png b/newsrc/afd/14752fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0461-000-Weavile-Female.png rename to newsrc/afd/14752fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0461-000-Weavile.png b/newsrc/afd/14752s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0461-000-Weavile.png rename to newsrc/afd/14752s.png diff --git a/src/afd/sprites-canonical/front/0462-000-Magnezone.png b/newsrc/afd/14784.png similarity index 100% rename from src/afd/sprites-canonical/front/0462-000-Magnezone.png rename to newsrc/afd/14784.png diff --git a/src/afd/sprites-canonical/back/0462-000-Magnezone.png b/newsrc/afd/14784b.png similarity index 100% rename from src/afd/sprites-canonical/back/0462-000-Magnezone.png rename to newsrc/afd/14784b.png diff --git a/src/afd/sprites-canonical/back-shiny/0462-000-Magnezone.png b/newsrc/afd/14784bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0462-000-Magnezone.png rename to newsrc/afd/14784bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0462-000-Magnezone.png b/newsrc/afd/14784s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0462-000-Magnezone.png rename to newsrc/afd/14784s.png diff --git a/src/afd/sprites-canonical/front/0463-000-Lickilicky.png b/newsrc/afd/14816.png similarity index 100% rename from src/afd/sprites-canonical/front/0463-000-Lickilicky.png rename to newsrc/afd/14816.png diff --git a/src/afd/sprites-canonical/back/0463-000-Lickilicky.png b/newsrc/afd/14816b.png similarity index 100% rename from src/afd/sprites-canonical/back/0463-000-Lickilicky.png rename to newsrc/afd/14816b.png diff --git a/src/afd/sprites-canonical/back-shiny/0463-000-Lickilicky.png b/newsrc/afd/14816bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0463-000-Lickilicky.png rename to newsrc/afd/14816bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0463-000-Lickilicky.png b/newsrc/afd/14816s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0463-000-Lickilicky.png rename to newsrc/afd/14816s.png diff --git a/src/afd/sprites-canonical/front/0464-000-Rhyperior.png b/newsrc/afd/14848.png similarity index 100% rename from src/afd/sprites-canonical/front/0464-000-Rhyperior.png rename to newsrc/afd/14848.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0464-000-Rhyperior-Female.png b/newsrc/afd/14848b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0464-000-Rhyperior-Female.png rename to newsrc/afd/14848b.png diff --git a/src/afd/sprites-canonical/back/0464-000-Rhyperior.png b/newsrc/afd/14848bf.png similarity index 100% rename from src/afd/sprites-canonical/back/0464-000-Rhyperior.png rename to newsrc/afd/14848bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0464-000-Rhyperior-Female.png b/newsrc/afd/14848bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0464-000-Rhyperior-Female.png rename to newsrc/afd/14848bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0464-000-Rhyperior.png b/newsrc/afd/14848bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0464-000-Rhyperior.png rename to newsrc/afd/14848bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0464-000-Rhyperior-Female.png b/newsrc/afd/14848f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0464-000-Rhyperior-Female.png rename to newsrc/afd/14848f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0464-000-Rhyperior-Female.png b/newsrc/afd/14848fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0464-000-Rhyperior-Female.png rename to newsrc/afd/14848fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0464-000-Rhyperior.png b/newsrc/afd/14848s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0464-000-Rhyperior.png rename to newsrc/afd/14848s.png diff --git a/src/afd/sprites-canonical/front/0465-000-Tangrowth.png b/newsrc/afd/14880.png similarity index 100% rename from src/afd/sprites-canonical/front/0465-000-Tangrowth.png rename to newsrc/afd/14880.png diff --git a/src/afd/sprites-canonical/back/0465-000-Tangrowth.png b/newsrc/afd/14880b.png similarity index 100% rename from src/afd/sprites-canonical/back/0465-000-Tangrowth.png rename to newsrc/afd/14880b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0465-000-Tangrowth-Female.png b/newsrc/afd/14880bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0465-000-Tangrowth-Female.png rename to newsrc/afd/14880bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0465-000-Tangrowth-Female.png b/newsrc/afd/14880bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0465-000-Tangrowth-Female.png rename to newsrc/afd/14880bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0465-000-Tangrowth.png b/newsrc/afd/14880bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0465-000-Tangrowth.png rename to newsrc/afd/14880bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0465-000-Tangrowth-Female.png b/newsrc/afd/14880f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0465-000-Tangrowth-Female.png rename to newsrc/afd/14880f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0465-000-Tangrowth-Female.png b/newsrc/afd/14880fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0465-000-Tangrowth-Female.png rename to newsrc/afd/14880fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0465-000-Tangrowth.png b/newsrc/afd/14880s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0465-000-Tangrowth.png rename to newsrc/afd/14880s.png diff --git a/src/afd/sprites-canonical/front/0466-000-Electivire.png b/newsrc/afd/14912.png similarity index 100% rename from src/afd/sprites-canonical/front/0466-000-Electivire.png rename to newsrc/afd/14912.png diff --git a/src/afd/sprites-canonical/back/0466-000-Electivire.png b/newsrc/afd/14912b.png similarity index 100% rename from src/afd/sprites-canonical/back/0466-000-Electivire.png rename to newsrc/afd/14912b.png diff --git a/src/afd/sprites-canonical/back-shiny/0466-000-Electivire.png b/newsrc/afd/14912bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0466-000-Electivire.png rename to newsrc/afd/14912bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0466-000-Electivire.png b/newsrc/afd/14912s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0466-000-Electivire.png rename to newsrc/afd/14912s.png diff --git a/src/afd/sprites-canonical/front/0467-000-Magmortar.png b/newsrc/afd/14944.png similarity index 100% rename from src/afd/sprites-canonical/front/0467-000-Magmortar.png rename to newsrc/afd/14944.png diff --git a/src/afd/sprites-canonical/back/0467-000-Magmortar.png b/newsrc/afd/14944b.png similarity index 100% rename from src/afd/sprites-canonical/back/0467-000-Magmortar.png rename to newsrc/afd/14944b.png diff --git a/src/afd/sprites-canonical/front/0468-000-Togekiss.png b/newsrc/afd/14976.png similarity index 100% rename from src/afd/sprites-canonical/front/0468-000-Togekiss.png rename to newsrc/afd/14976.png diff --git a/src/afd/sprites-canonical/back/0468-000-Togekiss.png b/newsrc/afd/14976b.png similarity index 100% rename from src/afd/sprites-canonical/back/0468-000-Togekiss.png rename to newsrc/afd/14976b.png diff --git a/src/afd/sprites-canonical/back-shiny/0468-000-Togekiss.png b/newsrc/afd/14976bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0468-000-Togekiss.png rename to newsrc/afd/14976bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0468-000-Togekiss.png b/newsrc/afd/14976s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0468-000-Togekiss.png rename to newsrc/afd/14976s.png diff --git a/src/afd/sprites-canonical/front/0469-000-Yanmega.png b/newsrc/afd/15008.png similarity index 100% rename from src/afd/sprites-canonical/front/0469-000-Yanmega.png rename to newsrc/afd/15008.png diff --git a/src/afd/sprites-canonical/back/0469-000-Yanmega.png b/newsrc/afd/15008b.png similarity index 100% rename from src/afd/sprites-canonical/back/0469-000-Yanmega.png rename to newsrc/afd/15008b.png diff --git a/src/afd/sprites-canonical/back-shiny/0469-000-Yanmega.png b/newsrc/afd/15008bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0469-000-Yanmega.png rename to newsrc/afd/15008bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0469-000-Yanmega.png b/newsrc/afd/15008s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0469-000-Yanmega.png rename to newsrc/afd/15008s.png diff --git a/src/afd/sprites-canonical/front/0047-000-Parasect.png b/newsrc/afd/1504.png similarity index 100% rename from src/afd/sprites-canonical/front/0047-000-Parasect.png rename to newsrc/afd/1504.png diff --git a/src/afd/sprites-canonical/front/0470-000-Leafeon.png b/newsrc/afd/15040.png similarity index 100% rename from src/afd/sprites-canonical/front/0470-000-Leafeon.png rename to newsrc/afd/15040.png diff --git a/src/afd/sprites-canonical/back/0470-000-Leafeon.png b/newsrc/afd/15040b.png similarity index 100% rename from src/afd/sprites-canonical/back/0470-000-Leafeon.png rename to newsrc/afd/15040b.png diff --git a/src/afd/sprites-canonical/back-shiny/0470-000-Leafeon.png b/newsrc/afd/15040bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0470-000-Leafeon.png rename to newsrc/afd/15040bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0470-000-Leafeon.png b/newsrc/afd/15040s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0470-000-Leafeon.png rename to newsrc/afd/15040s.png diff --git a/src/afd/sprites-canonical/back/0047-000-Parasect.png b/newsrc/afd/1504b.png similarity index 100% rename from src/afd/sprites-canonical/back/0047-000-Parasect.png rename to newsrc/afd/1504b.png diff --git a/src/afd/sprites-canonical/back-shiny/0047-000-Parasect.png b/newsrc/afd/1504bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0047-000-Parasect.png rename to newsrc/afd/1504bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0047-000-Parasect.png b/newsrc/afd/1504s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0047-000-Parasect.png rename to newsrc/afd/1504s.png diff --git a/src/afd/sprites-canonical/front/0471-000-Glaceon.png b/newsrc/afd/15072.png similarity index 100% rename from src/afd/sprites-canonical/front/0471-000-Glaceon.png rename to newsrc/afd/15072.png diff --git a/src/afd/sprites-canonical/back/0471-000-Glaceon.png b/newsrc/afd/15072b.png similarity index 100% rename from src/afd/sprites-canonical/back/0471-000-Glaceon.png rename to newsrc/afd/15072b.png diff --git a/src/afd/sprites-canonical/back-shiny/0471-000-Glaceon.png b/newsrc/afd/15072bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0471-000-Glaceon.png rename to newsrc/afd/15072bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0471-000-Glaceon.png b/newsrc/afd/15072s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0471-000-Glaceon.png rename to newsrc/afd/15072s.png diff --git a/src/afd/sprites-canonical/front/0472-000-Gliscor.png b/newsrc/afd/15104.png similarity index 100% rename from src/afd/sprites-canonical/front/0472-000-Gliscor.png rename to newsrc/afd/15104.png diff --git a/src/afd/sprites-canonical/back/0472-000-Gliscor.png b/newsrc/afd/15104b.png similarity index 100% rename from src/afd/sprites-canonical/back/0472-000-Gliscor.png rename to newsrc/afd/15104b.png diff --git a/src/afd/sprites-canonical/back-shiny/0472-000-Gliscor.png b/newsrc/afd/15104bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0472-000-Gliscor.png rename to newsrc/afd/15104bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0472-000-Gliscor.png b/newsrc/afd/15104s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0472-000-Gliscor.png rename to newsrc/afd/15104s.png diff --git a/src/afd/sprites-canonical/front/0473-000-Mamoswine.png b/newsrc/afd/15136.png similarity index 100% rename from src/afd/sprites-canonical/front/0473-000-Mamoswine.png rename to newsrc/afd/15136.png diff --git a/src/afd/sprites-canonical/back/0473-000-Mamoswine.png b/newsrc/afd/15136b.png similarity index 100% rename from src/afd/sprites-canonical/back/0473-000-Mamoswine.png rename to newsrc/afd/15136b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0473-000-Mamoswine-Female.png b/newsrc/afd/15136bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0473-000-Mamoswine-Female.png rename to newsrc/afd/15136bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0473-000-Mamoswine-Female.png b/newsrc/afd/15136bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0473-000-Mamoswine-Female.png rename to newsrc/afd/15136bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0473-000-Mamoswine.png b/newsrc/afd/15136bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0473-000-Mamoswine.png rename to newsrc/afd/15136bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0473-000-Mamoswine-Female.png b/newsrc/afd/15136f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0473-000-Mamoswine-Female.png rename to newsrc/afd/15136f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0473-000-Mamoswine-Female.png b/newsrc/afd/15136fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0473-000-Mamoswine-Female.png rename to newsrc/afd/15136fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0473-000-Mamoswine.png b/newsrc/afd/15136s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0473-000-Mamoswine.png rename to newsrc/afd/15136s.png diff --git a/src/afd/sprites-canonical/front/0474-000-Porygon~Z.png b/newsrc/afd/15168.png similarity index 100% rename from src/afd/sprites-canonical/front/0474-000-Porygon~Z.png rename to newsrc/afd/15168.png diff --git a/src/afd/sprites-canonical/back/0474-000-Porygon~Z.png b/newsrc/afd/15168b.png similarity index 100% rename from src/afd/sprites-canonical/back/0474-000-Porygon~Z.png rename to newsrc/afd/15168b.png diff --git a/src/afd/sprites-canonical/back-shiny/0474-000-Porygon~Z.png b/newsrc/afd/15168bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0474-000-Porygon~Z.png rename to newsrc/afd/15168bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0474-000-Porygon~Z.png b/newsrc/afd/15168s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0474-000-Porygon~Z.png rename to newsrc/afd/15168s.png diff --git a/src/afd/sprites-canonical/front-shiny/0475-000-Gallade.png b/newsrc/afd/15200.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0475-000-Gallade.png rename to newsrc/afd/15200.png diff --git a/src/afd/sprites-canonical/back-shiny/0475-000-Gallade.png b/newsrc/afd/15200b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0475-000-Gallade.png rename to newsrc/afd/15200b.png diff --git a/src/afd/sprites-canonical/back/0475-000-Gallade.png b/newsrc/afd/15200bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0475-000-Gallade.png rename to newsrc/afd/15200bs.png diff --git a/src/afd/sprites-canonical/front/0475-000-Gallade.png b/newsrc/afd/15200s.png similarity index 100% rename from src/afd/sprites-canonical/front/0475-000-Gallade.png rename to newsrc/afd/15200s.png diff --git a/src/afd/sprites-canonical/front/0475-420-Gallade-Mega.png b/newsrc/afd/15201.png similarity index 100% rename from src/afd/sprites-canonical/front/0475-420-Gallade-Mega.png rename to newsrc/afd/15201.png diff --git a/src/afd/sprites-canonical/back/0475-420-Gallade-Mega.png b/newsrc/afd/15201b.png similarity index 100% rename from src/afd/sprites-canonical/back/0475-420-Gallade-Mega.png rename to newsrc/afd/15201b.png diff --git a/src/afd/sprites-canonical/back-shiny/0475-420-Gallade-Mega.png b/newsrc/afd/15201bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0475-420-Gallade-Mega.png rename to newsrc/afd/15201bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0475-420-Gallade-Mega.png b/newsrc/afd/15201s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0475-420-Gallade-Mega.png rename to newsrc/afd/15201s.png diff --git a/src/afd/sprites-canonical/front/0476-000-Probopass.png b/newsrc/afd/15232.png similarity index 100% rename from src/afd/sprites-canonical/front/0476-000-Probopass.png rename to newsrc/afd/15232.png diff --git a/src/afd/sprites-canonical/back/0476-000-Probopass.png b/newsrc/afd/15232b.png similarity index 100% rename from src/afd/sprites-canonical/back/0476-000-Probopass.png rename to newsrc/afd/15232b.png diff --git a/src/afd/sprites-canonical/back-shiny/0476-000-Probopass.png b/newsrc/afd/15232bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0476-000-Probopass.png rename to newsrc/afd/15232bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0476-000-Probopass.png b/newsrc/afd/15232s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0476-000-Probopass.png rename to newsrc/afd/15232s.png diff --git a/src/afd/sprites-canonical/front/0477-000-Dusknoir.png b/newsrc/afd/15264.png similarity index 100% rename from src/afd/sprites-canonical/front/0477-000-Dusknoir.png rename to newsrc/afd/15264.png diff --git a/src/afd/sprites-canonical/back/0477-000-Dusknoir.png b/newsrc/afd/15264b.png similarity index 100% rename from src/afd/sprites-canonical/back/0477-000-Dusknoir.png rename to newsrc/afd/15264b.png diff --git a/src/afd/sprites-canonical/back-shiny/0477-000-Dusknoir.png b/newsrc/afd/15264bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0477-000-Dusknoir.png rename to newsrc/afd/15264bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0477-000-Dusknoir.png b/newsrc/afd/15264s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0477-000-Dusknoir.png rename to newsrc/afd/15264s.png diff --git a/src/afd/sprites-canonical/front/0478-000-Froslass.png b/newsrc/afd/15296.png similarity index 100% rename from src/afd/sprites-canonical/front/0478-000-Froslass.png rename to newsrc/afd/15296.png diff --git a/src/afd/sprites-canonical/back/0478-000-Froslass.png b/newsrc/afd/15296b.png similarity index 100% rename from src/afd/sprites-canonical/back/0478-000-Froslass.png rename to newsrc/afd/15296b.png diff --git a/src/afd/sprites-canonical/back-shiny/0478-000-Froslass.png b/newsrc/afd/15296bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0478-000-Froslass.png rename to newsrc/afd/15296bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0478-000-Froslass.png b/newsrc/afd/15296s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0478-000-Froslass.png rename to newsrc/afd/15296s.png diff --git a/src/afd/sprites-canonical/front/0479-000-Rotom.png b/newsrc/afd/15328.png similarity index 100% rename from src/afd/sprites-canonical/front/0479-000-Rotom.png rename to newsrc/afd/15328.png diff --git a/src/afd/sprites-canonical/back/0479-000-Rotom.png b/newsrc/afd/15328b.png similarity index 100% rename from src/afd/sprites-canonical/back/0479-000-Rotom.png rename to newsrc/afd/15328b.png diff --git a/src/afd/sprites-canonical/back-shiny/0479-000-Rotom.png b/newsrc/afd/15328bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0479-000-Rotom.png rename to newsrc/afd/15328bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0479-000-Rotom.png b/newsrc/afd/15328s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0479-000-Rotom.png rename to newsrc/afd/15328s.png diff --git a/src/afd/sprites-canonical/front/0479-420-Rotom-Heat.png b/newsrc/afd/15329.png similarity index 100% rename from src/afd/sprites-canonical/front/0479-420-Rotom-Heat.png rename to newsrc/afd/15329.png diff --git a/src/afd/sprites-canonical/back/0479-420-Rotom-Heat.png b/newsrc/afd/15329b.png similarity index 100% rename from src/afd/sprites-canonical/back/0479-420-Rotom-Heat.png rename to newsrc/afd/15329b.png diff --git a/src/afd/sprites-canonical/back-shiny/0479-420-Rotom-Heat.png b/newsrc/afd/15329bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0479-420-Rotom-Heat.png rename to newsrc/afd/15329bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0479-420-Rotom-Heat.png b/newsrc/afd/15329s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0479-420-Rotom-Heat.png rename to newsrc/afd/15329s.png diff --git a/src/afd/sprites-canonical/front/0479-420-Rotom-Wash.png b/newsrc/afd/15330.png similarity index 100% rename from src/afd/sprites-canonical/front/0479-420-Rotom-Wash.png rename to newsrc/afd/15330.png diff --git a/src/afd/sprites-canonical/back/0479-420-Rotom-Wash.png b/newsrc/afd/15330b.png similarity index 100% rename from src/afd/sprites-canonical/back/0479-420-Rotom-Wash.png rename to newsrc/afd/15330b.png diff --git a/src/afd/sprites-canonical/back-shiny/0479-420-Rotom-Wash.png b/newsrc/afd/15330bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0479-420-Rotom-Wash.png rename to newsrc/afd/15330bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0479-420-Rotom-Wash.png b/newsrc/afd/15330s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0479-420-Rotom-Wash.png rename to newsrc/afd/15330s.png diff --git a/src/afd/sprites-canonical/front/0479-420-Rotom-Frost.png b/newsrc/afd/15331.png similarity index 100% rename from src/afd/sprites-canonical/front/0479-420-Rotom-Frost.png rename to newsrc/afd/15331.png diff --git a/src/afd/sprites-canonical/back/0479-420-Rotom-Frost.png b/newsrc/afd/15331b.png similarity index 100% rename from src/afd/sprites-canonical/back/0479-420-Rotom-Frost.png rename to newsrc/afd/15331b.png diff --git a/src/afd/sprites-canonical/back-shiny/0479-420-Rotom-Frost.png b/newsrc/afd/15331bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0479-420-Rotom-Frost.png rename to newsrc/afd/15331bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0479-420-Rotom-Frost.png b/newsrc/afd/15331s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0479-420-Rotom-Frost.png rename to newsrc/afd/15331s.png diff --git a/src/afd/sprites-canonical/front/0479-420-Rotom-Fan.png b/newsrc/afd/15332.png similarity index 100% rename from src/afd/sprites-canonical/front/0479-420-Rotom-Fan.png rename to newsrc/afd/15332.png diff --git a/src/afd/sprites-canonical/back/0479-420-Rotom-Fan.png b/newsrc/afd/15332b.png similarity index 100% rename from src/afd/sprites-canonical/back/0479-420-Rotom-Fan.png rename to newsrc/afd/15332b.png diff --git a/src/afd/sprites-canonical/back-shiny/0479-420-Rotom-Fan.png b/newsrc/afd/15332bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0479-420-Rotom-Fan.png rename to newsrc/afd/15332bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0479-420-Rotom-Fan.png b/newsrc/afd/15332s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0479-420-Rotom-Fan.png rename to newsrc/afd/15332s.png diff --git a/src/afd/sprites-canonical/front/0479-420-Rotom-Mow.png b/newsrc/afd/15333.png similarity index 100% rename from src/afd/sprites-canonical/front/0479-420-Rotom-Mow.png rename to newsrc/afd/15333.png diff --git a/src/afd/sprites-canonical/back/0479-420-Rotom-Mow.png b/newsrc/afd/15333b.png similarity index 100% rename from src/afd/sprites-canonical/back/0479-420-Rotom-Mow.png rename to newsrc/afd/15333b.png diff --git a/src/afd/sprites-canonical/back-shiny/0479-420-Rotom-Mow.png b/newsrc/afd/15333bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0479-420-Rotom-Mow.png rename to newsrc/afd/15333bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0479-420-Rotom-Mow.png b/newsrc/afd/15333s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0479-420-Rotom-Mow.png rename to newsrc/afd/15333s.png diff --git a/src/afd/sprites-canonical/front/0048-000-Venonat.png b/newsrc/afd/1536.png similarity index 100% rename from src/afd/sprites-canonical/front/0048-000-Venonat.png rename to newsrc/afd/1536.png diff --git a/src/afd/sprites-canonical/front/0480-000-Uxie.png b/newsrc/afd/15360.png similarity index 100% rename from src/afd/sprites-canonical/front/0480-000-Uxie.png rename to newsrc/afd/15360.png diff --git a/src/afd/sprites-canonical/back/0480-000-Uxie.png b/newsrc/afd/15360b.png similarity index 100% rename from src/afd/sprites-canonical/back/0480-000-Uxie.png rename to newsrc/afd/15360b.png diff --git a/src/afd/sprites-canonical/back-shiny/0480-000-Uxie.png b/newsrc/afd/15360bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0480-000-Uxie.png rename to newsrc/afd/15360bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0480-000-Uxie.png b/newsrc/afd/15360s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0480-000-Uxie.png rename to newsrc/afd/15360s.png diff --git a/src/afd/sprites-canonical/back/0048-000-Venonat.png b/newsrc/afd/1536b.png similarity index 100% rename from src/afd/sprites-canonical/back/0048-000-Venonat.png rename to newsrc/afd/1536b.png diff --git a/src/afd/sprites-canonical/back-shiny/0048-000-Venonat.png b/newsrc/afd/1536bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0048-000-Venonat.png rename to newsrc/afd/1536bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0048-000-Venonat.png b/newsrc/afd/1536s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0048-000-Venonat.png rename to newsrc/afd/1536s.png diff --git a/src/afd/sprites-canonical/front/0481-000-Mesprit.png b/newsrc/afd/15392.png similarity index 100% rename from src/afd/sprites-canonical/front/0481-000-Mesprit.png rename to newsrc/afd/15392.png diff --git a/src/afd/sprites-canonical/back/0481-000-Mesprit.png b/newsrc/afd/15392b.png similarity index 100% rename from src/afd/sprites-canonical/back/0481-000-Mesprit.png rename to newsrc/afd/15392b.png diff --git a/src/afd/sprites-canonical/back-shiny/0481-000-Mesprit.png b/newsrc/afd/15392bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0481-000-Mesprit.png rename to newsrc/afd/15392bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0481-000-Mesprit.png b/newsrc/afd/15392s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0481-000-Mesprit.png rename to newsrc/afd/15392s.png diff --git a/src/afd/sprites-canonical/front/0482-000-Azelf.png b/newsrc/afd/15424.png similarity index 100% rename from src/afd/sprites-canonical/front/0482-000-Azelf.png rename to newsrc/afd/15424.png diff --git a/src/afd/sprites-canonical/back/0482-000-Azelf.png b/newsrc/afd/15424b.png similarity index 100% rename from src/afd/sprites-canonical/back/0482-000-Azelf.png rename to newsrc/afd/15424b.png diff --git a/src/afd/sprites-canonical/back-shiny/0482-000-Azelf.png b/newsrc/afd/15424bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0482-000-Azelf.png rename to newsrc/afd/15424bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0482-000-Azelf.png b/newsrc/afd/15424s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0482-000-Azelf.png rename to newsrc/afd/15424s.png diff --git a/src/afd/sprites-canonical/front/0483-000-Dialga.png b/newsrc/afd/15456.png similarity index 100% rename from src/afd/sprites-canonical/front/0483-000-Dialga.png rename to newsrc/afd/15456.png diff --git a/src/afd/sprites-canonical/back/0483-000-Dialga.png b/newsrc/afd/15456b.png similarity index 100% rename from src/afd/sprites-canonical/back/0483-000-Dialga.png rename to newsrc/afd/15456b.png diff --git a/src/afd/sprites-canonical/back-shiny/0483-000-Dialga.png b/newsrc/afd/15456bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0483-000-Dialga.png rename to newsrc/afd/15456bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0483-000-Dialga.png b/newsrc/afd/15456s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0483-000-Dialga.png rename to newsrc/afd/15456s.png diff --git a/src/afd/sprites-canonical/front/0484-000-Palkia.png b/newsrc/afd/15488.png similarity index 100% rename from src/afd/sprites-canonical/front/0484-000-Palkia.png rename to newsrc/afd/15488.png diff --git a/src/afd/sprites-canonical/back/0484-000-Palkia.png b/newsrc/afd/15488b.png similarity index 100% rename from src/afd/sprites-canonical/back/0484-000-Palkia.png rename to newsrc/afd/15488b.png diff --git a/src/afd/sprites-canonical/back-shiny/0484-000-Palkia.png b/newsrc/afd/15488bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0484-000-Palkia.png rename to newsrc/afd/15488bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0484-000-Palkia.png b/newsrc/afd/15488s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0484-000-Palkia.png rename to newsrc/afd/15488s.png diff --git a/src/afd/sprites-canonical/front/0485-000-Heatran.png b/newsrc/afd/15520.png similarity index 100% rename from src/afd/sprites-canonical/front/0485-000-Heatran.png rename to newsrc/afd/15520.png diff --git a/src/afd/sprites-canonical/back/0485-000-Heatran.png b/newsrc/afd/15520b.png similarity index 100% rename from src/afd/sprites-canonical/back/0485-000-Heatran.png rename to newsrc/afd/15520b.png diff --git a/src/afd/sprites-canonical/back-shiny/0485-000-Heatran.png b/newsrc/afd/15520bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0485-000-Heatran.png rename to newsrc/afd/15520bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0485-000-Heatran.png b/newsrc/afd/15520s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0485-000-Heatran.png rename to newsrc/afd/15520s.png diff --git a/src/afd/sprites-canonical/front/0486-000-Regigigas.png b/newsrc/afd/15552.png similarity index 100% rename from src/afd/sprites-canonical/front/0486-000-Regigigas.png rename to newsrc/afd/15552.png diff --git a/src/afd/sprites-canonical/back/0486-000-Regigigas.png b/newsrc/afd/15552b.png similarity index 100% rename from src/afd/sprites-canonical/back/0486-000-Regigigas.png rename to newsrc/afd/15552b.png diff --git a/src/afd/sprites-canonical/back-shiny/0486-000-Regigigas.png b/newsrc/afd/15552bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0486-000-Regigigas.png rename to newsrc/afd/15552bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0486-000-Regigigas.png b/newsrc/afd/15552s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0486-000-Regigigas.png rename to newsrc/afd/15552s.png diff --git a/src/afd/sprites-canonical/front/0487-000-Giratina.png b/newsrc/afd/15584.png similarity index 100% rename from src/afd/sprites-canonical/front/0487-000-Giratina.png rename to newsrc/afd/15584.png diff --git a/src/afd/sprites-canonical/back/0487-000-Giratina.png b/newsrc/afd/15584b.png similarity index 100% rename from src/afd/sprites-canonical/back/0487-000-Giratina.png rename to newsrc/afd/15584b.png diff --git a/src/afd/sprites-canonical/back-shiny/0487-000-Giratina.png b/newsrc/afd/15584bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0487-000-Giratina.png rename to newsrc/afd/15584bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0487-000-Giratina.png b/newsrc/afd/15584s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0487-000-Giratina.png rename to newsrc/afd/15584s.png diff --git a/src/afd/sprites-canonical/front/0487-420-Giratina-Origin.png b/newsrc/afd/15585.png similarity index 100% rename from src/afd/sprites-canonical/front/0487-420-Giratina-Origin.png rename to newsrc/afd/15585.png diff --git a/src/afd/sprites-canonical/back/0487-420-Giratina-Origin.png b/newsrc/afd/15585b.png similarity index 100% rename from src/afd/sprites-canonical/back/0487-420-Giratina-Origin.png rename to newsrc/afd/15585b.png diff --git a/src/afd/sprites-canonical/back-shiny/0487-420-Giratina-Origin.png b/newsrc/afd/15585bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0487-420-Giratina-Origin.png rename to newsrc/afd/15585bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0487-420-Giratina-Origin.png b/newsrc/afd/15585s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0487-420-Giratina-Origin.png rename to newsrc/afd/15585s.png diff --git a/src/afd/sprites-canonical/front/0488-000-Cresselia.png b/newsrc/afd/15616.png similarity index 100% rename from src/afd/sprites-canonical/front/0488-000-Cresselia.png rename to newsrc/afd/15616.png diff --git a/src/afd/sprites-canonical/back/0488-000-Cresselia.png b/newsrc/afd/15616b.png similarity index 100% rename from src/afd/sprites-canonical/back/0488-000-Cresselia.png rename to newsrc/afd/15616b.png diff --git a/src/afd/sprites-canonical/back-shiny/0488-000-Cresselia.png b/newsrc/afd/15616bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0488-000-Cresselia.png rename to newsrc/afd/15616bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0488-000-Cresselia.png b/newsrc/afd/15616s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0488-000-Cresselia.png rename to newsrc/afd/15616s.png diff --git a/src/afd/sprites-canonical/front/0489-000-Phione.png b/newsrc/afd/15648.png similarity index 100% rename from src/afd/sprites-canonical/front/0489-000-Phione.png rename to newsrc/afd/15648.png diff --git a/src/afd/sprites-canonical/back/0489-000-Phione.png b/newsrc/afd/15648b.png similarity index 100% rename from src/afd/sprites-canonical/back/0489-000-Phione.png rename to newsrc/afd/15648b.png diff --git a/src/afd/sprites-canonical/back-shiny/0489-000-Phione.png b/newsrc/afd/15648bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0489-000-Phione.png rename to newsrc/afd/15648bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0489-000-Phione.png b/newsrc/afd/15648s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0489-000-Phione.png rename to newsrc/afd/15648s.png diff --git a/src/afd/sprites-canonical/front/0049-000-Venomoth.png b/newsrc/afd/1568.png similarity index 100% rename from src/afd/sprites-canonical/front/0049-000-Venomoth.png rename to newsrc/afd/1568.png diff --git a/src/afd/sprites-canonical/front/0490-000-Manaphy.png b/newsrc/afd/15680.png similarity index 100% rename from src/afd/sprites-canonical/front/0490-000-Manaphy.png rename to newsrc/afd/15680.png diff --git a/src/afd/sprites-canonical/back/0490-000-Manaphy.png b/newsrc/afd/15680b.png similarity index 100% rename from src/afd/sprites-canonical/back/0490-000-Manaphy.png rename to newsrc/afd/15680b.png diff --git a/src/afd/sprites-canonical/back-shiny/0490-000-Manaphy.png b/newsrc/afd/15680bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0490-000-Manaphy.png rename to newsrc/afd/15680bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0490-000-Manaphy.png b/newsrc/afd/15680s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0490-000-Manaphy.png rename to newsrc/afd/15680s.png diff --git a/src/afd/sprites-canonical/back/0049-000-Venomoth.png b/newsrc/afd/1568b.png similarity index 100% rename from src/afd/sprites-canonical/back/0049-000-Venomoth.png rename to newsrc/afd/1568b.png diff --git a/src/afd/sprites-canonical/back-shiny/0049-000-Venomoth.png b/newsrc/afd/1568bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0049-000-Venomoth.png rename to newsrc/afd/1568bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0049-000-Venomoth.png b/newsrc/afd/1568s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0049-000-Venomoth.png rename to newsrc/afd/1568s.png diff --git a/src/afd/sprites-canonical/front/0491-000-Darkrai.png b/newsrc/afd/15712.png similarity index 100% rename from src/afd/sprites-canonical/front/0491-000-Darkrai.png rename to newsrc/afd/15712.png diff --git a/src/afd/sprites-canonical/back/0491-000-Darkrai.png b/newsrc/afd/15712b.png similarity index 100% rename from src/afd/sprites-canonical/back/0491-000-Darkrai.png rename to newsrc/afd/15712b.png diff --git a/src/afd/sprites-canonical/back-shiny/0491-000-Darkrai.png b/newsrc/afd/15712bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0491-000-Darkrai.png rename to newsrc/afd/15712bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0491-000-Darkrai.png b/newsrc/afd/15712s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0491-000-Darkrai.png rename to newsrc/afd/15712s.png diff --git a/src/afd/sprites-canonical/front/0492-000-Shaymin.png b/newsrc/afd/15744.png similarity index 100% rename from src/afd/sprites-canonical/front/0492-000-Shaymin.png rename to newsrc/afd/15744.png diff --git a/src/afd/sprites-canonical/back/0492-000-Shaymin.png b/newsrc/afd/15744b.png similarity index 100% rename from src/afd/sprites-canonical/back/0492-000-Shaymin.png rename to newsrc/afd/15744b.png diff --git a/src/afd/sprites-canonical/back-shiny/0492-000-Shaymin.png b/newsrc/afd/15744bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0492-000-Shaymin.png rename to newsrc/afd/15744bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0492-000-Shaymin.png b/newsrc/afd/15744s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0492-000-Shaymin.png rename to newsrc/afd/15744s.png diff --git a/src/afd/sprites-canonical/front/0492-420-Shaymin-Sky.png b/newsrc/afd/15745.png similarity index 100% rename from src/afd/sprites-canonical/front/0492-420-Shaymin-Sky.png rename to newsrc/afd/15745.png diff --git a/src/afd/sprites-canonical/back/0492-420-Shaymin-Sky.png b/newsrc/afd/15745b.png similarity index 100% rename from src/afd/sprites-canonical/back/0492-420-Shaymin-Sky.png rename to newsrc/afd/15745b.png diff --git a/src/afd/sprites-canonical/back-shiny/0492-420-Shaymin-Sky.png b/newsrc/afd/15745bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0492-420-Shaymin-Sky.png rename to newsrc/afd/15745bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0492-420-Shaymin-Sky.png b/newsrc/afd/15745s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0492-420-Shaymin-Sky.png rename to newsrc/afd/15745s.png diff --git a/src/afd/sprites-canonical/front/0493-000-Arceus.png b/newsrc/afd/15776.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-000-Arceus.png rename to newsrc/afd/15776.png diff --git a/src/afd/sprites-canonical/back/0493-000-Arceus.png b/newsrc/afd/15776b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-000-Arceus.png rename to newsrc/afd/15776b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-000-Arceus.png b/newsrc/afd/15776bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-000-Arceus.png rename to newsrc/afd/15776bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-000-Arceus.png b/newsrc/afd/15776s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-000-Arceus.png rename to newsrc/afd/15776s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Fighting.png b/newsrc/afd/15777.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Fighting.png rename to newsrc/afd/15777.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Fighting.png b/newsrc/afd/15777b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Fighting.png rename to newsrc/afd/15777b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Fighting.png b/newsrc/afd/15777bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Fighting.png rename to newsrc/afd/15777bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Fighting.png b/newsrc/afd/15777s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Fighting.png rename to newsrc/afd/15777s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Flying.png b/newsrc/afd/15778.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Flying.png rename to newsrc/afd/15778.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Flying.png b/newsrc/afd/15778b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Flying.png rename to newsrc/afd/15778b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Flying.png b/newsrc/afd/15778bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Flying.png rename to newsrc/afd/15778bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Flying.png b/newsrc/afd/15778s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Flying.png rename to newsrc/afd/15778s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Poison.png b/newsrc/afd/15779.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Poison.png rename to newsrc/afd/15779.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Poison.png b/newsrc/afd/15779b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Poison.png rename to newsrc/afd/15779b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Poison.png b/newsrc/afd/15779bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Poison.png rename to newsrc/afd/15779bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Poison.png b/newsrc/afd/15779s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Poison.png rename to newsrc/afd/15779s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Ground.png b/newsrc/afd/15780.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Ground.png rename to newsrc/afd/15780.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Ground.png b/newsrc/afd/15780b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Ground.png rename to newsrc/afd/15780b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Ground.png b/newsrc/afd/15780bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Ground.png rename to newsrc/afd/15780bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Ground.png b/newsrc/afd/15780s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Ground.png rename to newsrc/afd/15780s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Rock.png b/newsrc/afd/15781.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Rock.png rename to newsrc/afd/15781.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Rock.png b/newsrc/afd/15781b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Rock.png rename to newsrc/afd/15781b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Rock.png b/newsrc/afd/15781bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Rock.png rename to newsrc/afd/15781bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Rock.png b/newsrc/afd/15781s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Rock.png rename to newsrc/afd/15781s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Bug.png b/newsrc/afd/15782.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Bug.png rename to newsrc/afd/15782.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Bug.png b/newsrc/afd/15782b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Bug.png rename to newsrc/afd/15782b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Bug.png b/newsrc/afd/15782bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Bug.png rename to newsrc/afd/15782bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Bug.png b/newsrc/afd/15782s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Bug.png rename to newsrc/afd/15782s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Ghost.png b/newsrc/afd/15783.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Ghost.png rename to newsrc/afd/15783.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Ghost.png b/newsrc/afd/15783b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Ghost.png rename to newsrc/afd/15783b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Ghost.png b/newsrc/afd/15783bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Ghost.png rename to newsrc/afd/15783bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Ghost.png b/newsrc/afd/15783s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Ghost.png rename to newsrc/afd/15783s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Steel.png b/newsrc/afd/15784.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Steel.png rename to newsrc/afd/15784.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Steel.png b/newsrc/afd/15784b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Steel.png rename to newsrc/afd/15784b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Steel.png b/newsrc/afd/15784bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Steel.png rename to newsrc/afd/15784bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Steel.png b/newsrc/afd/15784s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Steel.png rename to newsrc/afd/15784s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Fire.png b/newsrc/afd/15785.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Fire.png rename to newsrc/afd/15785.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Fire.png b/newsrc/afd/15785b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Fire.png rename to newsrc/afd/15785b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Fire.png b/newsrc/afd/15785bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Fire.png rename to newsrc/afd/15785bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Fire.png b/newsrc/afd/15785s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Fire.png rename to newsrc/afd/15785s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Water.png b/newsrc/afd/15786.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Water.png rename to newsrc/afd/15786.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Water.png b/newsrc/afd/15786b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Water.png rename to newsrc/afd/15786b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Water.png b/newsrc/afd/15786bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Water.png rename to newsrc/afd/15786bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Water.png b/newsrc/afd/15786s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Water.png rename to newsrc/afd/15786s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Grass.png b/newsrc/afd/15787.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Grass.png rename to newsrc/afd/15787.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Grass.png b/newsrc/afd/15787b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Grass.png rename to newsrc/afd/15787b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Grass.png b/newsrc/afd/15787bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Grass.png rename to newsrc/afd/15787bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Grass.png b/newsrc/afd/15787s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Grass.png rename to newsrc/afd/15787s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Electric.png b/newsrc/afd/15788.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Electric.png rename to newsrc/afd/15788.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Electric.png b/newsrc/afd/15788b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Electric.png rename to newsrc/afd/15788b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Electric.png b/newsrc/afd/15788bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Electric.png rename to newsrc/afd/15788bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Electric.png b/newsrc/afd/15788s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Electric.png rename to newsrc/afd/15788s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Psychic.png b/newsrc/afd/15789.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Psychic.png rename to newsrc/afd/15789.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Psychic.png b/newsrc/afd/15789b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Psychic.png rename to newsrc/afd/15789b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Psychic.png b/newsrc/afd/15789bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Psychic.png rename to newsrc/afd/15789bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Psychic.png b/newsrc/afd/15789s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Psychic.png rename to newsrc/afd/15789s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Ice.png b/newsrc/afd/15790.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Ice.png rename to newsrc/afd/15790.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Ice.png b/newsrc/afd/15790b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Ice.png rename to newsrc/afd/15790b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Ice.png b/newsrc/afd/15790bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Ice.png rename to newsrc/afd/15790bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Ice.png b/newsrc/afd/15790s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Ice.png rename to newsrc/afd/15790s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Dragon.png b/newsrc/afd/15791.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Dragon.png rename to newsrc/afd/15791.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Dragon.png b/newsrc/afd/15791b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Dragon.png rename to newsrc/afd/15791b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Dragon.png b/newsrc/afd/15791bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Dragon.png rename to newsrc/afd/15791bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Dragon.png b/newsrc/afd/15791s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Dragon.png rename to newsrc/afd/15791s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Dark.png b/newsrc/afd/15792.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Dark.png rename to newsrc/afd/15792.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Dark.png b/newsrc/afd/15792b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Dark.png rename to newsrc/afd/15792b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Dark.png b/newsrc/afd/15792bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Dark.png rename to newsrc/afd/15792bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Dark.png b/newsrc/afd/15792s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Dark.png rename to newsrc/afd/15792s.png diff --git a/src/afd/sprites-canonical/front/0493-420-Arceus-Fairy.png b/newsrc/afd/15793.png similarity index 100% rename from src/afd/sprites-canonical/front/0493-420-Arceus-Fairy.png rename to newsrc/afd/15793.png diff --git a/src/afd/sprites-canonical/back/0493-420-Arceus-Fairy.png b/newsrc/afd/15793b.png similarity index 100% rename from src/afd/sprites-canonical/back/0493-420-Arceus-Fairy.png rename to newsrc/afd/15793b.png diff --git a/src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Fairy.png b/newsrc/afd/15793bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0493-420-Arceus-Fairy.png rename to newsrc/afd/15793bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Fairy.png b/newsrc/afd/15793s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0493-420-Arceus-Fairy.png rename to newsrc/afd/15793s.png diff --git a/src/afd/sprites-canonical/front/0494-000-Victini.png b/newsrc/afd/15808.png similarity index 100% rename from src/afd/sprites-canonical/front/0494-000-Victini.png rename to newsrc/afd/15808.png diff --git a/src/afd/sprites-canonical/back/0494-000-Victini.png b/newsrc/afd/15808b.png similarity index 100% rename from src/afd/sprites-canonical/back/0494-000-Victini.png rename to newsrc/afd/15808b.png diff --git a/src/afd/sprites-canonical/back-shiny/0494-000-Victini.png b/newsrc/afd/15808bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0494-000-Victini.png rename to newsrc/afd/15808bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0494-000-Victini.png b/newsrc/afd/15808s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0494-000-Victini.png rename to newsrc/afd/15808s.png diff --git a/src/afd/sprites-canonical/front/0495-000-Snivy.png b/newsrc/afd/15840.png similarity index 100% rename from src/afd/sprites-canonical/front/0495-000-Snivy.png rename to newsrc/afd/15840.png diff --git a/src/afd/sprites-canonical/back/0495-000-Snivy.png b/newsrc/afd/15840b.png similarity index 100% rename from src/afd/sprites-canonical/back/0495-000-Snivy.png rename to newsrc/afd/15840b.png diff --git a/src/afd/sprites-canonical/back-shiny/0495-000-Snivy.png b/newsrc/afd/15840bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0495-000-Snivy.png rename to newsrc/afd/15840bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0495-000-Snivy.png b/newsrc/afd/15840s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0495-000-Snivy.png rename to newsrc/afd/15840s.png diff --git a/src/afd/sprites-canonical/front/0496-000-Servine.png b/newsrc/afd/15872.png similarity index 100% rename from src/afd/sprites-canonical/front/0496-000-Servine.png rename to newsrc/afd/15872.png diff --git a/src/afd/sprites-canonical/back/0496-000-Servine.png b/newsrc/afd/15872b.png similarity index 100% rename from src/afd/sprites-canonical/back/0496-000-Servine.png rename to newsrc/afd/15872b.png diff --git a/src/afd/sprites-canonical/back-shiny/0496-000-Servine.png b/newsrc/afd/15872bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0496-000-Servine.png rename to newsrc/afd/15872bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0496-000-Servine.png b/newsrc/afd/15872s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0496-000-Servine.png rename to newsrc/afd/15872s.png diff --git a/src/afd/sprites-canonical/front/0497-000-Serperior.png b/newsrc/afd/15904.png similarity index 100% rename from src/afd/sprites-canonical/front/0497-000-Serperior.png rename to newsrc/afd/15904.png diff --git a/src/afd/sprites-canonical/back/0497-000-Serperior.png b/newsrc/afd/15904b.png similarity index 100% rename from src/afd/sprites-canonical/back/0497-000-Serperior.png rename to newsrc/afd/15904b.png diff --git a/src/afd/sprites-canonical/back-shiny/0497-000-Serperior.png b/newsrc/afd/15904bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0497-000-Serperior.png rename to newsrc/afd/15904bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0497-000-Serperior.png b/newsrc/afd/15904s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0497-000-Serperior.png rename to newsrc/afd/15904s.png diff --git a/src/afd/sprites-canonical/front/0498-000-Tepig.png b/newsrc/afd/15936.png similarity index 100% rename from src/afd/sprites-canonical/front/0498-000-Tepig.png rename to newsrc/afd/15936.png diff --git a/src/afd/sprites-canonical/back/0498-000-Tepig.png b/newsrc/afd/15936b.png similarity index 100% rename from src/afd/sprites-canonical/back/0498-000-Tepig.png rename to newsrc/afd/15936b.png diff --git a/src/afd/sprites-canonical/back-shiny/0498-000-Tepig.png b/newsrc/afd/15936bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0498-000-Tepig.png rename to newsrc/afd/15936bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0498-000-Tepig.png b/newsrc/afd/15936s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0498-000-Tepig.png rename to newsrc/afd/15936s.png diff --git a/src/afd/sprites-canonical/front/0499-000-Pignite.png b/newsrc/afd/15968.png similarity index 100% rename from src/afd/sprites-canonical/front/0499-000-Pignite.png rename to newsrc/afd/15968.png diff --git a/src/afd/sprites-canonical/back/0499-000-Pignite.png b/newsrc/afd/15968b.png similarity index 100% rename from src/afd/sprites-canonical/back/0499-000-Pignite.png rename to newsrc/afd/15968b.png diff --git a/src/afd/sprites-canonical/back-shiny/0499-000-Pignite.png b/newsrc/afd/15968bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0499-000-Pignite.png rename to newsrc/afd/15968bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0499-000-Pignite.png b/newsrc/afd/15968s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0499-000-Pignite.png rename to newsrc/afd/15968s.png diff --git a/src/afd/sprites-canonical/front/0005-000-Charmeleon.png b/newsrc/afd/160.png similarity index 100% rename from src/afd/sprites-canonical/front/0005-000-Charmeleon.png rename to newsrc/afd/160.png diff --git a/src/afd/sprites-canonical/front/0050-000-Diglett.png b/newsrc/afd/1600.png similarity index 100% rename from src/afd/sprites-canonical/front/0050-000-Diglett.png rename to newsrc/afd/1600.png diff --git a/src/afd/sprites-canonical/front/0500-000-Emboar.png b/newsrc/afd/16000.png similarity index 100% rename from src/afd/sprites-canonical/front/0500-000-Emboar.png rename to newsrc/afd/16000.png diff --git a/src/afd/sprites-canonical/back/0500-000-Emboar.png b/newsrc/afd/16000b.png similarity index 100% rename from src/afd/sprites-canonical/back/0500-000-Emboar.png rename to newsrc/afd/16000b.png diff --git a/src/afd/sprites-canonical/back-shiny/0500-000-Emboar.png b/newsrc/afd/16000bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0500-000-Emboar.png rename to newsrc/afd/16000bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0500-000-Emboar.png b/newsrc/afd/16000s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0500-000-Emboar.png rename to newsrc/afd/16000s.png diff --git a/src/afd/sprites-canonical/back/0050-000-Diglett.png b/newsrc/afd/1600b.png similarity index 100% rename from src/afd/sprites-canonical/back/0050-000-Diglett.png rename to newsrc/afd/1600b.png diff --git a/src/afd/sprites-canonical/back-shiny/0050-000-Diglett.png b/newsrc/afd/1600bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0050-000-Diglett.png rename to newsrc/afd/1600bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0050-000-Diglett.png b/newsrc/afd/1600s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0050-000-Diglett.png rename to newsrc/afd/1600s.png diff --git a/src/afd/sprites-canonical/front/0050-420-Diglett-Alola.png b/newsrc/afd/1601.png similarity index 100% rename from src/afd/sprites-canonical/front/0050-420-Diglett-Alola.png rename to newsrc/afd/1601.png diff --git a/src/afd/sprites-canonical/back/0050-420-Diglett-Alola.png b/newsrc/afd/1601b.png similarity index 100% rename from src/afd/sprites-canonical/back/0050-420-Diglett-Alola.png rename to newsrc/afd/1601b.png diff --git a/src/afd/sprites-canonical/back-shiny/0050-420-Diglett-Alola.png b/newsrc/afd/1601bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0050-420-Diglett-Alola.png rename to newsrc/afd/1601bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0050-420-Diglett-Alola.png b/newsrc/afd/1601s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0050-420-Diglett-Alola.png rename to newsrc/afd/1601s.png diff --git a/src/afd/sprites-canonical/front/0501-000-Oshawott.png b/newsrc/afd/16032.png similarity index 100% rename from src/afd/sprites-canonical/front/0501-000-Oshawott.png rename to newsrc/afd/16032.png diff --git a/src/afd/sprites-canonical/back/0501-000-Oshawott.png b/newsrc/afd/16032b.png similarity index 100% rename from src/afd/sprites-canonical/back/0501-000-Oshawott.png rename to newsrc/afd/16032b.png diff --git a/src/afd/sprites-canonical/back-shiny/0501-000-Oshawott.png b/newsrc/afd/16032bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0501-000-Oshawott.png rename to newsrc/afd/16032bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0501-000-Oshawott.png b/newsrc/afd/16032s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0501-000-Oshawott.png rename to newsrc/afd/16032s.png diff --git a/src/afd/sprites-canonical/front/0502-000-Dewott.png b/newsrc/afd/16064.png similarity index 100% rename from src/afd/sprites-canonical/front/0502-000-Dewott.png rename to newsrc/afd/16064.png diff --git a/src/afd/sprites-canonical/back/0502-000-Dewott.png b/newsrc/afd/16064b.png similarity index 100% rename from src/afd/sprites-canonical/back/0502-000-Dewott.png rename to newsrc/afd/16064b.png diff --git a/src/afd/sprites-canonical/back-shiny/0502-000-Dewott.png b/newsrc/afd/16064bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0502-000-Dewott.png rename to newsrc/afd/16064bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0502-000-Dewott.png b/newsrc/afd/16064s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0502-000-Dewott.png rename to newsrc/afd/16064s.png diff --git a/src/afd/sprites-canonical/front/0503-000-Samurott.png b/newsrc/afd/16096.png similarity index 100% rename from src/afd/sprites-canonical/front/0503-000-Samurott.png rename to newsrc/afd/16096.png diff --git a/src/afd/sprites-canonical/back/0503-000-Samurott.png b/newsrc/afd/16096b.png similarity index 100% rename from src/afd/sprites-canonical/back/0503-000-Samurott.png rename to newsrc/afd/16096b.png diff --git a/src/afd/sprites-canonical/back-shiny/0503-000-Samurott.png b/newsrc/afd/16096bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0503-000-Samurott.png rename to newsrc/afd/16096bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0503-000-Samurott.png b/newsrc/afd/16096s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0503-000-Samurott.png rename to newsrc/afd/16096s.png diff --git a/src/afd/sprites-canonical/back/0005-000-Charmeleon.png b/newsrc/afd/160b.png similarity index 100% rename from src/afd/sprites-canonical/back/0005-000-Charmeleon.png rename to newsrc/afd/160b.png diff --git a/src/afd/sprites-canonical/back-shiny/0005-000-Charmeleon.png b/newsrc/afd/160bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0005-000-Charmeleon.png rename to newsrc/afd/160bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0005-000-Charmeleon.png b/newsrc/afd/160s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0005-000-Charmeleon.png rename to newsrc/afd/160s.png diff --git a/src/afd/sprites-canonical/front/0504-000-Patrat.png b/newsrc/afd/16128.png similarity index 100% rename from src/afd/sprites-canonical/front/0504-000-Patrat.png rename to newsrc/afd/16128.png diff --git a/src/afd/sprites-canonical/back/0504-000-Patrat.png b/newsrc/afd/16128b.png similarity index 100% rename from src/afd/sprites-canonical/back/0504-000-Patrat.png rename to newsrc/afd/16128b.png diff --git a/src/afd/sprites-canonical/back-shiny/0504-000-Patrat.png b/newsrc/afd/16128bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0504-000-Patrat.png rename to newsrc/afd/16128bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0504-000-Patrat.png b/newsrc/afd/16128s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0504-000-Patrat.png rename to newsrc/afd/16128s.png diff --git a/src/afd/sprites-canonical/front/0505-000-Watchog.png b/newsrc/afd/16160.png similarity index 100% rename from src/afd/sprites-canonical/front/0505-000-Watchog.png rename to newsrc/afd/16160.png diff --git a/src/afd/sprites-canonical/back/0505-000-Watchog.png b/newsrc/afd/16160b.png similarity index 100% rename from src/afd/sprites-canonical/back/0505-000-Watchog.png rename to newsrc/afd/16160b.png diff --git a/src/afd/sprites-canonical/back-shiny/0505-000-Watchog.png b/newsrc/afd/16160bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0505-000-Watchog.png rename to newsrc/afd/16160bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0505-000-Watchog.png b/newsrc/afd/16160s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0505-000-Watchog.png rename to newsrc/afd/16160s.png diff --git a/src/afd/sprites-canonical/front/0506-000-Lillipup.png b/newsrc/afd/16192.png similarity index 100% rename from src/afd/sprites-canonical/front/0506-000-Lillipup.png rename to newsrc/afd/16192.png diff --git a/src/afd/sprites-canonical/back/0506-000-Lillipup.png b/newsrc/afd/16192b.png similarity index 100% rename from src/afd/sprites-canonical/back/0506-000-Lillipup.png rename to newsrc/afd/16192b.png diff --git a/src/afd/sprites-canonical/back-shiny/0506-000-Lillipup.png b/newsrc/afd/16192bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0506-000-Lillipup.png rename to newsrc/afd/16192bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0506-000-Lillipup.png b/newsrc/afd/16192s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0506-000-Lillipup.png rename to newsrc/afd/16192s.png diff --git a/src/afd/sprites-canonical/front/0507-000-Herdier.png b/newsrc/afd/16224.png similarity index 100% rename from src/afd/sprites-canonical/front/0507-000-Herdier.png rename to newsrc/afd/16224.png diff --git a/src/afd/sprites-canonical/back/0507-000-Herdier.png b/newsrc/afd/16224b.png similarity index 100% rename from src/afd/sprites-canonical/back/0507-000-Herdier.png rename to newsrc/afd/16224b.png diff --git a/src/afd/sprites-canonical/back-shiny/0507-000-Herdier.png b/newsrc/afd/16224bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0507-000-Herdier.png rename to newsrc/afd/16224bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0507-000-Herdier.png b/newsrc/afd/16224s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0507-000-Herdier.png rename to newsrc/afd/16224s.png diff --git a/src/afd/sprites-canonical/front/0508-000-Stoutland.png b/newsrc/afd/16256.png similarity index 100% rename from src/afd/sprites-canonical/front/0508-000-Stoutland.png rename to newsrc/afd/16256.png diff --git a/src/afd/sprites-canonical/back/0508-000-Stoutland.png b/newsrc/afd/16256b.png similarity index 100% rename from src/afd/sprites-canonical/back/0508-000-Stoutland.png rename to newsrc/afd/16256b.png diff --git a/src/afd/sprites-canonical/back-shiny/0508-000-Stoutland.png b/newsrc/afd/16256bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0508-000-Stoutland.png rename to newsrc/afd/16256bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0508-000-Stoutland.png b/newsrc/afd/16256s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0508-000-Stoutland.png rename to newsrc/afd/16256s.png diff --git a/src/afd/sprites-canonical/front/0509-000-Purrloin.png b/newsrc/afd/16288.png similarity index 100% rename from src/afd/sprites-canonical/front/0509-000-Purrloin.png rename to newsrc/afd/16288.png diff --git a/src/afd/sprites-canonical/back/0509-000-Purrloin.png b/newsrc/afd/16288b.png similarity index 100% rename from src/afd/sprites-canonical/back/0509-000-Purrloin.png rename to newsrc/afd/16288b.png diff --git a/src/afd/sprites-canonical/back-shiny/0509-000-Purrloin.png b/newsrc/afd/16288bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0509-000-Purrloin.png rename to newsrc/afd/16288bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0509-000-Purrloin.png b/newsrc/afd/16288s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0509-000-Purrloin.png rename to newsrc/afd/16288s.png diff --git a/src/afd/sprites-canonical/front/0051-000-Dugtrio.png b/newsrc/afd/1632.png similarity index 100% rename from src/afd/sprites-canonical/front/0051-000-Dugtrio.png rename to newsrc/afd/1632.png diff --git a/src/afd/sprites-canonical/front/0510-000-Liepard.png b/newsrc/afd/16320.png similarity index 100% rename from src/afd/sprites-canonical/front/0510-000-Liepard.png rename to newsrc/afd/16320.png diff --git a/src/afd/sprites-canonical/back/0510-000-Liepard.png b/newsrc/afd/16320b.png similarity index 100% rename from src/afd/sprites-canonical/back/0510-000-Liepard.png rename to newsrc/afd/16320b.png diff --git a/src/afd/sprites-canonical/back-shiny/0510-000-Liepard.png b/newsrc/afd/16320bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0510-000-Liepard.png rename to newsrc/afd/16320bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0510-000-Liepard.png b/newsrc/afd/16320s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0510-000-Liepard.png rename to newsrc/afd/16320s.png diff --git a/src/afd/sprites-canonical/back/0051-000-Dugtrio.png b/newsrc/afd/1632b.png similarity index 100% rename from src/afd/sprites-canonical/back/0051-000-Dugtrio.png rename to newsrc/afd/1632b.png diff --git a/src/afd/sprites-canonical/back-shiny/0051-000-Dugtrio.png b/newsrc/afd/1632bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0051-000-Dugtrio.png rename to newsrc/afd/1632bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0051-000-Dugtrio.png b/newsrc/afd/1632s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0051-000-Dugtrio.png rename to newsrc/afd/1632s.png diff --git a/src/afd/sprites-canonical/back/0051-420-Dugtrio-Alola.png b/newsrc/afd/1633.png similarity index 100% rename from src/afd/sprites-canonical/back/0051-420-Dugtrio-Alola.png rename to newsrc/afd/1633.png diff --git a/src/afd/sprites-canonical/front/0051-420-Dugtrio-Alola.png b/newsrc/afd/1633b.png similarity index 100% rename from src/afd/sprites-canonical/front/0051-420-Dugtrio-Alola.png rename to newsrc/afd/1633b.png diff --git a/src/afd/sprites-canonical/back-shiny/0051-420-Dugtrio-Alola.png b/newsrc/afd/1633bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0051-420-Dugtrio-Alola.png rename to newsrc/afd/1633bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0051-420-Dugtrio-Alola.png b/newsrc/afd/1633s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0051-420-Dugtrio-Alola.png rename to newsrc/afd/1633s.png diff --git a/src/afd/sprites-canonical/front/0511-000-Pansage.png b/newsrc/afd/16352.png similarity index 100% rename from src/afd/sprites-canonical/front/0511-000-Pansage.png rename to newsrc/afd/16352.png diff --git a/src/afd/sprites-canonical/back/0511-000-Pansage.png b/newsrc/afd/16352b.png similarity index 100% rename from src/afd/sprites-canonical/back/0511-000-Pansage.png rename to newsrc/afd/16352b.png diff --git a/src/afd/sprites-canonical/back-shiny/0511-000-Pansage.png b/newsrc/afd/16352bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0511-000-Pansage.png rename to newsrc/afd/16352bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0511-000-Pansage.png b/newsrc/afd/16352s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0511-000-Pansage.png rename to newsrc/afd/16352s.png diff --git a/src/afd/sprites-canonical/front/0512-000-Simisage.png b/newsrc/afd/16384.png similarity index 100% rename from src/afd/sprites-canonical/front/0512-000-Simisage.png rename to newsrc/afd/16384.png diff --git a/src/afd/sprites-canonical/back/0512-000-Simisage.png b/newsrc/afd/16384b.png similarity index 100% rename from src/afd/sprites-canonical/back/0512-000-Simisage.png rename to newsrc/afd/16384b.png diff --git a/src/afd/sprites-canonical/back-shiny/0512-000-Simisage.png b/newsrc/afd/16384bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0512-000-Simisage.png rename to newsrc/afd/16384bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0512-000-Simisage.png b/newsrc/afd/16384s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0512-000-Simisage.png rename to newsrc/afd/16384s.png diff --git a/src/afd/sprites-canonical/front/0513-000-Pansear.png b/newsrc/afd/16416.png similarity index 100% rename from src/afd/sprites-canonical/front/0513-000-Pansear.png rename to newsrc/afd/16416.png diff --git a/src/afd/sprites-canonical/back/0513-000-Pansear.png b/newsrc/afd/16416b.png similarity index 100% rename from src/afd/sprites-canonical/back/0513-000-Pansear.png rename to newsrc/afd/16416b.png diff --git a/src/afd/sprites-canonical/back-shiny/0513-000-Pansear.png b/newsrc/afd/16416bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0513-000-Pansear.png rename to newsrc/afd/16416bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0513-000-Pansear.png b/newsrc/afd/16416s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0513-000-Pansear.png rename to newsrc/afd/16416s.png diff --git a/src/afd/sprites-canonical/front/0514-000-Simisear.png b/newsrc/afd/16448.png similarity index 100% rename from src/afd/sprites-canonical/front/0514-000-Simisear.png rename to newsrc/afd/16448.png diff --git a/src/afd/sprites-canonical/back/0514-000-Simisear.png b/newsrc/afd/16448b.png similarity index 100% rename from src/afd/sprites-canonical/back/0514-000-Simisear.png rename to newsrc/afd/16448b.png diff --git a/src/afd/sprites-canonical/back-shiny/0514-000-Simisear.png b/newsrc/afd/16448bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0514-000-Simisear.png rename to newsrc/afd/16448bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0514-000-Simisear.png b/newsrc/afd/16448s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0514-000-Simisear.png rename to newsrc/afd/16448s.png diff --git a/src/afd/sprites-canonical/front/0515-000-Panpour.png b/newsrc/afd/16480.png similarity index 100% rename from src/afd/sprites-canonical/front/0515-000-Panpour.png rename to newsrc/afd/16480.png diff --git a/src/afd/sprites-canonical/back/0515-000-Panpour.png b/newsrc/afd/16480b.png similarity index 100% rename from src/afd/sprites-canonical/back/0515-000-Panpour.png rename to newsrc/afd/16480b.png diff --git a/src/afd/sprites-canonical/back-shiny/0515-000-Panpour.png b/newsrc/afd/16480bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0515-000-Panpour.png rename to newsrc/afd/16480bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0515-000-Panpour.png b/newsrc/afd/16480s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0515-000-Panpour.png rename to newsrc/afd/16480s.png diff --git a/src/afd/sprites-canonical/front/0516-000-Simipour.png b/newsrc/afd/16512.png similarity index 100% rename from src/afd/sprites-canonical/front/0516-000-Simipour.png rename to newsrc/afd/16512.png diff --git a/src/afd/sprites-canonical/back/0516-000-Simipour.png b/newsrc/afd/16512b.png similarity index 100% rename from src/afd/sprites-canonical/back/0516-000-Simipour.png rename to newsrc/afd/16512b.png diff --git a/src/afd/sprites-canonical/back-shiny/0516-000-Simipour.png b/newsrc/afd/16512bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0516-000-Simipour.png rename to newsrc/afd/16512bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0516-000-Simipour.png b/newsrc/afd/16512s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0516-000-Simipour.png rename to newsrc/afd/16512s.png diff --git a/src/afd/sprites-canonical/front/0517-000-Munna.png b/newsrc/afd/16544.png similarity index 100% rename from src/afd/sprites-canonical/front/0517-000-Munna.png rename to newsrc/afd/16544.png diff --git a/src/afd/sprites-canonical/back/0517-000-Munna.png b/newsrc/afd/16544b.png similarity index 100% rename from src/afd/sprites-canonical/back/0517-000-Munna.png rename to newsrc/afd/16544b.png diff --git a/src/afd/sprites-canonical/back-shiny/0517-000-Munna.png b/newsrc/afd/16544bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0517-000-Munna.png rename to newsrc/afd/16544bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0517-000-Munna.png b/newsrc/afd/16544s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0517-000-Munna.png rename to newsrc/afd/16544s.png diff --git a/src/afd/sprites-canonical/front/0518-000-Musharna.png b/newsrc/afd/16576.png similarity index 100% rename from src/afd/sprites-canonical/front/0518-000-Musharna.png rename to newsrc/afd/16576.png diff --git a/src/afd/sprites-canonical/back/0518-000-Musharna.png b/newsrc/afd/16576b.png similarity index 100% rename from src/afd/sprites-canonical/back/0518-000-Musharna.png rename to newsrc/afd/16576b.png diff --git a/src/afd/sprites-canonical/back-shiny/0518-000-Musharna.png b/newsrc/afd/16576bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0518-000-Musharna.png rename to newsrc/afd/16576bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0518-000-Musharna.png b/newsrc/afd/16576s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0518-000-Musharna.png rename to newsrc/afd/16576s.png diff --git a/src/afd/sprites-canonical/front/0519-000-Pidove.png b/newsrc/afd/16608.png similarity index 100% rename from src/afd/sprites-canonical/front/0519-000-Pidove.png rename to newsrc/afd/16608.png diff --git a/src/afd/sprites-canonical/back/0519-000-Pidove.png b/newsrc/afd/16608b.png similarity index 100% rename from src/afd/sprites-canonical/back/0519-000-Pidove.png rename to newsrc/afd/16608b.png diff --git a/src/afd/sprites-canonical/back-shiny/0519-000-Pidove.png b/newsrc/afd/16608bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0519-000-Pidove.png rename to newsrc/afd/16608bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0519-000-Pidove.png b/newsrc/afd/16608s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0519-000-Pidove.png rename to newsrc/afd/16608s.png diff --git a/src/afd/sprites-canonical/front/0052-000-Meowth.png b/newsrc/afd/1664.png similarity index 100% rename from src/afd/sprites-canonical/front/0052-000-Meowth.png rename to newsrc/afd/1664.png diff --git a/src/afd/sprites-canonical/front/0520-000-Tranquill.png b/newsrc/afd/16640.png similarity index 100% rename from src/afd/sprites-canonical/front/0520-000-Tranquill.png rename to newsrc/afd/16640.png diff --git a/src/afd/sprites-canonical/back/0520-000-Tranquill.png b/newsrc/afd/16640b.png similarity index 100% rename from src/afd/sprites-canonical/back/0520-000-Tranquill.png rename to newsrc/afd/16640b.png diff --git a/src/afd/sprites-canonical/back-shiny/0520-000-Tranquill.png b/newsrc/afd/16640bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0520-000-Tranquill.png rename to newsrc/afd/16640bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0520-000-Tranquill.png b/newsrc/afd/16640s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0520-000-Tranquill.png rename to newsrc/afd/16640s.png diff --git a/src/afd/sprites-canonical/back/0052-000-Meowth.png b/newsrc/afd/1664b.png similarity index 100% rename from src/afd/sprites-canonical/back/0052-000-Meowth.png rename to newsrc/afd/1664b.png diff --git a/src/afd/sprites-canonical/back/0052-420-Meowth-Gmax.png b/newsrc/afd/1664bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0052-420-Meowth-Gmax.png rename to newsrc/afd/1664bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0052-420-Meowth-Gmax.png b/newsrc/afd/1664bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0052-420-Meowth-Gmax.png rename to newsrc/afd/1664bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0052-000-Meowth.png b/newsrc/afd/1664bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0052-000-Meowth.png rename to newsrc/afd/1664bs.png diff --git a/src/afd/sprites-canonical/front/0052-420-Meowth-Gmax.png b/newsrc/afd/1664g.png similarity index 100% rename from src/afd/sprites-canonical/front/0052-420-Meowth-Gmax.png rename to newsrc/afd/1664g.png diff --git a/src/afd/sprites-canonical/front-shiny/0052-420-Meowth-Gmax.png b/newsrc/afd/1664gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0052-420-Meowth-Gmax.png rename to newsrc/afd/1664gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0052-000-Meowth.png b/newsrc/afd/1664s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0052-000-Meowth.png rename to newsrc/afd/1664s.png diff --git a/src/afd/sprites-canonical/front/0052-420-Meowth-Alola.png b/newsrc/afd/1665.png similarity index 100% rename from src/afd/sprites-canonical/front/0052-420-Meowth-Alola.png rename to newsrc/afd/1665.png diff --git a/src/afd/sprites-canonical/back/0052-420-Meowth-Alola.png b/newsrc/afd/1665b.png similarity index 100% rename from src/afd/sprites-canonical/back/0052-420-Meowth-Alola.png rename to newsrc/afd/1665b.png diff --git a/src/afd/sprites-canonical/back-shiny/0052-420-Meowth-Alola.png b/newsrc/afd/1665bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0052-420-Meowth-Alola.png rename to newsrc/afd/1665bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0052-420-Meowth-Alola.png b/newsrc/afd/1665s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0052-420-Meowth-Alola.png rename to newsrc/afd/1665s.png diff --git a/src/afd/sprites-canonical/front/0052-420-Meowth-Galar.png b/newsrc/afd/1666.png similarity index 100% rename from src/afd/sprites-canonical/front/0052-420-Meowth-Galar.png rename to newsrc/afd/1666.png diff --git a/src/afd/sprites-canonical/back/0052-420-Meowth-Galar.png b/newsrc/afd/1666b.png similarity index 100% rename from src/afd/sprites-canonical/back/0052-420-Meowth-Galar.png rename to newsrc/afd/1666b.png diff --git a/src/afd/sprites-canonical/back-shiny/0052-420-Meowth-Galar.png b/newsrc/afd/1666bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0052-420-Meowth-Galar.png rename to newsrc/afd/1666bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0052-420-Meowth-Galar.png b/newsrc/afd/1666s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0052-420-Meowth-Galar.png rename to newsrc/afd/1666s.png diff --git a/src/afd/sprites-canonical/front/0521-000-Unfezant.png b/newsrc/afd/16672.png similarity index 100% rename from src/afd/sprites-canonical/front/0521-000-Unfezant.png rename to newsrc/afd/16672.png diff --git a/src/afd/sprites-canonical/back/0521-000-Unfezant.png b/newsrc/afd/16672b.png similarity index 100% rename from src/afd/sprites-canonical/back/0521-000-Unfezant.png rename to newsrc/afd/16672b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0521-000-Unfezant-Female.png b/newsrc/afd/16672bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0521-000-Unfezant-Female.png rename to newsrc/afd/16672bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0521-000-Unfezant-Female.png b/newsrc/afd/16672bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0521-000-Unfezant-Female.png rename to newsrc/afd/16672bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0521-000-Unfezant.png b/newsrc/afd/16672bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0521-000-Unfezant.png rename to newsrc/afd/16672bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0521-000-Unfezant-Female.png b/newsrc/afd/16672f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0521-000-Unfezant-Female.png rename to newsrc/afd/16672f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0521-000-Unfezant-Female.png b/newsrc/afd/16672fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0521-000-Unfezant-Female.png rename to newsrc/afd/16672fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0521-000-Unfezant.png b/newsrc/afd/16672s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0521-000-Unfezant.png rename to newsrc/afd/16672s.png diff --git a/src/afd/sprites-canonical/front/0522-000-Blitzle.png b/newsrc/afd/16704.png similarity index 100% rename from src/afd/sprites-canonical/front/0522-000-Blitzle.png rename to newsrc/afd/16704.png diff --git a/src/afd/sprites-canonical/back/0522-000-Blitzle.png b/newsrc/afd/16704b.png similarity index 100% rename from src/afd/sprites-canonical/back/0522-000-Blitzle.png rename to newsrc/afd/16704b.png diff --git a/src/afd/sprites-canonical/back-shiny/0522-000-Blitzle.png b/newsrc/afd/16704bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0522-000-Blitzle.png rename to newsrc/afd/16704bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0522-000-Blitzle.png b/newsrc/afd/16704s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0522-000-Blitzle.png rename to newsrc/afd/16704s.png diff --git a/src/afd/sprites-canonical/front/0523-000-Zebstrika.png b/newsrc/afd/16736.png similarity index 100% rename from src/afd/sprites-canonical/front/0523-000-Zebstrika.png rename to newsrc/afd/16736.png diff --git a/src/afd/sprites-canonical/back/0523-000-Zebstrika.png b/newsrc/afd/16736b.png similarity index 100% rename from src/afd/sprites-canonical/back/0523-000-Zebstrika.png rename to newsrc/afd/16736b.png diff --git a/src/afd/sprites-canonical/back-shiny/0523-000-Zebstrika.png b/newsrc/afd/16736bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0523-000-Zebstrika.png rename to newsrc/afd/16736bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0523-000-Zebstrika.png b/newsrc/afd/16736s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0523-000-Zebstrika.png rename to newsrc/afd/16736s.png diff --git a/src/afd/sprites-canonical/front/0524-000-Roggenrola.png b/newsrc/afd/16768.png similarity index 100% rename from src/afd/sprites-canonical/front/0524-000-Roggenrola.png rename to newsrc/afd/16768.png diff --git a/src/afd/sprites-canonical/back/0524-000-Roggenrola.png b/newsrc/afd/16768b.png similarity index 100% rename from src/afd/sprites-canonical/back/0524-000-Roggenrola.png rename to newsrc/afd/16768b.png diff --git a/src/afd/sprites-canonical/back-shiny/0524-000-Roggenrola.png b/newsrc/afd/16768bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0524-000-Roggenrola.png rename to newsrc/afd/16768bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0524-000-Roggenrola.png b/newsrc/afd/16768s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0524-000-Roggenrola.png rename to newsrc/afd/16768s.png diff --git a/src/afd/sprites-canonical/front/0525-000-Boldore.png b/newsrc/afd/16800.png similarity index 100% rename from src/afd/sprites-canonical/front/0525-000-Boldore.png rename to newsrc/afd/16800.png diff --git a/src/afd/sprites-canonical/back/0525-000-Boldore.png b/newsrc/afd/16800b.png similarity index 100% rename from src/afd/sprites-canonical/back/0525-000-Boldore.png rename to newsrc/afd/16800b.png diff --git a/src/afd/sprites-canonical/back-shiny/0525-000-Boldore.png b/newsrc/afd/16800bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0525-000-Boldore.png rename to newsrc/afd/16800bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0525-000-Boldore.png b/newsrc/afd/16800s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0525-000-Boldore.png rename to newsrc/afd/16800s.png diff --git a/src/afd/sprites-canonical/front/0526-000-Gigalith.png b/newsrc/afd/16832.png similarity index 100% rename from src/afd/sprites-canonical/front/0526-000-Gigalith.png rename to newsrc/afd/16832.png diff --git a/src/afd/sprites-canonical/back/0526-000-Gigalith.png b/newsrc/afd/16832b.png similarity index 100% rename from src/afd/sprites-canonical/back/0526-000-Gigalith.png rename to newsrc/afd/16832b.png diff --git a/src/afd/sprites-canonical/back-shiny/0526-000-Gigalith.png b/newsrc/afd/16832bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0526-000-Gigalith.png rename to newsrc/afd/16832bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0526-000-Gigalith.png b/newsrc/afd/16832s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0526-000-Gigalith.png rename to newsrc/afd/16832s.png diff --git a/src/afd/sprites-canonical/front/0527-000-Woobat.png b/newsrc/afd/16864.png similarity index 100% rename from src/afd/sprites-canonical/front/0527-000-Woobat.png rename to newsrc/afd/16864.png diff --git a/src/afd/sprites-canonical/back/0527-000-Woobat.png b/newsrc/afd/16864b.png similarity index 100% rename from src/afd/sprites-canonical/back/0527-000-Woobat.png rename to newsrc/afd/16864b.png diff --git a/src/afd/sprites-canonical/back-shiny/0527-000-Woobat.png b/newsrc/afd/16864bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0527-000-Woobat.png rename to newsrc/afd/16864bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0527-000-Woobat.png b/newsrc/afd/16864s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0527-000-Woobat.png rename to newsrc/afd/16864s.png diff --git a/src/afd/sprites-canonical/front/0528-000-Swoobat.png b/newsrc/afd/16896.png similarity index 100% rename from src/afd/sprites-canonical/front/0528-000-Swoobat.png rename to newsrc/afd/16896.png diff --git a/src/afd/sprites-canonical/back/0528-000-Swoobat.png b/newsrc/afd/16896b.png similarity index 100% rename from src/afd/sprites-canonical/back/0528-000-Swoobat.png rename to newsrc/afd/16896b.png diff --git a/src/afd/sprites-canonical/back-shiny/0528-000-Swoobat.png b/newsrc/afd/16896bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0528-000-Swoobat.png rename to newsrc/afd/16896bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0528-000-Swoobat.png b/newsrc/afd/16896s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0528-000-Swoobat.png rename to newsrc/afd/16896s.png diff --git a/src/afd/sprites-canonical/front/0529-000-Drilbur.png b/newsrc/afd/16928.png similarity index 100% rename from src/afd/sprites-canonical/front/0529-000-Drilbur.png rename to newsrc/afd/16928.png diff --git a/src/afd/sprites-canonical/back/0529-000-Drilbur.png b/newsrc/afd/16928b.png similarity index 100% rename from src/afd/sprites-canonical/back/0529-000-Drilbur.png rename to newsrc/afd/16928b.png diff --git a/src/afd/sprites-canonical/back-shiny/0529-000-Drilbur.png b/newsrc/afd/16928bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0529-000-Drilbur.png rename to newsrc/afd/16928bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0529-000-Drilbur.png b/newsrc/afd/16928s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0529-000-Drilbur.png rename to newsrc/afd/16928s.png diff --git a/src/afd/sprites-canonical/front/0053-000-Persian.png b/newsrc/afd/1696.png similarity index 100% rename from src/afd/sprites-canonical/front/0053-000-Persian.png rename to newsrc/afd/1696.png diff --git a/src/afd/sprites-canonical/front/0530-000-Excadrill.png b/newsrc/afd/16960.png similarity index 100% rename from src/afd/sprites-canonical/front/0530-000-Excadrill.png rename to newsrc/afd/16960.png diff --git a/src/afd/sprites-canonical/back/0530-000-Excadrill.png b/newsrc/afd/16960b.png similarity index 100% rename from src/afd/sprites-canonical/back/0530-000-Excadrill.png rename to newsrc/afd/16960b.png diff --git a/src/afd/sprites-canonical/back-shiny/0530-000-Excadrill.png b/newsrc/afd/16960bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0530-000-Excadrill.png rename to newsrc/afd/16960bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0530-000-Excadrill.png b/newsrc/afd/16960s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0530-000-Excadrill.png rename to newsrc/afd/16960s.png diff --git a/src/afd/sprites-canonical/back/0053-000-Persian.png b/newsrc/afd/1696b.png similarity index 100% rename from src/afd/sprites-canonical/back/0053-000-Persian.png rename to newsrc/afd/1696b.png diff --git a/src/afd/sprites-canonical/back-shiny/0053-000-Persian.png b/newsrc/afd/1696bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0053-000-Persian.png rename to newsrc/afd/1696bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0053-000-Persian.png b/newsrc/afd/1696s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0053-000-Persian.png rename to newsrc/afd/1696s.png diff --git a/src/afd/sprites-canonical/front/0053-420-Persian-Alola.png b/newsrc/afd/1697.png similarity index 100% rename from src/afd/sprites-canonical/front/0053-420-Persian-Alola.png rename to newsrc/afd/1697.png diff --git a/src/afd/sprites-canonical/back/0053-420-Persian-Alola.png b/newsrc/afd/1697b.png similarity index 100% rename from src/afd/sprites-canonical/back/0053-420-Persian-Alola.png rename to newsrc/afd/1697b.png diff --git a/src/afd/sprites-canonical/back-shiny/0053-420-Persian-Alola.png b/newsrc/afd/1697bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0053-420-Persian-Alola.png rename to newsrc/afd/1697bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0053-420-Persian-Alola.png b/newsrc/afd/1697s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0053-420-Persian-Alola.png rename to newsrc/afd/1697s.png diff --git a/src/afd/sprites-canonical/front/0531-000-Audino.png b/newsrc/afd/16992.png similarity index 100% rename from src/afd/sprites-canonical/front/0531-000-Audino.png rename to newsrc/afd/16992.png diff --git a/src/afd/sprites-canonical/back/0531-000-Audino.png b/newsrc/afd/16992b.png similarity index 100% rename from src/afd/sprites-canonical/back/0531-000-Audino.png rename to newsrc/afd/16992b.png diff --git a/src/afd/sprites-canonical/back-shiny/0531-000-Audino.png b/newsrc/afd/16992bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0531-000-Audino.png rename to newsrc/afd/16992bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0531-000-Audino.png b/newsrc/afd/16992s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0531-000-Audino.png rename to newsrc/afd/16992s.png diff --git a/src/afd/sprites-canonical/front/0531-420-Audino-Mega.png b/newsrc/afd/16993.png similarity index 100% rename from src/afd/sprites-canonical/front/0531-420-Audino-Mega.png rename to newsrc/afd/16993.png diff --git a/src/afd/sprites-canonical/back/0531-420-Audino-Mega.png b/newsrc/afd/16993b.png similarity index 100% rename from src/afd/sprites-canonical/back/0531-420-Audino-Mega.png rename to newsrc/afd/16993b.png diff --git a/src/afd/sprites-canonical/back-shiny/0531-420-Audino-Mega.png b/newsrc/afd/16993bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0531-420-Audino-Mega.png rename to newsrc/afd/16993bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0531-420-Audino-Mega.png b/newsrc/afd/16993s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0531-420-Audino-Mega.png rename to newsrc/afd/16993s.png diff --git a/src/afd/sprites-canonical/front/0532-000-Timburr.png b/newsrc/afd/17024.png similarity index 100% rename from src/afd/sprites-canonical/front/0532-000-Timburr.png rename to newsrc/afd/17024.png diff --git a/src/afd/sprites-canonical/back/0532-000-Timburr.png b/newsrc/afd/17024b.png similarity index 100% rename from src/afd/sprites-canonical/back/0532-000-Timburr.png rename to newsrc/afd/17024b.png diff --git a/src/afd/sprites-canonical/back-shiny/0532-000-Timburr.png b/newsrc/afd/17024bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0532-000-Timburr.png rename to newsrc/afd/17024bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0532-000-Timburr.png b/newsrc/afd/17024s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0532-000-Timburr.png rename to newsrc/afd/17024s.png diff --git a/src/afd/sprites-canonical/front/0533-000-Gurdurr.png b/newsrc/afd/17056.png similarity index 100% rename from src/afd/sprites-canonical/front/0533-000-Gurdurr.png rename to newsrc/afd/17056.png diff --git a/src/afd/sprites-canonical/back/0533-000-Gurdurr.png b/newsrc/afd/17056b.png similarity index 100% rename from src/afd/sprites-canonical/back/0533-000-Gurdurr.png rename to newsrc/afd/17056b.png diff --git a/src/afd/sprites-canonical/back-shiny/0533-000-Gurdurr.png b/newsrc/afd/17056bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0533-000-Gurdurr.png rename to newsrc/afd/17056bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0533-000-Gurdurr.png b/newsrc/afd/17056s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0533-000-Gurdurr.png rename to newsrc/afd/17056s.png diff --git a/src/afd/sprites-canonical/front/0534-000-Conkeldurr.png b/newsrc/afd/17088.png similarity index 100% rename from src/afd/sprites-canonical/front/0534-000-Conkeldurr.png rename to newsrc/afd/17088.png diff --git a/src/afd/sprites-canonical/back/0534-000-Conkeldurr.png b/newsrc/afd/17088b.png similarity index 100% rename from src/afd/sprites-canonical/back/0534-000-Conkeldurr.png rename to newsrc/afd/17088b.png diff --git a/src/afd/sprites-canonical/back-shiny/0534-000-Conkeldurr.png b/newsrc/afd/17088bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0534-000-Conkeldurr.png rename to newsrc/afd/17088bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0534-000-Conkeldurr.png b/newsrc/afd/17088s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0534-000-Conkeldurr.png rename to newsrc/afd/17088s.png diff --git a/src/afd/sprites-canonical/front/0535-000-Tympole.png b/newsrc/afd/17120.png similarity index 100% rename from src/afd/sprites-canonical/front/0535-000-Tympole.png rename to newsrc/afd/17120.png diff --git a/src/afd/sprites-canonical/back/0535-000-Tympole.png b/newsrc/afd/17120b.png similarity index 100% rename from src/afd/sprites-canonical/back/0535-000-Tympole.png rename to newsrc/afd/17120b.png diff --git a/src/afd/sprites-canonical/back-shiny/0535-000-Tympole.png b/newsrc/afd/17120bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0535-000-Tympole.png rename to newsrc/afd/17120bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0535-000-Tympole.png b/newsrc/afd/17120s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0535-000-Tympole.png rename to newsrc/afd/17120s.png diff --git a/src/afd/sprites-canonical/front/0536-000-Palpitoad.png b/newsrc/afd/17152.png similarity index 100% rename from src/afd/sprites-canonical/front/0536-000-Palpitoad.png rename to newsrc/afd/17152.png diff --git a/src/afd/sprites-canonical/back/0536-000-Palpitoad.png b/newsrc/afd/17152b.png similarity index 100% rename from src/afd/sprites-canonical/back/0536-000-Palpitoad.png rename to newsrc/afd/17152b.png diff --git a/src/afd/sprites-canonical/back-shiny/0536-000-Palpitoad.png b/newsrc/afd/17152bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0536-000-Palpitoad.png rename to newsrc/afd/17152bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0536-000-Palpitoad.png b/newsrc/afd/17152s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0536-000-Palpitoad.png rename to newsrc/afd/17152s.png diff --git a/src/afd/sprites-canonical/front/0537-000-Seismitoad.png b/newsrc/afd/17184.png similarity index 100% rename from src/afd/sprites-canonical/front/0537-000-Seismitoad.png rename to newsrc/afd/17184.png diff --git a/src/afd/sprites-canonical/back/0537-000-Seismitoad.png b/newsrc/afd/17184b.png similarity index 100% rename from src/afd/sprites-canonical/back/0537-000-Seismitoad.png rename to newsrc/afd/17184b.png diff --git a/src/afd/sprites-canonical/back-shiny/0537-000-Seismitoad.png b/newsrc/afd/17184bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0537-000-Seismitoad.png rename to newsrc/afd/17184bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0537-000-Seismitoad.png b/newsrc/afd/17184s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0537-000-Seismitoad.png rename to newsrc/afd/17184s.png diff --git a/src/afd/sprites-canonical/front/0538-000-Throh.png b/newsrc/afd/17216.png similarity index 100% rename from src/afd/sprites-canonical/front/0538-000-Throh.png rename to newsrc/afd/17216.png diff --git a/src/afd/sprites-canonical/back/0538-000-Throh.png b/newsrc/afd/17216b.png similarity index 100% rename from src/afd/sprites-canonical/back/0538-000-Throh.png rename to newsrc/afd/17216b.png diff --git a/src/afd/sprites-canonical/back-shiny/0538-000-Throh.png b/newsrc/afd/17216bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0538-000-Throh.png rename to newsrc/afd/17216bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0538-000-Throh.png b/newsrc/afd/17216s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0538-000-Throh.png rename to newsrc/afd/17216s.png diff --git a/src/afd/sprites-canonical/front/0539-000-Sawk.png b/newsrc/afd/17248.png similarity index 100% rename from src/afd/sprites-canonical/front/0539-000-Sawk.png rename to newsrc/afd/17248.png diff --git a/src/afd/sprites-canonical/back/0539-000-Sawk.png b/newsrc/afd/17248b.png similarity index 100% rename from src/afd/sprites-canonical/back/0539-000-Sawk.png rename to newsrc/afd/17248b.png diff --git a/src/afd/sprites-canonical/back-shiny/0539-000-Sawk.png b/newsrc/afd/17248bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0539-000-Sawk.png rename to newsrc/afd/17248bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0539-000-Sawk.png b/newsrc/afd/17248s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0539-000-Sawk.png rename to newsrc/afd/17248s.png diff --git a/src/afd/sprites-canonical/front/0054-000-Psyduck.png b/newsrc/afd/1728.png similarity index 100% rename from src/afd/sprites-canonical/front/0054-000-Psyduck.png rename to newsrc/afd/1728.png diff --git a/src/afd/sprites-canonical/front/0540-000-Sewaddle.png b/newsrc/afd/17280.png similarity index 100% rename from src/afd/sprites-canonical/front/0540-000-Sewaddle.png rename to newsrc/afd/17280.png diff --git a/src/afd/sprites-canonical/back/0540-000-Sewaddle.png b/newsrc/afd/17280b.png similarity index 100% rename from src/afd/sprites-canonical/back/0540-000-Sewaddle.png rename to newsrc/afd/17280b.png diff --git a/src/afd/sprites-canonical/back-shiny/0540-000-Sewaddle.png b/newsrc/afd/17280bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0540-000-Sewaddle.png rename to newsrc/afd/17280bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0540-000-Sewaddle.png b/newsrc/afd/17280s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0540-000-Sewaddle.png rename to newsrc/afd/17280s.png diff --git a/src/afd/sprites-canonical/back/0054-000-Psyduck.png b/newsrc/afd/1728b.png similarity index 100% rename from src/afd/sprites-canonical/back/0054-000-Psyduck.png rename to newsrc/afd/1728b.png diff --git a/src/afd/sprites-canonical/back-shiny/0054-000-Psyduck.png b/newsrc/afd/1728bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0054-000-Psyduck.png rename to newsrc/afd/1728bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0054-000-Psyduck.png b/newsrc/afd/1728s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0054-000-Psyduck.png rename to newsrc/afd/1728s.png diff --git a/src/afd/sprites-canonical/front/0541-000-Swadloon.png b/newsrc/afd/17312.png similarity index 100% rename from src/afd/sprites-canonical/front/0541-000-Swadloon.png rename to newsrc/afd/17312.png diff --git a/src/afd/sprites-canonical/back/0541-000-Swadloon.png b/newsrc/afd/17312b.png similarity index 100% rename from src/afd/sprites-canonical/back/0541-000-Swadloon.png rename to newsrc/afd/17312b.png diff --git a/src/afd/sprites-canonical/back-shiny/0541-000-Swadloon.png b/newsrc/afd/17312bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0541-000-Swadloon.png rename to newsrc/afd/17312bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0541-000-Swadloon.png b/newsrc/afd/17312s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0541-000-Swadloon.png rename to newsrc/afd/17312s.png diff --git a/src/afd/sprites-canonical/front/0542-000-Leavanny.png b/newsrc/afd/17344.png similarity index 100% rename from src/afd/sprites-canonical/front/0542-000-Leavanny.png rename to newsrc/afd/17344.png diff --git a/src/afd/sprites-canonical/back/0542-000-Leavanny.png b/newsrc/afd/17344b.png similarity index 100% rename from src/afd/sprites-canonical/back/0542-000-Leavanny.png rename to newsrc/afd/17344b.png diff --git a/src/afd/sprites-canonical/back-shiny/0542-000-Leavanny.png b/newsrc/afd/17344bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0542-000-Leavanny.png rename to newsrc/afd/17344bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0542-000-Leavanny.png b/newsrc/afd/17344s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0542-000-Leavanny.png rename to newsrc/afd/17344s.png diff --git a/src/afd/sprites-canonical/front/0543-000-Venipede.png b/newsrc/afd/17376.png similarity index 100% rename from src/afd/sprites-canonical/front/0543-000-Venipede.png rename to newsrc/afd/17376.png diff --git a/src/afd/sprites-canonical/back/0543-000-Venipede.png b/newsrc/afd/17376b.png similarity index 100% rename from src/afd/sprites-canonical/back/0543-000-Venipede.png rename to newsrc/afd/17376b.png diff --git a/src/afd/sprites-canonical/back-shiny/0543-000-Venipede.png b/newsrc/afd/17376bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0543-000-Venipede.png rename to newsrc/afd/17376bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0543-000-Venipede.png b/newsrc/afd/17376s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0543-000-Venipede.png rename to newsrc/afd/17376s.png diff --git a/src/afd/sprites-canonical/front/0544-000-Whirlipede.png b/newsrc/afd/17408.png similarity index 100% rename from src/afd/sprites-canonical/front/0544-000-Whirlipede.png rename to newsrc/afd/17408.png diff --git a/src/afd/sprites-canonical/back/0544-000-Whirlipede.png b/newsrc/afd/17408b.png similarity index 100% rename from src/afd/sprites-canonical/back/0544-000-Whirlipede.png rename to newsrc/afd/17408b.png diff --git a/src/afd/sprites-canonical/back-shiny/0544-000-Whirlipede.png b/newsrc/afd/17408bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0544-000-Whirlipede.png rename to newsrc/afd/17408bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0544-000-Whirlipede.png b/newsrc/afd/17408s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0544-000-Whirlipede.png rename to newsrc/afd/17408s.png diff --git a/src/afd/sprites-canonical/front/0545-000-Scolipede.png b/newsrc/afd/17440.png similarity index 100% rename from src/afd/sprites-canonical/front/0545-000-Scolipede.png rename to newsrc/afd/17440.png diff --git a/src/afd/sprites-canonical/back/0545-000-Scolipede.png b/newsrc/afd/17440b.png similarity index 100% rename from src/afd/sprites-canonical/back/0545-000-Scolipede.png rename to newsrc/afd/17440b.png diff --git a/src/afd/sprites-canonical/back-shiny/0545-000-Scolipede.png b/newsrc/afd/17440bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0545-000-Scolipede.png rename to newsrc/afd/17440bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0545-000-Scolipede.png b/newsrc/afd/17440s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0545-000-Scolipede.png rename to newsrc/afd/17440s.png diff --git a/src/afd/sprites-canonical/front/0546-000-Cottonee.png b/newsrc/afd/17472.png similarity index 100% rename from src/afd/sprites-canonical/front/0546-000-Cottonee.png rename to newsrc/afd/17472.png diff --git a/src/afd/sprites-canonical/back/0546-000-Cottonee.png b/newsrc/afd/17472b.png similarity index 100% rename from src/afd/sprites-canonical/back/0546-000-Cottonee.png rename to newsrc/afd/17472b.png diff --git a/src/afd/sprites-canonical/back-shiny/0546-000-Cottonee.png b/newsrc/afd/17472bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0546-000-Cottonee.png rename to newsrc/afd/17472bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0546-000-Cottonee.png b/newsrc/afd/17472s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0546-000-Cottonee.png rename to newsrc/afd/17472s.png diff --git a/src/afd/sprites-canonical/front/0547-000-Whimsicott.png b/newsrc/afd/17504.png similarity index 100% rename from src/afd/sprites-canonical/front/0547-000-Whimsicott.png rename to newsrc/afd/17504.png diff --git a/src/afd/sprites-canonical/back/0547-000-Whimsicott.png b/newsrc/afd/17504b.png similarity index 100% rename from src/afd/sprites-canonical/back/0547-000-Whimsicott.png rename to newsrc/afd/17504b.png diff --git a/src/afd/sprites-canonical/back-shiny/0547-000-Whimsicott.png b/newsrc/afd/17504bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0547-000-Whimsicott.png rename to newsrc/afd/17504bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0547-000-Whimsicott.png b/newsrc/afd/17504s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0547-000-Whimsicott.png rename to newsrc/afd/17504s.png diff --git a/src/afd/sprites-canonical/front/0548-000-Petilil.png b/newsrc/afd/17536.png similarity index 100% rename from src/afd/sprites-canonical/front/0548-000-Petilil.png rename to newsrc/afd/17536.png diff --git a/src/afd/sprites-canonical/back/0548-000-Petilil.png b/newsrc/afd/17536b.png similarity index 100% rename from src/afd/sprites-canonical/back/0548-000-Petilil.png rename to newsrc/afd/17536b.png diff --git a/src/afd/sprites-canonical/back-shiny/0548-000-Petilil.png b/newsrc/afd/17536bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0548-000-Petilil.png rename to newsrc/afd/17536bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0548-000-Petilil.png b/newsrc/afd/17536s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0548-000-Petilil.png rename to newsrc/afd/17536s.png diff --git a/src/afd/sprites-canonical/front/0549-000-Lilligant.png b/newsrc/afd/17568.png similarity index 100% rename from src/afd/sprites-canonical/front/0549-000-Lilligant.png rename to newsrc/afd/17568.png diff --git a/src/afd/sprites-canonical/back/0549-000-Lilligant.png b/newsrc/afd/17568b.png similarity index 100% rename from src/afd/sprites-canonical/back/0549-000-Lilligant.png rename to newsrc/afd/17568b.png diff --git a/src/afd/sprites-canonical/back-shiny/0549-000-Lilligant.png b/newsrc/afd/17568bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0549-000-Lilligant.png rename to newsrc/afd/17568bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0549-000-Lilligant.png b/newsrc/afd/17568s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0549-000-Lilligant.png rename to newsrc/afd/17568s.png diff --git a/src/afd/sprites-canonical/front/0055-000-Golduck.png b/newsrc/afd/1760.png similarity index 100% rename from src/afd/sprites-canonical/front/0055-000-Golduck.png rename to newsrc/afd/1760.png diff --git a/src/afd/sprites-canonical/front/0550-000-Basculin.png b/newsrc/afd/17600.png similarity index 100% rename from src/afd/sprites-canonical/front/0550-000-Basculin.png rename to newsrc/afd/17600.png diff --git a/src/afd/sprites-canonical/back/0550-000-Basculin.png b/newsrc/afd/17600b.png similarity index 100% rename from src/afd/sprites-canonical/back/0550-000-Basculin.png rename to newsrc/afd/17600b.png diff --git a/src/afd/sprites-canonical/back-shiny/0550-000-Basculin.png b/newsrc/afd/17600bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0550-000-Basculin.png rename to newsrc/afd/17600bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0550-000-Basculin.png b/newsrc/afd/17600s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0550-000-Basculin.png rename to newsrc/afd/17600s.png diff --git a/src/afd/sprites-canonical/front/0550-420-Basculin-Blue~Striped.png b/newsrc/afd/17601.png similarity index 100% rename from src/afd/sprites-canonical/front/0550-420-Basculin-Blue~Striped.png rename to newsrc/afd/17601.png diff --git a/src/afd/sprites-canonical/back/0550-420-Basculin-Blue~Striped.png b/newsrc/afd/17601b.png similarity index 100% rename from src/afd/sprites-canonical/back/0550-420-Basculin-Blue~Striped.png rename to newsrc/afd/17601b.png diff --git a/src/afd/sprites-canonical/back/0055-000-Golduck.png b/newsrc/afd/1760b.png similarity index 100% rename from src/afd/sprites-canonical/back/0055-000-Golduck.png rename to newsrc/afd/1760b.png diff --git a/src/afd/sprites-canonical/back-shiny/0055-000-Golduck.png b/newsrc/afd/1760bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0055-000-Golduck.png rename to newsrc/afd/1760bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0055-000-Golduck.png b/newsrc/afd/1760s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0055-000-Golduck.png rename to newsrc/afd/1760s.png diff --git a/src/afd/sprites-canonical/front/0551-000-Sandile.png b/newsrc/afd/17632.png similarity index 100% rename from src/afd/sprites-canonical/front/0551-000-Sandile.png rename to newsrc/afd/17632.png diff --git a/src/afd/sprites-canonical/back/0551-000-Sandile.png b/newsrc/afd/17632b.png similarity index 100% rename from src/afd/sprites-canonical/back/0551-000-Sandile.png rename to newsrc/afd/17632b.png diff --git a/src/afd/sprites-canonical/back-shiny/0551-000-Sandile.png b/newsrc/afd/17632bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0551-000-Sandile.png rename to newsrc/afd/17632bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0551-000-Sandile.png b/newsrc/afd/17632s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0551-000-Sandile.png rename to newsrc/afd/17632s.png diff --git a/src/afd/sprites-canonical/front/0552-000-Krokorok.png b/newsrc/afd/17664.png similarity index 100% rename from src/afd/sprites-canonical/front/0552-000-Krokorok.png rename to newsrc/afd/17664.png diff --git a/src/afd/sprites-canonical/back/0552-000-Krokorok.png b/newsrc/afd/17664b.png similarity index 100% rename from src/afd/sprites-canonical/back/0552-000-Krokorok.png rename to newsrc/afd/17664b.png diff --git a/src/afd/sprites-canonical/back-shiny/0552-000-Krokorok.png b/newsrc/afd/17664bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0552-000-Krokorok.png rename to newsrc/afd/17664bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0552-000-Krokorok.png b/newsrc/afd/17664s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0552-000-Krokorok.png rename to newsrc/afd/17664s.png diff --git a/src/afd/sprites-canonical/front/0553-000-Krookodile.png b/newsrc/afd/17696.png similarity index 100% rename from src/afd/sprites-canonical/front/0553-000-Krookodile.png rename to newsrc/afd/17696.png diff --git a/src/afd/sprites-canonical/back/0553-000-Krookodile.png b/newsrc/afd/17696b.png similarity index 100% rename from src/afd/sprites-canonical/back/0553-000-Krookodile.png rename to newsrc/afd/17696b.png diff --git a/src/afd/sprites-canonical/back-shiny/0553-000-Krookodile.png b/newsrc/afd/17696bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0553-000-Krookodile.png rename to newsrc/afd/17696bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0553-000-Krookodile.png b/newsrc/afd/17696s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0553-000-Krookodile.png rename to newsrc/afd/17696s.png diff --git a/src/afd/sprites-canonical/front/0554-000-Darumaka.png b/newsrc/afd/17728.png similarity index 100% rename from src/afd/sprites-canonical/front/0554-000-Darumaka.png rename to newsrc/afd/17728.png diff --git a/src/afd/sprites-canonical/back/0554-000-Darumaka.png b/newsrc/afd/17728b.png similarity index 100% rename from src/afd/sprites-canonical/back/0554-000-Darumaka.png rename to newsrc/afd/17728b.png diff --git a/src/afd/sprites-canonical/back-shiny/0554-000-Darumaka.png b/newsrc/afd/17728bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0554-000-Darumaka.png rename to newsrc/afd/17728bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0554-000-Darumaka.png b/newsrc/afd/17728s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0554-000-Darumaka.png rename to newsrc/afd/17728s.png diff --git a/src/afd/sprites-canonical/front/0554-420-Darumaka-Galar.png b/newsrc/afd/17729.png similarity index 100% rename from src/afd/sprites-canonical/front/0554-420-Darumaka-Galar.png rename to newsrc/afd/17729.png diff --git a/src/afd/sprites-canonical/back/0554-420-Darumaka-Galar.png b/newsrc/afd/17729b.png similarity index 100% rename from src/afd/sprites-canonical/back/0554-420-Darumaka-Galar.png rename to newsrc/afd/17729b.png diff --git a/src/afd/sprites-canonical/back-shiny/0554-420-Darumaka-Galar.png b/newsrc/afd/17729bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0554-420-Darumaka-Galar.png rename to newsrc/afd/17729bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0554-420-Darumaka-Galar.png b/newsrc/afd/17729s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0554-420-Darumaka-Galar.png rename to newsrc/afd/17729s.png diff --git a/src/afd/sprites-canonical/front/0555-000-Darmanitan.png b/newsrc/afd/17760.png similarity index 100% rename from src/afd/sprites-canonical/front/0555-000-Darmanitan.png rename to newsrc/afd/17760.png diff --git a/src/afd/sprites-canonical/back/0555-000-Darmanitan.png b/newsrc/afd/17760b.png similarity index 100% rename from src/afd/sprites-canonical/back/0555-000-Darmanitan.png rename to newsrc/afd/17760b.png diff --git a/src/afd/sprites-canonical/back-shiny/0555-000-Darmanitan.png b/newsrc/afd/17760bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0555-000-Darmanitan.png rename to newsrc/afd/17760bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0555-000-Darmanitan.png b/newsrc/afd/17760s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0555-000-Darmanitan.png rename to newsrc/afd/17760s.png diff --git a/src/afd/sprites-canonical/front/0555-420-Darmanitan-Zen.png b/newsrc/afd/17761.png similarity index 100% rename from src/afd/sprites-canonical/front/0555-420-Darmanitan-Zen.png rename to newsrc/afd/17761.png diff --git a/src/afd/sprites-canonical/back/0555-420-Darmanitan-Zen.png b/newsrc/afd/17761b.png similarity index 100% rename from src/afd/sprites-canonical/back/0555-420-Darmanitan-Zen.png rename to newsrc/afd/17761b.png diff --git a/src/afd/sprites-canonical/back-shiny/0555-420-Darmanitan-Zen.png b/newsrc/afd/17761bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0555-420-Darmanitan-Zen.png rename to newsrc/afd/17761bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0555-420-Darmanitan-Zen.png b/newsrc/afd/17761s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0555-420-Darmanitan-Zen.png rename to newsrc/afd/17761s.png diff --git a/src/afd/sprites-canonical/front/0555-420-Darmanitan-Galar.png b/newsrc/afd/17762.png similarity index 100% rename from src/afd/sprites-canonical/front/0555-420-Darmanitan-Galar.png rename to newsrc/afd/17762.png diff --git a/src/afd/sprites-canonical/back/0555-420-Darmanitan-Galar.png b/newsrc/afd/17762b.png similarity index 100% rename from src/afd/sprites-canonical/back/0555-420-Darmanitan-Galar.png rename to newsrc/afd/17762b.png diff --git a/src/afd/sprites-canonical/back-shiny/0555-420-Darmanitan-Galar.png b/newsrc/afd/17762bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0555-420-Darmanitan-Galar.png rename to newsrc/afd/17762bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0555-420-Darmanitan-Galar.png b/newsrc/afd/17762s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0555-420-Darmanitan-Galar.png rename to newsrc/afd/17762s.png diff --git a/src/afd/sprites-canonical/front/0555-420-Darmanitan-Galar~Zen.png b/newsrc/afd/17763.png similarity index 100% rename from src/afd/sprites-canonical/front/0555-420-Darmanitan-Galar~Zen.png rename to newsrc/afd/17763.png diff --git a/src/afd/sprites-canonical/back/0555-420-Darmanitan-Galar~Zen.png b/newsrc/afd/17763b.png similarity index 100% rename from src/afd/sprites-canonical/back/0555-420-Darmanitan-Galar~Zen.png rename to newsrc/afd/17763b.png diff --git a/src/afd/sprites-canonical/back-shiny/0555-420-Darmanitan-Galar~Zen.png b/newsrc/afd/17763bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0555-420-Darmanitan-Galar~Zen.png rename to newsrc/afd/17763bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0555-420-Darmanitan-Galar~Zen.png b/newsrc/afd/17763s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0555-420-Darmanitan-Galar~Zen.png rename to newsrc/afd/17763s.png diff --git a/src/afd/sprites-canonical/front/0556-000-Maractus.png b/newsrc/afd/17792.png similarity index 100% rename from src/afd/sprites-canonical/front/0556-000-Maractus.png rename to newsrc/afd/17792.png diff --git a/src/afd/sprites-canonical/back/0556-000-Maractus.png b/newsrc/afd/17792b.png similarity index 100% rename from src/afd/sprites-canonical/back/0556-000-Maractus.png rename to newsrc/afd/17792b.png diff --git a/src/afd/sprites-canonical/back-shiny/0556-000-Maractus.png b/newsrc/afd/17792bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0556-000-Maractus.png rename to newsrc/afd/17792bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0556-000-Maractus.png b/newsrc/afd/17792s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0556-000-Maractus.png rename to newsrc/afd/17792s.png diff --git a/src/afd/sprites-canonical/front/0557-000-Dwebble.png b/newsrc/afd/17824.png similarity index 100% rename from src/afd/sprites-canonical/front/0557-000-Dwebble.png rename to newsrc/afd/17824.png diff --git a/src/afd/sprites-canonical/back/0557-000-Dwebble.png b/newsrc/afd/17824b.png similarity index 100% rename from src/afd/sprites-canonical/back/0557-000-Dwebble.png rename to newsrc/afd/17824b.png diff --git a/src/afd/sprites-canonical/back-shiny/0557-000-Dwebble.png b/newsrc/afd/17824bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0557-000-Dwebble.png rename to newsrc/afd/17824bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0557-000-Dwebble.png b/newsrc/afd/17824s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0557-000-Dwebble.png rename to newsrc/afd/17824s.png diff --git a/src/afd/sprites-canonical/front/0558-000-Crustle.png b/newsrc/afd/17856.png similarity index 100% rename from src/afd/sprites-canonical/front/0558-000-Crustle.png rename to newsrc/afd/17856.png diff --git a/src/afd/sprites-canonical/back/0558-000-Crustle.png b/newsrc/afd/17856b.png similarity index 100% rename from src/afd/sprites-canonical/back/0558-000-Crustle.png rename to newsrc/afd/17856b.png diff --git a/src/afd/sprites-canonical/back-shiny/0558-000-Crustle.png b/newsrc/afd/17856bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0558-000-Crustle.png rename to newsrc/afd/17856bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0558-000-Crustle.png b/newsrc/afd/17856s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0558-000-Crustle.png rename to newsrc/afd/17856s.png diff --git a/src/afd/sprites-canonical/front/0559-000-Scraggy.png b/newsrc/afd/17888.png similarity index 100% rename from src/afd/sprites-canonical/front/0559-000-Scraggy.png rename to newsrc/afd/17888.png diff --git a/src/afd/sprites-canonical/back/0559-000-Scraggy.png b/newsrc/afd/17888b.png similarity index 100% rename from src/afd/sprites-canonical/back/0559-000-Scraggy.png rename to newsrc/afd/17888b.png diff --git a/src/afd/sprites-canonical/back-shiny/0559-000-Scraggy.png b/newsrc/afd/17888bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0559-000-Scraggy.png rename to newsrc/afd/17888bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0559-000-Scraggy.png b/newsrc/afd/17888s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0559-000-Scraggy.png rename to newsrc/afd/17888s.png diff --git a/src/afd/sprites-canonical/front/0056-000-Mankey.png b/newsrc/afd/1792.png similarity index 100% rename from src/afd/sprites-canonical/front/0056-000-Mankey.png rename to newsrc/afd/1792.png diff --git a/src/afd/sprites-canonical/front/0560-000-Scrafty.png b/newsrc/afd/17920.png similarity index 100% rename from src/afd/sprites-canonical/front/0560-000-Scrafty.png rename to newsrc/afd/17920.png diff --git a/src/afd/sprites-canonical/back/0560-000-Scrafty.png b/newsrc/afd/17920b.png similarity index 100% rename from src/afd/sprites-canonical/back/0560-000-Scrafty.png rename to newsrc/afd/17920b.png diff --git a/src/afd/sprites-canonical/back-shiny/0560-000-Scrafty.png b/newsrc/afd/17920bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0560-000-Scrafty.png rename to newsrc/afd/17920bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0560-000-Scrafty.png b/newsrc/afd/17920s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0560-000-Scrafty.png rename to newsrc/afd/17920s.png diff --git a/src/afd/sprites-canonical/back/0056-000-Mankey.png b/newsrc/afd/1792b.png similarity index 100% rename from src/afd/sprites-canonical/back/0056-000-Mankey.png rename to newsrc/afd/1792b.png diff --git a/src/afd/sprites-canonical/back-shiny/0056-000-Mankey.png b/newsrc/afd/1792bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0056-000-Mankey.png rename to newsrc/afd/1792bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0056-000-Mankey.png b/newsrc/afd/1792s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0056-000-Mankey.png rename to newsrc/afd/1792s.png diff --git a/src/afd/sprites-canonical/front/0561-000-Sigilyph.png b/newsrc/afd/17952.png similarity index 100% rename from src/afd/sprites-canonical/front/0561-000-Sigilyph.png rename to newsrc/afd/17952.png diff --git a/src/afd/sprites-canonical/back/0561-000-Sigilyph.png b/newsrc/afd/17952b.png similarity index 100% rename from src/afd/sprites-canonical/back/0561-000-Sigilyph.png rename to newsrc/afd/17952b.png diff --git a/src/afd/sprites-canonical/back-shiny/0561-000-Sigilyph.png b/newsrc/afd/17952bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0561-000-Sigilyph.png rename to newsrc/afd/17952bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0561-000-Sigilyph.png b/newsrc/afd/17952s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0561-000-Sigilyph.png rename to newsrc/afd/17952s.png diff --git a/src/afd/sprites-canonical/front/0562-000-Yamask.png b/newsrc/afd/17984.png similarity index 100% rename from src/afd/sprites-canonical/front/0562-000-Yamask.png rename to newsrc/afd/17984.png diff --git a/src/afd/sprites-canonical/back/0562-000-Yamask.png b/newsrc/afd/17984b.png similarity index 100% rename from src/afd/sprites-canonical/back/0562-000-Yamask.png rename to newsrc/afd/17984b.png diff --git a/src/afd/sprites-canonical/back-shiny/0562-000-Yamask.png b/newsrc/afd/17984bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0562-000-Yamask.png rename to newsrc/afd/17984bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0562-000-Yamask.png b/newsrc/afd/17984s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0562-000-Yamask.png rename to newsrc/afd/17984s.png diff --git a/src/afd/sprites-canonical/front/0562-420-Yamask-Galar.png b/newsrc/afd/17985.png similarity index 100% rename from src/afd/sprites-canonical/front/0562-420-Yamask-Galar.png rename to newsrc/afd/17985.png diff --git a/src/afd/sprites-canonical/back/0562-420-Yamask-Galar.png b/newsrc/afd/17985b.png similarity index 100% rename from src/afd/sprites-canonical/back/0562-420-Yamask-Galar.png rename to newsrc/afd/17985b.png diff --git a/src/afd/sprites-canonical/back-shiny/0562-420-Yamask-Galar.png b/newsrc/afd/17985bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0562-420-Yamask-Galar.png rename to newsrc/afd/17985bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0562-420-Yamask-Galar.png b/newsrc/afd/17985s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0562-420-Yamask-Galar.png rename to newsrc/afd/17985s.png diff --git a/src/afd/sprites-canonical/front/0563-000-Cofagrigus.png b/newsrc/afd/18016.png similarity index 100% rename from src/afd/sprites-canonical/front/0563-000-Cofagrigus.png rename to newsrc/afd/18016.png diff --git a/src/afd/sprites-canonical/back/0563-000-Cofagrigus.png b/newsrc/afd/18016b.png similarity index 100% rename from src/afd/sprites-canonical/back/0563-000-Cofagrigus.png rename to newsrc/afd/18016b.png diff --git a/src/afd/sprites-canonical/back-shiny/0563-000-Cofagrigus.png b/newsrc/afd/18016bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0563-000-Cofagrigus.png rename to newsrc/afd/18016bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0563-000-Cofagrigus.png b/newsrc/afd/18016s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0563-000-Cofagrigus.png rename to newsrc/afd/18016s.png diff --git a/src/afd/sprites-canonical/front/0564-000-Tirtouga.png b/newsrc/afd/18048.png similarity index 100% rename from src/afd/sprites-canonical/front/0564-000-Tirtouga.png rename to newsrc/afd/18048.png diff --git a/src/afd/sprites-canonical/back/0564-000-Tirtouga.png b/newsrc/afd/18048b.png similarity index 100% rename from src/afd/sprites-canonical/back/0564-000-Tirtouga.png rename to newsrc/afd/18048b.png diff --git a/src/afd/sprites-canonical/back-shiny/0564-000-Tirtouga.png b/newsrc/afd/18048bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0564-000-Tirtouga.png rename to newsrc/afd/18048bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0564-000-Tirtouga.png b/newsrc/afd/18048s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0564-000-Tirtouga.png rename to newsrc/afd/18048s.png diff --git a/src/afd/sprites-canonical/front/0565-000-Carracosta.png b/newsrc/afd/18080.png similarity index 100% rename from src/afd/sprites-canonical/front/0565-000-Carracosta.png rename to newsrc/afd/18080.png diff --git a/src/afd/sprites-canonical/back/0565-000-Carracosta.png b/newsrc/afd/18080b.png similarity index 100% rename from src/afd/sprites-canonical/back/0565-000-Carracosta.png rename to newsrc/afd/18080b.png diff --git a/src/afd/sprites-canonical/back-shiny/0565-000-Carracosta.png b/newsrc/afd/18080bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0565-000-Carracosta.png rename to newsrc/afd/18080bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0565-000-Carracosta.png b/newsrc/afd/18080s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0565-000-Carracosta.png rename to newsrc/afd/18080s.png diff --git a/src/afd/sprites-canonical/front/0566-000-Archen.png b/newsrc/afd/18112.png similarity index 100% rename from src/afd/sprites-canonical/front/0566-000-Archen.png rename to newsrc/afd/18112.png diff --git a/src/afd/sprites-canonical/back/0566-000-Archen.png b/newsrc/afd/18112b.png similarity index 100% rename from src/afd/sprites-canonical/back/0566-000-Archen.png rename to newsrc/afd/18112b.png diff --git a/src/afd/sprites-canonical/back-shiny/0566-000-Archen.png b/newsrc/afd/18112bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0566-000-Archen.png rename to newsrc/afd/18112bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0566-000-Archen.png b/newsrc/afd/18112s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0566-000-Archen.png rename to newsrc/afd/18112s.png diff --git a/src/afd/sprites-canonical/front/0567-000-Archeops.png b/newsrc/afd/18144.png similarity index 100% rename from src/afd/sprites-canonical/front/0567-000-Archeops.png rename to newsrc/afd/18144.png diff --git a/src/afd/sprites-canonical/back/0567-000-Archeops.png b/newsrc/afd/18144b.png similarity index 100% rename from src/afd/sprites-canonical/back/0567-000-Archeops.png rename to newsrc/afd/18144b.png diff --git a/src/afd/sprites-canonical/back-shiny/0567-000-Archeops.png b/newsrc/afd/18144bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0567-000-Archeops.png rename to newsrc/afd/18144bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0567-000-Archeops.png b/newsrc/afd/18144s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0567-000-Archeops.png rename to newsrc/afd/18144s.png diff --git a/src/afd/sprites-canonical/front/0568-000-Trubbish.png b/newsrc/afd/18176.png similarity index 100% rename from src/afd/sprites-canonical/front/0568-000-Trubbish.png rename to newsrc/afd/18176.png diff --git a/src/afd/sprites-canonical/back/0568-000-Trubbish.png b/newsrc/afd/18176b.png similarity index 100% rename from src/afd/sprites-canonical/back/0568-000-Trubbish.png rename to newsrc/afd/18176b.png diff --git a/src/afd/sprites-canonical/back-shiny/0568-000-Trubbish.png b/newsrc/afd/18176bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0568-000-Trubbish.png rename to newsrc/afd/18176bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0568-000-Trubbish.png b/newsrc/afd/18176s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0568-000-Trubbish.png rename to newsrc/afd/18176s.png diff --git a/src/afd/sprites-canonical/front-shiny/0569-000-Garbodor.png b/newsrc/afd/18208.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0569-000-Garbodor.png rename to newsrc/afd/18208.png diff --git a/src/afd/sprites-canonical/back-shiny/0569-000-Garbodor.png b/newsrc/afd/18208b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0569-000-Garbodor.png rename to newsrc/afd/18208b.png diff --git a/src/afd/sprites-canonical/back/0569-420-Garbodor-Gmax.png b/newsrc/afd/18208bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0569-420-Garbodor-Gmax.png rename to newsrc/afd/18208bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0569-420-Garbodor-Gmax.png b/newsrc/afd/18208bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0569-420-Garbodor-Gmax.png rename to newsrc/afd/18208bgs.png diff --git a/src/afd/sprites-canonical/back/0569-000-Garbodor.png b/newsrc/afd/18208bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0569-000-Garbodor.png rename to newsrc/afd/18208bs.png diff --git a/src/afd/sprites-canonical/front/0569-420-Garbodor-Gmax.png b/newsrc/afd/18208g.png similarity index 100% rename from src/afd/sprites-canonical/front/0569-420-Garbodor-Gmax.png rename to newsrc/afd/18208g.png diff --git a/src/afd/sprites-canonical/front-shiny/0569-420-Garbodor-Gmax.png b/newsrc/afd/18208gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0569-420-Garbodor-Gmax.png rename to newsrc/afd/18208gs.png diff --git a/src/afd/sprites-canonical/front/0569-000-Garbodor.png b/newsrc/afd/18208s.png similarity index 100% rename from src/afd/sprites-canonical/front/0569-000-Garbodor.png rename to newsrc/afd/18208s.png diff --git a/src/afd/sprites-canonical/front/0057-000-Primeape.png b/newsrc/afd/1824.png similarity index 100% rename from src/afd/sprites-canonical/front/0057-000-Primeape.png rename to newsrc/afd/1824.png diff --git a/src/afd/sprites-canonical/front/0570-000-Zorua.png b/newsrc/afd/18240.png similarity index 100% rename from src/afd/sprites-canonical/front/0570-000-Zorua.png rename to newsrc/afd/18240.png diff --git a/src/afd/sprites-canonical/back/0570-000-Zorua.png b/newsrc/afd/18240b.png similarity index 100% rename from src/afd/sprites-canonical/back/0570-000-Zorua.png rename to newsrc/afd/18240b.png diff --git a/src/afd/sprites-canonical/back-shiny/0570-000-Zorua.png b/newsrc/afd/18240bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0570-000-Zorua.png rename to newsrc/afd/18240bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0570-000-Zorua.png b/newsrc/afd/18240s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0570-000-Zorua.png rename to newsrc/afd/18240s.png diff --git a/src/afd/sprites-canonical/back/0057-000-Primeape.png b/newsrc/afd/1824b.png similarity index 100% rename from src/afd/sprites-canonical/back/0057-000-Primeape.png rename to newsrc/afd/1824b.png diff --git a/src/afd/sprites-canonical/back-shiny/0057-000-Primeape.png b/newsrc/afd/1824bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0057-000-Primeape.png rename to newsrc/afd/1824bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0057-000-Primeape.png b/newsrc/afd/1824s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0057-000-Primeape.png rename to newsrc/afd/1824s.png diff --git a/src/afd/sprites-canonical/front/0571-000-Zoroark.png b/newsrc/afd/18272.png similarity index 100% rename from src/afd/sprites-canonical/front/0571-000-Zoroark.png rename to newsrc/afd/18272.png diff --git a/src/afd/sprites-canonical/back/0571-000-Zoroark.png b/newsrc/afd/18272b.png similarity index 100% rename from src/afd/sprites-canonical/back/0571-000-Zoroark.png rename to newsrc/afd/18272b.png diff --git a/src/afd/sprites-canonical/back-shiny/0571-000-Zoroark.png b/newsrc/afd/18272bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0571-000-Zoroark.png rename to newsrc/afd/18272bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0571-000-Zoroark.png b/newsrc/afd/18272s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0571-000-Zoroark.png rename to newsrc/afd/18272s.png diff --git a/src/afd/sprites-canonical/front/0572-000-Minccino.png b/newsrc/afd/18304.png similarity index 100% rename from src/afd/sprites-canonical/front/0572-000-Minccino.png rename to newsrc/afd/18304.png diff --git a/src/afd/sprites-canonical/back/0572-000-Minccino.png b/newsrc/afd/18304b.png similarity index 100% rename from src/afd/sprites-canonical/back/0572-000-Minccino.png rename to newsrc/afd/18304b.png diff --git a/src/afd/sprites-canonical/back-shiny/0572-000-Minccino.png b/newsrc/afd/18304bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0572-000-Minccino.png rename to newsrc/afd/18304bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0572-000-Minccino.png b/newsrc/afd/18304s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0572-000-Minccino.png rename to newsrc/afd/18304s.png diff --git a/src/afd/sprites-canonical/front/0573-000-Cinccino.png b/newsrc/afd/18336.png similarity index 100% rename from src/afd/sprites-canonical/front/0573-000-Cinccino.png rename to newsrc/afd/18336.png diff --git a/src/afd/sprites-canonical/back/0573-000-Cinccino.png b/newsrc/afd/18336b.png similarity index 100% rename from src/afd/sprites-canonical/back/0573-000-Cinccino.png rename to newsrc/afd/18336b.png diff --git a/src/afd/sprites-canonical/back-shiny/0573-000-Cinccino.png b/newsrc/afd/18336bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0573-000-Cinccino.png rename to newsrc/afd/18336bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0573-000-Cinccino.png b/newsrc/afd/18336s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0573-000-Cinccino.png rename to newsrc/afd/18336s.png diff --git a/src/afd/sprites-canonical/front/0574-000-Gothita.png b/newsrc/afd/18368.png similarity index 100% rename from src/afd/sprites-canonical/front/0574-000-Gothita.png rename to newsrc/afd/18368.png diff --git a/src/afd/sprites-canonical/back/0574-000-Gothita.png b/newsrc/afd/18368b.png similarity index 100% rename from src/afd/sprites-canonical/back/0574-000-Gothita.png rename to newsrc/afd/18368b.png diff --git a/src/afd/sprites-canonical/back-shiny/0574-000-Gothita.png b/newsrc/afd/18368bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0574-000-Gothita.png rename to newsrc/afd/18368bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0574-000-Gothita.png b/newsrc/afd/18368s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0574-000-Gothita.png rename to newsrc/afd/18368s.png diff --git a/src/afd/sprites-canonical/front/0575-000-Gothorita.png b/newsrc/afd/18400.png similarity index 100% rename from src/afd/sprites-canonical/front/0575-000-Gothorita.png rename to newsrc/afd/18400.png diff --git a/src/afd/sprites-canonical/back/0575-000-Gothorita.png b/newsrc/afd/18400b.png similarity index 100% rename from src/afd/sprites-canonical/back/0575-000-Gothorita.png rename to newsrc/afd/18400b.png diff --git a/src/afd/sprites-canonical/back-shiny/0575-000-Gothorita.png b/newsrc/afd/18400bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0575-000-Gothorita.png rename to newsrc/afd/18400bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0575-000-Gothorita.png b/newsrc/afd/18400s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0575-000-Gothorita.png rename to newsrc/afd/18400s.png diff --git a/src/afd/sprites-canonical/front/0576-000-Gothitelle.png b/newsrc/afd/18432.png similarity index 100% rename from src/afd/sprites-canonical/front/0576-000-Gothitelle.png rename to newsrc/afd/18432.png diff --git a/src/afd/sprites-canonical/back/0576-000-Gothitelle.png b/newsrc/afd/18432b.png similarity index 100% rename from src/afd/sprites-canonical/back/0576-000-Gothitelle.png rename to newsrc/afd/18432b.png diff --git a/src/afd/sprites-canonical/back-shiny/0576-000-Gothitelle.png b/newsrc/afd/18432bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0576-000-Gothitelle.png rename to newsrc/afd/18432bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0576-000-Gothitelle.png b/newsrc/afd/18432s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0576-000-Gothitelle.png rename to newsrc/afd/18432s.png diff --git a/src/afd/sprites-canonical/front/0577-000-Solosis.png b/newsrc/afd/18464.png similarity index 100% rename from src/afd/sprites-canonical/front/0577-000-Solosis.png rename to newsrc/afd/18464.png diff --git a/src/afd/sprites-canonical/back/0577-000-Solosis.png b/newsrc/afd/18464b.png similarity index 100% rename from src/afd/sprites-canonical/back/0577-000-Solosis.png rename to newsrc/afd/18464b.png diff --git a/src/afd/sprites-canonical/back-shiny/0577-000-Solosis.png b/newsrc/afd/18464bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0577-000-Solosis.png rename to newsrc/afd/18464bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0577-000-Solosis.png b/newsrc/afd/18464s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0577-000-Solosis.png rename to newsrc/afd/18464s.png diff --git a/src/afd/sprites-canonical/front/0578-000-Duosion.png b/newsrc/afd/18496.png similarity index 100% rename from src/afd/sprites-canonical/front/0578-000-Duosion.png rename to newsrc/afd/18496.png diff --git a/src/afd/sprites-canonical/back/0578-000-Duosion.png b/newsrc/afd/18496b.png similarity index 100% rename from src/afd/sprites-canonical/back/0578-000-Duosion.png rename to newsrc/afd/18496b.png diff --git a/src/afd/sprites-canonical/back-shiny/0578-000-Duosion.png b/newsrc/afd/18496bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0578-000-Duosion.png rename to newsrc/afd/18496bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0578-000-Duosion.png b/newsrc/afd/18496s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0578-000-Duosion.png rename to newsrc/afd/18496s.png diff --git a/src/afd/sprites-canonical/front/0579-000-Reuniclus.png b/newsrc/afd/18528.png similarity index 100% rename from src/afd/sprites-canonical/front/0579-000-Reuniclus.png rename to newsrc/afd/18528.png diff --git a/src/afd/sprites-canonical/back/0579-000-Reuniclus.png b/newsrc/afd/18528b.png similarity index 100% rename from src/afd/sprites-canonical/back/0579-000-Reuniclus.png rename to newsrc/afd/18528b.png diff --git a/src/afd/sprites-canonical/back-shiny/0579-000-Reuniclus.png b/newsrc/afd/18528bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0579-000-Reuniclus.png rename to newsrc/afd/18528bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0579-000-Reuniclus.png b/newsrc/afd/18528s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0579-000-Reuniclus.png rename to newsrc/afd/18528s.png diff --git a/src/afd/sprites-canonical/front/0058-000-Growlithe.png b/newsrc/afd/1856.png similarity index 100% rename from src/afd/sprites-canonical/front/0058-000-Growlithe.png rename to newsrc/afd/1856.png diff --git a/src/afd/sprites-canonical/front/0580-000-Ducklett.png b/newsrc/afd/18560.png similarity index 100% rename from src/afd/sprites-canonical/front/0580-000-Ducklett.png rename to newsrc/afd/18560.png diff --git a/src/afd/sprites-canonical/back/0580-000-Ducklett.png b/newsrc/afd/18560b.png similarity index 100% rename from src/afd/sprites-canonical/back/0580-000-Ducklett.png rename to newsrc/afd/18560b.png diff --git a/src/afd/sprites-canonical/back-shiny/0580-000-Ducklett.png b/newsrc/afd/18560bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0580-000-Ducklett.png rename to newsrc/afd/18560bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0580-000-Ducklett.png b/newsrc/afd/18560s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0580-000-Ducklett.png rename to newsrc/afd/18560s.png diff --git a/src/afd/sprites-canonical/back/0058-000-Growlithe.png b/newsrc/afd/1856b.png similarity index 100% rename from src/afd/sprites-canonical/back/0058-000-Growlithe.png rename to newsrc/afd/1856b.png diff --git a/src/afd/sprites-canonical/back-shiny/0058-000-Growlithe.png b/newsrc/afd/1856bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0058-000-Growlithe.png rename to newsrc/afd/1856bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0058-000-Growlithe.png b/newsrc/afd/1856s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0058-000-Growlithe.png rename to newsrc/afd/1856s.png diff --git a/src/afd/sprites-canonical/front/0581-000-Swanna.png b/newsrc/afd/18592.png similarity index 100% rename from src/afd/sprites-canonical/front/0581-000-Swanna.png rename to newsrc/afd/18592.png diff --git a/src/afd/sprites-canonical/back/0581-000-Swanna.png b/newsrc/afd/18592b.png similarity index 100% rename from src/afd/sprites-canonical/back/0581-000-Swanna.png rename to newsrc/afd/18592b.png diff --git a/src/afd/sprites-canonical/back-shiny/0581-000-Swanna.png b/newsrc/afd/18592bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0581-000-Swanna.png rename to newsrc/afd/18592bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0581-000-Swanna.png b/newsrc/afd/18592s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0581-000-Swanna.png rename to newsrc/afd/18592s.png diff --git a/src/afd/sprites-canonical/front/0582-000-Vanillite.png b/newsrc/afd/18624.png similarity index 100% rename from src/afd/sprites-canonical/front/0582-000-Vanillite.png rename to newsrc/afd/18624.png diff --git a/src/afd/sprites-canonical/back/0582-000-Vanillite.png b/newsrc/afd/18624b.png similarity index 100% rename from src/afd/sprites-canonical/back/0582-000-Vanillite.png rename to newsrc/afd/18624b.png diff --git a/src/afd/sprites-canonical/back-shiny/0582-000-Vanillite.png b/newsrc/afd/18624bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0582-000-Vanillite.png rename to newsrc/afd/18624bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0582-000-Vanillite.png b/newsrc/afd/18624s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0582-000-Vanillite.png rename to newsrc/afd/18624s.png diff --git a/src/afd/sprites-canonical/front/0583-000-Vanillish.png b/newsrc/afd/18656.png similarity index 100% rename from src/afd/sprites-canonical/front/0583-000-Vanillish.png rename to newsrc/afd/18656.png diff --git a/src/afd/sprites-canonical/back/0583-000-Vanillish.png b/newsrc/afd/18656b.png similarity index 100% rename from src/afd/sprites-canonical/back/0583-000-Vanillish.png rename to newsrc/afd/18656b.png diff --git a/src/afd/sprites-canonical/back-shiny/0583-000-Vanillish.png b/newsrc/afd/18656bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0583-000-Vanillish.png rename to newsrc/afd/18656bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0583-000-Vanillish.png b/newsrc/afd/18656s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0583-000-Vanillish.png rename to newsrc/afd/18656s.png diff --git a/src/afd/sprites-canonical/front/0584-000-Vanilluxe.png b/newsrc/afd/18688.png similarity index 100% rename from src/afd/sprites-canonical/front/0584-000-Vanilluxe.png rename to newsrc/afd/18688.png diff --git a/src/afd/sprites-canonical/back/0584-000-Vanilluxe.png b/newsrc/afd/18688b.png similarity index 100% rename from src/afd/sprites-canonical/back/0584-000-Vanilluxe.png rename to newsrc/afd/18688b.png diff --git a/src/afd/sprites-canonical/back-shiny/0584-000-Vanilluxe.png b/newsrc/afd/18688bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0584-000-Vanilluxe.png rename to newsrc/afd/18688bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0584-000-Vanilluxe.png b/newsrc/afd/18688s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0584-000-Vanilluxe.png rename to newsrc/afd/18688s.png diff --git a/src/afd/sprites-canonical/front/0585-000-Deerling.png b/newsrc/afd/18720.png similarity index 100% rename from src/afd/sprites-canonical/front/0585-000-Deerling.png rename to newsrc/afd/18720.png diff --git a/src/afd/sprites-canonical/back/0585-000-Deerling.png b/newsrc/afd/18720b.png similarity index 100% rename from src/afd/sprites-canonical/back/0585-000-Deerling.png rename to newsrc/afd/18720b.png diff --git a/src/afd/sprites-canonical/back-shiny/0585-000-Deerling.png b/newsrc/afd/18720bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0585-000-Deerling.png rename to newsrc/afd/18720bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0585-000-Deerling.png b/newsrc/afd/18720s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0585-000-Deerling.png rename to newsrc/afd/18720s.png diff --git a/src/afd/sprites-canonical/front/0586-000-Sawsbuck.png b/newsrc/afd/18752.png similarity index 100% rename from src/afd/sprites-canonical/front/0586-000-Sawsbuck.png rename to newsrc/afd/18752.png diff --git a/src/afd/sprites-canonical/back/0586-000-Sawsbuck.png b/newsrc/afd/18752b.png similarity index 100% rename from src/afd/sprites-canonical/back/0586-000-Sawsbuck.png rename to newsrc/afd/18752b.png diff --git a/src/afd/sprites-canonical/back-shiny/0586-000-Sawsbuck.png b/newsrc/afd/18752bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0586-000-Sawsbuck.png rename to newsrc/afd/18752bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0586-000-Sawsbuck.png b/newsrc/afd/18752s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0586-000-Sawsbuck.png rename to newsrc/afd/18752s.png diff --git a/src/afd/sprites-canonical/front/0587-000-Emolga.png b/newsrc/afd/18784.png similarity index 100% rename from src/afd/sprites-canonical/front/0587-000-Emolga.png rename to newsrc/afd/18784.png diff --git a/src/afd/sprites-canonical/back/0587-000-Emolga.png b/newsrc/afd/18784b.png similarity index 100% rename from src/afd/sprites-canonical/back/0587-000-Emolga.png rename to newsrc/afd/18784b.png diff --git a/src/afd/sprites-canonical/back-shiny/0587-000-Emolga.png b/newsrc/afd/18784bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0587-000-Emolga.png rename to newsrc/afd/18784bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0587-000-Emolga.png b/newsrc/afd/18784s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0587-000-Emolga.png rename to newsrc/afd/18784s.png diff --git a/src/afd/sprites-canonical/front/0588-000-Karrablast.png b/newsrc/afd/18816.png similarity index 100% rename from src/afd/sprites-canonical/front/0588-000-Karrablast.png rename to newsrc/afd/18816.png diff --git a/src/afd/sprites-canonical/back/0588-000-Karrablast.png b/newsrc/afd/18816b.png similarity index 100% rename from src/afd/sprites-canonical/back/0588-000-Karrablast.png rename to newsrc/afd/18816b.png diff --git a/src/afd/sprites-canonical/back-shiny/0588-000-Karrablast.png b/newsrc/afd/18816bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0588-000-Karrablast.png rename to newsrc/afd/18816bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0588-000-Karrablast.png b/newsrc/afd/18816s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0588-000-Karrablast.png rename to newsrc/afd/18816s.png diff --git a/src/afd/sprites-canonical/front/0589-000-Escavalier.png b/newsrc/afd/18848.png similarity index 100% rename from src/afd/sprites-canonical/front/0589-000-Escavalier.png rename to newsrc/afd/18848.png diff --git a/src/afd/sprites-canonical/back/0589-000-Escavalier.png b/newsrc/afd/18848b.png similarity index 100% rename from src/afd/sprites-canonical/back/0589-000-Escavalier.png rename to newsrc/afd/18848b.png diff --git a/src/afd/sprites-canonical/back-shiny/0589-000-Escavalier.png b/newsrc/afd/18848bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0589-000-Escavalier.png rename to newsrc/afd/18848bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0589-000-Escavalier.png b/newsrc/afd/18848s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0589-000-Escavalier.png rename to newsrc/afd/18848s.png diff --git a/src/afd/sprites-canonical/front/0059-000-Arcanine.png b/newsrc/afd/1888.png similarity index 100% rename from src/afd/sprites-canonical/front/0059-000-Arcanine.png rename to newsrc/afd/1888.png diff --git a/src/afd/sprites-canonical/front/0590-000-Foongus.png b/newsrc/afd/18880.png similarity index 100% rename from src/afd/sprites-canonical/front/0590-000-Foongus.png rename to newsrc/afd/18880.png diff --git a/src/afd/sprites-canonical/back/0590-000-Foongus.png b/newsrc/afd/18880b.png similarity index 100% rename from src/afd/sprites-canonical/back/0590-000-Foongus.png rename to newsrc/afd/18880b.png diff --git a/src/afd/sprites-canonical/back-shiny/0590-000-Foongus.png b/newsrc/afd/18880bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0590-000-Foongus.png rename to newsrc/afd/18880bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0590-000-Foongus.png b/newsrc/afd/18880s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0590-000-Foongus.png rename to newsrc/afd/18880s.png diff --git a/src/afd/sprites-canonical/back/0059-000-Arcanine.png b/newsrc/afd/1888b.png similarity index 100% rename from src/afd/sprites-canonical/back/0059-000-Arcanine.png rename to newsrc/afd/1888b.png diff --git a/src/afd/sprites-canonical/back-shiny/0059-000-Arcanine.png b/newsrc/afd/1888bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0059-000-Arcanine.png rename to newsrc/afd/1888bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0059-000-Arcanine.png b/newsrc/afd/1888s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0059-000-Arcanine.png rename to newsrc/afd/1888s.png diff --git a/src/afd/sprites-canonical/front/0591-000-Amoonguss.png b/newsrc/afd/18912.png similarity index 100% rename from src/afd/sprites-canonical/front/0591-000-Amoonguss.png rename to newsrc/afd/18912.png diff --git a/src/afd/sprites-canonical/back/0591-000-Amoonguss.png b/newsrc/afd/18912b.png similarity index 100% rename from src/afd/sprites-canonical/back/0591-000-Amoonguss.png rename to newsrc/afd/18912b.png diff --git a/src/afd/sprites-canonical/back-shiny/0591-000-Amoonguss.png b/newsrc/afd/18912bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0591-000-Amoonguss.png rename to newsrc/afd/18912bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0591-000-Amoonguss.png b/newsrc/afd/18912s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0591-000-Amoonguss.png rename to newsrc/afd/18912s.png diff --git a/src/afd/sprites-canonical/front/0592-000-Frillish.png b/newsrc/afd/18944.png similarity index 100% rename from src/afd/sprites-canonical/front/0592-000-Frillish.png rename to newsrc/afd/18944.png diff --git a/src/afd/sprites-canonical/back/0592-000-Frillish.png b/newsrc/afd/18944b.png similarity index 100% rename from src/afd/sprites-canonical/back/0592-000-Frillish.png rename to newsrc/afd/18944b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0592-000-Frillish-Female.png b/newsrc/afd/18944bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0592-000-Frillish-Female.png rename to newsrc/afd/18944bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0592-000-Frillish-Female.png b/newsrc/afd/18944bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0592-000-Frillish-Female.png rename to newsrc/afd/18944bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0592-000-Frillish.png b/newsrc/afd/18944bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0592-000-Frillish.png rename to newsrc/afd/18944bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0592-000-Frillish-Female.png b/newsrc/afd/18944f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0592-000-Frillish-Female.png rename to newsrc/afd/18944f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0592-000-Frillish-Female.png b/newsrc/afd/18944fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0592-000-Frillish-Female.png rename to newsrc/afd/18944fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0592-000-Frillish.png b/newsrc/afd/18944s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0592-000-Frillish.png rename to newsrc/afd/18944s.png diff --git a/src/afd/sprites-canonical/front/0593-000-Jellicent.png b/newsrc/afd/18976.png similarity index 100% rename from src/afd/sprites-canonical/front/0593-000-Jellicent.png rename to newsrc/afd/18976.png diff --git a/src/afd/sprites-canonical/back/0593-000-Jellicent.png b/newsrc/afd/18976b.png similarity index 100% rename from src/afd/sprites-canonical/back/0593-000-Jellicent.png rename to newsrc/afd/18976b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0593-000-Jellicent-Female.png b/newsrc/afd/18976bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0593-000-Jellicent-Female.png rename to newsrc/afd/18976bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0593-000-Jellicent-Female.png b/newsrc/afd/18976bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0593-000-Jellicent-Female.png rename to newsrc/afd/18976bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0593-000-Jellicent.png b/newsrc/afd/18976bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0593-000-Jellicent.png rename to newsrc/afd/18976bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0593-000-Jellicent-Female.png b/newsrc/afd/18976f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0593-000-Jellicent-Female.png rename to newsrc/afd/18976f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0593-000-Jellicent-Female.png b/newsrc/afd/18976fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0593-000-Jellicent-Female.png rename to newsrc/afd/18976fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0593-000-Jellicent.png b/newsrc/afd/18976s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0593-000-Jellicent.png rename to newsrc/afd/18976s.png diff --git a/src/afd/sprites-canonical/front/0594-000-Alomomola.png b/newsrc/afd/19008.png similarity index 100% rename from src/afd/sprites-canonical/front/0594-000-Alomomola.png rename to newsrc/afd/19008.png diff --git a/src/afd/sprites-canonical/back/0594-000-Alomomola.png b/newsrc/afd/19008b.png similarity index 100% rename from src/afd/sprites-canonical/back/0594-000-Alomomola.png rename to newsrc/afd/19008b.png diff --git a/src/afd/sprites-canonical/back-shiny/0594-000-Alomomola.png b/newsrc/afd/19008bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0594-000-Alomomola.png rename to newsrc/afd/19008bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0594-000-Alomomola.png b/newsrc/afd/19008s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0594-000-Alomomola.png rename to newsrc/afd/19008s.png diff --git a/src/afd/sprites-canonical/front/0595-000-Joltik.png b/newsrc/afd/19040.png similarity index 100% rename from src/afd/sprites-canonical/front/0595-000-Joltik.png rename to newsrc/afd/19040.png diff --git a/src/afd/sprites-canonical/back/0595-000-Joltik.png b/newsrc/afd/19040b.png similarity index 100% rename from src/afd/sprites-canonical/back/0595-000-Joltik.png rename to newsrc/afd/19040b.png diff --git a/src/afd/sprites-canonical/back-shiny/0595-000-Joltik.png b/newsrc/afd/19040bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0595-000-Joltik.png rename to newsrc/afd/19040bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0595-000-Joltik.png b/newsrc/afd/19040s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0595-000-Joltik.png rename to newsrc/afd/19040s.png diff --git a/src/afd/sprites-canonical/front-shiny/0596-000-Galvantula.png b/newsrc/afd/19072.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0596-000-Galvantula.png rename to newsrc/afd/19072.png diff --git a/src/afd/sprites-canonical/back-shiny/0596-000-Galvantula.png b/newsrc/afd/19072b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0596-000-Galvantula.png rename to newsrc/afd/19072b.png diff --git a/src/afd/sprites-canonical/back/0596-000-Galvantula.png b/newsrc/afd/19072bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0596-000-Galvantula.png rename to newsrc/afd/19072bs.png diff --git a/src/afd/sprites-canonical/front/0596-000-Galvantula.png b/newsrc/afd/19072s.png similarity index 100% rename from src/afd/sprites-canonical/front/0596-000-Galvantula.png rename to newsrc/afd/19072s.png diff --git a/src/afd/sprites-canonical/front/0597-000-Ferroseed.png b/newsrc/afd/19104.png similarity index 100% rename from src/afd/sprites-canonical/front/0597-000-Ferroseed.png rename to newsrc/afd/19104.png diff --git a/src/afd/sprites-canonical/back/0597-000-Ferroseed.png b/newsrc/afd/19104b.png similarity index 100% rename from src/afd/sprites-canonical/back/0597-000-Ferroseed.png rename to newsrc/afd/19104b.png diff --git a/src/afd/sprites-canonical/back-shiny/0597-000-Ferroseed.png b/newsrc/afd/19104bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0597-000-Ferroseed.png rename to newsrc/afd/19104bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0597-000-Ferroseed.png b/newsrc/afd/19104s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0597-000-Ferroseed.png rename to newsrc/afd/19104s.png diff --git a/src/afd/sprites-canonical/front/0598-000-Ferrothorn.png b/newsrc/afd/19136.png similarity index 100% rename from src/afd/sprites-canonical/front/0598-000-Ferrothorn.png rename to newsrc/afd/19136.png diff --git a/src/afd/sprites-canonical/back/0598-000-Ferrothorn.png b/newsrc/afd/19136b.png similarity index 100% rename from src/afd/sprites-canonical/back/0598-000-Ferrothorn.png rename to newsrc/afd/19136b.png diff --git a/src/afd/sprites-canonical/back-shiny/0598-000-Ferrothorn.png b/newsrc/afd/19136bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0598-000-Ferrothorn.png rename to newsrc/afd/19136bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0598-000-Ferrothorn.png b/newsrc/afd/19136s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0598-000-Ferrothorn.png rename to newsrc/afd/19136s.png diff --git a/src/afd/sprites-canonical/front/0599-000-Klink.png b/newsrc/afd/19168.png similarity index 100% rename from src/afd/sprites-canonical/front/0599-000-Klink.png rename to newsrc/afd/19168.png diff --git a/src/afd/sprites-canonical/back/0599-000-Klink.png b/newsrc/afd/19168b.png similarity index 100% rename from src/afd/sprites-canonical/back/0599-000-Klink.png rename to newsrc/afd/19168b.png diff --git a/src/afd/sprites-canonical/back-shiny/0599-000-Klink.png b/newsrc/afd/19168bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0599-000-Klink.png rename to newsrc/afd/19168bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0599-000-Klink.png b/newsrc/afd/19168s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0599-000-Klink.png rename to newsrc/afd/19168s.png diff --git a/src/afd/sprites-canonical/front/0006-000-Charizard.png b/newsrc/afd/192.png similarity index 100% rename from src/afd/sprites-canonical/front/0006-000-Charizard.png rename to newsrc/afd/192.png diff --git a/src/afd/sprites-canonical/front/0060-000-Poliwag.png b/newsrc/afd/1920.png similarity index 100% rename from src/afd/sprites-canonical/front/0060-000-Poliwag.png rename to newsrc/afd/1920.png diff --git a/src/afd/sprites-canonical/front/0600-000-Klang.png b/newsrc/afd/19200.png similarity index 100% rename from src/afd/sprites-canonical/front/0600-000-Klang.png rename to newsrc/afd/19200.png diff --git a/src/afd/sprites-canonical/back/0600-000-Klang.png b/newsrc/afd/19200b.png similarity index 100% rename from src/afd/sprites-canonical/back/0600-000-Klang.png rename to newsrc/afd/19200b.png diff --git a/src/afd/sprites-canonical/back-shiny/0600-000-Klang.png b/newsrc/afd/19200bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0600-000-Klang.png rename to newsrc/afd/19200bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0600-000-Klang.png b/newsrc/afd/19200s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0600-000-Klang.png rename to newsrc/afd/19200s.png diff --git a/src/afd/sprites-canonical/back/0060-000-Poliwag.png b/newsrc/afd/1920b.png similarity index 100% rename from src/afd/sprites-canonical/back/0060-000-Poliwag.png rename to newsrc/afd/1920b.png diff --git a/src/afd/sprites-canonical/back-shiny/0060-000-Poliwag.png b/newsrc/afd/1920bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0060-000-Poliwag.png rename to newsrc/afd/1920bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0060-000-Poliwag.png b/newsrc/afd/1920s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0060-000-Poliwag.png rename to newsrc/afd/1920s.png diff --git a/src/afd/sprites-canonical/front/0601-000-Klinklang.png b/newsrc/afd/19232.png similarity index 100% rename from src/afd/sprites-canonical/front/0601-000-Klinklang.png rename to newsrc/afd/19232.png diff --git a/src/afd/sprites-canonical/back/0601-000-Klinklang.png b/newsrc/afd/19232b.png similarity index 100% rename from src/afd/sprites-canonical/back/0601-000-Klinklang.png rename to newsrc/afd/19232b.png diff --git a/src/afd/sprites-canonical/back-shiny/0601-000-Klinklang.png b/newsrc/afd/19232bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0601-000-Klinklang.png rename to newsrc/afd/19232bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0601-000-Klinklang.png b/newsrc/afd/19232s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0601-000-Klinklang.png rename to newsrc/afd/19232s.png diff --git a/src/afd/sprites-canonical/front/0602-000-Tynamo.png b/newsrc/afd/19264.png similarity index 100% rename from src/afd/sprites-canonical/front/0602-000-Tynamo.png rename to newsrc/afd/19264.png diff --git a/src/afd/sprites-canonical/back/0602-000-Tynamo.png b/newsrc/afd/19264b.png similarity index 100% rename from src/afd/sprites-canonical/back/0602-000-Tynamo.png rename to newsrc/afd/19264b.png diff --git a/src/afd/sprites-canonical/back-shiny/0602-000-Tynamo.png b/newsrc/afd/19264bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0602-000-Tynamo.png rename to newsrc/afd/19264bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0602-000-Tynamo.png b/newsrc/afd/19264s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0602-000-Tynamo.png rename to newsrc/afd/19264s.png diff --git a/src/afd/sprites-canonical/front/0603-000-Eelektrik.png b/newsrc/afd/19296.png similarity index 100% rename from src/afd/sprites-canonical/front/0603-000-Eelektrik.png rename to newsrc/afd/19296.png diff --git a/src/afd/sprites-canonical/back/0603-000-Eelektrik.png b/newsrc/afd/19296b.png similarity index 100% rename from src/afd/sprites-canonical/back/0603-000-Eelektrik.png rename to newsrc/afd/19296b.png diff --git a/src/afd/sprites-canonical/back-shiny/0603-000-Eelektrik.png b/newsrc/afd/19296bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0603-000-Eelektrik.png rename to newsrc/afd/19296bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0603-000-Eelektrik.png b/newsrc/afd/19296s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0603-000-Eelektrik.png rename to newsrc/afd/19296s.png diff --git a/src/afd/sprites-canonical/back/0006-000-Charizard.png b/newsrc/afd/192b.png similarity index 100% rename from src/afd/sprites-canonical/back/0006-000-Charizard.png rename to newsrc/afd/192b.png diff --git a/src/afd/sprites-canonical/back/0006-420-Charizard-Gmax.png b/newsrc/afd/192bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0006-420-Charizard-Gmax.png rename to newsrc/afd/192bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0006-420-Charizard-Gmax.png b/newsrc/afd/192bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0006-420-Charizard-Gmax.png rename to newsrc/afd/192bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0006-000-Charizard.png b/newsrc/afd/192bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0006-000-Charizard.png rename to newsrc/afd/192bs.png diff --git a/src/afd/sprites-canonical/front/0006-420-Charizard-Gmax.png b/newsrc/afd/192g.png similarity index 100% rename from src/afd/sprites-canonical/front/0006-420-Charizard-Gmax.png rename to newsrc/afd/192g.png diff --git a/src/afd/sprites-canonical/front-shiny/0006-420-Charizard-Gmax.png b/newsrc/afd/192gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0006-420-Charizard-Gmax.png rename to newsrc/afd/192gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0006-000-Charizard.png b/newsrc/afd/192s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0006-000-Charizard.png rename to newsrc/afd/192s.png diff --git a/src/afd/sprites-canonical/front/0006-420-Charizard-Mega~X.png b/newsrc/afd/193.png similarity index 100% rename from src/afd/sprites-canonical/front/0006-420-Charizard-Mega~X.png rename to newsrc/afd/193.png diff --git a/src/afd/sprites-canonical/front/0604-000-Eelektross.png b/newsrc/afd/19328.png similarity index 100% rename from src/afd/sprites-canonical/front/0604-000-Eelektross.png rename to newsrc/afd/19328.png diff --git a/src/afd/sprites-canonical/back/0604-000-Eelektross.png b/newsrc/afd/19328b.png similarity index 100% rename from src/afd/sprites-canonical/back/0604-000-Eelektross.png rename to newsrc/afd/19328b.png diff --git a/src/afd/sprites-canonical/back-shiny/0604-000-Eelektross.png b/newsrc/afd/19328bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0604-000-Eelektross.png rename to newsrc/afd/19328bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0604-000-Eelektross.png b/newsrc/afd/19328s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0604-000-Eelektross.png rename to newsrc/afd/19328s.png diff --git a/src/afd/sprites-canonical/front/0605-000-Elgyem.png b/newsrc/afd/19360.png similarity index 100% rename from src/afd/sprites-canonical/front/0605-000-Elgyem.png rename to newsrc/afd/19360.png diff --git a/src/afd/sprites-canonical/back/0605-000-Elgyem.png b/newsrc/afd/19360b.png similarity index 100% rename from src/afd/sprites-canonical/back/0605-000-Elgyem.png rename to newsrc/afd/19360b.png diff --git a/src/afd/sprites-canonical/back-shiny/0605-000-Elgyem.png b/newsrc/afd/19360bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0605-000-Elgyem.png rename to newsrc/afd/19360bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0605-000-Elgyem.png b/newsrc/afd/19360s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0605-000-Elgyem.png rename to newsrc/afd/19360s.png diff --git a/src/afd/sprites-canonical/front/0606-000-Beheeyem.png b/newsrc/afd/19392.png similarity index 100% rename from src/afd/sprites-canonical/front/0606-000-Beheeyem.png rename to newsrc/afd/19392.png diff --git a/src/afd/sprites-canonical/back/0606-000-Beheeyem.png b/newsrc/afd/19392b.png similarity index 100% rename from src/afd/sprites-canonical/back/0606-000-Beheeyem.png rename to newsrc/afd/19392b.png diff --git a/src/afd/sprites-canonical/back-shiny/0606-000-Beheeyem.png b/newsrc/afd/19392bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0606-000-Beheeyem.png rename to newsrc/afd/19392bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0606-000-Beheeyem.png b/newsrc/afd/19392s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0606-000-Beheeyem.png rename to newsrc/afd/19392s.png diff --git a/src/afd/sprites-canonical/back/0006-420-Charizard-Mega~X.png b/newsrc/afd/193b.png similarity index 100% rename from src/afd/sprites-canonical/back/0006-420-Charizard-Mega~X.png rename to newsrc/afd/193b.png diff --git a/src/afd/sprites-canonical/back-shiny/0006-420-Charizard-Mega~X.png b/newsrc/afd/193bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0006-420-Charizard-Mega~X.png rename to newsrc/afd/193bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0006-420-Charizard-Mega~X.png b/newsrc/afd/193s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0006-420-Charizard-Mega~X.png rename to newsrc/afd/193s.png diff --git a/src/afd/sprites-canonical/front/0006-420-Charizard-Mega~Y.png b/newsrc/afd/194.png similarity index 100% rename from src/afd/sprites-canonical/front/0006-420-Charizard-Mega~Y.png rename to newsrc/afd/194.png diff --git a/src/afd/sprites-canonical/front/0607-000-Litwick.png b/newsrc/afd/19424.png similarity index 100% rename from src/afd/sprites-canonical/front/0607-000-Litwick.png rename to newsrc/afd/19424.png diff --git a/src/afd/sprites-canonical/back/0607-000-Litwick.png b/newsrc/afd/19424b.png similarity index 100% rename from src/afd/sprites-canonical/back/0607-000-Litwick.png rename to newsrc/afd/19424b.png diff --git a/src/afd/sprites-canonical/back-shiny/0607-000-Litwick.png b/newsrc/afd/19424bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0607-000-Litwick.png rename to newsrc/afd/19424bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0607-000-Litwick.png b/newsrc/afd/19424s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0607-000-Litwick.png rename to newsrc/afd/19424s.png diff --git a/src/afd/sprites-canonical/front/0608-000-Lampent.png b/newsrc/afd/19456.png similarity index 100% rename from src/afd/sprites-canonical/front/0608-000-Lampent.png rename to newsrc/afd/19456.png diff --git a/src/afd/sprites-canonical/back/0608-000-Lampent.png b/newsrc/afd/19456b.png similarity index 100% rename from src/afd/sprites-canonical/back/0608-000-Lampent.png rename to newsrc/afd/19456b.png diff --git a/src/afd/sprites-canonical/back-shiny/0608-000-Lampent.png b/newsrc/afd/19456bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0608-000-Lampent.png rename to newsrc/afd/19456bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0608-000-Lampent.png b/newsrc/afd/19456s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0608-000-Lampent.png rename to newsrc/afd/19456s.png diff --git a/src/afd/sprites-canonical/front/0609-000-Chandelure.png b/newsrc/afd/19488.png similarity index 100% rename from src/afd/sprites-canonical/front/0609-000-Chandelure.png rename to newsrc/afd/19488.png diff --git a/src/afd/sprites-canonical/back/0609-000-Chandelure.png b/newsrc/afd/19488b.png similarity index 100% rename from src/afd/sprites-canonical/back/0609-000-Chandelure.png rename to newsrc/afd/19488b.png diff --git a/src/afd/sprites-canonical/back-shiny/0609-000-Chandelure.png b/newsrc/afd/19488bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0609-000-Chandelure.png rename to newsrc/afd/19488bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0609-000-Chandelure.png b/newsrc/afd/19488s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0609-000-Chandelure.png rename to newsrc/afd/19488s.png diff --git a/src/afd/sprites-canonical/back/0006-420-Charizard-Mega~Y.png b/newsrc/afd/194b.png similarity index 100% rename from src/afd/sprites-canonical/back/0006-420-Charizard-Mega~Y.png rename to newsrc/afd/194b.png diff --git a/src/afd/sprites-canonical/back-shiny/0006-420-Charizard-Mega~Y.png b/newsrc/afd/194bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0006-420-Charizard-Mega~Y.png rename to newsrc/afd/194bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0006-420-Charizard-Mega~Y.png b/newsrc/afd/194s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0006-420-Charizard-Mega~Y.png rename to newsrc/afd/194s.png diff --git a/src/afd/sprites-canonical/front/0061-000-Poliwhirl.png b/newsrc/afd/1952.png similarity index 100% rename from src/afd/sprites-canonical/front/0061-000-Poliwhirl.png rename to newsrc/afd/1952.png diff --git a/src/afd/sprites-canonical/front/0610-000-Axew.png b/newsrc/afd/19520.png similarity index 100% rename from src/afd/sprites-canonical/front/0610-000-Axew.png rename to newsrc/afd/19520.png diff --git a/src/afd/sprites-canonical/back/0610-000-Axew.png b/newsrc/afd/19520b.png similarity index 100% rename from src/afd/sprites-canonical/back/0610-000-Axew.png rename to newsrc/afd/19520b.png diff --git a/src/afd/sprites-canonical/back-shiny/0610-000-Axew.png b/newsrc/afd/19520bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0610-000-Axew.png rename to newsrc/afd/19520bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0610-000-Axew.png b/newsrc/afd/19520s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0610-000-Axew.png rename to newsrc/afd/19520s.png diff --git a/src/afd/sprites-canonical/back/0061-000-Poliwhirl.png b/newsrc/afd/1952b.png similarity index 100% rename from src/afd/sprites-canonical/back/0061-000-Poliwhirl.png rename to newsrc/afd/1952b.png diff --git a/src/afd/sprites-canonical/back-shiny/0061-000-Poliwhirl.png b/newsrc/afd/1952bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0061-000-Poliwhirl.png rename to newsrc/afd/1952bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0061-000-Poliwhirl.png b/newsrc/afd/1952s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0061-000-Poliwhirl.png rename to newsrc/afd/1952s.png diff --git a/src/afd/sprites-canonical/front/0611-000-Fraxure.png b/newsrc/afd/19552.png similarity index 100% rename from src/afd/sprites-canonical/front/0611-000-Fraxure.png rename to newsrc/afd/19552.png diff --git a/src/afd/sprites-canonical/back/0611-000-Fraxure.png b/newsrc/afd/19552b.png similarity index 100% rename from src/afd/sprites-canonical/back/0611-000-Fraxure.png rename to newsrc/afd/19552b.png diff --git a/src/afd/sprites-canonical/back-shiny/0611-000-Fraxure.png b/newsrc/afd/19552bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0611-000-Fraxure.png rename to newsrc/afd/19552bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0611-000-Fraxure.png b/newsrc/afd/19552s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0611-000-Fraxure.png rename to newsrc/afd/19552s.png diff --git a/src/afd/sprites-canonical/front/0612-000-Haxorus.png b/newsrc/afd/19584.png similarity index 100% rename from src/afd/sprites-canonical/front/0612-000-Haxorus.png rename to newsrc/afd/19584.png diff --git a/src/afd/sprites-canonical/back/0612-000-Haxorus.png b/newsrc/afd/19584b.png similarity index 100% rename from src/afd/sprites-canonical/back/0612-000-Haxorus.png rename to newsrc/afd/19584b.png diff --git a/src/afd/sprites-canonical/back-shiny/0612-000-Haxorus.png b/newsrc/afd/19584bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0612-000-Haxorus.png rename to newsrc/afd/19584bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0612-000-Haxorus.png b/newsrc/afd/19584s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0612-000-Haxorus.png rename to newsrc/afd/19584s.png diff --git a/src/afd/sprites-canonical/front/0613-000-Cubchoo.png b/newsrc/afd/19616.png similarity index 100% rename from src/afd/sprites-canonical/front/0613-000-Cubchoo.png rename to newsrc/afd/19616.png diff --git a/src/afd/sprites-canonical/back/0613-000-Cubchoo.png b/newsrc/afd/19616b.png similarity index 100% rename from src/afd/sprites-canonical/back/0613-000-Cubchoo.png rename to newsrc/afd/19616b.png diff --git a/src/afd/sprites-canonical/back-shiny/0613-000-Cubchoo.png b/newsrc/afd/19616bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0613-000-Cubchoo.png rename to newsrc/afd/19616bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0613-000-Cubchoo.png b/newsrc/afd/19616s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0613-000-Cubchoo.png rename to newsrc/afd/19616s.png diff --git a/src/afd/sprites-canonical/front/0614-000-Beartic.png b/newsrc/afd/19648.png similarity index 100% rename from src/afd/sprites-canonical/front/0614-000-Beartic.png rename to newsrc/afd/19648.png diff --git a/src/afd/sprites-canonical/back/0614-000-Beartic.png b/newsrc/afd/19648b.png similarity index 100% rename from src/afd/sprites-canonical/back/0614-000-Beartic.png rename to newsrc/afd/19648b.png diff --git a/src/afd/sprites-canonical/back-shiny/0614-000-Beartic.png b/newsrc/afd/19648bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0614-000-Beartic.png rename to newsrc/afd/19648bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0614-000-Beartic.png b/newsrc/afd/19648s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0614-000-Beartic.png rename to newsrc/afd/19648s.png diff --git a/src/afd/sprites-canonical/front/0615-000-Cryogonal.png b/newsrc/afd/19680.png similarity index 100% rename from src/afd/sprites-canonical/front/0615-000-Cryogonal.png rename to newsrc/afd/19680.png diff --git a/src/afd/sprites-canonical/back/0615-000-Cryogonal.png b/newsrc/afd/19680b.png similarity index 100% rename from src/afd/sprites-canonical/back/0615-000-Cryogonal.png rename to newsrc/afd/19680b.png diff --git a/src/afd/sprites-canonical/back-shiny/0615-000-Cryogonal.png b/newsrc/afd/19680bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0615-000-Cryogonal.png rename to newsrc/afd/19680bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0615-000-Cryogonal.png b/newsrc/afd/19680s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0615-000-Cryogonal.png rename to newsrc/afd/19680s.png diff --git a/src/afd/sprites-canonical/front/0616-000-Shelmet.png b/newsrc/afd/19712.png similarity index 100% rename from src/afd/sprites-canonical/front/0616-000-Shelmet.png rename to newsrc/afd/19712.png diff --git a/src/afd/sprites-canonical/back/0616-000-Shelmet.png b/newsrc/afd/19712b.png similarity index 100% rename from src/afd/sprites-canonical/back/0616-000-Shelmet.png rename to newsrc/afd/19712b.png diff --git a/src/afd/sprites-canonical/back-shiny/0616-000-Shelmet.png b/newsrc/afd/19712bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0616-000-Shelmet.png rename to newsrc/afd/19712bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0616-000-Shelmet.png b/newsrc/afd/19712s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0616-000-Shelmet.png rename to newsrc/afd/19712s.png diff --git a/src/afd/sprites-canonical/front/0617-000-Accelgor.png b/newsrc/afd/19744.png similarity index 100% rename from src/afd/sprites-canonical/front/0617-000-Accelgor.png rename to newsrc/afd/19744.png diff --git a/src/afd/sprites-canonical/back/0617-000-Accelgor.png b/newsrc/afd/19744b.png similarity index 100% rename from src/afd/sprites-canonical/back/0617-000-Accelgor.png rename to newsrc/afd/19744b.png diff --git a/src/afd/sprites-canonical/back-shiny/0617-000-Accelgor.png b/newsrc/afd/19744bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0617-000-Accelgor.png rename to newsrc/afd/19744bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0617-000-Accelgor.png b/newsrc/afd/19744s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0617-000-Accelgor.png rename to newsrc/afd/19744s.png diff --git a/src/afd/sprites-canonical/front/0618-000-Stunfisk.png b/newsrc/afd/19776.png similarity index 100% rename from src/afd/sprites-canonical/front/0618-000-Stunfisk.png rename to newsrc/afd/19776.png diff --git a/src/afd/sprites-canonical/back/0618-000-Stunfisk.png b/newsrc/afd/19776b.png similarity index 100% rename from src/afd/sprites-canonical/back/0618-000-Stunfisk.png rename to newsrc/afd/19776b.png diff --git a/src/afd/sprites-canonical/back-shiny/0618-000-Stunfisk.png b/newsrc/afd/19776bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0618-000-Stunfisk.png rename to newsrc/afd/19776bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0618-000-Stunfisk.png b/newsrc/afd/19776s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0618-000-Stunfisk.png rename to newsrc/afd/19776s.png diff --git a/src/afd/sprites-canonical/front/0618-420-Stunfisk-Galar.png b/newsrc/afd/19777.png similarity index 100% rename from src/afd/sprites-canonical/front/0618-420-Stunfisk-Galar.png rename to newsrc/afd/19777.png diff --git a/src/afd/sprites-canonical/back/0618-420-Stunfisk-Galar.png b/newsrc/afd/19777b.png similarity index 100% rename from src/afd/sprites-canonical/back/0618-420-Stunfisk-Galar.png rename to newsrc/afd/19777b.png diff --git a/src/afd/sprites-canonical/back-shiny/0618-420-Stunfisk-Galar.png b/newsrc/afd/19777bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0618-420-Stunfisk-Galar.png rename to newsrc/afd/19777bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0618-420-Stunfisk-Galar.png b/newsrc/afd/19777s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0618-420-Stunfisk-Galar.png rename to newsrc/afd/19777s.png diff --git a/src/afd/sprites-canonical/front/0619-000-Mienfoo.png b/newsrc/afd/19808.png similarity index 100% rename from src/afd/sprites-canonical/front/0619-000-Mienfoo.png rename to newsrc/afd/19808.png diff --git a/src/afd/sprites-canonical/back/0619-000-Mienfoo.png b/newsrc/afd/19808b.png similarity index 100% rename from src/afd/sprites-canonical/back/0619-000-Mienfoo.png rename to newsrc/afd/19808b.png diff --git a/src/afd/sprites-canonical/back-shiny/0619-000-Mienfoo.png b/newsrc/afd/19808bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0619-000-Mienfoo.png rename to newsrc/afd/19808bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0619-000-Mienfoo.png b/newsrc/afd/19808s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0619-000-Mienfoo.png rename to newsrc/afd/19808s.png diff --git a/src/afd/sprites-canonical/front/0062-000-Poliwrath.png b/newsrc/afd/1984.png similarity index 100% rename from src/afd/sprites-canonical/front/0062-000-Poliwrath.png rename to newsrc/afd/1984.png diff --git a/src/afd/sprites-canonical/front/0620-000-Mienshao.png b/newsrc/afd/19840.png similarity index 100% rename from src/afd/sprites-canonical/front/0620-000-Mienshao.png rename to newsrc/afd/19840.png diff --git a/src/afd/sprites-canonical/back/0620-000-Mienshao.png b/newsrc/afd/19840b.png similarity index 100% rename from src/afd/sprites-canonical/back/0620-000-Mienshao.png rename to newsrc/afd/19840b.png diff --git a/src/afd/sprites-canonical/back-shiny/0620-000-Mienshao.png b/newsrc/afd/19840bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0620-000-Mienshao.png rename to newsrc/afd/19840bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0620-000-Mienshao.png b/newsrc/afd/19840s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0620-000-Mienshao.png rename to newsrc/afd/19840s.png diff --git a/src/afd/sprites-canonical/back/0062-000-Poliwrath.png b/newsrc/afd/1984b.png similarity index 100% rename from src/afd/sprites-canonical/back/0062-000-Poliwrath.png rename to newsrc/afd/1984b.png diff --git a/src/afd/sprites-canonical/back-shiny/0062-000-Poliwrath.png b/newsrc/afd/1984bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0062-000-Poliwrath.png rename to newsrc/afd/1984bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0062-000-Poliwrath.png b/newsrc/afd/1984s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0062-000-Poliwrath.png rename to newsrc/afd/1984s.png diff --git a/src/afd/sprites-canonical/front/0621-000-Druddigon.png b/newsrc/afd/19872.png similarity index 100% rename from src/afd/sprites-canonical/front/0621-000-Druddigon.png rename to newsrc/afd/19872.png diff --git a/src/afd/sprites-canonical/back/0621-000-Druddigon.png b/newsrc/afd/19872b.png similarity index 100% rename from src/afd/sprites-canonical/back/0621-000-Druddigon.png rename to newsrc/afd/19872b.png diff --git a/src/afd/sprites-canonical/back-shiny/0621-000-Druddigon.png b/newsrc/afd/19872bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0621-000-Druddigon.png rename to newsrc/afd/19872bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0621-000-Druddigon.png b/newsrc/afd/19872s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0621-000-Druddigon.png rename to newsrc/afd/19872s.png diff --git a/src/afd/sprites-canonical/front/0622-000-Golett.png b/newsrc/afd/19904.png similarity index 100% rename from src/afd/sprites-canonical/front/0622-000-Golett.png rename to newsrc/afd/19904.png diff --git a/src/afd/sprites-canonical/back/0622-000-Golett.png b/newsrc/afd/19904b.png similarity index 100% rename from src/afd/sprites-canonical/back/0622-000-Golett.png rename to newsrc/afd/19904b.png diff --git a/src/afd/sprites-canonical/back-shiny/0622-000-Golett.png b/newsrc/afd/19904bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0622-000-Golett.png rename to newsrc/afd/19904bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0622-000-Golett.png b/newsrc/afd/19904s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0622-000-Golett.png rename to newsrc/afd/19904s.png diff --git a/src/afd/sprites-canonical/front/0623-000-Golurk.png b/newsrc/afd/19936.png similarity index 100% rename from src/afd/sprites-canonical/front/0623-000-Golurk.png rename to newsrc/afd/19936.png diff --git a/src/afd/sprites-canonical/back/0623-000-Golurk.png b/newsrc/afd/19936b.png similarity index 100% rename from src/afd/sprites-canonical/back/0623-000-Golurk.png rename to newsrc/afd/19936b.png diff --git a/src/afd/sprites-canonical/back-shiny/0623-000-Golurk.png b/newsrc/afd/19936bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0623-000-Golurk.png rename to newsrc/afd/19936bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0623-000-Golurk.png b/newsrc/afd/19936s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0623-000-Golurk.png rename to newsrc/afd/19936s.png diff --git a/src/afd/sprites-canonical/front/0624-000-Pawniard.png b/newsrc/afd/19968.png similarity index 100% rename from src/afd/sprites-canonical/front/0624-000-Pawniard.png rename to newsrc/afd/19968.png diff --git a/src/afd/sprites-canonical/back/0624-000-Pawniard.png b/newsrc/afd/19968b.png similarity index 100% rename from src/afd/sprites-canonical/back/0624-000-Pawniard.png rename to newsrc/afd/19968b.png diff --git a/src/afd/sprites-canonical/back-shiny/0624-000-Pawniard.png b/newsrc/afd/19968bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0624-000-Pawniard.png rename to newsrc/afd/19968bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0624-000-Pawniard.png b/newsrc/afd/19968s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0624-000-Pawniard.png rename to newsrc/afd/19968s.png diff --git a/src/afd/sprites-canonical/front/0625-000-Bisharp.png b/newsrc/afd/20000.png similarity index 100% rename from src/afd/sprites-canonical/front/0625-000-Bisharp.png rename to newsrc/afd/20000.png diff --git a/src/afd/sprites-canonical/back/0625-000-Bisharp.png b/newsrc/afd/20000b.png similarity index 100% rename from src/afd/sprites-canonical/back/0625-000-Bisharp.png rename to newsrc/afd/20000b.png diff --git a/src/afd/sprites-canonical/back-shiny/0625-000-Bisharp.png b/newsrc/afd/20000bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0625-000-Bisharp.png rename to newsrc/afd/20000bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0625-000-Bisharp.png b/newsrc/afd/20000s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0625-000-Bisharp.png rename to newsrc/afd/20000s.png diff --git a/src/afd/sprites-canonical/front/0626-000-Bouffalant.png b/newsrc/afd/20032.png similarity index 100% rename from src/afd/sprites-canonical/front/0626-000-Bouffalant.png rename to newsrc/afd/20032.png diff --git a/src/afd/sprites-canonical/back/0626-000-Bouffalant.png b/newsrc/afd/20032b.png similarity index 100% rename from src/afd/sprites-canonical/back/0626-000-Bouffalant.png rename to newsrc/afd/20032b.png diff --git a/src/afd/sprites-canonical/back-shiny/0626-000-Bouffalant.png b/newsrc/afd/20032bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0626-000-Bouffalant.png rename to newsrc/afd/20032bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0626-000-Bouffalant.png b/newsrc/afd/20032s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0626-000-Bouffalant.png rename to newsrc/afd/20032s.png diff --git a/src/afd/sprites-canonical/front/0627-000-Rufflet.png b/newsrc/afd/20064.png similarity index 100% rename from src/afd/sprites-canonical/front/0627-000-Rufflet.png rename to newsrc/afd/20064.png diff --git a/src/afd/sprites-canonical/back/0627-000-Rufflet.png b/newsrc/afd/20064b.png similarity index 100% rename from src/afd/sprites-canonical/back/0627-000-Rufflet.png rename to newsrc/afd/20064b.png diff --git a/src/afd/sprites-canonical/back-shiny/0627-000-Rufflet.png b/newsrc/afd/20064bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0627-000-Rufflet.png rename to newsrc/afd/20064bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0627-000-Rufflet.png b/newsrc/afd/20064s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0627-000-Rufflet.png rename to newsrc/afd/20064s.png diff --git a/src/afd/sprites-canonical/front/0628-000-Braviary.png b/newsrc/afd/20096.png similarity index 100% rename from src/afd/sprites-canonical/front/0628-000-Braviary.png rename to newsrc/afd/20096.png diff --git a/src/afd/sprites-canonical/back/0628-000-Braviary.png b/newsrc/afd/20096b.png similarity index 100% rename from src/afd/sprites-canonical/back/0628-000-Braviary.png rename to newsrc/afd/20096b.png diff --git a/src/afd/sprites-canonical/back-shiny/0628-000-Braviary.png b/newsrc/afd/20096bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0628-000-Braviary.png rename to newsrc/afd/20096bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0628-000-Braviary.png b/newsrc/afd/20096s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0628-000-Braviary.png rename to newsrc/afd/20096s.png diff --git a/src/afd/sprites-canonical/front/0629-000-Vullaby.png b/newsrc/afd/20128.png similarity index 100% rename from src/afd/sprites-canonical/front/0629-000-Vullaby.png rename to newsrc/afd/20128.png diff --git a/src/afd/sprites-canonical/back/0629-000-Vullaby.png b/newsrc/afd/20128b.png similarity index 100% rename from src/afd/sprites-canonical/back/0629-000-Vullaby.png rename to newsrc/afd/20128b.png diff --git a/src/afd/sprites-canonical/back-shiny/0629-000-Vullaby.png b/newsrc/afd/20128bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0629-000-Vullaby.png rename to newsrc/afd/20128bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0629-000-Vullaby.png b/newsrc/afd/20128s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0629-000-Vullaby.png rename to newsrc/afd/20128s.png diff --git a/src/afd/sprites-canonical/front/0063-000-Abra.png b/newsrc/afd/2016.png similarity index 100% rename from src/afd/sprites-canonical/front/0063-000-Abra.png rename to newsrc/afd/2016.png diff --git a/src/afd/sprites-canonical/front/0630-000-Mandibuzz.png b/newsrc/afd/20160.png similarity index 100% rename from src/afd/sprites-canonical/front/0630-000-Mandibuzz.png rename to newsrc/afd/20160.png diff --git a/src/afd/sprites-canonical/back/0630-000-Mandibuzz.png b/newsrc/afd/20160b.png similarity index 100% rename from src/afd/sprites-canonical/back/0630-000-Mandibuzz.png rename to newsrc/afd/20160b.png diff --git a/src/afd/sprites-canonical/back-shiny/0630-000-Mandibuzz.png b/newsrc/afd/20160bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0630-000-Mandibuzz.png rename to newsrc/afd/20160bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0630-000-Mandibuzz.png b/newsrc/afd/20160s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0630-000-Mandibuzz.png rename to newsrc/afd/20160s.png diff --git a/src/afd/sprites-canonical/back/0063-000-Abra.png b/newsrc/afd/2016b.png similarity index 100% rename from src/afd/sprites-canonical/back/0063-000-Abra.png rename to newsrc/afd/2016b.png diff --git a/src/afd/sprites-canonical/back-shiny/0063-000-Abra.png b/newsrc/afd/2016bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0063-000-Abra.png rename to newsrc/afd/2016bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0063-000-Abra.png b/newsrc/afd/2016s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0063-000-Abra.png rename to newsrc/afd/2016s.png diff --git a/src/afd/sprites-canonical/front/0631-000-Heatmor.png b/newsrc/afd/20192.png similarity index 100% rename from src/afd/sprites-canonical/front/0631-000-Heatmor.png rename to newsrc/afd/20192.png diff --git a/src/afd/sprites-canonical/back/0631-000-Heatmor.png b/newsrc/afd/20192b.png similarity index 100% rename from src/afd/sprites-canonical/back/0631-000-Heatmor.png rename to newsrc/afd/20192b.png diff --git a/src/afd/sprites-canonical/back-shiny/0631-000-Heatmor.png b/newsrc/afd/20192bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0631-000-Heatmor.png rename to newsrc/afd/20192bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0631-000-Heatmor.png b/newsrc/afd/20192s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0631-000-Heatmor.png rename to newsrc/afd/20192s.png diff --git a/src/afd/sprites-canonical/front/0632-000-Durant.png b/newsrc/afd/20224.png similarity index 100% rename from src/afd/sprites-canonical/front/0632-000-Durant.png rename to newsrc/afd/20224.png diff --git a/src/afd/sprites-canonical/back/0632-000-Durant.png b/newsrc/afd/20224b.png similarity index 100% rename from src/afd/sprites-canonical/back/0632-000-Durant.png rename to newsrc/afd/20224b.png diff --git a/src/afd/sprites-canonical/back-shiny/0632-000-Durant.png b/newsrc/afd/20224bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0632-000-Durant.png rename to newsrc/afd/20224bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0632-000-Durant.png b/newsrc/afd/20224s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0632-000-Durant.png rename to newsrc/afd/20224s.png diff --git a/src/afd/sprites-canonical/front/0633-000-Deino.png b/newsrc/afd/20256.png similarity index 100% rename from src/afd/sprites-canonical/front/0633-000-Deino.png rename to newsrc/afd/20256.png diff --git a/src/afd/sprites-canonical/back/0633-000-Deino.png b/newsrc/afd/20256b.png similarity index 100% rename from src/afd/sprites-canonical/back/0633-000-Deino.png rename to newsrc/afd/20256b.png diff --git a/src/afd/sprites-canonical/back-shiny/0633-000-Deino.png b/newsrc/afd/20256bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0633-000-Deino.png rename to newsrc/afd/20256bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0633-000-Deino.png b/newsrc/afd/20256s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0633-000-Deino.png rename to newsrc/afd/20256s.png diff --git a/src/afd/sprites-canonical/front/0634-000-Zweilous.png b/newsrc/afd/20288.png similarity index 100% rename from src/afd/sprites-canonical/front/0634-000-Zweilous.png rename to newsrc/afd/20288.png diff --git a/src/afd/sprites-canonical/back/0634-000-Zweilous.png b/newsrc/afd/20288b.png similarity index 100% rename from src/afd/sprites-canonical/back/0634-000-Zweilous.png rename to newsrc/afd/20288b.png diff --git a/src/afd/sprites-canonical/back-shiny/0634-000-Zweilous.png b/newsrc/afd/20288bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0634-000-Zweilous.png rename to newsrc/afd/20288bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0634-000-Zweilous.png b/newsrc/afd/20288s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0634-000-Zweilous.png rename to newsrc/afd/20288s.png diff --git a/src/afd/sprites-canonical/front/0635-000-Hydreigon.png b/newsrc/afd/20320.png similarity index 100% rename from src/afd/sprites-canonical/front/0635-000-Hydreigon.png rename to newsrc/afd/20320.png diff --git a/src/afd/sprites-canonical/back/0635-000-Hydreigon.png b/newsrc/afd/20320b.png similarity index 100% rename from src/afd/sprites-canonical/back/0635-000-Hydreigon.png rename to newsrc/afd/20320b.png diff --git a/src/afd/sprites-canonical/back-shiny/0635-000-Hydreigon.png b/newsrc/afd/20320bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0635-000-Hydreigon.png rename to newsrc/afd/20320bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0635-000-Hydreigon.png b/newsrc/afd/20320s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0635-000-Hydreigon.png rename to newsrc/afd/20320s.png diff --git a/src/afd/sprites-canonical/front/0636-000-Larvesta.png b/newsrc/afd/20352.png similarity index 100% rename from src/afd/sprites-canonical/front/0636-000-Larvesta.png rename to newsrc/afd/20352.png diff --git a/src/afd/sprites-canonical/back/0636-000-Larvesta.png b/newsrc/afd/20352b.png similarity index 100% rename from src/afd/sprites-canonical/back/0636-000-Larvesta.png rename to newsrc/afd/20352b.png diff --git a/src/afd/sprites-canonical/back-shiny/0636-000-Larvesta.png b/newsrc/afd/20352bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0636-000-Larvesta.png rename to newsrc/afd/20352bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0636-000-Larvesta.png b/newsrc/afd/20352s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0636-000-Larvesta.png rename to newsrc/afd/20352s.png diff --git a/src/afd/sprites-canonical/front/0637-000-Volcarona.png b/newsrc/afd/20384.png similarity index 100% rename from src/afd/sprites-canonical/front/0637-000-Volcarona.png rename to newsrc/afd/20384.png diff --git a/src/afd/sprites-canonical/back/0637-000-Volcarona.png b/newsrc/afd/20384b.png similarity index 100% rename from src/afd/sprites-canonical/back/0637-000-Volcarona.png rename to newsrc/afd/20384b.png diff --git a/src/afd/sprites-canonical/back-shiny/0637-000-Volcarona.png b/newsrc/afd/20384bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0637-000-Volcarona.png rename to newsrc/afd/20384bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0637-000-Volcarona.png b/newsrc/afd/20384s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0637-000-Volcarona.png rename to newsrc/afd/20384s.png diff --git a/src/afd/sprites-canonical/front/0638-000-Cobalion.png b/newsrc/afd/20416.png similarity index 100% rename from src/afd/sprites-canonical/front/0638-000-Cobalion.png rename to newsrc/afd/20416.png diff --git a/src/afd/sprites-canonical/back/0638-000-Cobalion.png b/newsrc/afd/20416b.png similarity index 100% rename from src/afd/sprites-canonical/back/0638-000-Cobalion.png rename to newsrc/afd/20416b.png diff --git a/src/afd/sprites-canonical/back-shiny/0638-000-Cobalion.png b/newsrc/afd/20416bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0638-000-Cobalion.png rename to newsrc/afd/20416bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0638-000-Cobalion.png b/newsrc/afd/20416s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0638-000-Cobalion.png rename to newsrc/afd/20416s.png diff --git a/src/afd/sprites-canonical/front/0639-000-Terrakion.png b/newsrc/afd/20448.png similarity index 100% rename from src/afd/sprites-canonical/front/0639-000-Terrakion.png rename to newsrc/afd/20448.png diff --git a/src/afd/sprites-canonical/back/0639-000-Terrakion.png b/newsrc/afd/20448b.png similarity index 100% rename from src/afd/sprites-canonical/back/0639-000-Terrakion.png rename to newsrc/afd/20448b.png diff --git a/src/afd/sprites-canonical/back-shiny/0639-000-Terrakion.png b/newsrc/afd/20448bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0639-000-Terrakion.png rename to newsrc/afd/20448bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0639-000-Terrakion.png b/newsrc/afd/20448s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0639-000-Terrakion.png rename to newsrc/afd/20448s.png diff --git a/src/afd/sprites-canonical/front/0064-000-Kadabra.png b/newsrc/afd/2048.png similarity index 100% rename from src/afd/sprites-canonical/front/0064-000-Kadabra.png rename to newsrc/afd/2048.png diff --git a/src/afd/sprites-canonical/front/0640-000-Virizion.png b/newsrc/afd/20480.png similarity index 100% rename from src/afd/sprites-canonical/front/0640-000-Virizion.png rename to newsrc/afd/20480.png diff --git a/src/afd/sprites-canonical/back/0640-000-Virizion.png b/newsrc/afd/20480b.png similarity index 100% rename from src/afd/sprites-canonical/back/0640-000-Virizion.png rename to newsrc/afd/20480b.png diff --git a/src/afd/sprites-canonical/back-shiny/0640-000-Virizion.png b/newsrc/afd/20480bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0640-000-Virizion.png rename to newsrc/afd/20480bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0640-000-Virizion.png b/newsrc/afd/20480s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0640-000-Virizion.png rename to newsrc/afd/20480s.png diff --git a/src/afd/sprites-canonical/back/0064-000-Kadabra.png b/newsrc/afd/2048b.png similarity index 100% rename from src/afd/sprites-canonical/back/0064-000-Kadabra.png rename to newsrc/afd/2048b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0064-000-Kadabra-Female.png b/newsrc/afd/2048bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0064-000-Kadabra-Female.png rename to newsrc/afd/2048bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0064-000-Kadabra-Female.png b/newsrc/afd/2048bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0064-000-Kadabra-Female.png rename to newsrc/afd/2048bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0064-000-Kadabra.png b/newsrc/afd/2048bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0064-000-Kadabra.png rename to newsrc/afd/2048bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0064-000-Kadabra-Female.png b/newsrc/afd/2048f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0064-000-Kadabra-Female.png rename to newsrc/afd/2048f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0064-000-Kadabra-Female.png b/newsrc/afd/2048fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0064-000-Kadabra-Female.png rename to newsrc/afd/2048fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0064-000-Kadabra.png b/newsrc/afd/2048s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0064-000-Kadabra.png rename to newsrc/afd/2048s.png diff --git a/src/afd/sprites-canonical/front/0641-000-Tornadus.png b/newsrc/afd/20512.png similarity index 100% rename from src/afd/sprites-canonical/front/0641-000-Tornadus.png rename to newsrc/afd/20512.png diff --git a/src/afd/sprites-canonical/back/0641-000-Tornadus.png b/newsrc/afd/20512b.png similarity index 100% rename from src/afd/sprites-canonical/back/0641-000-Tornadus.png rename to newsrc/afd/20512b.png diff --git a/src/afd/sprites-canonical/back-shiny/0641-000-Tornadus.png b/newsrc/afd/20512bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0641-000-Tornadus.png rename to newsrc/afd/20512bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0641-000-Tornadus.png b/newsrc/afd/20512s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0641-000-Tornadus.png rename to newsrc/afd/20512s.png diff --git a/src/afd/sprites-canonical/front/0641-420-Tornadus-Therian.png b/newsrc/afd/20513.png similarity index 100% rename from src/afd/sprites-canonical/front/0641-420-Tornadus-Therian.png rename to newsrc/afd/20513.png diff --git a/src/afd/sprites-canonical/back/0641-420-Tornadus-Therian.png b/newsrc/afd/20513b.png similarity index 100% rename from src/afd/sprites-canonical/back/0641-420-Tornadus-Therian.png rename to newsrc/afd/20513b.png diff --git a/src/afd/sprites-canonical/front/0642-000-Thundurus.png b/newsrc/afd/20544.png similarity index 100% rename from src/afd/sprites-canonical/front/0642-000-Thundurus.png rename to newsrc/afd/20544.png diff --git a/src/afd/sprites-canonical/back/0642-000-Thundurus.png b/newsrc/afd/20544b.png similarity index 100% rename from src/afd/sprites-canonical/back/0642-000-Thundurus.png rename to newsrc/afd/20544b.png diff --git a/src/afd/sprites-canonical/back-shiny/0642-000-Thundurus.png b/newsrc/afd/20544bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0642-000-Thundurus.png rename to newsrc/afd/20544bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0642-000-Thundurus.png b/newsrc/afd/20544s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0642-000-Thundurus.png rename to newsrc/afd/20544s.png diff --git a/src/afd/sprites-canonical/front/0642-420-Thundurus-Therian.png b/newsrc/afd/20545.png similarity index 100% rename from src/afd/sprites-canonical/front/0642-420-Thundurus-Therian.png rename to newsrc/afd/20545.png diff --git a/src/afd/sprites-canonical/back/0642-420-Thundurus-Therian.png b/newsrc/afd/20545b.png similarity index 100% rename from src/afd/sprites-canonical/back/0642-420-Thundurus-Therian.png rename to newsrc/afd/20545b.png diff --git a/src/afd/sprites-canonical/back-shiny/0642-420-Thundurus-Therian.png b/newsrc/afd/20545bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0642-420-Thundurus-Therian.png rename to newsrc/afd/20545bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0642-420-Thundurus-Therian.png b/newsrc/afd/20545s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0642-420-Thundurus-Therian.png rename to newsrc/afd/20545s.png diff --git a/src/afd/sprites-canonical/front/0643-000-Reshiram.png b/newsrc/afd/20576.png similarity index 100% rename from src/afd/sprites-canonical/front/0643-000-Reshiram.png rename to newsrc/afd/20576.png diff --git a/src/afd/sprites-canonical/back/0643-000-Reshiram.png b/newsrc/afd/20576b.png similarity index 100% rename from src/afd/sprites-canonical/back/0643-000-Reshiram.png rename to newsrc/afd/20576b.png diff --git a/src/afd/sprites-canonical/back-shiny/0643-000-Reshiram.png b/newsrc/afd/20576bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0643-000-Reshiram.png rename to newsrc/afd/20576bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0643-000-Reshiram.png b/newsrc/afd/20576s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0643-000-Reshiram.png rename to newsrc/afd/20576s.png diff --git a/src/afd/sprites-canonical/front/0644-000-Zekrom.png b/newsrc/afd/20608.png similarity index 100% rename from src/afd/sprites-canonical/front/0644-000-Zekrom.png rename to newsrc/afd/20608.png diff --git a/src/afd/sprites-canonical/back/0644-000-Zekrom.png b/newsrc/afd/20608b.png similarity index 100% rename from src/afd/sprites-canonical/back/0644-000-Zekrom.png rename to newsrc/afd/20608b.png diff --git a/src/afd/sprites-canonical/back-shiny/0644-000-Zekrom.png b/newsrc/afd/20608bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0644-000-Zekrom.png rename to newsrc/afd/20608bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0644-000-Zekrom.png b/newsrc/afd/20608s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0644-000-Zekrom.png rename to newsrc/afd/20608s.png diff --git a/src/afd/sprites-canonical/front/0645-000-Landorus.png b/newsrc/afd/20640.png similarity index 100% rename from src/afd/sprites-canonical/front/0645-000-Landorus.png rename to newsrc/afd/20640.png diff --git a/src/afd/sprites-canonical/back/0645-000-Landorus.png b/newsrc/afd/20640b.png similarity index 100% rename from src/afd/sprites-canonical/back/0645-000-Landorus.png rename to newsrc/afd/20640b.png diff --git a/src/afd/sprites-canonical/back-shiny/0645-000-Landorus.png b/newsrc/afd/20640bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0645-000-Landorus.png rename to newsrc/afd/20640bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0645-000-Landorus.png b/newsrc/afd/20640s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0645-000-Landorus.png rename to newsrc/afd/20640s.png diff --git a/src/afd/sprites-canonical/front/0645-420-Landorus-Therian.png b/newsrc/afd/20641.png similarity index 100% rename from src/afd/sprites-canonical/front/0645-420-Landorus-Therian.png rename to newsrc/afd/20641.png diff --git a/src/afd/sprites-canonical/back/0645-420-Landorus-Therian.png b/newsrc/afd/20641b.png similarity index 100% rename from src/afd/sprites-canonical/back/0645-420-Landorus-Therian.png rename to newsrc/afd/20641b.png diff --git a/src/afd/sprites-canonical/back-shiny/0645-420-Landorus-Therian.png b/newsrc/afd/20641bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0645-420-Landorus-Therian.png rename to newsrc/afd/20641bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0645-420-Landorus-Therian.png b/newsrc/afd/20641s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0645-420-Landorus-Therian.png rename to newsrc/afd/20641s.png diff --git a/src/afd/sprites-canonical/front/0646-000-Kyurem.png b/newsrc/afd/20672.png similarity index 100% rename from src/afd/sprites-canonical/front/0646-000-Kyurem.png rename to newsrc/afd/20672.png diff --git a/src/afd/sprites-canonical/back/0646-000-Kyurem.png b/newsrc/afd/20672b.png similarity index 100% rename from src/afd/sprites-canonical/back/0646-000-Kyurem.png rename to newsrc/afd/20672b.png diff --git a/src/afd/sprites-canonical/back-shiny/0646-000-Kyurem.png b/newsrc/afd/20672bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0646-000-Kyurem.png rename to newsrc/afd/20672bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0646-000-Kyurem.png b/newsrc/afd/20672s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0646-000-Kyurem.png rename to newsrc/afd/20672s.png diff --git a/src/afd/sprites-canonical/front/0646-420-Kyurem-White.png b/newsrc/afd/20673.png similarity index 100% rename from src/afd/sprites-canonical/front/0646-420-Kyurem-White.png rename to newsrc/afd/20673.png diff --git a/src/afd/sprites-canonical/back/0646-420-Kyurem-White.png b/newsrc/afd/20673b.png similarity index 100% rename from src/afd/sprites-canonical/back/0646-420-Kyurem-White.png rename to newsrc/afd/20673b.png diff --git a/src/afd/sprites-canonical/back-shiny/0646-420-Kyurem-White.png b/newsrc/afd/20673bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0646-420-Kyurem-White.png rename to newsrc/afd/20673bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0646-420-Kyurem-White.png b/newsrc/afd/20673s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0646-420-Kyurem-White.png rename to newsrc/afd/20673s.png diff --git a/src/afd/sprites-canonical/front/0646-420-Kyurem-Black.png b/newsrc/afd/20674.png similarity index 100% rename from src/afd/sprites-canonical/front/0646-420-Kyurem-Black.png rename to newsrc/afd/20674.png diff --git a/src/afd/sprites-canonical/back/0646-420-Kyurem-Black.png b/newsrc/afd/20674b.png similarity index 100% rename from src/afd/sprites-canonical/back/0646-420-Kyurem-Black.png rename to newsrc/afd/20674b.png diff --git a/src/afd/sprites-canonical/back-shiny/0646-420-Kyurem-Black.png b/newsrc/afd/20674bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0646-420-Kyurem-Black.png rename to newsrc/afd/20674bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0646-420-Kyurem-Black.png b/newsrc/afd/20674s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0646-420-Kyurem-Black.png rename to newsrc/afd/20674s.png diff --git a/src/afd/sprites-canonical/front/0647-000-Keldeo.png b/newsrc/afd/20704.png similarity index 100% rename from src/afd/sprites-canonical/front/0647-000-Keldeo.png rename to newsrc/afd/20704.png diff --git a/src/afd/sprites-canonical/back/0647-000-Keldeo.png b/newsrc/afd/20704b.png similarity index 100% rename from src/afd/sprites-canonical/back/0647-000-Keldeo.png rename to newsrc/afd/20704b.png diff --git a/src/afd/sprites-canonical/back-shiny/0647-000-Keldeo.png b/newsrc/afd/20704bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0647-000-Keldeo.png rename to newsrc/afd/20704bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0647-000-Keldeo.png b/newsrc/afd/20704s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0647-000-Keldeo.png rename to newsrc/afd/20704s.png diff --git a/src/afd/sprites-canonical/front/0647-420-Keldeo-Resolute.png b/newsrc/afd/20705.png similarity index 100% rename from src/afd/sprites-canonical/front/0647-420-Keldeo-Resolute.png rename to newsrc/afd/20705.png diff --git a/src/afd/sprites-canonical/back/0647-420-Keldeo-Resolute.png b/newsrc/afd/20705b.png similarity index 100% rename from src/afd/sprites-canonical/back/0647-420-Keldeo-Resolute.png rename to newsrc/afd/20705b.png diff --git a/src/afd/sprites-canonical/back-shiny/0647-420-Keldeo-Resolute.png b/newsrc/afd/20705bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0647-420-Keldeo-Resolute.png rename to newsrc/afd/20705bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0647-420-Keldeo-Resolute.png b/newsrc/afd/20705s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0647-420-Keldeo-Resolute.png rename to newsrc/afd/20705s.png diff --git a/src/afd/sprites-canonical/front/0648-000-Meloetta.png b/newsrc/afd/20736.png similarity index 100% rename from src/afd/sprites-canonical/front/0648-000-Meloetta.png rename to newsrc/afd/20736.png diff --git a/src/afd/sprites-canonical/back/0648-000-Meloetta.png b/newsrc/afd/20736b.png similarity index 100% rename from src/afd/sprites-canonical/back/0648-000-Meloetta.png rename to newsrc/afd/20736b.png diff --git a/src/afd/sprites-canonical/back-shiny/0648-000-Meloetta.png b/newsrc/afd/20736bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0648-000-Meloetta.png rename to newsrc/afd/20736bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0648-000-Meloetta.png b/newsrc/afd/20736s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0648-000-Meloetta.png rename to newsrc/afd/20736s.png diff --git a/src/afd/sprites-canonical/front/0648-420-Meloetta-Pirouette.png b/newsrc/afd/20737.png similarity index 100% rename from src/afd/sprites-canonical/front/0648-420-Meloetta-Pirouette.png rename to newsrc/afd/20737.png diff --git a/src/afd/sprites-canonical/back/0648-420-Meloetta-Pirouette.png b/newsrc/afd/20737b.png similarity index 100% rename from src/afd/sprites-canonical/back/0648-420-Meloetta-Pirouette.png rename to newsrc/afd/20737b.png diff --git a/src/afd/sprites-canonical/back-shiny/0648-420-Meloetta-Pirouette.png b/newsrc/afd/20737bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0648-420-Meloetta-Pirouette.png rename to newsrc/afd/20737bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0648-420-Meloetta-Pirouette.png b/newsrc/afd/20737s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0648-420-Meloetta-Pirouette.png rename to newsrc/afd/20737s.png diff --git a/src/afd/sprites-canonical/front/0649-000-Genesect.png b/newsrc/afd/20768.png similarity index 100% rename from src/afd/sprites-canonical/front/0649-000-Genesect.png rename to newsrc/afd/20768.png diff --git a/src/afd/sprites-canonical/back/0649-000-Genesect.png b/newsrc/afd/20768b.png similarity index 100% rename from src/afd/sprites-canonical/back/0649-000-Genesect.png rename to newsrc/afd/20768b.png diff --git a/src/afd/sprites-canonical/back-shiny/0649-000-Genesect.png b/newsrc/afd/20768bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0649-000-Genesect.png rename to newsrc/afd/20768bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0649-000-Genesect.png b/newsrc/afd/20768s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0649-000-Genesect.png rename to newsrc/afd/20768s.png diff --git a/src/afd/sprites-canonical/front/0649-420-Genesect-Douse.png b/newsrc/afd/20769.png similarity index 100% rename from src/afd/sprites-canonical/front/0649-420-Genesect-Douse.png rename to newsrc/afd/20769.png diff --git a/src/afd/sprites-canonical/back/0649-420-Genesect-Douse.png b/newsrc/afd/20769b.png similarity index 100% rename from src/afd/sprites-canonical/back/0649-420-Genesect-Douse.png rename to newsrc/afd/20769b.png diff --git a/src/afd/sprites-canonical/back-shiny/0649-420-Genesect-Douse.png b/newsrc/afd/20769bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0649-420-Genesect-Douse.png rename to newsrc/afd/20769bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0649-420-Genesect-Douse.png b/newsrc/afd/20769s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0649-420-Genesect-Douse.png rename to newsrc/afd/20769s.png diff --git a/src/afd/sprites-canonical/front/0649-420-Genesect-Shock.png b/newsrc/afd/20770.png similarity index 100% rename from src/afd/sprites-canonical/front/0649-420-Genesect-Shock.png rename to newsrc/afd/20770.png diff --git a/src/afd/sprites-canonical/back/0649-420-Genesect-Shock.png b/newsrc/afd/20770b.png similarity index 100% rename from src/afd/sprites-canonical/back/0649-420-Genesect-Shock.png rename to newsrc/afd/20770b.png diff --git a/src/afd/sprites-canonical/back-shiny/0649-420-Genesect-Shock.png b/newsrc/afd/20770bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0649-420-Genesect-Shock.png rename to newsrc/afd/20770bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0649-420-Genesect-Shock.png b/newsrc/afd/20770s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0649-420-Genesect-Shock.png rename to newsrc/afd/20770s.png diff --git a/src/afd/sprites-canonical/front/0649-420-Genesect-Burn.png b/newsrc/afd/20771.png similarity index 100% rename from src/afd/sprites-canonical/front/0649-420-Genesect-Burn.png rename to newsrc/afd/20771.png diff --git a/src/afd/sprites-canonical/back/0649-420-Genesect-Burn.png b/newsrc/afd/20771b.png similarity index 100% rename from src/afd/sprites-canonical/back/0649-420-Genesect-Burn.png rename to newsrc/afd/20771b.png diff --git a/src/afd/sprites-canonical/back-shiny/0649-420-Genesect-Burn.png b/newsrc/afd/20771bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0649-420-Genesect-Burn.png rename to newsrc/afd/20771bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0649-420-Genesect-Burn.png b/newsrc/afd/20771s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0649-420-Genesect-Burn.png rename to newsrc/afd/20771s.png diff --git a/src/afd/sprites-canonical/front/0649-420-Genesect-Chill.png b/newsrc/afd/20772.png similarity index 100% rename from src/afd/sprites-canonical/front/0649-420-Genesect-Chill.png rename to newsrc/afd/20772.png diff --git a/src/afd/sprites-canonical/back/0649-420-Genesect-Chill.png b/newsrc/afd/20772b.png similarity index 100% rename from src/afd/sprites-canonical/back/0649-420-Genesect-Chill.png rename to newsrc/afd/20772b.png diff --git a/src/afd/sprites-canonical/back-shiny/0649-420-Genesect-Chill.png b/newsrc/afd/20772bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0649-420-Genesect-Chill.png rename to newsrc/afd/20772bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0649-420-Genesect-Chill.png b/newsrc/afd/20772s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0649-420-Genesect-Chill.png rename to newsrc/afd/20772s.png diff --git a/src/afd/sprites-canonical/front/0065-000-Alakazam.png b/newsrc/afd/2080.png similarity index 100% rename from src/afd/sprites-canonical/front/0065-000-Alakazam.png rename to newsrc/afd/2080.png diff --git a/src/afd/sprites-canonical/front/0650-000-Chespin.png b/newsrc/afd/20800.png similarity index 100% rename from src/afd/sprites-canonical/front/0650-000-Chespin.png rename to newsrc/afd/20800.png diff --git a/src/afd/sprites-canonical/back/0650-000-Chespin.png b/newsrc/afd/20800b.png similarity index 100% rename from src/afd/sprites-canonical/back/0650-000-Chespin.png rename to newsrc/afd/20800b.png diff --git a/src/afd/sprites-canonical/back-shiny/0650-000-Chespin.png b/newsrc/afd/20800bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0650-000-Chespin.png rename to newsrc/afd/20800bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0650-000-Chespin.png b/newsrc/afd/20800s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0650-000-Chespin.png rename to newsrc/afd/20800s.png diff --git a/src/afd/sprites-canonical/back/0065-000-Alakazam.png b/newsrc/afd/2080b.png similarity index 100% rename from src/afd/sprites-canonical/back/0065-000-Alakazam.png rename to newsrc/afd/2080b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0065-000-Alakazam-Female.png b/newsrc/afd/2080bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0065-000-Alakazam-Female.png rename to newsrc/afd/2080bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0065-000-Alakazam-Female.png b/newsrc/afd/2080bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0065-000-Alakazam-Female.png rename to newsrc/afd/2080bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0065-000-Alakazam.png b/newsrc/afd/2080bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0065-000-Alakazam.png rename to newsrc/afd/2080bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0065-000-Alakazam-Female.png b/newsrc/afd/2080f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0065-000-Alakazam-Female.png rename to newsrc/afd/2080f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0065-000-Alakazam-Female.png b/newsrc/afd/2080fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0065-000-Alakazam-Female.png rename to newsrc/afd/2080fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0065-000-Alakazam.png b/newsrc/afd/2080s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0065-000-Alakazam.png rename to newsrc/afd/2080s.png diff --git a/src/afd/sprites-canonical/front/0065-420-Alakazam-Mega.png b/newsrc/afd/2081.png similarity index 100% rename from src/afd/sprites-canonical/front/0065-420-Alakazam-Mega.png rename to newsrc/afd/2081.png diff --git a/src/afd/sprites-canonical/back/0065-420-Alakazam-Mega.png b/newsrc/afd/2081b.png similarity index 100% rename from src/afd/sprites-canonical/back/0065-420-Alakazam-Mega.png rename to newsrc/afd/2081b.png diff --git a/src/afd/sprites-canonical/back-shiny/0065-420-Alakazam-Mega.png b/newsrc/afd/2081bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0065-420-Alakazam-Mega.png rename to newsrc/afd/2081bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0065-420-Alakazam-Mega.png b/newsrc/afd/2081s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0065-420-Alakazam-Mega.png rename to newsrc/afd/2081s.png diff --git a/src/afd/sprites-canonical/front/0651-000-Quilladin.png b/newsrc/afd/20832.png similarity index 100% rename from src/afd/sprites-canonical/front/0651-000-Quilladin.png rename to newsrc/afd/20832.png diff --git a/src/afd/sprites-canonical/back/0651-000-Quilladin.png b/newsrc/afd/20832b.png similarity index 100% rename from src/afd/sprites-canonical/back/0651-000-Quilladin.png rename to newsrc/afd/20832b.png diff --git a/src/afd/sprites-canonical/back-shiny/0651-000-Quilladin.png b/newsrc/afd/20832bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0651-000-Quilladin.png rename to newsrc/afd/20832bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0651-000-Quilladin.png b/newsrc/afd/20832s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0651-000-Quilladin.png rename to newsrc/afd/20832s.png diff --git a/src/afd/sprites-canonical/front/0652-000-Chesnaught.png b/newsrc/afd/20864.png similarity index 100% rename from src/afd/sprites-canonical/front/0652-000-Chesnaught.png rename to newsrc/afd/20864.png diff --git a/src/afd/sprites-canonical/back/0652-000-Chesnaught.png b/newsrc/afd/20864b.png similarity index 100% rename from src/afd/sprites-canonical/back/0652-000-Chesnaught.png rename to newsrc/afd/20864b.png diff --git a/src/afd/sprites-canonical/back-shiny/0652-000-Chesnaught.png b/newsrc/afd/20864bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0652-000-Chesnaught.png rename to newsrc/afd/20864bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0652-000-Chesnaught.png b/newsrc/afd/20864s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0652-000-Chesnaught.png rename to newsrc/afd/20864s.png diff --git a/src/afd/sprites-canonical/front/0653-000-Fennekin.png b/newsrc/afd/20896.png similarity index 100% rename from src/afd/sprites-canonical/front/0653-000-Fennekin.png rename to newsrc/afd/20896.png diff --git a/src/afd/sprites-canonical/back/0653-000-Fennekin.png b/newsrc/afd/20896b.png similarity index 100% rename from src/afd/sprites-canonical/back/0653-000-Fennekin.png rename to newsrc/afd/20896b.png diff --git a/src/afd/sprites-canonical/back-shiny/0653-000-Fennekin.png b/newsrc/afd/20896bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0653-000-Fennekin.png rename to newsrc/afd/20896bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0653-000-Fennekin.png b/newsrc/afd/20896s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0653-000-Fennekin.png rename to newsrc/afd/20896s.png diff --git a/src/afd/sprites-canonical/front/0654-000-Braixen.png b/newsrc/afd/20928.png similarity index 100% rename from src/afd/sprites-canonical/front/0654-000-Braixen.png rename to newsrc/afd/20928.png diff --git a/src/afd/sprites-canonical/back/0654-000-Braixen.png b/newsrc/afd/20928b.png similarity index 100% rename from src/afd/sprites-canonical/back/0654-000-Braixen.png rename to newsrc/afd/20928b.png diff --git a/src/afd/sprites-canonical/back-shiny/0654-000-Braixen.png b/newsrc/afd/20928bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0654-000-Braixen.png rename to newsrc/afd/20928bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0654-000-Braixen.png b/newsrc/afd/20928s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0654-000-Braixen.png rename to newsrc/afd/20928s.png diff --git a/src/afd/sprites-canonical/front/0655-000-Delphox.png b/newsrc/afd/20960.png similarity index 100% rename from src/afd/sprites-canonical/front/0655-000-Delphox.png rename to newsrc/afd/20960.png diff --git a/src/afd/sprites-canonical/back/0655-000-Delphox.png b/newsrc/afd/20960b.png similarity index 100% rename from src/afd/sprites-canonical/back/0655-000-Delphox.png rename to newsrc/afd/20960b.png diff --git a/src/afd/sprites-canonical/back-shiny/0655-000-Delphox.png b/newsrc/afd/20960bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0655-000-Delphox.png rename to newsrc/afd/20960bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0655-000-Delphox.png b/newsrc/afd/20960s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0655-000-Delphox.png rename to newsrc/afd/20960s.png diff --git a/src/afd/sprites-canonical/front/0656-000-Froakie.png b/newsrc/afd/20992.png similarity index 100% rename from src/afd/sprites-canonical/front/0656-000-Froakie.png rename to newsrc/afd/20992.png diff --git a/src/afd/sprites-canonical/back/0656-000-Froakie.png b/newsrc/afd/20992b.png similarity index 100% rename from src/afd/sprites-canonical/back/0656-000-Froakie.png rename to newsrc/afd/20992b.png diff --git a/src/afd/sprites-canonical/back-shiny/0656-000-Froakie.png b/newsrc/afd/20992bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0656-000-Froakie.png rename to newsrc/afd/20992bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0656-000-Froakie.png b/newsrc/afd/20992s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0656-000-Froakie.png rename to newsrc/afd/20992s.png diff --git a/src/afd/sprites-canonical/front/0657-000-Frogadier.png b/newsrc/afd/21024.png similarity index 100% rename from src/afd/sprites-canonical/front/0657-000-Frogadier.png rename to newsrc/afd/21024.png diff --git a/src/afd/sprites-canonical/back/0657-000-Frogadier.png b/newsrc/afd/21024b.png similarity index 100% rename from src/afd/sprites-canonical/back/0657-000-Frogadier.png rename to newsrc/afd/21024b.png diff --git a/src/afd/sprites-canonical/back-shiny/0657-000-Frogadier.png b/newsrc/afd/21024bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0657-000-Frogadier.png rename to newsrc/afd/21024bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0657-000-Frogadier.png b/newsrc/afd/21024s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0657-000-Frogadier.png rename to newsrc/afd/21024s.png diff --git a/src/afd/sprites-canonical/front/0658-000-Greninja.png b/newsrc/afd/21056.png similarity index 100% rename from src/afd/sprites-canonical/front/0658-000-Greninja.png rename to newsrc/afd/21056.png diff --git a/src/afd/sprites-canonical/back/0658-000-Greninja.png b/newsrc/afd/21056b.png similarity index 100% rename from src/afd/sprites-canonical/back/0658-000-Greninja.png rename to newsrc/afd/21056b.png diff --git a/src/afd/sprites-canonical/back-shiny/0658-000-Greninja.png b/newsrc/afd/21056bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0658-000-Greninja.png rename to newsrc/afd/21056bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0658-000-Greninja.png b/newsrc/afd/21056s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0658-000-Greninja.png rename to newsrc/afd/21056s.png diff --git a/src/afd/sprites-canonical/front/0658-420-Greninja-Ash.png b/newsrc/afd/21058.png similarity index 100% rename from src/afd/sprites-canonical/front/0658-420-Greninja-Ash.png rename to newsrc/afd/21058.png diff --git a/src/afd/sprites-canonical/back/0658-420-Greninja-Ash.png b/newsrc/afd/21058b.png similarity index 100% rename from src/afd/sprites-canonical/back/0658-420-Greninja-Ash.png rename to newsrc/afd/21058b.png diff --git a/src/afd/sprites-canonical/back-shiny/0658-420-Greninja-Ash.png b/newsrc/afd/21058bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0658-420-Greninja-Ash.png rename to newsrc/afd/21058bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0658-420-Greninja-Ash.png b/newsrc/afd/21058s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0658-420-Greninja-Ash.png rename to newsrc/afd/21058s.png diff --git a/src/afd/sprites-canonical/front/0659-000-Bunnelby.png b/newsrc/afd/21088.png similarity index 100% rename from src/afd/sprites-canonical/front/0659-000-Bunnelby.png rename to newsrc/afd/21088.png diff --git a/src/afd/sprites-canonical/back/0659-000-Bunnelby.png b/newsrc/afd/21088b.png similarity index 100% rename from src/afd/sprites-canonical/back/0659-000-Bunnelby.png rename to newsrc/afd/21088b.png diff --git a/src/afd/sprites-canonical/back-shiny/0659-000-Bunnelby.png b/newsrc/afd/21088bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0659-000-Bunnelby.png rename to newsrc/afd/21088bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0659-000-Bunnelby.png b/newsrc/afd/21088s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0659-000-Bunnelby.png rename to newsrc/afd/21088s.png diff --git a/src/afd/sprites-canonical/front/0066-000-Machop.png b/newsrc/afd/2112.png similarity index 100% rename from src/afd/sprites-canonical/front/0066-000-Machop.png rename to newsrc/afd/2112.png diff --git a/src/afd/sprites-canonical/front/0660-000-Diggersby.png b/newsrc/afd/21120.png similarity index 100% rename from src/afd/sprites-canonical/front/0660-000-Diggersby.png rename to newsrc/afd/21120.png diff --git a/src/afd/sprites-canonical/back/0660-000-Diggersby.png b/newsrc/afd/21120b.png similarity index 100% rename from src/afd/sprites-canonical/back/0660-000-Diggersby.png rename to newsrc/afd/21120b.png diff --git a/src/afd/sprites-canonical/back-shiny/0660-000-Diggersby.png b/newsrc/afd/21120bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0660-000-Diggersby.png rename to newsrc/afd/21120bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0660-000-Diggersby.png b/newsrc/afd/21120s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0660-000-Diggersby.png rename to newsrc/afd/21120s.png diff --git a/src/afd/sprites-canonical/back/0066-000-Machop.png b/newsrc/afd/2112b.png similarity index 100% rename from src/afd/sprites-canonical/back/0066-000-Machop.png rename to newsrc/afd/2112b.png diff --git a/src/afd/sprites-canonical/back-shiny/0066-000-Machop.png b/newsrc/afd/2112bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0066-000-Machop.png rename to newsrc/afd/2112bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0066-000-Machop.png b/newsrc/afd/2112s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0066-000-Machop.png rename to newsrc/afd/2112s.png diff --git a/src/afd/sprites-canonical/front/0661-000-Fletchling.png b/newsrc/afd/21152.png similarity index 100% rename from src/afd/sprites-canonical/front/0661-000-Fletchling.png rename to newsrc/afd/21152.png diff --git a/src/afd/sprites-canonical/back/0661-000-Fletchling.png b/newsrc/afd/21152b.png similarity index 100% rename from src/afd/sprites-canonical/back/0661-000-Fletchling.png rename to newsrc/afd/21152b.png diff --git a/src/afd/sprites-canonical/back-shiny/0661-000-Fletchling.png b/newsrc/afd/21152bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0661-000-Fletchling.png rename to newsrc/afd/21152bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0661-000-Fletchling.png b/newsrc/afd/21152s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0661-000-Fletchling.png rename to newsrc/afd/21152s.png diff --git a/src/afd/sprites-canonical/front/0662-000-Fletchinder.png b/newsrc/afd/21184.png similarity index 100% rename from src/afd/sprites-canonical/front/0662-000-Fletchinder.png rename to newsrc/afd/21184.png diff --git a/src/afd/sprites-canonical/back/0662-000-Fletchinder.png b/newsrc/afd/21184b.png similarity index 100% rename from src/afd/sprites-canonical/back/0662-000-Fletchinder.png rename to newsrc/afd/21184b.png diff --git a/src/afd/sprites-canonical/back-shiny/0662-000-Fletchinder.png b/newsrc/afd/21184bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0662-000-Fletchinder.png rename to newsrc/afd/21184bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0662-000-Fletchinder.png b/newsrc/afd/21184s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0662-000-Fletchinder.png rename to newsrc/afd/21184s.png diff --git a/src/afd/sprites-canonical/front/0663-000-Talonflame.png b/newsrc/afd/21216.png similarity index 100% rename from src/afd/sprites-canonical/front/0663-000-Talonflame.png rename to newsrc/afd/21216.png diff --git a/src/afd/sprites-canonical/back/0663-000-Talonflame.png b/newsrc/afd/21216b.png similarity index 100% rename from src/afd/sprites-canonical/back/0663-000-Talonflame.png rename to newsrc/afd/21216b.png diff --git a/src/afd/sprites-canonical/back-shiny/0663-000-Talonflame.png b/newsrc/afd/21216bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0663-000-Talonflame.png rename to newsrc/afd/21216bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0663-000-Talonflame.png b/newsrc/afd/21216s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0663-000-Talonflame.png rename to newsrc/afd/21216s.png diff --git a/src/afd/sprites-canonical/front/0664-000-Scatterbug.png b/newsrc/afd/21248.png similarity index 100% rename from src/afd/sprites-canonical/front/0664-000-Scatterbug.png rename to newsrc/afd/21248.png diff --git a/src/afd/sprites-canonical/back/0664-000-Scatterbug.png b/newsrc/afd/21248b.png similarity index 100% rename from src/afd/sprites-canonical/back/0664-000-Scatterbug.png rename to newsrc/afd/21248b.png diff --git a/src/afd/sprites-canonical/back-shiny/0664-000-Scatterbug.png b/newsrc/afd/21248bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0664-000-Scatterbug.png rename to newsrc/afd/21248bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0664-000-Scatterbug.png b/newsrc/afd/21248s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0664-000-Scatterbug.png rename to newsrc/afd/21248s.png diff --git a/src/afd/sprites-canonical/back/0665-000-Spewpa.png b/newsrc/afd/21280.png similarity index 100% rename from src/afd/sprites-canonical/back/0665-000-Spewpa.png rename to newsrc/afd/21280.png diff --git a/src/afd/sprites-canonical/front/0665-000-Spewpa.png b/newsrc/afd/21280b.png similarity index 100% rename from src/afd/sprites-canonical/front/0665-000-Spewpa.png rename to newsrc/afd/21280b.png diff --git a/src/afd/sprites-canonical/back-shiny/0665-000-Spewpa.png b/newsrc/afd/21280bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0665-000-Spewpa.png rename to newsrc/afd/21280bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0665-000-Spewpa.png b/newsrc/afd/21280s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0665-000-Spewpa.png rename to newsrc/afd/21280s.png diff --git a/src/afd/sprites-canonical/front/0666-000-Vivillon.png b/newsrc/afd/21318.png similarity index 100% rename from src/afd/sprites-canonical/front/0666-000-Vivillon.png rename to newsrc/afd/21318.png diff --git a/src/afd/sprites-canonical/back/0666-000-Vivillon.png b/newsrc/afd/21318b.png similarity index 100% rename from src/afd/sprites-canonical/back/0666-000-Vivillon.png rename to newsrc/afd/21318b.png diff --git a/src/afd/sprites-canonical/back-shiny/0666-000-Vivillon.png b/newsrc/afd/21318bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0666-000-Vivillon.png rename to newsrc/afd/21318bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0666-000-Vivillon.png b/newsrc/afd/21318s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0666-000-Vivillon.png rename to newsrc/afd/21318s.png diff --git a/src/afd/sprites-canonical/front/0667-000-Litleo.png b/newsrc/afd/21344.png similarity index 100% rename from src/afd/sprites-canonical/front/0667-000-Litleo.png rename to newsrc/afd/21344.png diff --git a/src/afd/sprites-canonical/back/0667-000-Litleo.png b/newsrc/afd/21344b.png similarity index 100% rename from src/afd/sprites-canonical/back/0667-000-Litleo.png rename to newsrc/afd/21344b.png diff --git a/src/afd/sprites-canonical/back-shiny/0667-000-Litleo.png b/newsrc/afd/21344bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0667-000-Litleo.png rename to newsrc/afd/21344bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0667-000-Litleo.png b/newsrc/afd/21344s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0667-000-Litleo.png rename to newsrc/afd/21344s.png diff --git a/src/afd/sprites-canonical/front/0668-000-Pyroar.png b/newsrc/afd/21376.png similarity index 100% rename from src/afd/sprites-canonical/front/0668-000-Pyroar.png rename to newsrc/afd/21376.png diff --git a/src/afd/sprites-canonical/back/0668-000-Pyroar.png b/newsrc/afd/21376b.png similarity index 100% rename from src/afd/sprites-canonical/back/0668-000-Pyroar.png rename to newsrc/afd/21376b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0668-000-Pyroar-Female.png b/newsrc/afd/21376bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0668-000-Pyroar-Female.png rename to newsrc/afd/21376bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0668-000-Pyroar-Female.png b/newsrc/afd/21376bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0668-000-Pyroar-Female.png rename to newsrc/afd/21376bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0668-000-Pyroar.png b/newsrc/afd/21376bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0668-000-Pyroar.png rename to newsrc/afd/21376bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0668-000-Pyroar-Female.png b/newsrc/afd/21376f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0668-000-Pyroar-Female.png rename to newsrc/afd/21376f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0668-000-Pyroar-Female.png b/newsrc/afd/21376fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0668-000-Pyroar-Female.png rename to newsrc/afd/21376fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0668-000-Pyroar.png b/newsrc/afd/21376s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0668-000-Pyroar.png rename to newsrc/afd/21376s.png diff --git a/src/afd/sprites-canonical/front/0669-000-Flabe__0301be__0301.png b/newsrc/afd/21408.png similarity index 100% rename from src/afd/sprites-canonical/front/0669-000-Flabe__0301be__0301.png rename to newsrc/afd/21408.png diff --git a/src/afd/sprites-canonical/back/0669-000-Flabe__0301be__0301.png b/newsrc/afd/21408b.png similarity index 100% rename from src/afd/sprites-canonical/back/0669-000-Flabe__0301be__0301.png rename to newsrc/afd/21408b.png diff --git a/src/afd/sprites-canonical/back-shiny/0669-000-Flabe__0301be__0301.png b/newsrc/afd/21408bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0669-000-Flabe__0301be__0301.png rename to newsrc/afd/21408bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0669-000-Flabe__0301be__0301.png b/newsrc/afd/21408s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0669-000-Flabe__0301be__0301.png rename to newsrc/afd/21408s.png diff --git a/src/afd/sprites-canonical/front/0067-000-Machoke.png b/newsrc/afd/2144.png similarity index 100% rename from src/afd/sprites-canonical/front/0067-000-Machoke.png rename to newsrc/afd/2144.png diff --git a/src/afd/sprites-canonical/front/0670-000-Floette.png b/newsrc/afd/21440.png similarity index 100% rename from src/afd/sprites-canonical/front/0670-000-Floette.png rename to newsrc/afd/21440.png diff --git a/src/afd/sprites-canonical/back/0670-000-Floette.png b/newsrc/afd/21440b.png similarity index 100% rename from src/afd/sprites-canonical/back/0670-000-Floette.png rename to newsrc/afd/21440b.png diff --git a/src/afd/sprites-canonical/back-shiny/0670-000-Floette.png b/newsrc/afd/21440bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0670-000-Floette.png rename to newsrc/afd/21440bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0670-000-Floette.png b/newsrc/afd/21440s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0670-000-Floette.png rename to newsrc/afd/21440s.png diff --git a/src/afd/sprites-canonical/front/0670-420-Floette-Eternal.png b/newsrc/afd/21445.png similarity index 100% rename from src/afd/sprites-canonical/front/0670-420-Floette-Eternal.png rename to newsrc/afd/21445.png diff --git a/src/afd/sprites-canonical/back/0670-420-Floette-Eternal.png b/newsrc/afd/21445b.png similarity index 100% rename from src/afd/sprites-canonical/back/0670-420-Floette-Eternal.png rename to newsrc/afd/21445b.png diff --git a/src/afd/sprites-canonical/back-shiny/0670-420-Floette-Eternal.png b/newsrc/afd/21445bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0670-420-Floette-Eternal.png rename to newsrc/afd/21445bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0670-420-Floette-Eternal.png b/newsrc/afd/21445s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0670-420-Floette-Eternal.png rename to newsrc/afd/21445s.png diff --git a/src/afd/sprites-canonical/back/0067-000-Machoke.png b/newsrc/afd/2144b.png similarity index 100% rename from src/afd/sprites-canonical/back/0067-000-Machoke.png rename to newsrc/afd/2144b.png diff --git a/src/afd/sprites-canonical/back-shiny/0067-000-Machoke.png b/newsrc/afd/2144bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0067-000-Machoke.png rename to newsrc/afd/2144bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0067-000-Machoke.png b/newsrc/afd/2144s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0067-000-Machoke.png rename to newsrc/afd/2144s.png diff --git a/src/afd/sprites-canonical/front/0671-000-Florges.png b/newsrc/afd/21472.png similarity index 100% rename from src/afd/sprites-canonical/front/0671-000-Florges.png rename to newsrc/afd/21472.png diff --git a/src/afd/sprites-canonical/back/0671-000-Florges.png b/newsrc/afd/21472b.png similarity index 100% rename from src/afd/sprites-canonical/back/0671-000-Florges.png rename to newsrc/afd/21472b.png diff --git a/src/afd/sprites-canonical/back-shiny/0671-000-Florges.png b/newsrc/afd/21472bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0671-000-Florges.png rename to newsrc/afd/21472bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0671-000-Florges.png b/newsrc/afd/21472s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0671-000-Florges.png rename to newsrc/afd/21472s.png diff --git a/src/afd/sprites-canonical/front/0672-000-Skiddo.png b/newsrc/afd/21504.png similarity index 100% rename from src/afd/sprites-canonical/front/0672-000-Skiddo.png rename to newsrc/afd/21504.png diff --git a/src/afd/sprites-canonical/back/0672-000-Skiddo.png b/newsrc/afd/21504b.png similarity index 100% rename from src/afd/sprites-canonical/back/0672-000-Skiddo.png rename to newsrc/afd/21504b.png diff --git a/src/afd/sprites-canonical/back-shiny/0672-000-Skiddo.png b/newsrc/afd/21504bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0672-000-Skiddo.png rename to newsrc/afd/21504bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0672-000-Skiddo.png b/newsrc/afd/21504s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0672-000-Skiddo.png rename to newsrc/afd/21504s.png diff --git a/src/afd/sprites-canonical/front/0673-000-Gogoat.png b/newsrc/afd/21536.png similarity index 100% rename from src/afd/sprites-canonical/front/0673-000-Gogoat.png rename to newsrc/afd/21536.png diff --git a/src/afd/sprites-canonical/back/0673-000-Gogoat.png b/newsrc/afd/21536b.png similarity index 100% rename from src/afd/sprites-canonical/back/0673-000-Gogoat.png rename to newsrc/afd/21536b.png diff --git a/src/afd/sprites-canonical/back-shiny/0673-000-Gogoat.png b/newsrc/afd/21536bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0673-000-Gogoat.png rename to newsrc/afd/21536bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0673-000-Gogoat.png b/newsrc/afd/21536s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0673-000-Gogoat.png rename to newsrc/afd/21536s.png diff --git a/src/afd/sprites-canonical/front/0674-000-Pancham.png b/newsrc/afd/21568.png similarity index 100% rename from src/afd/sprites-canonical/front/0674-000-Pancham.png rename to newsrc/afd/21568.png diff --git a/src/afd/sprites-canonical/back/0674-000-Pancham.png b/newsrc/afd/21568b.png similarity index 100% rename from src/afd/sprites-canonical/back/0674-000-Pancham.png rename to newsrc/afd/21568b.png diff --git a/src/afd/sprites-canonical/back-shiny/0674-000-Pancham.png b/newsrc/afd/21568bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0674-000-Pancham.png rename to newsrc/afd/21568bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0674-000-Pancham.png b/newsrc/afd/21568s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0674-000-Pancham.png rename to newsrc/afd/21568s.png diff --git a/src/afd/sprites-canonical/front/0675-000-Pangoro.png b/newsrc/afd/21600.png similarity index 100% rename from src/afd/sprites-canonical/front/0675-000-Pangoro.png rename to newsrc/afd/21600.png diff --git a/src/afd/sprites-canonical/back/0675-000-Pangoro.png b/newsrc/afd/21600b.png similarity index 100% rename from src/afd/sprites-canonical/back/0675-000-Pangoro.png rename to newsrc/afd/21600b.png diff --git a/src/afd/sprites-canonical/back-shiny/0675-000-Pangoro.png b/newsrc/afd/21600bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0675-000-Pangoro.png rename to newsrc/afd/21600bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0675-000-Pangoro.png b/newsrc/afd/21600s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0675-000-Pangoro.png rename to newsrc/afd/21600s.png diff --git a/src/afd/sprites-canonical/front/0676-000-Furfrou.png b/newsrc/afd/21632.png similarity index 100% rename from src/afd/sprites-canonical/front/0676-000-Furfrou.png rename to newsrc/afd/21632.png diff --git a/src/afd/sprites-canonical/back/0676-000-Furfrou.png b/newsrc/afd/21632b.png similarity index 100% rename from src/afd/sprites-canonical/back/0676-000-Furfrou.png rename to newsrc/afd/21632b.png diff --git a/src/afd/sprites-canonical/back-shiny/0676-000-Furfrou.png b/newsrc/afd/21632bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0676-000-Furfrou.png rename to newsrc/afd/21632bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0676-000-Furfrou.png b/newsrc/afd/21632s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0676-000-Furfrou.png rename to newsrc/afd/21632s.png diff --git a/src/afd/sprites-canonical/front/0677-000-Espurr.png b/newsrc/afd/21664.png similarity index 100% rename from src/afd/sprites-canonical/front/0677-000-Espurr.png rename to newsrc/afd/21664.png diff --git a/src/afd/sprites-canonical/back/0677-000-Espurr.png b/newsrc/afd/21664b.png similarity index 100% rename from src/afd/sprites-canonical/back/0677-000-Espurr.png rename to newsrc/afd/21664b.png diff --git a/src/afd/sprites-canonical/back-shiny/0677-000-Espurr.png b/newsrc/afd/21664bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0677-000-Espurr.png rename to newsrc/afd/21664bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0677-000-Espurr.png b/newsrc/afd/21664s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0677-000-Espurr.png rename to newsrc/afd/21664s.png diff --git a/src/afd/sprites-canonical/front/0678-000-Meowstic.png b/newsrc/afd/21696.png similarity index 100% rename from src/afd/sprites-canonical/front/0678-000-Meowstic.png rename to newsrc/afd/21696.png diff --git a/src/afd/sprites-canonical/back/0678-000-Meowstic.png b/newsrc/afd/21696b.png similarity index 100% rename from src/afd/sprites-canonical/back/0678-000-Meowstic.png rename to newsrc/afd/21696b.png diff --git a/src/afd/sprites-canonical/back-shiny/0678-000-Meowstic.png b/newsrc/afd/21696bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0678-000-Meowstic.png rename to newsrc/afd/21696bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0678-000-Meowstic.png b/newsrc/afd/21696s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0678-000-Meowstic.png rename to newsrc/afd/21696s.png diff --git a/src/afd/sprites-canonical/front/0678-420-Meowstic-F.png b/newsrc/afd/21697.png similarity index 100% rename from src/afd/sprites-canonical/front/0678-420-Meowstic-F.png rename to newsrc/afd/21697.png diff --git a/src/afd/sprites-canonical/back/0678-420-Meowstic-F.png b/newsrc/afd/21697b.png similarity index 100% rename from src/afd/sprites-canonical/back/0678-420-Meowstic-F.png rename to newsrc/afd/21697b.png diff --git a/src/afd/sprites-canonical/back-shiny/0678-420-Meowstic-F.png b/newsrc/afd/21697bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0678-420-Meowstic-F.png rename to newsrc/afd/21697bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0678-420-Meowstic-F.png b/newsrc/afd/21697s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0678-420-Meowstic-F.png rename to newsrc/afd/21697s.png diff --git a/src/afd/sprites-canonical/front/0679-000-Honedge.png b/newsrc/afd/21728.png similarity index 100% rename from src/afd/sprites-canonical/front/0679-000-Honedge.png rename to newsrc/afd/21728.png diff --git a/src/afd/sprites-canonical/back/0679-000-Honedge.png b/newsrc/afd/21728b.png similarity index 100% rename from src/afd/sprites-canonical/back/0679-000-Honedge.png rename to newsrc/afd/21728b.png diff --git a/src/afd/sprites-canonical/back-shiny/0679-000-Honedge.png b/newsrc/afd/21728bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0679-000-Honedge.png rename to newsrc/afd/21728bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0679-000-Honedge.png b/newsrc/afd/21728s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0679-000-Honedge.png rename to newsrc/afd/21728s.png diff --git a/src/afd/sprites-canonical/front/0068-000-Machamp.png b/newsrc/afd/2176.png similarity index 100% rename from src/afd/sprites-canonical/front/0068-000-Machamp.png rename to newsrc/afd/2176.png diff --git a/src/afd/sprites-canonical/front/0680-000-Doublade.png b/newsrc/afd/21760.png similarity index 100% rename from src/afd/sprites-canonical/front/0680-000-Doublade.png rename to newsrc/afd/21760.png diff --git a/src/afd/sprites-canonical/back/0680-000-Doublade.png b/newsrc/afd/21760b.png similarity index 100% rename from src/afd/sprites-canonical/back/0680-000-Doublade.png rename to newsrc/afd/21760b.png diff --git a/src/afd/sprites-canonical/back-shiny/0680-000-Doublade.png b/newsrc/afd/21760bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0680-000-Doublade.png rename to newsrc/afd/21760bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0680-000-Doublade.png b/newsrc/afd/21760s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0680-000-Doublade.png rename to newsrc/afd/21760s.png diff --git a/src/afd/sprites-canonical/back/0068-000-Machamp.png b/newsrc/afd/2176b.png similarity index 100% rename from src/afd/sprites-canonical/back/0068-000-Machamp.png rename to newsrc/afd/2176b.png diff --git a/src/afd/sprites-canonical/back/0068-420-Machamp-Gmax.png b/newsrc/afd/2176bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0068-420-Machamp-Gmax.png rename to newsrc/afd/2176bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0068-420-Machamp-Gmax.png b/newsrc/afd/2176bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0068-420-Machamp-Gmax.png rename to newsrc/afd/2176bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0068-000-Machamp.png b/newsrc/afd/2176bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0068-000-Machamp.png rename to newsrc/afd/2176bs.png diff --git a/src/afd/sprites-canonical/front/0068-420-Machamp-Gmax.png b/newsrc/afd/2176g.png similarity index 100% rename from src/afd/sprites-canonical/front/0068-420-Machamp-Gmax.png rename to newsrc/afd/2176g.png diff --git a/src/afd/sprites-canonical/front-shiny/0068-420-Machamp-Gmax.png b/newsrc/afd/2176gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0068-420-Machamp-Gmax.png rename to newsrc/afd/2176gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0068-000-Machamp.png b/newsrc/afd/2176s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0068-000-Machamp.png rename to newsrc/afd/2176s.png diff --git a/src/afd/sprites-canonical/front/0681-000-Aegislash.png b/newsrc/afd/21792.png similarity index 100% rename from src/afd/sprites-canonical/front/0681-000-Aegislash.png rename to newsrc/afd/21792.png diff --git a/src/afd/sprites-canonical/back/0681-000-Aegislash.png b/newsrc/afd/21792b.png similarity index 100% rename from src/afd/sprites-canonical/back/0681-000-Aegislash.png rename to newsrc/afd/21792b.png diff --git a/src/afd/sprites-canonical/back-shiny/0681-000-Aegislash.png b/newsrc/afd/21792bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0681-000-Aegislash.png rename to newsrc/afd/21792bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0681-000-Aegislash.png b/newsrc/afd/21792s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0681-000-Aegislash.png rename to newsrc/afd/21792s.png diff --git a/src/afd/sprites-canonical/front/0681-420-Aegislash-Blade.png b/newsrc/afd/21793.png similarity index 100% rename from src/afd/sprites-canonical/front/0681-420-Aegislash-Blade.png rename to newsrc/afd/21793.png diff --git a/src/afd/sprites-canonical/back/0681-420-Aegislash-Blade.png b/newsrc/afd/21793b.png similarity index 100% rename from src/afd/sprites-canonical/back/0681-420-Aegislash-Blade.png rename to newsrc/afd/21793b.png diff --git a/src/afd/sprites-canonical/back-shiny/0681-420-Aegislash-Blade.png b/newsrc/afd/21793bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0681-420-Aegislash-Blade.png rename to newsrc/afd/21793bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0681-420-Aegislash-Blade.png b/newsrc/afd/21793s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0681-420-Aegislash-Blade.png rename to newsrc/afd/21793s.png diff --git a/src/afd/sprites-canonical/front/0682-000-Spritzee.png b/newsrc/afd/21824.png similarity index 100% rename from src/afd/sprites-canonical/front/0682-000-Spritzee.png rename to newsrc/afd/21824.png diff --git a/src/afd/sprites-canonical/back/0682-000-Spritzee.png b/newsrc/afd/21824b.png similarity index 100% rename from src/afd/sprites-canonical/back/0682-000-Spritzee.png rename to newsrc/afd/21824b.png diff --git a/src/afd/sprites-canonical/back-shiny/0682-000-Spritzee.png b/newsrc/afd/21824bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0682-000-Spritzee.png rename to newsrc/afd/21824bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0682-000-Spritzee.png b/newsrc/afd/21824s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0682-000-Spritzee.png rename to newsrc/afd/21824s.png diff --git a/src/afd/sprites-canonical/front/0683-000-Aromatisse.png b/newsrc/afd/21856.png similarity index 100% rename from src/afd/sprites-canonical/front/0683-000-Aromatisse.png rename to newsrc/afd/21856.png diff --git a/src/afd/sprites-canonical/back/0683-000-Aromatisse.png b/newsrc/afd/21856b.png similarity index 100% rename from src/afd/sprites-canonical/back/0683-000-Aromatisse.png rename to newsrc/afd/21856b.png diff --git a/src/afd/sprites-canonical/back-shiny/0683-000-Aromatisse.png b/newsrc/afd/21856bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0683-000-Aromatisse.png rename to newsrc/afd/21856bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0683-000-Aromatisse.png b/newsrc/afd/21856s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0683-000-Aromatisse.png rename to newsrc/afd/21856s.png diff --git a/src/afd/sprites-canonical/front/0684-000-Swirlix.png b/newsrc/afd/21888.png similarity index 100% rename from src/afd/sprites-canonical/front/0684-000-Swirlix.png rename to newsrc/afd/21888.png diff --git a/src/afd/sprites-canonical/back/0684-000-Swirlix.png b/newsrc/afd/21888b.png similarity index 100% rename from src/afd/sprites-canonical/back/0684-000-Swirlix.png rename to newsrc/afd/21888b.png diff --git a/src/afd/sprites-canonical/back-shiny/0684-000-Swirlix.png b/newsrc/afd/21888bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0684-000-Swirlix.png rename to newsrc/afd/21888bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0684-000-Swirlix.png b/newsrc/afd/21888s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0684-000-Swirlix.png rename to newsrc/afd/21888s.png diff --git a/src/afd/sprites-canonical/front/0685-000-Slurpuff.png b/newsrc/afd/21920.png similarity index 100% rename from src/afd/sprites-canonical/front/0685-000-Slurpuff.png rename to newsrc/afd/21920.png diff --git a/src/afd/sprites-canonical/back/0685-000-Slurpuff.png b/newsrc/afd/21920b.png similarity index 100% rename from src/afd/sprites-canonical/back/0685-000-Slurpuff.png rename to newsrc/afd/21920b.png diff --git a/src/afd/sprites-canonical/back-shiny/0685-000-Slurpuff.png b/newsrc/afd/21920bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0685-000-Slurpuff.png rename to newsrc/afd/21920bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0685-000-Slurpuff.png b/newsrc/afd/21920s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0685-000-Slurpuff.png rename to newsrc/afd/21920s.png diff --git a/src/afd/sprites-canonical/front/0686-000-Inkay.png b/newsrc/afd/21952.png similarity index 100% rename from src/afd/sprites-canonical/front/0686-000-Inkay.png rename to newsrc/afd/21952.png diff --git a/src/afd/sprites-canonical/back/0686-000-Inkay.png b/newsrc/afd/21952b.png similarity index 100% rename from src/afd/sprites-canonical/back/0686-000-Inkay.png rename to newsrc/afd/21952b.png diff --git a/src/afd/sprites-canonical/back-shiny/0686-000-Inkay.png b/newsrc/afd/21952bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0686-000-Inkay.png rename to newsrc/afd/21952bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0686-000-Inkay.png b/newsrc/afd/21952s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0686-000-Inkay.png rename to newsrc/afd/21952s.png diff --git a/src/afd/sprites-canonical/front/0687-000-Malamar.png b/newsrc/afd/21984.png similarity index 100% rename from src/afd/sprites-canonical/front/0687-000-Malamar.png rename to newsrc/afd/21984.png diff --git a/src/afd/sprites-canonical/back/0687-000-Malamar.png b/newsrc/afd/21984b.png similarity index 100% rename from src/afd/sprites-canonical/back/0687-000-Malamar.png rename to newsrc/afd/21984b.png diff --git a/src/afd/sprites-canonical/back-shiny/0687-000-Malamar.png b/newsrc/afd/21984bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0687-000-Malamar.png rename to newsrc/afd/21984bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0687-000-Malamar.png b/newsrc/afd/21984s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0687-000-Malamar.png rename to newsrc/afd/21984s.png diff --git a/src/afd/sprites-canonical/front/0688-000-Binacle.png b/newsrc/afd/22016.png similarity index 100% rename from src/afd/sprites-canonical/front/0688-000-Binacle.png rename to newsrc/afd/22016.png diff --git a/src/afd/sprites-canonical/back/0688-000-Binacle.png b/newsrc/afd/22016b.png similarity index 100% rename from src/afd/sprites-canonical/back/0688-000-Binacle.png rename to newsrc/afd/22016b.png diff --git a/src/afd/sprites-canonical/back-shiny/0688-000-Binacle.png b/newsrc/afd/22016bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0688-000-Binacle.png rename to newsrc/afd/22016bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0688-000-Binacle.png b/newsrc/afd/22016s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0688-000-Binacle.png rename to newsrc/afd/22016s.png diff --git a/src/afd/sprites-canonical/front/0689-000-Barbaracle.png b/newsrc/afd/22048.png similarity index 100% rename from src/afd/sprites-canonical/front/0689-000-Barbaracle.png rename to newsrc/afd/22048.png diff --git a/src/afd/sprites-canonical/back/0689-000-Barbaracle.png b/newsrc/afd/22048b.png similarity index 100% rename from src/afd/sprites-canonical/back/0689-000-Barbaracle.png rename to newsrc/afd/22048b.png diff --git a/src/afd/sprites-canonical/back-shiny/0689-000-Barbaracle.png b/newsrc/afd/22048bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0689-000-Barbaracle.png rename to newsrc/afd/22048bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0689-000-Barbaracle.png b/newsrc/afd/22048s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0689-000-Barbaracle.png rename to newsrc/afd/22048s.png diff --git a/src/afd/sprites-canonical/front/0069-000-Bellsprout.png b/newsrc/afd/2208.png similarity index 100% rename from src/afd/sprites-canonical/front/0069-000-Bellsprout.png rename to newsrc/afd/2208.png diff --git a/src/afd/sprites-canonical/front/0690-000-Skrelp.png b/newsrc/afd/22080.png similarity index 100% rename from src/afd/sprites-canonical/front/0690-000-Skrelp.png rename to newsrc/afd/22080.png diff --git a/src/afd/sprites-canonical/back/0690-000-Skrelp.png b/newsrc/afd/22080b.png similarity index 100% rename from src/afd/sprites-canonical/back/0690-000-Skrelp.png rename to newsrc/afd/22080b.png diff --git a/src/afd/sprites-canonical/back-shiny/0690-000-Skrelp.png b/newsrc/afd/22080bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0690-000-Skrelp.png rename to newsrc/afd/22080bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0690-000-Skrelp.png b/newsrc/afd/22080s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0690-000-Skrelp.png rename to newsrc/afd/22080s.png diff --git a/src/afd/sprites-canonical/back/0069-000-Bellsprout.png b/newsrc/afd/2208b.png similarity index 100% rename from src/afd/sprites-canonical/back/0069-000-Bellsprout.png rename to newsrc/afd/2208b.png diff --git a/src/afd/sprites-canonical/back-shiny/0069-000-Bellsprout.png b/newsrc/afd/2208bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0069-000-Bellsprout.png rename to newsrc/afd/2208bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0069-000-Bellsprout.png b/newsrc/afd/2208s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0069-000-Bellsprout.png rename to newsrc/afd/2208s.png diff --git a/src/afd/sprites-canonical/front/0691-000-Dragalge.png b/newsrc/afd/22112.png similarity index 100% rename from src/afd/sprites-canonical/front/0691-000-Dragalge.png rename to newsrc/afd/22112.png diff --git a/src/afd/sprites-canonical/back/0691-000-Dragalge.png b/newsrc/afd/22112b.png similarity index 100% rename from src/afd/sprites-canonical/back/0691-000-Dragalge.png rename to newsrc/afd/22112b.png diff --git a/src/afd/sprites-canonical/back-shiny/0691-000-Dragalge.png b/newsrc/afd/22112bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0691-000-Dragalge.png rename to newsrc/afd/22112bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0691-000-Dragalge.png b/newsrc/afd/22112s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0691-000-Dragalge.png rename to newsrc/afd/22112s.png diff --git a/src/afd/sprites-canonical/front/0692-000-Clauncher.png b/newsrc/afd/22144.png similarity index 100% rename from src/afd/sprites-canonical/front/0692-000-Clauncher.png rename to newsrc/afd/22144.png diff --git a/src/afd/sprites-canonical/back/0692-000-Clauncher.png b/newsrc/afd/22144b.png similarity index 100% rename from src/afd/sprites-canonical/back/0692-000-Clauncher.png rename to newsrc/afd/22144b.png diff --git a/src/afd/sprites-canonical/back-shiny/0692-000-Clauncher.png b/newsrc/afd/22144bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0692-000-Clauncher.png rename to newsrc/afd/22144bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0692-000-Clauncher.png b/newsrc/afd/22144s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0692-000-Clauncher.png rename to newsrc/afd/22144s.png diff --git a/src/afd/sprites-canonical/front/0693-000-Clawitzer.png b/newsrc/afd/22176.png similarity index 100% rename from src/afd/sprites-canonical/front/0693-000-Clawitzer.png rename to newsrc/afd/22176.png diff --git a/src/afd/sprites-canonical/back/0693-000-Clawitzer.png b/newsrc/afd/22176b.png similarity index 100% rename from src/afd/sprites-canonical/back/0693-000-Clawitzer.png rename to newsrc/afd/22176b.png diff --git a/src/afd/sprites-canonical/back-shiny/0693-000-Clawitzer.png b/newsrc/afd/22176bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0693-000-Clawitzer.png rename to newsrc/afd/22176bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0693-000-Clawitzer.png b/newsrc/afd/22176s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0693-000-Clawitzer.png rename to newsrc/afd/22176s.png diff --git a/src/afd/sprites-canonical/front/0694-000-Helioptile.png b/newsrc/afd/22208.png similarity index 100% rename from src/afd/sprites-canonical/front/0694-000-Helioptile.png rename to newsrc/afd/22208.png diff --git a/src/afd/sprites-canonical/back/0694-000-Helioptile.png b/newsrc/afd/22208b.png similarity index 100% rename from src/afd/sprites-canonical/back/0694-000-Helioptile.png rename to newsrc/afd/22208b.png diff --git a/src/afd/sprites-canonical/back-shiny/0694-000-Helioptile.png b/newsrc/afd/22208bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0694-000-Helioptile.png rename to newsrc/afd/22208bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0694-000-Helioptile.png b/newsrc/afd/22208s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0694-000-Helioptile.png rename to newsrc/afd/22208s.png diff --git a/src/afd/sprites-canonical/front/0695-000-Heliolisk.png b/newsrc/afd/22240.png similarity index 100% rename from src/afd/sprites-canonical/front/0695-000-Heliolisk.png rename to newsrc/afd/22240.png diff --git a/src/afd/sprites-canonical/back/0695-000-Heliolisk.png b/newsrc/afd/22240b.png similarity index 100% rename from src/afd/sprites-canonical/back/0695-000-Heliolisk.png rename to newsrc/afd/22240b.png diff --git a/src/afd/sprites-canonical/back-shiny/0695-000-Heliolisk.png b/newsrc/afd/22240bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0695-000-Heliolisk.png rename to newsrc/afd/22240bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0695-000-Heliolisk.png b/newsrc/afd/22240s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0695-000-Heliolisk.png rename to newsrc/afd/22240s.png diff --git a/src/afd/sprites-canonical/front/0696-000-Tyrunt.png b/newsrc/afd/22272.png similarity index 100% rename from src/afd/sprites-canonical/front/0696-000-Tyrunt.png rename to newsrc/afd/22272.png diff --git a/src/afd/sprites-canonical/back/0696-000-Tyrunt.png b/newsrc/afd/22272b.png similarity index 100% rename from src/afd/sprites-canonical/back/0696-000-Tyrunt.png rename to newsrc/afd/22272b.png diff --git a/src/afd/sprites-canonical/back-shiny/0696-000-Tyrunt.png b/newsrc/afd/22272bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0696-000-Tyrunt.png rename to newsrc/afd/22272bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0696-000-Tyrunt.png b/newsrc/afd/22272s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0696-000-Tyrunt.png rename to newsrc/afd/22272s.png diff --git a/src/afd/sprites-canonical/front/0697-000-Tyrantrum.png b/newsrc/afd/22304.png similarity index 100% rename from src/afd/sprites-canonical/front/0697-000-Tyrantrum.png rename to newsrc/afd/22304.png diff --git a/src/afd/sprites-canonical/back/0697-000-Tyrantrum.png b/newsrc/afd/22304b.png similarity index 100% rename from src/afd/sprites-canonical/back/0697-000-Tyrantrum.png rename to newsrc/afd/22304b.png diff --git a/src/afd/sprites-canonical/back-shiny/0697-000-Tyrantrum.png b/newsrc/afd/22304bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0697-000-Tyrantrum.png rename to newsrc/afd/22304bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0697-000-Tyrantrum.png b/newsrc/afd/22304s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0697-000-Tyrantrum.png rename to newsrc/afd/22304s.png diff --git a/src/afd/sprites-canonical/front/0698-000-Amaura.png b/newsrc/afd/22336.png similarity index 100% rename from src/afd/sprites-canonical/front/0698-000-Amaura.png rename to newsrc/afd/22336.png diff --git a/src/afd/sprites-canonical/back/0698-000-Amaura.png b/newsrc/afd/22336b.png similarity index 100% rename from src/afd/sprites-canonical/back/0698-000-Amaura.png rename to newsrc/afd/22336b.png diff --git a/src/afd/sprites-canonical/back-shiny/0698-000-Amaura.png b/newsrc/afd/22336bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0698-000-Amaura.png rename to newsrc/afd/22336bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0698-000-Amaura.png b/newsrc/afd/22336s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0698-000-Amaura.png rename to newsrc/afd/22336s.png diff --git a/src/afd/sprites-canonical/front/0699-000-Aurorus.png b/newsrc/afd/22368.png similarity index 100% rename from src/afd/sprites-canonical/front/0699-000-Aurorus.png rename to newsrc/afd/22368.png diff --git a/src/afd/sprites-canonical/back/0699-000-Aurorus.png b/newsrc/afd/22368b.png similarity index 100% rename from src/afd/sprites-canonical/back/0699-000-Aurorus.png rename to newsrc/afd/22368b.png diff --git a/src/afd/sprites-canonical/back-shiny/0699-000-Aurorus.png b/newsrc/afd/22368bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0699-000-Aurorus.png rename to newsrc/afd/22368bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0699-000-Aurorus.png b/newsrc/afd/22368s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0699-000-Aurorus.png rename to newsrc/afd/22368s.png diff --git a/src/afd/sprites-canonical/front/0007-000-Squirtle.png b/newsrc/afd/224.png similarity index 100% rename from src/afd/sprites-canonical/front/0007-000-Squirtle.png rename to newsrc/afd/224.png diff --git a/src/afd/sprites-canonical/front/0070-000-Weepinbell.png b/newsrc/afd/2240.png similarity index 100% rename from src/afd/sprites-canonical/front/0070-000-Weepinbell.png rename to newsrc/afd/2240.png diff --git a/src/afd/sprites-canonical/front/0700-000-Sylveon.png b/newsrc/afd/22400.png similarity index 100% rename from src/afd/sprites-canonical/front/0700-000-Sylveon.png rename to newsrc/afd/22400.png diff --git a/src/afd/sprites-canonical/back/0700-000-Sylveon.png b/newsrc/afd/22400b.png similarity index 100% rename from src/afd/sprites-canonical/back/0700-000-Sylveon.png rename to newsrc/afd/22400b.png diff --git a/src/afd/sprites-canonical/back-shiny/0700-000-Sylveon.png b/newsrc/afd/22400bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0700-000-Sylveon.png rename to newsrc/afd/22400bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0700-000-Sylveon.png b/newsrc/afd/22400s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0700-000-Sylveon.png rename to newsrc/afd/22400s.png diff --git a/src/afd/sprites-canonical/back/0070-000-Weepinbell.png b/newsrc/afd/2240b.png similarity index 100% rename from src/afd/sprites-canonical/back/0070-000-Weepinbell.png rename to newsrc/afd/2240b.png diff --git a/src/afd/sprites-canonical/back-shiny/0070-000-Weepinbell.png b/newsrc/afd/2240bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0070-000-Weepinbell.png rename to newsrc/afd/2240bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0070-000-Weepinbell.png b/newsrc/afd/2240s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0070-000-Weepinbell.png rename to newsrc/afd/2240s.png diff --git a/src/afd/sprites-canonical/front/0701-000-Hawlucha.png b/newsrc/afd/22432.png similarity index 100% rename from src/afd/sprites-canonical/front/0701-000-Hawlucha.png rename to newsrc/afd/22432.png diff --git a/src/afd/sprites-canonical/back/0701-000-Hawlucha.png b/newsrc/afd/22432b.png similarity index 100% rename from src/afd/sprites-canonical/back/0701-000-Hawlucha.png rename to newsrc/afd/22432b.png diff --git a/src/afd/sprites-canonical/back-shiny/0701-000-Hawlucha.png b/newsrc/afd/22432bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0701-000-Hawlucha.png rename to newsrc/afd/22432bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0701-000-Hawlucha.png b/newsrc/afd/22432s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0701-000-Hawlucha.png rename to newsrc/afd/22432s.png diff --git a/src/afd/sprites-canonical/front/0702-000-Dedenne.png b/newsrc/afd/22464.png similarity index 100% rename from src/afd/sprites-canonical/front/0702-000-Dedenne.png rename to newsrc/afd/22464.png diff --git a/src/afd/sprites-canonical/back/0702-000-Dedenne.png b/newsrc/afd/22464b.png similarity index 100% rename from src/afd/sprites-canonical/back/0702-000-Dedenne.png rename to newsrc/afd/22464b.png diff --git a/src/afd/sprites-canonical/back-shiny/0702-000-Dedenne.png b/newsrc/afd/22464bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0702-000-Dedenne.png rename to newsrc/afd/22464bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0702-000-Dedenne.png b/newsrc/afd/22464s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0702-000-Dedenne.png rename to newsrc/afd/22464s.png diff --git a/src/afd/sprites-canonical/front/0703-000-Carbink.png b/newsrc/afd/22496.png similarity index 100% rename from src/afd/sprites-canonical/front/0703-000-Carbink.png rename to newsrc/afd/22496.png diff --git a/src/afd/sprites-canonical/back/0703-000-Carbink.png b/newsrc/afd/22496b.png similarity index 100% rename from src/afd/sprites-canonical/back/0703-000-Carbink.png rename to newsrc/afd/22496b.png diff --git a/src/afd/sprites-canonical/back-shiny/0703-000-Carbink.png b/newsrc/afd/22496bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0703-000-Carbink.png rename to newsrc/afd/22496bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0703-000-Carbink.png b/newsrc/afd/22496s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0703-000-Carbink.png rename to newsrc/afd/22496s.png diff --git a/src/afd/sprites-canonical/back/0007-000-Squirtle.png b/newsrc/afd/224b.png similarity index 100% rename from src/afd/sprites-canonical/back/0007-000-Squirtle.png rename to newsrc/afd/224b.png diff --git a/src/afd/sprites-canonical/back-shiny/0007-000-Squirtle.png b/newsrc/afd/224bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0007-000-Squirtle.png rename to newsrc/afd/224bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0007-000-Squirtle.png b/newsrc/afd/224s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0007-000-Squirtle.png rename to newsrc/afd/224s.png diff --git a/src/afd/sprites-canonical/front/0704-000-Goomy.png b/newsrc/afd/22528.png similarity index 100% rename from src/afd/sprites-canonical/front/0704-000-Goomy.png rename to newsrc/afd/22528.png diff --git a/src/afd/sprites-canonical/back/0704-000-Goomy.png b/newsrc/afd/22528b.png similarity index 100% rename from src/afd/sprites-canonical/back/0704-000-Goomy.png rename to newsrc/afd/22528b.png diff --git a/src/afd/sprites-canonical/back-shiny/0704-000-Goomy.png b/newsrc/afd/22528bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0704-000-Goomy.png rename to newsrc/afd/22528bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0704-000-Goomy.png b/newsrc/afd/22528s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0704-000-Goomy.png rename to newsrc/afd/22528s.png diff --git a/src/afd/sprites-canonical/front/0705-000-Sliggoo.png b/newsrc/afd/22560.png similarity index 100% rename from src/afd/sprites-canonical/front/0705-000-Sliggoo.png rename to newsrc/afd/22560.png diff --git a/src/afd/sprites-canonical/back/0705-000-Sliggoo.png b/newsrc/afd/22560b.png similarity index 100% rename from src/afd/sprites-canonical/back/0705-000-Sliggoo.png rename to newsrc/afd/22560b.png diff --git a/src/afd/sprites-canonical/back-shiny/0705-000-Sliggoo.png b/newsrc/afd/22560bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0705-000-Sliggoo.png rename to newsrc/afd/22560bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0705-000-Sliggoo.png b/newsrc/afd/22560s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0705-000-Sliggoo.png rename to newsrc/afd/22560s.png diff --git a/src/afd/sprites-canonical/front/0706-000-Goodra.png b/newsrc/afd/22592.png similarity index 100% rename from src/afd/sprites-canonical/front/0706-000-Goodra.png rename to newsrc/afd/22592.png diff --git a/src/afd/sprites-canonical/back/0706-000-Goodra.png b/newsrc/afd/22592b.png similarity index 100% rename from src/afd/sprites-canonical/back/0706-000-Goodra.png rename to newsrc/afd/22592b.png diff --git a/src/afd/sprites-canonical/back-shiny/0706-000-Goodra.png b/newsrc/afd/22592bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0706-000-Goodra.png rename to newsrc/afd/22592bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0706-000-Goodra.png b/newsrc/afd/22592s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0706-000-Goodra.png rename to newsrc/afd/22592s.png diff --git a/src/afd/sprites-canonical/front/0707-000-Klefki.png b/newsrc/afd/22624.png similarity index 100% rename from src/afd/sprites-canonical/front/0707-000-Klefki.png rename to newsrc/afd/22624.png diff --git a/src/afd/sprites-canonical/back/0707-000-Klefki.png b/newsrc/afd/22624b.png similarity index 100% rename from src/afd/sprites-canonical/back/0707-000-Klefki.png rename to newsrc/afd/22624b.png diff --git a/src/afd/sprites-canonical/back-shiny/0707-000-Klefki.png b/newsrc/afd/22624bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0707-000-Klefki.png rename to newsrc/afd/22624bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0707-000-Klefki.png b/newsrc/afd/22624s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0707-000-Klefki.png rename to newsrc/afd/22624s.png diff --git a/src/afd/sprites-canonical/front/0708-000-Phantump.png b/newsrc/afd/22656.png similarity index 100% rename from src/afd/sprites-canonical/front/0708-000-Phantump.png rename to newsrc/afd/22656.png diff --git a/src/afd/sprites-canonical/back/0708-000-Phantump.png b/newsrc/afd/22656b.png similarity index 100% rename from src/afd/sprites-canonical/back/0708-000-Phantump.png rename to newsrc/afd/22656b.png diff --git a/src/afd/sprites-canonical/back-shiny/0708-000-Phantump.png b/newsrc/afd/22656bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0708-000-Phantump.png rename to newsrc/afd/22656bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0708-000-Phantump.png b/newsrc/afd/22656s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0708-000-Phantump.png rename to newsrc/afd/22656s.png diff --git a/src/afd/sprites-canonical/front/0709-000-Trevenant.png b/newsrc/afd/22688.png similarity index 100% rename from src/afd/sprites-canonical/front/0709-000-Trevenant.png rename to newsrc/afd/22688.png diff --git a/src/afd/sprites-canonical/back/0709-000-Trevenant.png b/newsrc/afd/22688b.png similarity index 100% rename from src/afd/sprites-canonical/back/0709-000-Trevenant.png rename to newsrc/afd/22688b.png diff --git a/src/afd/sprites-canonical/back-shiny/0709-000-Trevenant.png b/newsrc/afd/22688bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0709-000-Trevenant.png rename to newsrc/afd/22688bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0709-000-Trevenant.png b/newsrc/afd/22688s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0709-000-Trevenant.png rename to newsrc/afd/22688s.png diff --git a/src/afd/sprites-canonical/front/0071-000-Victreebel.png b/newsrc/afd/2272.png similarity index 100% rename from src/afd/sprites-canonical/front/0071-000-Victreebel.png rename to newsrc/afd/2272.png diff --git a/src/afd/sprites-canonical/front/0710-000-Pumpkaboo.png b/newsrc/afd/22720.png similarity index 100% rename from src/afd/sprites-canonical/front/0710-000-Pumpkaboo.png rename to newsrc/afd/22720.png diff --git a/src/afd/sprites-canonical/back/0710-000-Pumpkaboo.png b/newsrc/afd/22720b.png similarity index 100% rename from src/afd/sprites-canonical/back/0710-000-Pumpkaboo.png rename to newsrc/afd/22720b.png diff --git a/src/afd/sprites-canonical/back-shiny/0710-000-Pumpkaboo.png b/newsrc/afd/22720bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0710-000-Pumpkaboo.png rename to newsrc/afd/22720bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0710-000-Pumpkaboo.png b/newsrc/afd/22720s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0710-000-Pumpkaboo.png rename to newsrc/afd/22720s.png diff --git a/src/afd/sprites-canonical/front/0710-420-Pumpkaboo-Small.png b/newsrc/afd/22721.png similarity index 100% rename from src/afd/sprites-canonical/front/0710-420-Pumpkaboo-Small.png rename to newsrc/afd/22721.png diff --git a/src/afd/sprites-canonical/back/0710-420-Pumpkaboo-Small.png b/newsrc/afd/22721b.png similarity index 100% rename from src/afd/sprites-canonical/back/0710-420-Pumpkaboo-Small.png rename to newsrc/afd/22721b.png diff --git a/src/afd/sprites-canonical/back-shiny/0710-420-Pumpkaboo-Small.png b/newsrc/afd/22721bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0710-420-Pumpkaboo-Small.png rename to newsrc/afd/22721bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0710-420-Pumpkaboo-Small.png b/newsrc/afd/22721s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0710-420-Pumpkaboo-Small.png rename to newsrc/afd/22721s.png diff --git a/src/afd/sprites-canonical/front/0710-420-Pumpkaboo-Large.png b/newsrc/afd/22722.png similarity index 100% rename from src/afd/sprites-canonical/front/0710-420-Pumpkaboo-Large.png rename to newsrc/afd/22722.png diff --git a/src/afd/sprites-canonical/back/0710-420-Pumpkaboo-Large.png b/newsrc/afd/22722b.png similarity index 100% rename from src/afd/sprites-canonical/back/0710-420-Pumpkaboo-Large.png rename to newsrc/afd/22722b.png diff --git a/src/afd/sprites-canonical/back-shiny/0710-420-Pumpkaboo-Large.png b/newsrc/afd/22722bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0710-420-Pumpkaboo-Large.png rename to newsrc/afd/22722bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0710-420-Pumpkaboo-Large.png b/newsrc/afd/22722s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0710-420-Pumpkaboo-Large.png rename to newsrc/afd/22722s.png diff --git a/src/afd/sprites-canonical/front/0710-420-Pumpkaboo-Super.png b/newsrc/afd/22723.png similarity index 100% rename from src/afd/sprites-canonical/front/0710-420-Pumpkaboo-Super.png rename to newsrc/afd/22723.png diff --git a/src/afd/sprites-canonical/back/0710-420-Pumpkaboo-Super.png b/newsrc/afd/22723b.png similarity index 100% rename from src/afd/sprites-canonical/back/0710-420-Pumpkaboo-Super.png rename to newsrc/afd/22723b.png diff --git a/src/afd/sprites-canonical/back-shiny/0710-420-Pumpkaboo-Super.png b/newsrc/afd/22723bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0710-420-Pumpkaboo-Super.png rename to newsrc/afd/22723bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0710-420-Pumpkaboo-Super.png b/newsrc/afd/22723s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0710-420-Pumpkaboo-Super.png rename to newsrc/afd/22723s.png diff --git a/src/afd/sprites-canonical/back/0071-000-Victreebel.png b/newsrc/afd/2272b.png similarity index 100% rename from src/afd/sprites-canonical/back/0071-000-Victreebel.png rename to newsrc/afd/2272b.png diff --git a/src/afd/sprites-canonical/back-shiny/0071-000-Victreebel.png b/newsrc/afd/2272bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0071-000-Victreebel.png rename to newsrc/afd/2272bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0071-000-Victreebel.png b/newsrc/afd/2272s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0071-000-Victreebel.png rename to newsrc/afd/2272s.png diff --git a/src/afd/sprites-canonical/front/0711-000-Gourgeist.png b/newsrc/afd/22752.png similarity index 100% rename from src/afd/sprites-canonical/front/0711-000-Gourgeist.png rename to newsrc/afd/22752.png diff --git a/src/afd/sprites-canonical/back/0711-000-Gourgeist.png b/newsrc/afd/22752b.png similarity index 100% rename from src/afd/sprites-canonical/back/0711-000-Gourgeist.png rename to newsrc/afd/22752b.png diff --git a/src/afd/sprites-canonical/back-shiny/0711-000-Gourgeist.png b/newsrc/afd/22752bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0711-000-Gourgeist.png rename to newsrc/afd/22752bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0711-000-Gourgeist.png b/newsrc/afd/22752s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0711-000-Gourgeist.png rename to newsrc/afd/22752s.png diff --git a/src/afd/sprites-canonical/front/0711-420-Gourgeist-Small.png b/newsrc/afd/22753.png similarity index 100% rename from src/afd/sprites-canonical/front/0711-420-Gourgeist-Small.png rename to newsrc/afd/22753.png diff --git a/src/afd/sprites-canonical/back/0711-420-Gourgeist-Small.png b/newsrc/afd/22753b.png similarity index 100% rename from src/afd/sprites-canonical/back/0711-420-Gourgeist-Small.png rename to newsrc/afd/22753b.png diff --git a/src/afd/sprites-canonical/back-shiny/0711-420-Gourgeist-Small.png b/newsrc/afd/22753bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0711-420-Gourgeist-Small.png rename to newsrc/afd/22753bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0711-420-Gourgeist-Small.png b/newsrc/afd/22753s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0711-420-Gourgeist-Small.png rename to newsrc/afd/22753s.png diff --git a/src/afd/sprites-canonical/front/0711-420-Gourgeist-Large.png b/newsrc/afd/22754.png similarity index 100% rename from src/afd/sprites-canonical/front/0711-420-Gourgeist-Large.png rename to newsrc/afd/22754.png diff --git a/src/afd/sprites-canonical/back/0711-420-Gourgeist-Large.png b/newsrc/afd/22754b.png similarity index 100% rename from src/afd/sprites-canonical/back/0711-420-Gourgeist-Large.png rename to newsrc/afd/22754b.png diff --git a/src/afd/sprites-canonical/back-shiny/0711-420-Gourgeist-Large.png b/newsrc/afd/22754bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0711-420-Gourgeist-Large.png rename to newsrc/afd/22754bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0711-420-Gourgeist-Large.png b/newsrc/afd/22754s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0711-420-Gourgeist-Large.png rename to newsrc/afd/22754s.png diff --git a/src/afd/sprites-canonical/front/0711-420-Gourgeist-Super.png b/newsrc/afd/22755.png similarity index 100% rename from src/afd/sprites-canonical/front/0711-420-Gourgeist-Super.png rename to newsrc/afd/22755.png diff --git a/src/afd/sprites-canonical/back/0711-420-Gourgeist-Super.png b/newsrc/afd/22755b.png similarity index 100% rename from src/afd/sprites-canonical/back/0711-420-Gourgeist-Super.png rename to newsrc/afd/22755b.png diff --git a/src/afd/sprites-canonical/back-shiny/0711-420-Gourgeist-Super.png b/newsrc/afd/22755bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0711-420-Gourgeist-Super.png rename to newsrc/afd/22755bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0711-420-Gourgeist-Super.png b/newsrc/afd/22755s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0711-420-Gourgeist-Super.png rename to newsrc/afd/22755s.png diff --git a/src/afd/sprites-canonical/front/0712-000-Bergmite.png b/newsrc/afd/22784.png similarity index 100% rename from src/afd/sprites-canonical/front/0712-000-Bergmite.png rename to newsrc/afd/22784.png diff --git a/src/afd/sprites-canonical/back/0712-000-Bergmite.png b/newsrc/afd/22784b.png similarity index 100% rename from src/afd/sprites-canonical/back/0712-000-Bergmite.png rename to newsrc/afd/22784b.png diff --git a/src/afd/sprites-canonical/back-shiny/0712-000-Bergmite.png b/newsrc/afd/22784bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0712-000-Bergmite.png rename to newsrc/afd/22784bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0712-000-Bergmite.png b/newsrc/afd/22784s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0712-000-Bergmite.png rename to newsrc/afd/22784s.png diff --git a/src/afd/sprites-canonical/front/0713-000-Avalugg.png b/newsrc/afd/22816.png similarity index 100% rename from src/afd/sprites-canonical/front/0713-000-Avalugg.png rename to newsrc/afd/22816.png diff --git a/src/afd/sprites-canonical/back/0713-000-Avalugg.png b/newsrc/afd/22816b.png similarity index 100% rename from src/afd/sprites-canonical/back/0713-000-Avalugg.png rename to newsrc/afd/22816b.png diff --git a/src/afd/sprites-canonical/back-shiny/0713-000-Avalugg.png b/newsrc/afd/22816bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0713-000-Avalugg.png rename to newsrc/afd/22816bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0713-000-Avalugg.png b/newsrc/afd/22816s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0713-000-Avalugg.png rename to newsrc/afd/22816s.png diff --git a/src/afd/sprites-canonical/front/0714-000-Noibat.png b/newsrc/afd/22848.png similarity index 100% rename from src/afd/sprites-canonical/front/0714-000-Noibat.png rename to newsrc/afd/22848.png diff --git a/src/afd/sprites-canonical/back/0714-000-Noibat.png b/newsrc/afd/22848b.png similarity index 100% rename from src/afd/sprites-canonical/back/0714-000-Noibat.png rename to newsrc/afd/22848b.png diff --git a/src/afd/sprites-canonical/back-shiny/0714-000-Noibat.png b/newsrc/afd/22848bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0714-000-Noibat.png rename to newsrc/afd/22848bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0714-000-Noibat.png b/newsrc/afd/22848s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0714-000-Noibat.png rename to newsrc/afd/22848s.png diff --git a/src/afd/sprites-canonical/front/0715-000-Noivern.png b/newsrc/afd/22880.png similarity index 100% rename from src/afd/sprites-canonical/front/0715-000-Noivern.png rename to newsrc/afd/22880.png diff --git a/src/afd/sprites-canonical/back/0715-000-Noivern.png b/newsrc/afd/22880b.png similarity index 100% rename from src/afd/sprites-canonical/back/0715-000-Noivern.png rename to newsrc/afd/22880b.png diff --git a/src/afd/sprites-canonical/back-shiny/0715-000-Noivern.png b/newsrc/afd/22880bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0715-000-Noivern.png rename to newsrc/afd/22880bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0715-000-Noivern.png b/newsrc/afd/22880s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0715-000-Noivern.png rename to newsrc/afd/22880s.png diff --git a/src/afd/sprites-canonical/front/0716-000-Xerneas.png b/newsrc/afd/22913.png similarity index 100% rename from src/afd/sprites-canonical/front/0716-000-Xerneas.png rename to newsrc/afd/22913.png diff --git a/src/afd/sprites-canonical/back/0716-000-Xerneas.png b/newsrc/afd/22913b.png similarity index 100% rename from src/afd/sprites-canonical/back/0716-000-Xerneas.png rename to newsrc/afd/22913b.png diff --git a/src/afd/sprites-canonical/back-shiny/0716-000-Xerneas.png b/newsrc/afd/22913bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0716-000-Xerneas.png rename to newsrc/afd/22913bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0716-000-Xerneas.png b/newsrc/afd/22913s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0716-000-Xerneas.png rename to newsrc/afd/22913s.png diff --git a/src/afd/sprites-canonical/front/0717-000-Yveltal.png b/newsrc/afd/22944.png similarity index 100% rename from src/afd/sprites-canonical/front/0717-000-Yveltal.png rename to newsrc/afd/22944.png diff --git a/src/afd/sprites-canonical/back/0717-000-Yveltal.png b/newsrc/afd/22944b.png similarity index 100% rename from src/afd/sprites-canonical/back/0717-000-Yveltal.png rename to newsrc/afd/22944b.png diff --git a/src/afd/sprites-canonical/back-shiny/0717-000-Yveltal.png b/newsrc/afd/22944bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0717-000-Yveltal.png rename to newsrc/afd/22944bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0717-000-Yveltal.png b/newsrc/afd/22944s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0717-000-Yveltal.png rename to newsrc/afd/22944s.png diff --git a/src/afd/sprites-canonical/front/0718-000-Zygarde.png b/newsrc/afd/22976.png similarity index 100% rename from src/afd/sprites-canonical/front/0718-000-Zygarde.png rename to newsrc/afd/22976.png diff --git a/src/afd/sprites-canonical/back/0718-000-Zygarde.png b/newsrc/afd/22976b.png similarity index 100% rename from src/afd/sprites-canonical/back/0718-000-Zygarde.png rename to newsrc/afd/22976b.png diff --git a/src/afd/sprites-canonical/back-shiny/0718-000-Zygarde.png b/newsrc/afd/22976bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0718-000-Zygarde.png rename to newsrc/afd/22976bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0718-000-Zygarde.png b/newsrc/afd/22976s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0718-000-Zygarde.png rename to newsrc/afd/22976s.png diff --git a/src/afd/sprites-canonical/front-shiny/0718-420-Zygarde-10__0025.png b/newsrc/afd/22977.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0718-420-Zygarde-10__0025.png rename to newsrc/afd/22977.png diff --git a/src/afd/sprites-canonical/back-shiny/0718-420-Zygarde-10__0025.png b/newsrc/afd/22977b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0718-420-Zygarde-10__0025.png rename to newsrc/afd/22977b.png diff --git a/src/afd/sprites-canonical/back/0718-420-Zygarde-10__0025.png b/newsrc/afd/22977bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0718-420-Zygarde-10__0025.png rename to newsrc/afd/22977bs.png diff --git a/src/afd/sprites-canonical/front/0718-420-Zygarde-10__0025.png b/newsrc/afd/22977s.png similarity index 100% rename from src/afd/sprites-canonical/front/0718-420-Zygarde-10__0025.png rename to newsrc/afd/22977s.png diff --git a/src/afd/sprites-canonical/front-shiny/0718-420-Zygarde-Complete.png b/newsrc/afd/22980.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0718-420-Zygarde-Complete.png rename to newsrc/afd/22980.png diff --git a/src/afd/sprites-canonical/back-shiny/0718-420-Zygarde-Complete.png b/newsrc/afd/22980b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0718-420-Zygarde-Complete.png rename to newsrc/afd/22980b.png diff --git a/src/afd/sprites-canonical/back/0718-420-Zygarde-Complete.png b/newsrc/afd/22980bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0718-420-Zygarde-Complete.png rename to newsrc/afd/22980bs.png diff --git a/src/afd/sprites-canonical/front/0718-420-Zygarde-Complete.png b/newsrc/afd/22980s.png similarity index 100% rename from src/afd/sprites-canonical/front/0718-420-Zygarde-Complete.png rename to newsrc/afd/22980s.png diff --git a/src/afd/sprites-canonical/front/0719-000-Diancie.png b/newsrc/afd/23008.png similarity index 100% rename from src/afd/sprites-canonical/front/0719-000-Diancie.png rename to newsrc/afd/23008.png diff --git a/src/afd/sprites-canonical/back/0719-000-Diancie.png b/newsrc/afd/23008b.png similarity index 100% rename from src/afd/sprites-canonical/back/0719-000-Diancie.png rename to newsrc/afd/23008b.png diff --git a/src/afd/sprites-canonical/back-shiny/0719-000-Diancie.png b/newsrc/afd/23008bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0719-000-Diancie.png rename to newsrc/afd/23008bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0719-000-Diancie.png b/newsrc/afd/23008s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0719-000-Diancie.png rename to newsrc/afd/23008s.png diff --git a/src/afd/sprites-canonical/front-shiny/0719-420-Diancie-Mega.png b/newsrc/afd/23009.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0719-420-Diancie-Mega.png rename to newsrc/afd/23009.png diff --git a/src/afd/sprites-canonical/back-shiny/0719-420-Diancie-Mega.png b/newsrc/afd/23009b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0719-420-Diancie-Mega.png rename to newsrc/afd/23009b.png diff --git a/src/afd/sprites-canonical/back/0719-420-Diancie-Mega.png b/newsrc/afd/23009bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0719-420-Diancie-Mega.png rename to newsrc/afd/23009bs.png diff --git a/src/afd/sprites-canonical/front/0719-420-Diancie-Mega.png b/newsrc/afd/23009s.png similarity index 100% rename from src/afd/sprites-canonical/front/0719-420-Diancie-Mega.png rename to newsrc/afd/23009s.png diff --git a/src/afd/sprites-canonical/front/0072-000-Tentacool.png b/newsrc/afd/2304.png similarity index 100% rename from src/afd/sprites-canonical/front/0072-000-Tentacool.png rename to newsrc/afd/2304.png diff --git a/src/afd/sprites-canonical/front/0720-000-Hoopa.png b/newsrc/afd/23040.png similarity index 100% rename from src/afd/sprites-canonical/front/0720-000-Hoopa.png rename to newsrc/afd/23040.png diff --git a/src/afd/sprites-canonical/back/0720-000-Hoopa.png b/newsrc/afd/23040b.png similarity index 100% rename from src/afd/sprites-canonical/back/0720-000-Hoopa.png rename to newsrc/afd/23040b.png diff --git a/src/afd/sprites-canonical/back-shiny/0720-000-Hoopa.png b/newsrc/afd/23040bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0720-000-Hoopa.png rename to newsrc/afd/23040bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0720-000-Hoopa.png b/newsrc/afd/23040s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0720-000-Hoopa.png rename to newsrc/afd/23040s.png diff --git a/src/afd/sprites-canonical/front/0720-420-Hoopa-Unbound.png b/newsrc/afd/23041.png similarity index 100% rename from src/afd/sprites-canonical/front/0720-420-Hoopa-Unbound.png rename to newsrc/afd/23041.png diff --git a/src/afd/sprites-canonical/back/0720-420-Hoopa-Unbound.png b/newsrc/afd/23041b.png similarity index 100% rename from src/afd/sprites-canonical/back/0720-420-Hoopa-Unbound.png rename to newsrc/afd/23041b.png diff --git a/src/afd/sprites-canonical/back-shiny/0720-420-Hoopa-Unbound.png b/newsrc/afd/23041bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0720-420-Hoopa-Unbound.png rename to newsrc/afd/23041bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0720-420-Hoopa-Unbound.png b/newsrc/afd/23041s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0720-420-Hoopa-Unbound.png rename to newsrc/afd/23041s.png diff --git a/src/afd/sprites-canonical/back/0072-000-Tentacool.png b/newsrc/afd/2304b.png similarity index 100% rename from src/afd/sprites-canonical/back/0072-000-Tentacool.png rename to newsrc/afd/2304b.png diff --git a/src/afd/sprites-canonical/back-shiny/0072-000-Tentacool.png b/newsrc/afd/2304bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0072-000-Tentacool.png rename to newsrc/afd/2304bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0072-000-Tentacool.png b/newsrc/afd/2304s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0072-000-Tentacool.png rename to newsrc/afd/2304s.png diff --git a/src/afd/sprites-canonical/front/0721-000-Volcanion.png b/newsrc/afd/23072.png similarity index 100% rename from src/afd/sprites-canonical/front/0721-000-Volcanion.png rename to newsrc/afd/23072.png diff --git a/src/afd/sprites-canonical/back/0721-000-Volcanion.png b/newsrc/afd/23072b.png similarity index 100% rename from src/afd/sprites-canonical/back/0721-000-Volcanion.png rename to newsrc/afd/23072b.png diff --git a/src/afd/sprites-canonical/back-shiny/0721-000-Volcanion.png b/newsrc/afd/23072bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0721-000-Volcanion.png rename to newsrc/afd/23072bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0721-000-Volcanion.png b/newsrc/afd/23072s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0721-000-Volcanion.png rename to newsrc/afd/23072s.png diff --git a/src/afd/sprites-canonical/front-shiny/0722-000-Rowlet.png b/newsrc/afd/23104.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0722-000-Rowlet.png rename to newsrc/afd/23104.png diff --git a/src/afd/sprites-canonical/back-shiny/0722-000-Rowlet.png b/newsrc/afd/23104b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0722-000-Rowlet.png rename to newsrc/afd/23104b.png diff --git a/src/afd/sprites-canonical/back/0722-000-Rowlet.png b/newsrc/afd/23104bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0722-000-Rowlet.png rename to newsrc/afd/23104bs.png diff --git a/src/afd/sprites-canonical/front/0722-000-Rowlet.png b/newsrc/afd/23104s.png similarity index 100% rename from src/afd/sprites-canonical/front/0722-000-Rowlet.png rename to newsrc/afd/23104s.png diff --git a/src/afd/sprites-canonical/front-shiny/0723-000-Dartrix.png b/newsrc/afd/23136.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0723-000-Dartrix.png rename to newsrc/afd/23136.png diff --git a/src/afd/sprites-canonical/back-shiny/0723-000-Dartrix.png b/newsrc/afd/23136b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0723-000-Dartrix.png rename to newsrc/afd/23136b.png diff --git a/src/afd/sprites-canonical/back/0723-000-Dartrix.png b/newsrc/afd/23136bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0723-000-Dartrix.png rename to newsrc/afd/23136bs.png diff --git a/src/afd/sprites-canonical/front/0723-000-Dartrix.png b/newsrc/afd/23136s.png similarity index 100% rename from src/afd/sprites-canonical/front/0723-000-Dartrix.png rename to newsrc/afd/23136s.png diff --git a/src/afd/sprites-canonical/front-shiny/0724-000-Decidueye.png b/newsrc/afd/23168.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0724-000-Decidueye.png rename to newsrc/afd/23168.png diff --git a/src/afd/sprites-canonical/back-shiny/0724-000-Decidueye.png b/newsrc/afd/23168b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0724-000-Decidueye.png rename to newsrc/afd/23168b.png diff --git a/src/afd/sprites-canonical/back/0724-000-Decidueye.png b/newsrc/afd/23168bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0724-000-Decidueye.png rename to newsrc/afd/23168bs.png diff --git a/src/afd/sprites-canonical/front/0724-000-Decidueye.png b/newsrc/afd/23168s.png similarity index 100% rename from src/afd/sprites-canonical/front/0724-000-Decidueye.png rename to newsrc/afd/23168s.png diff --git a/src/afd/sprites-canonical/front-shiny/0725-000-Litten.png b/newsrc/afd/23200.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0725-000-Litten.png rename to newsrc/afd/23200.png diff --git a/src/afd/sprites-canonical/back-shiny/0725-000-Litten.png b/newsrc/afd/23200b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0725-000-Litten.png rename to newsrc/afd/23200b.png diff --git a/src/afd/sprites-canonical/back/0725-000-Litten.png b/newsrc/afd/23200bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0725-000-Litten.png rename to newsrc/afd/23200bs.png diff --git a/src/afd/sprites-canonical/front/0725-000-Litten.png b/newsrc/afd/23200s.png similarity index 100% rename from src/afd/sprites-canonical/front/0725-000-Litten.png rename to newsrc/afd/23200s.png diff --git a/src/afd/sprites-canonical/front-shiny/0726-000-Torracat.png b/newsrc/afd/23232.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0726-000-Torracat.png rename to newsrc/afd/23232.png diff --git a/src/afd/sprites-canonical/back-shiny/0726-000-Torracat.png b/newsrc/afd/23232b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0726-000-Torracat.png rename to newsrc/afd/23232b.png diff --git a/src/afd/sprites-canonical/back/0726-000-Torracat.png b/newsrc/afd/23232bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0726-000-Torracat.png rename to newsrc/afd/23232bs.png diff --git a/src/afd/sprites-canonical/front/0726-000-Torracat.png b/newsrc/afd/23232s.png similarity index 100% rename from src/afd/sprites-canonical/front/0726-000-Torracat.png rename to newsrc/afd/23232s.png diff --git a/src/afd/sprites-canonical/front-shiny/0727-000-Incineroar.png b/newsrc/afd/23264.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0727-000-Incineroar.png rename to newsrc/afd/23264.png diff --git a/src/afd/sprites-canonical/back-shiny/0727-000-Incineroar.png b/newsrc/afd/23264b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0727-000-Incineroar.png rename to newsrc/afd/23264b.png diff --git a/src/afd/sprites-canonical/back/0727-000-Incineroar.png b/newsrc/afd/23264bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0727-000-Incineroar.png rename to newsrc/afd/23264bs.png diff --git a/src/afd/sprites-canonical/front/0727-000-Incineroar.png b/newsrc/afd/23264s.png similarity index 100% rename from src/afd/sprites-canonical/front/0727-000-Incineroar.png rename to newsrc/afd/23264s.png diff --git a/src/afd/sprites-canonical/front-shiny/0728-000-Popplio.png b/newsrc/afd/23296.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0728-000-Popplio.png rename to newsrc/afd/23296.png diff --git a/src/afd/sprites-canonical/back-shiny/0728-000-Popplio.png b/newsrc/afd/23296b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0728-000-Popplio.png rename to newsrc/afd/23296b.png diff --git a/src/afd/sprites-canonical/back/0728-000-Popplio.png b/newsrc/afd/23296bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0728-000-Popplio.png rename to newsrc/afd/23296bs.png diff --git a/src/afd/sprites-canonical/front/0728-000-Popplio.png b/newsrc/afd/23296s.png similarity index 100% rename from src/afd/sprites-canonical/front/0728-000-Popplio.png rename to newsrc/afd/23296s.png diff --git a/src/afd/sprites-canonical/front-shiny/0729-000-Brionne.png b/newsrc/afd/23328.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0729-000-Brionne.png rename to newsrc/afd/23328.png diff --git a/src/afd/sprites-canonical/back-shiny/0729-000-Brionne.png b/newsrc/afd/23328b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0729-000-Brionne.png rename to newsrc/afd/23328b.png diff --git a/src/afd/sprites-canonical/back/0729-000-Brionne.png b/newsrc/afd/23328bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0729-000-Brionne.png rename to newsrc/afd/23328bs.png diff --git a/src/afd/sprites-canonical/front/0729-000-Brionne.png b/newsrc/afd/23328s.png similarity index 100% rename from src/afd/sprites-canonical/front/0729-000-Brionne.png rename to newsrc/afd/23328s.png diff --git a/src/afd/sprites-canonical/front/0073-000-Tentacruel.png b/newsrc/afd/2336.png similarity index 100% rename from src/afd/sprites-canonical/front/0073-000-Tentacruel.png rename to newsrc/afd/2336.png diff --git a/src/afd/sprites-canonical/front-shiny/0730-000-Primarina.png b/newsrc/afd/23360.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0730-000-Primarina.png rename to newsrc/afd/23360.png diff --git a/src/afd/sprites-canonical/back-shiny/0730-000-Primarina.png b/newsrc/afd/23360b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0730-000-Primarina.png rename to newsrc/afd/23360b.png diff --git a/src/afd/sprites-canonical/back/0730-000-Primarina.png b/newsrc/afd/23360bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0730-000-Primarina.png rename to newsrc/afd/23360bs.png diff --git a/src/afd/sprites-canonical/front/0730-000-Primarina.png b/newsrc/afd/23360s.png similarity index 100% rename from src/afd/sprites-canonical/front/0730-000-Primarina.png rename to newsrc/afd/23360s.png diff --git a/src/afd/sprites-canonical/back/0073-000-Tentacruel.png b/newsrc/afd/2336b.png similarity index 100% rename from src/afd/sprites-canonical/back/0073-000-Tentacruel.png rename to newsrc/afd/2336b.png diff --git a/src/afd/sprites-canonical/back-shiny/0073-000-Tentacruel.png b/newsrc/afd/2336bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0073-000-Tentacruel.png rename to newsrc/afd/2336bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0073-000-Tentacruel.png b/newsrc/afd/2336s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0073-000-Tentacruel.png rename to newsrc/afd/2336s.png diff --git a/src/afd/sprites-canonical/front-shiny/0731-000-Pikipek.png b/newsrc/afd/23392.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0731-000-Pikipek.png rename to newsrc/afd/23392.png diff --git a/src/afd/sprites-canonical/back-shiny/0731-000-Pikipek.png b/newsrc/afd/23392b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0731-000-Pikipek.png rename to newsrc/afd/23392b.png diff --git a/src/afd/sprites-canonical/back/0731-000-Pikipek.png b/newsrc/afd/23392bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0731-000-Pikipek.png rename to newsrc/afd/23392bs.png diff --git a/src/afd/sprites-canonical/front/0731-000-Pikipek.png b/newsrc/afd/23392s.png similarity index 100% rename from src/afd/sprites-canonical/front/0731-000-Pikipek.png rename to newsrc/afd/23392s.png diff --git a/src/afd/sprites-canonical/front-shiny/0732-000-Trumbeak.png b/newsrc/afd/23424.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0732-000-Trumbeak.png rename to newsrc/afd/23424.png diff --git a/src/afd/sprites-canonical/back-shiny/0732-000-Trumbeak.png b/newsrc/afd/23424b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0732-000-Trumbeak.png rename to newsrc/afd/23424b.png diff --git a/src/afd/sprites-canonical/back/0732-000-Trumbeak.png b/newsrc/afd/23424bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0732-000-Trumbeak.png rename to newsrc/afd/23424bs.png diff --git a/src/afd/sprites-canonical/front/0732-000-Trumbeak.png b/newsrc/afd/23424s.png similarity index 100% rename from src/afd/sprites-canonical/front/0732-000-Trumbeak.png rename to newsrc/afd/23424s.png diff --git a/src/afd/sprites-canonical/front-shiny/0733-000-Toucannon.png b/newsrc/afd/23456.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0733-000-Toucannon.png rename to newsrc/afd/23456.png diff --git a/src/afd/sprites-canonical/back-shiny/0733-000-Toucannon.png b/newsrc/afd/23456b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0733-000-Toucannon.png rename to newsrc/afd/23456b.png diff --git a/src/afd/sprites-canonical/back/0733-000-Toucannon.png b/newsrc/afd/23456bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0733-000-Toucannon.png rename to newsrc/afd/23456bs.png diff --git a/src/afd/sprites-canonical/front/0733-000-Toucannon.png b/newsrc/afd/23456s.png similarity index 100% rename from src/afd/sprites-canonical/front/0733-000-Toucannon.png rename to newsrc/afd/23456s.png diff --git a/src/afd/sprites-canonical/front-shiny/0734-000-Yungoos.png b/newsrc/afd/23488.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0734-000-Yungoos.png rename to newsrc/afd/23488.png diff --git a/src/afd/sprites-canonical/back-shiny/0734-000-Yungoos.png b/newsrc/afd/23488b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0734-000-Yungoos.png rename to newsrc/afd/23488b.png diff --git a/src/afd/sprites-canonical/back/0734-000-Yungoos.png b/newsrc/afd/23488bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0734-000-Yungoos.png rename to newsrc/afd/23488bs.png diff --git a/src/afd/sprites-canonical/front/0734-000-Yungoos.png b/newsrc/afd/23488s.png similarity index 100% rename from src/afd/sprites-canonical/front/0734-000-Yungoos.png rename to newsrc/afd/23488s.png diff --git a/src/afd/sprites-canonical/front-shiny/0735-000-Gumshoos.png b/newsrc/afd/23520.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0735-000-Gumshoos.png rename to newsrc/afd/23520.png diff --git a/src/afd/sprites-canonical/back-shiny/0735-000-Gumshoos.png b/newsrc/afd/23520b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0735-000-Gumshoos.png rename to newsrc/afd/23520b.png diff --git a/src/afd/sprites-canonical/back/0735-000-Gumshoos.png b/newsrc/afd/23520bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0735-000-Gumshoos.png rename to newsrc/afd/23520bs.png diff --git a/src/afd/sprites-canonical/front/0735-000-Gumshoos.png b/newsrc/afd/23520s.png similarity index 100% rename from src/afd/sprites-canonical/front/0735-000-Gumshoos.png rename to newsrc/afd/23520s.png diff --git a/src/afd/sprites-canonical/front-shiny/0736-000-Grubbin.png b/newsrc/afd/23552.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0736-000-Grubbin.png rename to newsrc/afd/23552.png diff --git a/src/afd/sprites-canonical/back-shiny/0736-000-Grubbin.png b/newsrc/afd/23552b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0736-000-Grubbin.png rename to newsrc/afd/23552b.png diff --git a/src/afd/sprites-canonical/back/0736-000-Grubbin.png b/newsrc/afd/23552bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0736-000-Grubbin.png rename to newsrc/afd/23552bs.png diff --git a/src/afd/sprites-canonical/front/0736-000-Grubbin.png b/newsrc/afd/23552s.png similarity index 100% rename from src/afd/sprites-canonical/front/0736-000-Grubbin.png rename to newsrc/afd/23552s.png diff --git a/src/afd/sprites-canonical/front-shiny/0737-000-Charjabug.png b/newsrc/afd/23584.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0737-000-Charjabug.png rename to newsrc/afd/23584.png diff --git a/src/afd/sprites-canonical/back-shiny/0737-000-Charjabug.png b/newsrc/afd/23584b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0737-000-Charjabug.png rename to newsrc/afd/23584b.png diff --git a/src/afd/sprites-canonical/back/0737-000-Charjabug.png b/newsrc/afd/23584bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0737-000-Charjabug.png rename to newsrc/afd/23584bs.png diff --git a/src/afd/sprites-canonical/front/0737-000-Charjabug.png b/newsrc/afd/23584s.png similarity index 100% rename from src/afd/sprites-canonical/front/0737-000-Charjabug.png rename to newsrc/afd/23584s.png diff --git a/src/afd/sprites-canonical/front-shiny/0738-000-Vikavolt.png b/newsrc/afd/23616.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0738-000-Vikavolt.png rename to newsrc/afd/23616.png diff --git a/src/afd/sprites-canonical/back-shiny/0738-000-Vikavolt.png b/newsrc/afd/23616b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0738-000-Vikavolt.png rename to newsrc/afd/23616b.png diff --git a/src/afd/sprites-canonical/back/0738-000-Vikavolt.png b/newsrc/afd/23616bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0738-000-Vikavolt.png rename to newsrc/afd/23616bs.png diff --git a/src/afd/sprites-canonical/front/0738-000-Vikavolt.png b/newsrc/afd/23616s.png similarity index 100% rename from src/afd/sprites-canonical/front/0738-000-Vikavolt.png rename to newsrc/afd/23616s.png diff --git a/src/afd/sprites-canonical/front-shiny/0739-000-Crabrawler.png b/newsrc/afd/23648.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0739-000-Crabrawler.png rename to newsrc/afd/23648.png diff --git a/src/afd/sprites-canonical/back-shiny/0739-000-Crabrawler.png b/newsrc/afd/23648b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0739-000-Crabrawler.png rename to newsrc/afd/23648b.png diff --git a/src/afd/sprites-canonical/back/0739-000-Crabrawler.png b/newsrc/afd/23648bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0739-000-Crabrawler.png rename to newsrc/afd/23648bs.png diff --git a/src/afd/sprites-canonical/front/0739-000-Crabrawler.png b/newsrc/afd/23648s.png similarity index 100% rename from src/afd/sprites-canonical/front/0739-000-Crabrawler.png rename to newsrc/afd/23648s.png diff --git a/src/afd/sprites-canonical/front/0074-000-Geodude.png b/newsrc/afd/2368.png similarity index 100% rename from src/afd/sprites-canonical/front/0074-000-Geodude.png rename to newsrc/afd/2368.png diff --git a/src/afd/sprites-canonical/front-shiny/0740-000-Crabominable.png b/newsrc/afd/23680.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0740-000-Crabominable.png rename to newsrc/afd/23680.png diff --git a/src/afd/sprites-canonical/back-shiny/0740-000-Crabominable.png b/newsrc/afd/23680b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0740-000-Crabominable.png rename to newsrc/afd/23680b.png diff --git a/src/afd/sprites-canonical/back/0740-000-Crabominable.png b/newsrc/afd/23680bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0740-000-Crabominable.png rename to newsrc/afd/23680bs.png diff --git a/src/afd/sprites-canonical/front/0740-000-Crabominable.png b/newsrc/afd/23680s.png similarity index 100% rename from src/afd/sprites-canonical/front/0740-000-Crabominable.png rename to newsrc/afd/23680s.png diff --git a/src/afd/sprites-canonical/back/0074-000-Geodude.png b/newsrc/afd/2368b.png similarity index 100% rename from src/afd/sprites-canonical/back/0074-000-Geodude.png rename to newsrc/afd/2368b.png diff --git a/src/afd/sprites-canonical/back-shiny/0074-000-Geodude.png b/newsrc/afd/2368bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0074-000-Geodude.png rename to newsrc/afd/2368bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0074-000-Geodude.png b/newsrc/afd/2368s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0074-000-Geodude.png rename to newsrc/afd/2368s.png diff --git a/src/afd/sprites-canonical/front/0074-420-Geodude-Alola.png b/newsrc/afd/2369.png similarity index 100% rename from src/afd/sprites-canonical/front/0074-420-Geodude-Alola.png rename to newsrc/afd/2369.png diff --git a/src/afd/sprites-canonical/back/0074-420-Geodude-Alola.png b/newsrc/afd/2369b.png similarity index 100% rename from src/afd/sprites-canonical/back/0074-420-Geodude-Alola.png rename to newsrc/afd/2369b.png diff --git a/src/afd/sprites-canonical/back-shiny/0074-420-Geodude-Alola.png b/newsrc/afd/2369bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0074-420-Geodude-Alola.png rename to newsrc/afd/2369bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0074-420-Geodude-Alola.png b/newsrc/afd/2369s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0074-420-Geodude-Alola.png rename to newsrc/afd/2369s.png diff --git a/src/afd/sprites-canonical/front-shiny/0741-000-Oricorio.png b/newsrc/afd/23712.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0741-000-Oricorio.png rename to newsrc/afd/23712.png diff --git a/src/afd/sprites-canonical/back-shiny/0741-000-Oricorio.png b/newsrc/afd/23712b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0741-000-Oricorio.png rename to newsrc/afd/23712b.png diff --git a/src/afd/sprites-canonical/back/0741-000-Oricorio.png b/newsrc/afd/23712bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0741-000-Oricorio.png rename to newsrc/afd/23712bs.png diff --git a/src/afd/sprites-canonical/front/0741-000-Oricorio.png b/newsrc/afd/23712s.png similarity index 100% rename from src/afd/sprites-canonical/front/0741-000-Oricorio.png rename to newsrc/afd/23712s.png diff --git a/src/afd/sprites-canonical/front-shiny/0741-420-Oricorio-Pom~Pom.png b/newsrc/afd/23713.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0741-420-Oricorio-Pom~Pom.png rename to newsrc/afd/23713.png diff --git a/src/afd/sprites-canonical/back-shiny/0741-420-Oricorio-Pom~Pom.png b/newsrc/afd/23713b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0741-420-Oricorio-Pom~Pom.png rename to newsrc/afd/23713b.png diff --git a/src/afd/sprites-canonical/back/0741-420-Oricorio-Pom~Pom.png b/newsrc/afd/23713bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0741-420-Oricorio-Pom~Pom.png rename to newsrc/afd/23713bs.png diff --git a/src/afd/sprites-canonical/front/0741-420-Oricorio-Pom~Pom.png b/newsrc/afd/23713s.png similarity index 100% rename from src/afd/sprites-canonical/front/0741-420-Oricorio-Pom~Pom.png rename to newsrc/afd/23713s.png diff --git a/src/afd/sprites-canonical/front-shiny/0741-420-Oricorio-Pa__0027u.png b/newsrc/afd/23714.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0741-420-Oricorio-Pa__0027u.png rename to newsrc/afd/23714.png diff --git a/src/afd/sprites-canonical/back-shiny/0741-420-Oricorio-Pa__0027u.png b/newsrc/afd/23714b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0741-420-Oricorio-Pa__0027u.png rename to newsrc/afd/23714b.png diff --git a/src/afd/sprites-canonical/back/0741-420-Oricorio-Pa__0027u.png b/newsrc/afd/23714bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0741-420-Oricorio-Pa__0027u.png rename to newsrc/afd/23714bs.png diff --git a/src/afd/sprites-canonical/front/0741-420-Oricorio-Pa__0027u.png b/newsrc/afd/23714s.png similarity index 100% rename from src/afd/sprites-canonical/front/0741-420-Oricorio-Pa__0027u.png rename to newsrc/afd/23714s.png diff --git a/src/afd/sprites-canonical/front-shiny/0741-420-Oricorio-Sensu.png b/newsrc/afd/23715.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0741-420-Oricorio-Sensu.png rename to newsrc/afd/23715.png diff --git a/src/afd/sprites-canonical/back-shiny/0741-420-Oricorio-Sensu.png b/newsrc/afd/23715b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0741-420-Oricorio-Sensu.png rename to newsrc/afd/23715b.png diff --git a/src/afd/sprites-canonical/back/0741-420-Oricorio-Sensu.png b/newsrc/afd/23715bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0741-420-Oricorio-Sensu.png rename to newsrc/afd/23715bs.png diff --git a/src/afd/sprites-canonical/front/0741-420-Oricorio-Sensu.png b/newsrc/afd/23715s.png similarity index 100% rename from src/afd/sprites-canonical/front/0741-420-Oricorio-Sensu.png rename to newsrc/afd/23715s.png diff --git a/src/afd/sprites-canonical/front-shiny/0742-000-Cutiefly.png b/newsrc/afd/23744.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0742-000-Cutiefly.png rename to newsrc/afd/23744.png diff --git a/src/afd/sprites-canonical/back-shiny/0742-000-Cutiefly.png b/newsrc/afd/23744b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0742-000-Cutiefly.png rename to newsrc/afd/23744b.png diff --git a/src/afd/sprites-canonical/back/0742-000-Cutiefly.png b/newsrc/afd/23744bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0742-000-Cutiefly.png rename to newsrc/afd/23744bs.png diff --git a/src/afd/sprites-canonical/front/0742-000-Cutiefly.png b/newsrc/afd/23744s.png similarity index 100% rename from src/afd/sprites-canonical/front/0742-000-Cutiefly.png rename to newsrc/afd/23744s.png diff --git a/src/afd/sprites-canonical/front-shiny/0743-000-Ribombee.png b/newsrc/afd/23776.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0743-000-Ribombee.png rename to newsrc/afd/23776.png diff --git a/src/afd/sprites-canonical/back-shiny/0743-000-Ribombee.png b/newsrc/afd/23776b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0743-000-Ribombee.png rename to newsrc/afd/23776b.png diff --git a/src/afd/sprites-canonical/back/0743-000-Ribombee.png b/newsrc/afd/23776bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0743-000-Ribombee.png rename to newsrc/afd/23776bs.png diff --git a/src/afd/sprites-canonical/front/0743-000-Ribombee.png b/newsrc/afd/23776s.png similarity index 100% rename from src/afd/sprites-canonical/front/0743-000-Ribombee.png rename to newsrc/afd/23776s.png diff --git a/src/afd/sprites-canonical/front-shiny/0744-000-Rockruff.png b/newsrc/afd/23808.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0744-000-Rockruff.png rename to newsrc/afd/23808.png diff --git a/src/afd/sprites-canonical/back-shiny/0744-000-Rockruff.png b/newsrc/afd/23808b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0744-000-Rockruff.png rename to newsrc/afd/23808b.png diff --git a/src/afd/sprites-canonical/back/0744-000-Rockruff.png b/newsrc/afd/23808bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0744-000-Rockruff.png rename to newsrc/afd/23808bs.png diff --git a/src/afd/sprites-canonical/front/0744-000-Rockruff.png b/newsrc/afd/23808s.png similarity index 100% rename from src/afd/sprites-canonical/front/0744-000-Rockruff.png rename to newsrc/afd/23808s.png diff --git a/src/afd/sprites-canonical/front-shiny/0745-000-Lycanroc.png b/newsrc/afd/23840.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0745-000-Lycanroc.png rename to newsrc/afd/23840.png diff --git a/src/afd/sprites-canonical/back-shiny/0745-000-Lycanroc.png b/newsrc/afd/23840b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0745-000-Lycanroc.png rename to newsrc/afd/23840b.png diff --git a/src/afd/sprites-canonical/back/0745-000-Lycanroc.png b/newsrc/afd/23840bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0745-000-Lycanroc.png rename to newsrc/afd/23840bs.png diff --git a/src/afd/sprites-canonical/front/0745-000-Lycanroc.png b/newsrc/afd/23840s.png similarity index 100% rename from src/afd/sprites-canonical/front/0745-000-Lycanroc.png rename to newsrc/afd/23840s.png diff --git a/src/afd/sprites-canonical/front-shiny/0745-420-Lycanroc-Midnight.png b/newsrc/afd/23841.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0745-420-Lycanroc-Midnight.png rename to newsrc/afd/23841.png diff --git a/src/afd/sprites-canonical/back-shiny/0745-420-Lycanroc-Midnight.png b/newsrc/afd/23841b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0745-420-Lycanroc-Midnight.png rename to newsrc/afd/23841b.png diff --git a/src/afd/sprites-canonical/back/0745-420-Lycanroc-Midnight.png b/newsrc/afd/23841bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0745-420-Lycanroc-Midnight.png rename to newsrc/afd/23841bs.png diff --git a/src/afd/sprites-canonical/front/0745-420-Lycanroc-Midnight.png b/newsrc/afd/23841s.png similarity index 100% rename from src/afd/sprites-canonical/front/0745-420-Lycanroc-Midnight.png rename to newsrc/afd/23841s.png diff --git a/src/afd/sprites-canonical/front-shiny/0745-420-Lycanroc-Dusk.png b/newsrc/afd/23842.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0745-420-Lycanroc-Dusk.png rename to newsrc/afd/23842.png diff --git a/src/afd/sprites-canonical/back-shiny/0745-420-Lycanroc-Dusk.png b/newsrc/afd/23842b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0745-420-Lycanroc-Dusk.png rename to newsrc/afd/23842b.png diff --git a/src/afd/sprites-canonical/back/0745-420-Lycanroc-Dusk.png b/newsrc/afd/23842bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0745-420-Lycanroc-Dusk.png rename to newsrc/afd/23842bs.png diff --git a/src/afd/sprites-canonical/front/0745-420-Lycanroc-Dusk.png b/newsrc/afd/23842s.png similarity index 100% rename from src/afd/sprites-canonical/front/0745-420-Lycanroc-Dusk.png rename to newsrc/afd/23842s.png diff --git a/src/afd/sprites-canonical/front-shiny/0746-000-Wishiwashi.png b/newsrc/afd/23872.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0746-000-Wishiwashi.png rename to newsrc/afd/23872.png diff --git a/src/afd/sprites-canonical/back-shiny/0746-000-Wishiwashi.png b/newsrc/afd/23872b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0746-000-Wishiwashi.png rename to newsrc/afd/23872b.png diff --git a/src/afd/sprites-canonical/back/0746-000-Wishiwashi.png b/newsrc/afd/23872bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0746-000-Wishiwashi.png rename to newsrc/afd/23872bs.png diff --git a/src/afd/sprites-canonical/front/0746-000-Wishiwashi.png b/newsrc/afd/23872s.png similarity index 100% rename from src/afd/sprites-canonical/front/0746-000-Wishiwashi.png rename to newsrc/afd/23872s.png diff --git a/src/afd/sprites-canonical/front-shiny/0746-420-Wishiwashi-School.png b/newsrc/afd/23873.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0746-420-Wishiwashi-School.png rename to newsrc/afd/23873.png diff --git a/src/afd/sprites-canonical/back-shiny/0746-420-Wishiwashi-School.png b/newsrc/afd/23873b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0746-420-Wishiwashi-School.png rename to newsrc/afd/23873b.png diff --git a/src/afd/sprites-canonical/back/0746-420-Wishiwashi-School.png b/newsrc/afd/23873bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0746-420-Wishiwashi-School.png rename to newsrc/afd/23873bs.png diff --git a/src/afd/sprites-canonical/front/0746-420-Wishiwashi-School.png b/newsrc/afd/23873s.png similarity index 100% rename from src/afd/sprites-canonical/front/0746-420-Wishiwashi-School.png rename to newsrc/afd/23873s.png diff --git a/src/afd/sprites-canonical/front-shiny/0747-000-Mareanie.png b/newsrc/afd/23904.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0747-000-Mareanie.png rename to newsrc/afd/23904.png diff --git a/src/afd/sprites-canonical/back-shiny/0747-000-Mareanie.png b/newsrc/afd/23904b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0747-000-Mareanie.png rename to newsrc/afd/23904b.png diff --git a/src/afd/sprites-canonical/back/0747-000-Mareanie.png b/newsrc/afd/23904bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0747-000-Mareanie.png rename to newsrc/afd/23904bs.png diff --git a/src/afd/sprites-canonical/front/0747-000-Mareanie.png b/newsrc/afd/23904s.png similarity index 100% rename from src/afd/sprites-canonical/front/0747-000-Mareanie.png rename to newsrc/afd/23904s.png diff --git a/src/afd/sprites-canonical/front-shiny/0748-000-Toxapex.png b/newsrc/afd/23936.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0748-000-Toxapex.png rename to newsrc/afd/23936.png diff --git a/src/afd/sprites-canonical/back-shiny/0748-000-Toxapex.png b/newsrc/afd/23936b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0748-000-Toxapex.png rename to newsrc/afd/23936b.png diff --git a/src/afd/sprites-canonical/back/0748-000-Toxapex.png b/newsrc/afd/23936bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0748-000-Toxapex.png rename to newsrc/afd/23936bs.png diff --git a/src/afd/sprites-canonical/front/0748-000-Toxapex.png b/newsrc/afd/23936s.png similarity index 100% rename from src/afd/sprites-canonical/front/0748-000-Toxapex.png rename to newsrc/afd/23936s.png diff --git a/src/afd/sprites-canonical/front-shiny/0749-000-Mudbray.png b/newsrc/afd/23968.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0749-000-Mudbray.png rename to newsrc/afd/23968.png diff --git a/src/afd/sprites-canonical/back-shiny/0749-000-Mudbray.png b/newsrc/afd/23968b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0749-000-Mudbray.png rename to newsrc/afd/23968b.png diff --git a/src/afd/sprites-canonical/back/0749-000-Mudbray.png b/newsrc/afd/23968bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0749-000-Mudbray.png rename to newsrc/afd/23968bs.png diff --git a/src/afd/sprites-canonical/front/0749-000-Mudbray.png b/newsrc/afd/23968s.png similarity index 100% rename from src/afd/sprites-canonical/front/0749-000-Mudbray.png rename to newsrc/afd/23968s.png diff --git a/src/afd/sprites-canonical/front/0075-000-Graveler.png b/newsrc/afd/2400.png similarity index 100% rename from src/afd/sprites-canonical/front/0075-000-Graveler.png rename to newsrc/afd/2400.png diff --git a/src/afd/sprites-canonical/front/0750-000-Mudsdale.png b/newsrc/afd/24000.png similarity index 100% rename from src/afd/sprites-canonical/front/0750-000-Mudsdale.png rename to newsrc/afd/24000.png diff --git a/src/afd/sprites-canonical/back-shiny/0750-000-Mudsdale.png b/newsrc/afd/24000b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0750-000-Mudsdale.png rename to newsrc/afd/24000b.png diff --git a/src/afd/sprites-canonical/back/0750-000-Mudsdale.png b/newsrc/afd/24000bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0750-000-Mudsdale.png rename to newsrc/afd/24000bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0750-000-Mudsdale.png b/newsrc/afd/24000s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0750-000-Mudsdale.png rename to newsrc/afd/24000s.png diff --git a/src/afd/sprites-canonical/back/0075-000-Graveler.png b/newsrc/afd/2400b.png similarity index 100% rename from src/afd/sprites-canonical/back/0075-000-Graveler.png rename to newsrc/afd/2400b.png diff --git a/src/afd/sprites-canonical/back-shiny/0075-000-Graveler.png b/newsrc/afd/2400bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0075-000-Graveler.png rename to newsrc/afd/2400bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0075-000-Graveler.png b/newsrc/afd/2400s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0075-000-Graveler.png rename to newsrc/afd/2400s.png diff --git a/src/afd/sprites-canonical/front/0075-420-Graveler-Alola.png b/newsrc/afd/2401.png similarity index 100% rename from src/afd/sprites-canonical/front/0075-420-Graveler-Alola.png rename to newsrc/afd/2401.png diff --git a/src/afd/sprites-canonical/back/0075-420-Graveler-Alola.png b/newsrc/afd/2401b.png similarity index 100% rename from src/afd/sprites-canonical/back/0075-420-Graveler-Alola.png rename to newsrc/afd/2401b.png diff --git a/src/afd/sprites-canonical/back-shiny/0075-420-Graveler-Alola.png b/newsrc/afd/2401bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0075-420-Graveler-Alola.png rename to newsrc/afd/2401bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0075-420-Graveler-Alola.png b/newsrc/afd/2401s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0075-420-Graveler-Alola.png rename to newsrc/afd/2401s.png diff --git a/src/afd/sprites-canonical/front-shiny/0751-000-Dewpider.png b/newsrc/afd/24032.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0751-000-Dewpider.png rename to newsrc/afd/24032.png diff --git a/src/afd/sprites-canonical/back-shiny/0751-000-Dewpider.png b/newsrc/afd/24032b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0751-000-Dewpider.png rename to newsrc/afd/24032b.png diff --git a/src/afd/sprites-canonical/back/0751-000-Dewpider.png b/newsrc/afd/24032bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0751-000-Dewpider.png rename to newsrc/afd/24032bs.png diff --git a/src/afd/sprites-canonical/front/0751-000-Dewpider.png b/newsrc/afd/24032s.png similarity index 100% rename from src/afd/sprites-canonical/front/0751-000-Dewpider.png rename to newsrc/afd/24032s.png diff --git a/src/afd/sprites-canonical/front-shiny/0752-000-Araquanid.png b/newsrc/afd/24064.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0752-000-Araquanid.png rename to newsrc/afd/24064.png diff --git a/src/afd/sprites-canonical/back-shiny/0752-000-Araquanid.png b/newsrc/afd/24064b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0752-000-Araquanid.png rename to newsrc/afd/24064b.png diff --git a/src/afd/sprites-canonical/back/0752-000-Araquanid.png b/newsrc/afd/24064bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0752-000-Araquanid.png rename to newsrc/afd/24064bs.png diff --git a/src/afd/sprites-canonical/front/0752-000-Araquanid.png b/newsrc/afd/24064s.png similarity index 100% rename from src/afd/sprites-canonical/front/0752-000-Araquanid.png rename to newsrc/afd/24064s.png diff --git a/src/afd/sprites-canonical/back-shiny/0753-000-Fomantis.png b/newsrc/afd/24096b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0753-000-Fomantis.png rename to newsrc/afd/24096b.png diff --git a/src/afd/sprites-canonical/back/0753-000-Fomantis.png b/newsrc/afd/24096bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0753-000-Fomantis.png rename to newsrc/afd/24096bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0754-000-Lurantis.png b/newsrc/afd/24128.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0754-000-Lurantis.png rename to newsrc/afd/24128.png diff --git a/src/afd/sprites-canonical/back-shiny/0754-000-Lurantis.png b/newsrc/afd/24128b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0754-000-Lurantis.png rename to newsrc/afd/24128b.png diff --git a/src/afd/sprites-canonical/back/0754-000-Lurantis.png b/newsrc/afd/24128bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0754-000-Lurantis.png rename to newsrc/afd/24128bs.png diff --git a/src/afd/sprites-canonical/front/0754-000-Lurantis.png b/newsrc/afd/24128s.png similarity index 100% rename from src/afd/sprites-canonical/front/0754-000-Lurantis.png rename to newsrc/afd/24128s.png diff --git a/src/afd/sprites-canonical/front-shiny/0755-000-Morelull.png b/newsrc/afd/24160.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0755-000-Morelull.png rename to newsrc/afd/24160.png diff --git a/src/afd/sprites-canonical/back-shiny/0755-000-Morelull.png b/newsrc/afd/24160b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0755-000-Morelull.png rename to newsrc/afd/24160b.png diff --git a/src/afd/sprites-canonical/back/0755-000-Morelull.png b/newsrc/afd/24160bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0755-000-Morelull.png rename to newsrc/afd/24160bs.png diff --git a/src/afd/sprites-canonical/front/0755-000-Morelull.png b/newsrc/afd/24160s.png similarity index 100% rename from src/afd/sprites-canonical/front/0755-000-Morelull.png rename to newsrc/afd/24160s.png diff --git a/src/afd/sprites-canonical/front-shiny/0756-000-Shiinotic.png b/newsrc/afd/24192.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0756-000-Shiinotic.png rename to newsrc/afd/24192.png diff --git a/src/afd/sprites-canonical/back-shiny/0756-000-Shiinotic.png b/newsrc/afd/24192b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0756-000-Shiinotic.png rename to newsrc/afd/24192b.png diff --git a/src/afd/sprites-canonical/back/0756-000-Shiinotic.png b/newsrc/afd/24192bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0756-000-Shiinotic.png rename to newsrc/afd/24192bs.png diff --git a/src/afd/sprites-canonical/front/0756-000-Shiinotic.png b/newsrc/afd/24192s.png similarity index 100% rename from src/afd/sprites-canonical/front/0756-000-Shiinotic.png rename to newsrc/afd/24192s.png diff --git a/src/afd/sprites-canonical/front-shiny/0757-000-Salandit.png b/newsrc/afd/24224.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0757-000-Salandit.png rename to newsrc/afd/24224.png diff --git a/src/afd/sprites-canonical/back-shiny/0757-000-Salandit.png b/newsrc/afd/24224b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0757-000-Salandit.png rename to newsrc/afd/24224b.png diff --git a/src/afd/sprites-canonical/back/0757-000-Salandit.png b/newsrc/afd/24224bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0757-000-Salandit.png rename to newsrc/afd/24224bs.png diff --git a/src/afd/sprites-canonical/front/0757-000-Salandit.png b/newsrc/afd/24224s.png similarity index 100% rename from src/afd/sprites-canonical/front/0757-000-Salandit.png rename to newsrc/afd/24224s.png diff --git a/src/afd/sprites-canonical/front-shiny/0758-000-Salazzle.png b/newsrc/afd/24256.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0758-000-Salazzle.png rename to newsrc/afd/24256.png diff --git a/src/afd/sprites-canonical/back-shiny/0758-000-Salazzle.png b/newsrc/afd/24256b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0758-000-Salazzle.png rename to newsrc/afd/24256b.png diff --git a/src/afd/sprites-canonical/back/0758-000-Salazzle.png b/newsrc/afd/24256bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0758-000-Salazzle.png rename to newsrc/afd/24256bs.png diff --git a/src/afd/sprites-canonical/front/0758-000-Salazzle.png b/newsrc/afd/24256s.png similarity index 100% rename from src/afd/sprites-canonical/front/0758-000-Salazzle.png rename to newsrc/afd/24256s.png diff --git a/src/afd/sprites-canonical/front-shiny/0759-000-Stufful.png b/newsrc/afd/24288.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0759-000-Stufful.png rename to newsrc/afd/24288.png diff --git a/src/afd/sprites-canonical/back-shiny/0759-000-Stufful.png b/newsrc/afd/24288b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0759-000-Stufful.png rename to newsrc/afd/24288b.png diff --git a/src/afd/sprites-canonical/back/0759-000-Stufful.png b/newsrc/afd/24288bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0759-000-Stufful.png rename to newsrc/afd/24288bs.png diff --git a/src/afd/sprites-canonical/front/0759-000-Stufful.png b/newsrc/afd/24288s.png similarity index 100% rename from src/afd/sprites-canonical/front/0759-000-Stufful.png rename to newsrc/afd/24288s.png diff --git a/src/afd/sprites-canonical/front/0076-000-Golem.png b/newsrc/afd/2432.png similarity index 100% rename from src/afd/sprites-canonical/front/0076-000-Golem.png rename to newsrc/afd/2432.png diff --git a/src/afd/sprites-canonical/front-shiny/0760-000-Bewear.png b/newsrc/afd/24320.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0760-000-Bewear.png rename to newsrc/afd/24320.png diff --git a/src/afd/sprites-canonical/back-shiny/0760-000-Bewear.png b/newsrc/afd/24320b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0760-000-Bewear.png rename to newsrc/afd/24320b.png diff --git a/src/afd/sprites-canonical/back/0760-000-Bewear.png b/newsrc/afd/24320bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0760-000-Bewear.png rename to newsrc/afd/24320bs.png diff --git a/src/afd/sprites-canonical/front/0760-000-Bewear.png b/newsrc/afd/24320s.png similarity index 100% rename from src/afd/sprites-canonical/front/0760-000-Bewear.png rename to newsrc/afd/24320s.png diff --git a/src/afd/sprites-canonical/back/0076-000-Golem.png b/newsrc/afd/2432b.png similarity index 100% rename from src/afd/sprites-canonical/back/0076-000-Golem.png rename to newsrc/afd/2432b.png diff --git a/src/afd/sprites-canonical/back-shiny/0076-000-Golem.png b/newsrc/afd/2432bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0076-000-Golem.png rename to newsrc/afd/2432bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0076-000-Golem.png b/newsrc/afd/2432s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0076-000-Golem.png rename to newsrc/afd/2432s.png diff --git a/src/afd/sprites-canonical/front/0076-420-Golem-Alola.png b/newsrc/afd/2433.png similarity index 100% rename from src/afd/sprites-canonical/front/0076-420-Golem-Alola.png rename to newsrc/afd/2433.png diff --git a/src/afd/sprites-canonical/back/0076-420-Golem-Alola.png b/newsrc/afd/2433b.png similarity index 100% rename from src/afd/sprites-canonical/back/0076-420-Golem-Alola.png rename to newsrc/afd/2433b.png diff --git a/src/afd/sprites-canonical/back-shiny/0076-420-Golem-Alola.png b/newsrc/afd/2433bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0076-420-Golem-Alola.png rename to newsrc/afd/2433bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0076-420-Golem-Alola.png b/newsrc/afd/2433s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0076-420-Golem-Alola.png rename to newsrc/afd/2433s.png diff --git a/src/afd/sprites-canonical/front-shiny/0761-000-Bounsweet.png b/newsrc/afd/24352.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0761-000-Bounsweet.png rename to newsrc/afd/24352.png diff --git a/src/afd/sprites-canonical/back-shiny/0761-000-Bounsweet.png b/newsrc/afd/24352b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0761-000-Bounsweet.png rename to newsrc/afd/24352b.png diff --git a/src/afd/sprites-canonical/back/0761-000-Bounsweet.png b/newsrc/afd/24352bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0761-000-Bounsweet.png rename to newsrc/afd/24352bs.png diff --git a/src/afd/sprites-canonical/front/0761-000-Bounsweet.png b/newsrc/afd/24352s.png similarity index 100% rename from src/afd/sprites-canonical/front/0761-000-Bounsweet.png rename to newsrc/afd/24352s.png diff --git a/src/afd/sprites-canonical/front-shiny/0762-000-Steenee.png b/newsrc/afd/24384.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0762-000-Steenee.png rename to newsrc/afd/24384.png diff --git a/src/afd/sprites-canonical/back-shiny/0762-000-Steenee.png b/newsrc/afd/24384b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0762-000-Steenee.png rename to newsrc/afd/24384b.png diff --git a/src/afd/sprites-canonical/back/0762-000-Steenee.png b/newsrc/afd/24384bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0762-000-Steenee.png rename to newsrc/afd/24384bs.png diff --git a/src/afd/sprites-canonical/front/0762-000-Steenee.png b/newsrc/afd/24384s.png similarity index 100% rename from src/afd/sprites-canonical/front/0762-000-Steenee.png rename to newsrc/afd/24384s.png diff --git a/src/afd/sprites-canonical/front-shiny/0763-000-Tsareena.png b/newsrc/afd/24416.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0763-000-Tsareena.png rename to newsrc/afd/24416.png diff --git a/src/afd/sprites-canonical/back-shiny/0763-000-Tsareena.png b/newsrc/afd/24416b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0763-000-Tsareena.png rename to newsrc/afd/24416b.png diff --git a/src/afd/sprites-canonical/back/0763-000-Tsareena.png b/newsrc/afd/24416bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0763-000-Tsareena.png rename to newsrc/afd/24416bs.png diff --git a/src/afd/sprites-canonical/front/0763-000-Tsareena.png b/newsrc/afd/24416s.png similarity index 100% rename from src/afd/sprites-canonical/front/0763-000-Tsareena.png rename to newsrc/afd/24416s.png diff --git a/src/afd/sprites-canonical/front-shiny/0764-000-Comfey.png b/newsrc/afd/24448.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0764-000-Comfey.png rename to newsrc/afd/24448.png diff --git a/src/afd/sprites-canonical/back-shiny/0764-000-Comfey.png b/newsrc/afd/24448b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0764-000-Comfey.png rename to newsrc/afd/24448b.png diff --git a/src/afd/sprites-canonical/back/0764-000-Comfey.png b/newsrc/afd/24448bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0764-000-Comfey.png rename to newsrc/afd/24448bs.png diff --git a/src/afd/sprites-canonical/front/0764-000-Comfey.png b/newsrc/afd/24448s.png similarity index 100% rename from src/afd/sprites-canonical/front/0764-000-Comfey.png rename to newsrc/afd/24448s.png diff --git a/src/afd/sprites-canonical/front-shiny/0765-000-Oranguru.png b/newsrc/afd/24480.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0765-000-Oranguru.png rename to newsrc/afd/24480.png diff --git a/src/afd/sprites-canonical/back-shiny/0765-000-Oranguru.png b/newsrc/afd/24480b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0765-000-Oranguru.png rename to newsrc/afd/24480b.png diff --git a/src/afd/sprites-canonical/back/0765-000-Oranguru.png b/newsrc/afd/24480bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0765-000-Oranguru.png rename to newsrc/afd/24480bs.png diff --git a/src/afd/sprites-canonical/front/0765-000-Oranguru.png b/newsrc/afd/24480s.png similarity index 100% rename from src/afd/sprites-canonical/front/0765-000-Oranguru.png rename to newsrc/afd/24480s.png diff --git a/src/afd/sprites-canonical/front-shiny/0766-000-Passimian.png b/newsrc/afd/24512.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0766-000-Passimian.png rename to newsrc/afd/24512.png diff --git a/src/afd/sprites-canonical/back-shiny/0766-000-Passimian.png b/newsrc/afd/24512b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0766-000-Passimian.png rename to newsrc/afd/24512b.png diff --git a/src/afd/sprites-canonical/back/0766-000-Passimian.png b/newsrc/afd/24512bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0766-000-Passimian.png rename to newsrc/afd/24512bs.png diff --git a/src/afd/sprites-canonical/front/0766-000-Passimian.png b/newsrc/afd/24512s.png similarity index 100% rename from src/afd/sprites-canonical/front/0766-000-Passimian.png rename to newsrc/afd/24512s.png diff --git a/src/afd/sprites-canonical/front-shiny/0767-000-Wimpod.png b/newsrc/afd/24544.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0767-000-Wimpod.png rename to newsrc/afd/24544.png diff --git a/src/afd/sprites-canonical/back-shiny/0767-000-Wimpod.png b/newsrc/afd/24544b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0767-000-Wimpod.png rename to newsrc/afd/24544b.png diff --git a/src/afd/sprites-canonical/back/0767-000-Wimpod.png b/newsrc/afd/24544bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0767-000-Wimpod.png rename to newsrc/afd/24544bs.png diff --git a/src/afd/sprites-canonical/front/0767-000-Wimpod.png b/newsrc/afd/24544s.png similarity index 100% rename from src/afd/sprites-canonical/front/0767-000-Wimpod.png rename to newsrc/afd/24544s.png diff --git a/src/afd/sprites-canonical/front-shiny/0768-000-Golisopod.png b/newsrc/afd/24576.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0768-000-Golisopod.png rename to newsrc/afd/24576.png diff --git a/src/afd/sprites-canonical/back-shiny/0768-000-Golisopod.png b/newsrc/afd/24576b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0768-000-Golisopod.png rename to newsrc/afd/24576b.png diff --git a/src/afd/sprites-canonical/back/0768-000-Golisopod.png b/newsrc/afd/24576bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0768-000-Golisopod.png rename to newsrc/afd/24576bs.png diff --git a/src/afd/sprites-canonical/front/0768-000-Golisopod.png b/newsrc/afd/24576s.png similarity index 100% rename from src/afd/sprites-canonical/front/0768-000-Golisopod.png rename to newsrc/afd/24576s.png diff --git a/src/afd/sprites-canonical/front-shiny/0769-000-Sandygast.png b/newsrc/afd/24608.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0769-000-Sandygast.png rename to newsrc/afd/24608.png diff --git a/src/afd/sprites-canonical/back-shiny/0769-000-Sandygast.png b/newsrc/afd/24608b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0769-000-Sandygast.png rename to newsrc/afd/24608b.png diff --git a/src/afd/sprites-canonical/back/0769-000-Sandygast.png b/newsrc/afd/24608bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0769-000-Sandygast.png rename to newsrc/afd/24608bs.png diff --git a/src/afd/sprites-canonical/front/0769-000-Sandygast.png b/newsrc/afd/24608s.png similarity index 100% rename from src/afd/sprites-canonical/front/0769-000-Sandygast.png rename to newsrc/afd/24608s.png diff --git a/src/afd/sprites-canonical/front/0077-000-Ponyta.png b/newsrc/afd/2464.png similarity index 100% rename from src/afd/sprites-canonical/front/0077-000-Ponyta.png rename to newsrc/afd/2464.png diff --git a/src/afd/sprites-canonical/front-shiny/0770-000-Palossand.png b/newsrc/afd/24640.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0770-000-Palossand.png rename to newsrc/afd/24640.png diff --git a/src/afd/sprites-canonical/back-shiny/0770-000-Palossand.png b/newsrc/afd/24640b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0770-000-Palossand.png rename to newsrc/afd/24640b.png diff --git a/src/afd/sprites-canonical/back/0770-000-Palossand.png b/newsrc/afd/24640bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0770-000-Palossand.png rename to newsrc/afd/24640bs.png diff --git a/src/afd/sprites-canonical/front/0770-000-Palossand.png b/newsrc/afd/24640s.png similarity index 100% rename from src/afd/sprites-canonical/front/0770-000-Palossand.png rename to newsrc/afd/24640s.png diff --git a/src/afd/sprites-canonical/back/0077-000-Ponyta.png b/newsrc/afd/2464b.png similarity index 100% rename from src/afd/sprites-canonical/back/0077-000-Ponyta.png rename to newsrc/afd/2464b.png diff --git a/src/afd/sprites-canonical/back-shiny/0077-000-Ponyta.png b/newsrc/afd/2464bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0077-000-Ponyta.png rename to newsrc/afd/2464bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0077-000-Ponyta.png b/newsrc/afd/2464s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0077-000-Ponyta.png rename to newsrc/afd/2464s.png diff --git a/src/afd/sprites-canonical/front/0077-420-Ponyta-Galar.png b/newsrc/afd/2465.png similarity index 100% rename from src/afd/sprites-canonical/front/0077-420-Ponyta-Galar.png rename to newsrc/afd/2465.png diff --git a/src/afd/sprites-canonical/back/0077-420-Ponyta-Galar.png b/newsrc/afd/2465b.png similarity index 100% rename from src/afd/sprites-canonical/back/0077-420-Ponyta-Galar.png rename to newsrc/afd/2465b.png diff --git a/src/afd/sprites-canonical/back-shiny/0077-420-Ponyta-Galar.png b/newsrc/afd/2465bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0077-420-Ponyta-Galar.png rename to newsrc/afd/2465bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0077-420-Ponyta-Galar.png b/newsrc/afd/2465s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0077-420-Ponyta-Galar.png rename to newsrc/afd/2465s.png diff --git a/src/afd/sprites-canonical/front-shiny/0771-000-Pyukumuku.png b/newsrc/afd/24672.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0771-000-Pyukumuku.png rename to newsrc/afd/24672.png diff --git a/src/afd/sprites-canonical/back-shiny/0771-000-Pyukumuku.png b/newsrc/afd/24672b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0771-000-Pyukumuku.png rename to newsrc/afd/24672b.png diff --git a/src/afd/sprites-canonical/back/0771-000-Pyukumuku.png b/newsrc/afd/24672bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0771-000-Pyukumuku.png rename to newsrc/afd/24672bs.png diff --git a/src/afd/sprites-canonical/front/0771-000-Pyukumuku.png b/newsrc/afd/24672s.png similarity index 100% rename from src/afd/sprites-canonical/front/0771-000-Pyukumuku.png rename to newsrc/afd/24672s.png diff --git a/src/afd/sprites-canonical/front-shiny/0772-000-Type__003a_Null.png b/newsrc/afd/24704.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0772-000-Type__003a_Null.png rename to newsrc/afd/24704.png diff --git a/src/afd/sprites-canonical/back-shiny/0772-000-Type__003a_Null.png b/newsrc/afd/24704b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0772-000-Type__003a_Null.png rename to newsrc/afd/24704b.png diff --git a/src/afd/sprites-canonical/back/0772-000-Type__003a_Null.png b/newsrc/afd/24704bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0772-000-Type__003a_Null.png rename to newsrc/afd/24704bs.png diff --git a/src/afd/sprites-canonical/front/0772-000-Type__003a_Null.png b/newsrc/afd/24704s.png similarity index 100% rename from src/afd/sprites-canonical/front/0772-000-Type__003a_Null.png rename to newsrc/afd/24704s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-000-Silvally.png b/newsrc/afd/24736.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-000-Silvally.png rename to newsrc/afd/24736.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-000-Silvally.png b/newsrc/afd/24736b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-000-Silvally.png rename to newsrc/afd/24736b.png diff --git a/src/afd/sprites-canonical/back/0773-000-Silvally.png b/newsrc/afd/24736bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-000-Silvally.png rename to newsrc/afd/24736bs.png diff --git a/src/afd/sprites-canonical/front/0773-000-Silvally.png b/newsrc/afd/24736s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-000-Silvally.png rename to newsrc/afd/24736s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Fighting.png b/newsrc/afd/24737.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Fighting.png rename to newsrc/afd/24737.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Fighting.png b/newsrc/afd/24737b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Fighting.png rename to newsrc/afd/24737b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Fighting.png b/newsrc/afd/24737bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Fighting.png rename to newsrc/afd/24737bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Fighting.png b/newsrc/afd/24737s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Fighting.png rename to newsrc/afd/24737s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Flying.png b/newsrc/afd/24738.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Flying.png rename to newsrc/afd/24738.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Flying.png b/newsrc/afd/24738b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Flying.png rename to newsrc/afd/24738b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Flying.png b/newsrc/afd/24738bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Flying.png rename to newsrc/afd/24738bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Flying.png b/newsrc/afd/24738s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Flying.png rename to newsrc/afd/24738s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Poison.png b/newsrc/afd/24739.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Poison.png rename to newsrc/afd/24739.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Poison.png b/newsrc/afd/24739b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Poison.png rename to newsrc/afd/24739b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Poison.png b/newsrc/afd/24739bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Poison.png rename to newsrc/afd/24739bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Poison.png b/newsrc/afd/24739s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Poison.png rename to newsrc/afd/24739s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Ground.png b/newsrc/afd/24740.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Ground.png rename to newsrc/afd/24740.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Ground.png b/newsrc/afd/24740b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Ground.png rename to newsrc/afd/24740b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Ground.png b/newsrc/afd/24740bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Ground.png rename to newsrc/afd/24740bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Ground.png b/newsrc/afd/24740s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Ground.png rename to newsrc/afd/24740s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Rock.png b/newsrc/afd/24741.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Rock.png rename to newsrc/afd/24741.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Rock.png b/newsrc/afd/24741b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Rock.png rename to newsrc/afd/24741b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Rock.png b/newsrc/afd/24741bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Rock.png rename to newsrc/afd/24741bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Rock.png b/newsrc/afd/24741s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Rock.png rename to newsrc/afd/24741s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Bug.png b/newsrc/afd/24742.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Bug.png rename to newsrc/afd/24742.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Bug.png b/newsrc/afd/24742b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Bug.png rename to newsrc/afd/24742b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Bug.png b/newsrc/afd/24742bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Bug.png rename to newsrc/afd/24742bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Bug.png b/newsrc/afd/24742s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Bug.png rename to newsrc/afd/24742s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Ghost.png b/newsrc/afd/24743.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Ghost.png rename to newsrc/afd/24743.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Ghost.png b/newsrc/afd/24743b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Ghost.png rename to newsrc/afd/24743b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Ghost.png b/newsrc/afd/24743bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Ghost.png rename to newsrc/afd/24743bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Ghost.png b/newsrc/afd/24743s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Ghost.png rename to newsrc/afd/24743s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Steel.png b/newsrc/afd/24744.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Steel.png rename to newsrc/afd/24744.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Steel.png b/newsrc/afd/24744b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Steel.png rename to newsrc/afd/24744b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Steel.png b/newsrc/afd/24744bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Steel.png rename to newsrc/afd/24744bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Steel.png b/newsrc/afd/24744s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Steel.png rename to newsrc/afd/24744s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Fire.png b/newsrc/afd/24745.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Fire.png rename to newsrc/afd/24745.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Fire.png b/newsrc/afd/24745b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Fire.png rename to newsrc/afd/24745b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Fire.png b/newsrc/afd/24745bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Fire.png rename to newsrc/afd/24745bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Fire.png b/newsrc/afd/24745s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Fire.png rename to newsrc/afd/24745s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Water.png b/newsrc/afd/24746.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Water.png rename to newsrc/afd/24746.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Water.png b/newsrc/afd/24746b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Water.png rename to newsrc/afd/24746b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Water.png b/newsrc/afd/24746bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Water.png rename to newsrc/afd/24746bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Water.png b/newsrc/afd/24746s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Water.png rename to newsrc/afd/24746s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Grass.png b/newsrc/afd/24747.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Grass.png rename to newsrc/afd/24747.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Grass.png b/newsrc/afd/24747b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Grass.png rename to newsrc/afd/24747b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Grass.png b/newsrc/afd/24747bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Grass.png rename to newsrc/afd/24747bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Grass.png b/newsrc/afd/24747s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Grass.png rename to newsrc/afd/24747s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Electric.png b/newsrc/afd/24748.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Electric.png rename to newsrc/afd/24748.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Electric.png b/newsrc/afd/24748b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Electric.png rename to newsrc/afd/24748b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Electric.png b/newsrc/afd/24748bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Electric.png rename to newsrc/afd/24748bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Electric.png b/newsrc/afd/24748s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Electric.png rename to newsrc/afd/24748s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Psychic.png b/newsrc/afd/24749.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Psychic.png rename to newsrc/afd/24749.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Psychic.png b/newsrc/afd/24749b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Psychic.png rename to newsrc/afd/24749b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Psychic.png b/newsrc/afd/24749bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Psychic.png rename to newsrc/afd/24749bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Psychic.png b/newsrc/afd/24749s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Psychic.png rename to newsrc/afd/24749s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Ice.png b/newsrc/afd/24750.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Ice.png rename to newsrc/afd/24750.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Ice.png b/newsrc/afd/24750b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Ice.png rename to newsrc/afd/24750b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Ice.png b/newsrc/afd/24750bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Ice.png rename to newsrc/afd/24750bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Ice.png b/newsrc/afd/24750s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Ice.png rename to newsrc/afd/24750s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Dragon.png b/newsrc/afd/24751.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Dragon.png rename to newsrc/afd/24751.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Dragon.png b/newsrc/afd/24751b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Dragon.png rename to newsrc/afd/24751b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Dragon.png b/newsrc/afd/24751bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Dragon.png rename to newsrc/afd/24751bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Dragon.png b/newsrc/afd/24751s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Dragon.png rename to newsrc/afd/24751s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Dark.png b/newsrc/afd/24752.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Dark.png rename to newsrc/afd/24752.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Dark.png b/newsrc/afd/24752b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Dark.png rename to newsrc/afd/24752b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Dark.png b/newsrc/afd/24752bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Dark.png rename to newsrc/afd/24752bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Dark.png b/newsrc/afd/24752s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Dark.png rename to newsrc/afd/24752s.png diff --git a/src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Fairy.png b/newsrc/afd/24753.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0773-420-Silvally-Fairy.png rename to newsrc/afd/24753.png diff --git a/src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Fairy.png b/newsrc/afd/24753b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0773-420-Silvally-Fairy.png rename to newsrc/afd/24753b.png diff --git a/src/afd/sprites-canonical/back/0773-420-Silvally-Fairy.png b/newsrc/afd/24753bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0773-420-Silvally-Fairy.png rename to newsrc/afd/24753bs.png diff --git a/src/afd/sprites-canonical/front/0773-420-Silvally-Fairy.png b/newsrc/afd/24753s.png similarity index 100% rename from src/afd/sprites-canonical/front/0773-420-Silvally-Fairy.png rename to newsrc/afd/24753s.png diff --git a/src/afd/sprites-canonical/front-shiny/0774-420-Minior-Meteor.png b/newsrc/afd/24768.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0774-420-Minior-Meteor.png rename to newsrc/afd/24768.png diff --git a/src/afd/sprites-canonical/back-shiny/0774-420-Minior-Meteor.png b/newsrc/afd/24768b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0774-420-Minior-Meteor.png rename to newsrc/afd/24768b.png diff --git a/src/afd/sprites-canonical/back/0774-420-Minior-Meteor.png b/newsrc/afd/24768bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0774-420-Minior-Meteor.png rename to newsrc/afd/24768bs.png diff --git a/src/afd/sprites-canonical/front/0774-420-Minior-Meteor.png b/newsrc/afd/24768s.png similarity index 100% rename from src/afd/sprites-canonical/front/0774-420-Minior-Meteor.png rename to newsrc/afd/24768s.png diff --git a/src/afd/sprites-canonical/front-shiny/0774-000-Minior.png b/newsrc/afd/24775.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0774-000-Minior.png rename to newsrc/afd/24775.png diff --git a/src/afd/sprites-canonical/back-shiny/0774-000-Minior.png b/newsrc/afd/24775b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0774-000-Minior.png rename to newsrc/afd/24775b.png diff --git a/src/afd/sprites-canonical/back/0774-000-Minior.png b/newsrc/afd/24775bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0774-000-Minior.png rename to newsrc/afd/24775bs.png diff --git a/src/afd/sprites-canonical/front/0774-000-Minior.png b/newsrc/afd/24775s.png similarity index 100% rename from src/afd/sprites-canonical/front/0774-000-Minior.png rename to newsrc/afd/24775s.png diff --git a/src/afd/sprites-canonical/front-shiny/0775-000-Komala.png b/newsrc/afd/24800.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0775-000-Komala.png rename to newsrc/afd/24800.png diff --git a/src/afd/sprites-canonical/back-shiny/0775-000-Komala.png b/newsrc/afd/24800b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0775-000-Komala.png rename to newsrc/afd/24800b.png diff --git a/src/afd/sprites-canonical/back/0775-000-Komala.png b/newsrc/afd/24800bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0775-000-Komala.png rename to newsrc/afd/24800bs.png diff --git a/src/afd/sprites-canonical/front/0775-000-Komala.png b/newsrc/afd/24800s.png similarity index 100% rename from src/afd/sprites-canonical/front/0775-000-Komala.png rename to newsrc/afd/24800s.png diff --git a/src/afd/sprites-canonical/front-shiny/0776-000-Turtonator.png b/newsrc/afd/24832.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0776-000-Turtonator.png rename to newsrc/afd/24832.png diff --git a/src/afd/sprites-canonical/back-shiny/0776-000-Turtonator.png b/newsrc/afd/24832b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0776-000-Turtonator.png rename to newsrc/afd/24832b.png diff --git a/src/afd/sprites-canonical/back/0776-000-Turtonator.png b/newsrc/afd/24832bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0776-000-Turtonator.png rename to newsrc/afd/24832bs.png diff --git a/src/afd/sprites-canonical/front/0776-000-Turtonator.png b/newsrc/afd/24832s.png similarity index 100% rename from src/afd/sprites-canonical/front/0776-000-Turtonator.png rename to newsrc/afd/24832s.png diff --git a/src/afd/sprites-canonical/front-shiny/0777-000-Togedemaru.png b/newsrc/afd/24864.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0777-000-Togedemaru.png rename to newsrc/afd/24864.png diff --git a/src/afd/sprites-canonical/back-shiny/0777-000-Togedemaru.png b/newsrc/afd/24864b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0777-000-Togedemaru.png rename to newsrc/afd/24864b.png diff --git a/src/afd/sprites-canonical/back/0777-000-Togedemaru.png b/newsrc/afd/24864bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0777-000-Togedemaru.png rename to newsrc/afd/24864bs.png diff --git a/src/afd/sprites-canonical/front/0777-000-Togedemaru.png b/newsrc/afd/24864s.png similarity index 100% rename from src/afd/sprites-canonical/front/0777-000-Togedemaru.png rename to newsrc/afd/24864s.png diff --git a/src/afd/sprites-canonical/front-shiny/0778-000-Mimikyu.png b/newsrc/afd/24896.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0778-000-Mimikyu.png rename to newsrc/afd/24896.png diff --git a/src/afd/sprites-canonical/back-shiny/0778-000-Mimikyu.png b/newsrc/afd/24896b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0778-000-Mimikyu.png rename to newsrc/afd/24896b.png diff --git a/src/afd/sprites-canonical/back/0778-000-Mimikyu.png b/newsrc/afd/24896bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0778-000-Mimikyu.png rename to newsrc/afd/24896bs.png diff --git a/src/afd/sprites-canonical/front/0778-000-Mimikyu.png b/newsrc/afd/24896s.png similarity index 100% rename from src/afd/sprites-canonical/front/0778-000-Mimikyu.png rename to newsrc/afd/24896s.png diff --git a/src/afd/sprites-canonical/front-shiny/0778-420-Mimikyu-Busted.png b/newsrc/afd/24897.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0778-420-Mimikyu-Busted.png rename to newsrc/afd/24897.png diff --git a/src/afd/sprites-canonical/back-shiny/0778-420-Mimikyu-Busted.png b/newsrc/afd/24897b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0778-420-Mimikyu-Busted.png rename to newsrc/afd/24897b.png diff --git a/src/afd/sprites-canonical/back/0778-420-Mimikyu-Busted.png b/newsrc/afd/24897bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0778-420-Mimikyu-Busted.png rename to newsrc/afd/24897bs.png diff --git a/src/afd/sprites-canonical/front/0778-420-Mimikyu-Busted.png b/newsrc/afd/24897s.png similarity index 100% rename from src/afd/sprites-canonical/front/0778-420-Mimikyu-Busted.png rename to newsrc/afd/24897s.png diff --git a/src/afd/sprites-canonical/front-shiny/0779-000-Bruxish.png b/newsrc/afd/24928.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0779-000-Bruxish.png rename to newsrc/afd/24928.png diff --git a/src/afd/sprites-canonical/back-shiny/0779-000-Bruxish.png b/newsrc/afd/24928b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0779-000-Bruxish.png rename to newsrc/afd/24928b.png diff --git a/src/afd/sprites-canonical/back/0779-000-Bruxish.png b/newsrc/afd/24928bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0779-000-Bruxish.png rename to newsrc/afd/24928bs.png diff --git a/src/afd/sprites-canonical/front/0779-000-Bruxish.png b/newsrc/afd/24928s.png similarity index 100% rename from src/afd/sprites-canonical/front/0779-000-Bruxish.png rename to newsrc/afd/24928s.png diff --git a/src/afd/sprites-canonical/front/0078-000-Rapidash.png b/newsrc/afd/2496.png similarity index 100% rename from src/afd/sprites-canonical/front/0078-000-Rapidash.png rename to newsrc/afd/2496.png diff --git a/src/afd/sprites-canonical/front-shiny/0780-000-Drampa.png b/newsrc/afd/24960.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0780-000-Drampa.png rename to newsrc/afd/24960.png diff --git a/src/afd/sprites-canonical/back-shiny/0780-000-Drampa.png b/newsrc/afd/24960b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0780-000-Drampa.png rename to newsrc/afd/24960b.png diff --git a/src/afd/sprites-canonical/back/0780-000-Drampa.png b/newsrc/afd/24960bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0780-000-Drampa.png rename to newsrc/afd/24960bs.png diff --git a/src/afd/sprites-canonical/front/0780-000-Drampa.png b/newsrc/afd/24960s.png similarity index 100% rename from src/afd/sprites-canonical/front/0780-000-Drampa.png rename to newsrc/afd/24960s.png diff --git a/src/afd/sprites-canonical/back/0078-000-Rapidash.png b/newsrc/afd/2496b.png similarity index 100% rename from src/afd/sprites-canonical/back/0078-000-Rapidash.png rename to newsrc/afd/2496b.png diff --git a/src/afd/sprites-canonical/back-shiny/0078-000-Rapidash.png b/newsrc/afd/2496bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0078-000-Rapidash.png rename to newsrc/afd/2496bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0078-000-Rapidash.png b/newsrc/afd/2496s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0078-000-Rapidash.png rename to newsrc/afd/2496s.png diff --git a/src/afd/sprites-canonical/front/0078-420-Rapidash-Galar.png b/newsrc/afd/2497.png similarity index 100% rename from src/afd/sprites-canonical/front/0078-420-Rapidash-Galar.png rename to newsrc/afd/2497.png diff --git a/src/afd/sprites-canonical/back/0078-420-Rapidash-Galar.png b/newsrc/afd/2497b.png similarity index 100% rename from src/afd/sprites-canonical/back/0078-420-Rapidash-Galar.png rename to newsrc/afd/2497b.png diff --git a/src/afd/sprites-canonical/back-shiny/0078-420-Rapidash-Galar.png b/newsrc/afd/2497bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0078-420-Rapidash-Galar.png rename to newsrc/afd/2497bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0078-420-Rapidash-Galar.png b/newsrc/afd/2497s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0078-420-Rapidash-Galar.png rename to newsrc/afd/2497s.png diff --git a/src/afd/sprites-canonical/front-shiny/0781-000-Dhelmise.png b/newsrc/afd/24992.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0781-000-Dhelmise.png rename to newsrc/afd/24992.png diff --git a/src/afd/sprites-canonical/back-shiny/0781-000-Dhelmise.png b/newsrc/afd/24992b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0781-000-Dhelmise.png rename to newsrc/afd/24992b.png diff --git a/src/afd/sprites-canonical/back/0781-000-Dhelmise.png b/newsrc/afd/24992bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0781-000-Dhelmise.png rename to newsrc/afd/24992bs.png diff --git a/src/afd/sprites-canonical/front/0781-000-Dhelmise.png b/newsrc/afd/24992s.png similarity index 100% rename from src/afd/sprites-canonical/front/0781-000-Dhelmise.png rename to newsrc/afd/24992s.png diff --git a/src/afd/sprites-canonical/front-shiny/0782-000-Jangmo~o.png b/newsrc/afd/25024.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0782-000-Jangmo~o.png rename to newsrc/afd/25024.png diff --git a/src/afd/sprites-canonical/back-shiny/0782-000-Jangmo~o.png b/newsrc/afd/25024b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0782-000-Jangmo~o.png rename to newsrc/afd/25024b.png diff --git a/src/afd/sprites-canonical/back/0782-000-Jangmo~o.png b/newsrc/afd/25024bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0782-000-Jangmo~o.png rename to newsrc/afd/25024bs.png diff --git a/src/afd/sprites-canonical/front/0782-000-Jangmo~o.png b/newsrc/afd/25024s.png similarity index 100% rename from src/afd/sprites-canonical/front/0782-000-Jangmo~o.png rename to newsrc/afd/25024s.png diff --git a/src/afd/sprites-canonical/front-shiny/0783-000-Hakamo~o.png b/newsrc/afd/25056.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0783-000-Hakamo~o.png rename to newsrc/afd/25056.png diff --git a/src/afd/sprites-canonical/back-shiny/0783-000-Hakamo~o.png b/newsrc/afd/25056b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0783-000-Hakamo~o.png rename to newsrc/afd/25056b.png diff --git a/src/afd/sprites-canonical/back/0783-000-Hakamo~o.png b/newsrc/afd/25056bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0783-000-Hakamo~o.png rename to newsrc/afd/25056bs.png diff --git a/src/afd/sprites-canonical/front/0783-000-Hakamo~o.png b/newsrc/afd/25056s.png similarity index 100% rename from src/afd/sprites-canonical/front/0783-000-Hakamo~o.png rename to newsrc/afd/25056s.png diff --git a/src/afd/sprites-canonical/front-shiny/0784-000-Kommo~o.png b/newsrc/afd/25088.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0784-000-Kommo~o.png rename to newsrc/afd/25088.png diff --git a/src/afd/sprites-canonical/back-shiny/0784-000-Kommo~o.png b/newsrc/afd/25088b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0784-000-Kommo~o.png rename to newsrc/afd/25088b.png diff --git a/src/afd/sprites-canonical/back/0784-000-Kommo~o.png b/newsrc/afd/25088bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0784-000-Kommo~o.png rename to newsrc/afd/25088bs.png diff --git a/src/afd/sprites-canonical/front/0784-000-Kommo~o.png b/newsrc/afd/25088s.png similarity index 100% rename from src/afd/sprites-canonical/front/0784-000-Kommo~o.png rename to newsrc/afd/25088s.png diff --git a/src/afd/sprites-canonical/front-shiny/0785-000-Tapu_Koko.png b/newsrc/afd/25120.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0785-000-Tapu_Koko.png rename to newsrc/afd/25120.png diff --git a/src/afd/sprites-canonical/back-shiny/0785-000-Tapu_Koko.png b/newsrc/afd/25120b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0785-000-Tapu_Koko.png rename to newsrc/afd/25120b.png diff --git a/src/afd/sprites-canonical/back/0785-000-Tapu_Koko.png b/newsrc/afd/25120bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0785-000-Tapu_Koko.png rename to newsrc/afd/25120bs.png diff --git a/src/afd/sprites-canonical/front/0785-000-Tapu_Koko.png b/newsrc/afd/25120s.png similarity index 100% rename from src/afd/sprites-canonical/front/0785-000-Tapu_Koko.png rename to newsrc/afd/25120s.png diff --git a/src/afd/sprites-canonical/front-shiny/0786-000-Tapu_Lele.png b/newsrc/afd/25152.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0786-000-Tapu_Lele.png rename to newsrc/afd/25152.png diff --git a/src/afd/sprites-canonical/back-shiny/0786-000-Tapu_Lele.png b/newsrc/afd/25152b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0786-000-Tapu_Lele.png rename to newsrc/afd/25152b.png diff --git a/src/afd/sprites-canonical/back/0786-000-Tapu_Lele.png b/newsrc/afd/25152bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0786-000-Tapu_Lele.png rename to newsrc/afd/25152bs.png diff --git a/src/afd/sprites-canonical/front/0786-000-Tapu_Lele.png b/newsrc/afd/25152s.png similarity index 100% rename from src/afd/sprites-canonical/front/0786-000-Tapu_Lele.png rename to newsrc/afd/25152s.png diff --git a/src/afd/sprites-canonical/front-shiny/0787-000-Tapu_Bulu.png b/newsrc/afd/25184.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0787-000-Tapu_Bulu.png rename to newsrc/afd/25184.png diff --git a/src/afd/sprites-canonical/back-shiny/0787-000-Tapu_Bulu.png b/newsrc/afd/25184b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0787-000-Tapu_Bulu.png rename to newsrc/afd/25184b.png diff --git a/src/afd/sprites-canonical/back/0787-000-Tapu_Bulu.png b/newsrc/afd/25184bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0787-000-Tapu_Bulu.png rename to newsrc/afd/25184bs.png diff --git a/src/afd/sprites-canonical/front/0787-000-Tapu_Bulu.png b/newsrc/afd/25184s.png similarity index 100% rename from src/afd/sprites-canonical/front/0787-000-Tapu_Bulu.png rename to newsrc/afd/25184s.png diff --git a/src/afd/sprites-canonical/front-shiny/0788-000-Tapu_Fini.png b/newsrc/afd/25216.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0788-000-Tapu_Fini.png rename to newsrc/afd/25216.png diff --git a/src/afd/sprites-canonical/back-shiny/0788-000-Tapu_Fini.png b/newsrc/afd/25216b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0788-000-Tapu_Fini.png rename to newsrc/afd/25216b.png diff --git a/src/afd/sprites-canonical/back/0788-000-Tapu_Fini.png b/newsrc/afd/25216bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0788-000-Tapu_Fini.png rename to newsrc/afd/25216bs.png diff --git a/src/afd/sprites-canonical/front/0788-000-Tapu_Fini.png b/newsrc/afd/25216s.png similarity index 100% rename from src/afd/sprites-canonical/front/0788-000-Tapu_Fini.png rename to newsrc/afd/25216s.png diff --git a/src/afd/sprites-canonical/front-shiny/0789-000-Cosmog.png b/newsrc/afd/25248.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0789-000-Cosmog.png rename to newsrc/afd/25248.png diff --git a/src/afd/sprites-canonical/back-shiny/0789-000-Cosmog.png b/newsrc/afd/25248b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0789-000-Cosmog.png rename to newsrc/afd/25248b.png diff --git a/src/afd/sprites-canonical/back/0789-000-Cosmog.png b/newsrc/afd/25248bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0789-000-Cosmog.png rename to newsrc/afd/25248bs.png diff --git a/src/afd/sprites-canonical/front/0789-000-Cosmog.png b/newsrc/afd/25248s.png similarity index 100% rename from src/afd/sprites-canonical/front/0789-000-Cosmog.png rename to newsrc/afd/25248s.png diff --git a/src/afd/sprites-canonical/front/0079-000-Slowpoke.png b/newsrc/afd/2528.png similarity index 100% rename from src/afd/sprites-canonical/front/0079-000-Slowpoke.png rename to newsrc/afd/2528.png diff --git a/src/afd/sprites-canonical/front-shiny/0790-000-Cosmoem.png b/newsrc/afd/25280.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0790-000-Cosmoem.png rename to newsrc/afd/25280.png diff --git a/src/afd/sprites-canonical/back-shiny/0790-000-Cosmoem.png b/newsrc/afd/25280b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0790-000-Cosmoem.png rename to newsrc/afd/25280b.png diff --git a/src/afd/sprites-canonical/back/0790-000-Cosmoem.png b/newsrc/afd/25280bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0790-000-Cosmoem.png rename to newsrc/afd/25280bs.png diff --git a/src/afd/sprites-canonical/front/0790-000-Cosmoem.png b/newsrc/afd/25280s.png similarity index 100% rename from src/afd/sprites-canonical/front/0790-000-Cosmoem.png rename to newsrc/afd/25280s.png diff --git a/src/afd/sprites-canonical/back/0079-000-Slowpoke.png b/newsrc/afd/2528b.png similarity index 100% rename from src/afd/sprites-canonical/back/0079-000-Slowpoke.png rename to newsrc/afd/2528b.png diff --git a/src/afd/sprites-canonical/back-shiny/0079-000-Slowpoke.png b/newsrc/afd/2528bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0079-000-Slowpoke.png rename to newsrc/afd/2528bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0079-000-Slowpoke.png b/newsrc/afd/2528s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0079-000-Slowpoke.png rename to newsrc/afd/2528s.png diff --git a/src/afd/sprites-canonical/back/0079-420-Slowpoke-Galar.png b/newsrc/afd/2529.png similarity index 100% rename from src/afd/sprites-canonical/back/0079-420-Slowpoke-Galar.png rename to newsrc/afd/2529.png diff --git a/src/afd/sprites-canonical/front/0079-420-Slowpoke-Galar.png b/newsrc/afd/2529b.png similarity index 100% rename from src/afd/sprites-canonical/front/0079-420-Slowpoke-Galar.png rename to newsrc/afd/2529b.png diff --git a/src/afd/sprites-canonical/back-shiny/0079-420-Slowpoke-Galar.png b/newsrc/afd/2529bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0079-420-Slowpoke-Galar.png rename to newsrc/afd/2529bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0079-420-Slowpoke-Galar.png b/newsrc/afd/2529s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0079-420-Slowpoke-Galar.png rename to newsrc/afd/2529s.png diff --git a/src/afd/sprites-canonical/front-shiny/0791-000-Solgaleo.png b/newsrc/afd/25312.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0791-000-Solgaleo.png rename to newsrc/afd/25312.png diff --git a/src/afd/sprites-canonical/back-shiny/0791-000-Solgaleo.png b/newsrc/afd/25312b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0791-000-Solgaleo.png rename to newsrc/afd/25312b.png diff --git a/src/afd/sprites-canonical/back/0791-000-Solgaleo.png b/newsrc/afd/25312bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0791-000-Solgaleo.png rename to newsrc/afd/25312bs.png diff --git a/src/afd/sprites-canonical/front/0791-000-Solgaleo.png b/newsrc/afd/25312s.png similarity index 100% rename from src/afd/sprites-canonical/front/0791-000-Solgaleo.png rename to newsrc/afd/25312s.png diff --git a/src/afd/sprites-canonical/front-shiny/0792-000-Lunala.png b/newsrc/afd/25344.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0792-000-Lunala.png rename to newsrc/afd/25344.png diff --git a/src/afd/sprites-canonical/back-shiny/0792-000-Lunala.png b/newsrc/afd/25344b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0792-000-Lunala.png rename to newsrc/afd/25344b.png diff --git a/src/afd/sprites-canonical/back/0792-000-Lunala.png b/newsrc/afd/25344bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0792-000-Lunala.png rename to newsrc/afd/25344bs.png diff --git a/src/afd/sprites-canonical/front/0792-000-Lunala.png b/newsrc/afd/25344s.png similarity index 100% rename from src/afd/sprites-canonical/front/0792-000-Lunala.png rename to newsrc/afd/25344s.png diff --git a/src/afd/sprites-canonical/front-shiny/0793-000-Nihilego.png b/newsrc/afd/25376.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0793-000-Nihilego.png rename to newsrc/afd/25376.png diff --git a/src/afd/sprites-canonical/back-shiny/0793-000-Nihilego.png b/newsrc/afd/25376b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0793-000-Nihilego.png rename to newsrc/afd/25376b.png diff --git a/src/afd/sprites-canonical/back/0793-000-Nihilego.png b/newsrc/afd/25376bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0793-000-Nihilego.png rename to newsrc/afd/25376bs.png diff --git a/src/afd/sprites-canonical/front/0793-000-Nihilego.png b/newsrc/afd/25376s.png similarity index 100% rename from src/afd/sprites-canonical/front/0793-000-Nihilego.png rename to newsrc/afd/25376s.png diff --git a/src/afd/sprites-canonical/front-shiny/0794-000-Buzzwole.png b/newsrc/afd/25408.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0794-000-Buzzwole.png rename to newsrc/afd/25408.png diff --git a/src/afd/sprites-canonical/back-shiny/0794-000-Buzzwole.png b/newsrc/afd/25408b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0794-000-Buzzwole.png rename to newsrc/afd/25408b.png diff --git a/src/afd/sprites-canonical/back/0794-000-Buzzwole.png b/newsrc/afd/25408bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0794-000-Buzzwole.png rename to newsrc/afd/25408bs.png diff --git a/src/afd/sprites-canonical/front/0794-000-Buzzwole.png b/newsrc/afd/25408s.png similarity index 100% rename from src/afd/sprites-canonical/front/0794-000-Buzzwole.png rename to newsrc/afd/25408s.png diff --git a/src/afd/sprites-canonical/front-shiny/0795-000-Pheromosa.png b/newsrc/afd/25440.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0795-000-Pheromosa.png rename to newsrc/afd/25440.png diff --git a/src/afd/sprites-canonical/back-shiny/0795-000-Pheromosa.png b/newsrc/afd/25440b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0795-000-Pheromosa.png rename to newsrc/afd/25440b.png diff --git a/src/afd/sprites-canonical/back/0795-000-Pheromosa.png b/newsrc/afd/25440bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0795-000-Pheromosa.png rename to newsrc/afd/25440bs.png diff --git a/src/afd/sprites-canonical/front/0795-000-Pheromosa.png b/newsrc/afd/25440s.png similarity index 100% rename from src/afd/sprites-canonical/front/0795-000-Pheromosa.png rename to newsrc/afd/25440s.png diff --git a/src/afd/sprites-canonical/front-shiny/0796-000-Xurkitree.png b/newsrc/afd/25472.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0796-000-Xurkitree.png rename to newsrc/afd/25472.png diff --git a/src/afd/sprites-canonical/back-shiny/0796-000-Xurkitree.png b/newsrc/afd/25472b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0796-000-Xurkitree.png rename to newsrc/afd/25472b.png diff --git a/src/afd/sprites-canonical/back/0796-000-Xurkitree.png b/newsrc/afd/25472bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0796-000-Xurkitree.png rename to newsrc/afd/25472bs.png diff --git a/src/afd/sprites-canonical/front/0796-000-Xurkitree.png b/newsrc/afd/25472s.png similarity index 100% rename from src/afd/sprites-canonical/front/0796-000-Xurkitree.png rename to newsrc/afd/25472s.png diff --git a/src/afd/sprites-canonical/front-shiny/0797-000-Celesteela.png b/newsrc/afd/25504.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0797-000-Celesteela.png rename to newsrc/afd/25504.png diff --git a/src/afd/sprites-canonical/back-shiny/0797-000-Celesteela.png b/newsrc/afd/25504b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0797-000-Celesteela.png rename to newsrc/afd/25504b.png diff --git a/src/afd/sprites-canonical/back/0797-000-Celesteela.png b/newsrc/afd/25504bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0797-000-Celesteela.png rename to newsrc/afd/25504bs.png diff --git a/src/afd/sprites-canonical/front/0797-000-Celesteela.png b/newsrc/afd/25504s.png similarity index 100% rename from src/afd/sprites-canonical/front/0797-000-Celesteela.png rename to newsrc/afd/25504s.png diff --git a/src/afd/sprites-canonical/front-shiny/0798-000-Kartana.png b/newsrc/afd/25536.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0798-000-Kartana.png rename to newsrc/afd/25536.png diff --git a/src/afd/sprites-canonical/back-shiny/0798-000-Kartana.png b/newsrc/afd/25536b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0798-000-Kartana.png rename to newsrc/afd/25536b.png diff --git a/src/afd/sprites-canonical/back/0798-000-Kartana.png b/newsrc/afd/25536bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0798-000-Kartana.png rename to newsrc/afd/25536bs.png diff --git a/src/afd/sprites-canonical/front/0798-000-Kartana.png b/newsrc/afd/25536s.png similarity index 100% rename from src/afd/sprites-canonical/front/0798-000-Kartana.png rename to newsrc/afd/25536s.png diff --git a/src/afd/sprites-canonical/front-shiny/0799-000-Guzzlord.png b/newsrc/afd/25568.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0799-000-Guzzlord.png rename to newsrc/afd/25568.png diff --git a/src/afd/sprites-canonical/back-shiny/0799-000-Guzzlord.png b/newsrc/afd/25568b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0799-000-Guzzlord.png rename to newsrc/afd/25568b.png diff --git a/src/afd/sprites-canonical/back/0799-000-Guzzlord.png b/newsrc/afd/25568bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0799-000-Guzzlord.png rename to newsrc/afd/25568bs.png diff --git a/src/afd/sprites-canonical/front/0799-000-Guzzlord.png b/newsrc/afd/25568s.png similarity index 100% rename from src/afd/sprites-canonical/front/0799-000-Guzzlord.png rename to newsrc/afd/25568s.png diff --git a/src/afd/sprites-canonical/front/0008-000-Wartortle.png b/newsrc/afd/256.png similarity index 100% rename from src/afd/sprites-canonical/front/0008-000-Wartortle.png rename to newsrc/afd/256.png diff --git a/src/afd/sprites-canonical/front/0080-000-Slowbro.png b/newsrc/afd/2560.png similarity index 100% rename from src/afd/sprites-canonical/front/0080-000-Slowbro.png rename to newsrc/afd/2560.png diff --git a/src/afd/sprites-canonical/front-shiny/0800-000-Necrozma.png b/newsrc/afd/25600.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0800-000-Necrozma.png rename to newsrc/afd/25600.png diff --git a/src/afd/sprites-canonical/back-shiny/0800-000-Necrozma.png b/newsrc/afd/25600b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0800-000-Necrozma.png rename to newsrc/afd/25600b.png diff --git a/src/afd/sprites-canonical/back/0800-000-Necrozma.png b/newsrc/afd/25600bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0800-000-Necrozma.png rename to newsrc/afd/25600bs.png diff --git a/src/afd/sprites-canonical/front/0800-000-Necrozma.png b/newsrc/afd/25600s.png similarity index 100% rename from src/afd/sprites-canonical/front/0800-000-Necrozma.png rename to newsrc/afd/25600s.png diff --git a/src/afd/sprites-canonical/front-shiny/0800-420-Necrozma-Dusk_Mane.png b/newsrc/afd/25601.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0800-420-Necrozma-Dusk_Mane.png rename to newsrc/afd/25601.png diff --git a/src/afd/sprites-canonical/back-shiny/0800-420-Necrozma-Dusk_Mane.png b/newsrc/afd/25601b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0800-420-Necrozma-Dusk_Mane.png rename to newsrc/afd/25601b.png diff --git a/src/afd/sprites-canonical/back/0800-420-Necrozma-Dusk_Mane.png b/newsrc/afd/25601bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0800-420-Necrozma-Dusk_Mane.png rename to newsrc/afd/25601bs.png diff --git a/src/afd/sprites-canonical/front/0800-420-Necrozma-Dusk_Mane.png b/newsrc/afd/25601s.png similarity index 100% rename from src/afd/sprites-canonical/front/0800-420-Necrozma-Dusk_Mane.png rename to newsrc/afd/25601s.png diff --git a/src/afd/sprites-canonical/front-shiny/0800-420-Necrozma-Dawn_Wings.png b/newsrc/afd/25602.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0800-420-Necrozma-Dawn_Wings.png rename to newsrc/afd/25602.png diff --git a/src/afd/sprites-canonical/back-shiny/0800-420-Necrozma-Dawn_Wings.png b/newsrc/afd/25602b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0800-420-Necrozma-Dawn_Wings.png rename to newsrc/afd/25602b.png diff --git a/src/afd/sprites-canonical/back/0800-420-Necrozma-Dawn_Wings.png b/newsrc/afd/25602bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0800-420-Necrozma-Dawn_Wings.png rename to newsrc/afd/25602bs.png diff --git a/src/afd/sprites-canonical/front/0800-420-Necrozma-Dawn_Wings.png b/newsrc/afd/25602s.png similarity index 100% rename from src/afd/sprites-canonical/front/0800-420-Necrozma-Dawn_Wings.png rename to newsrc/afd/25602s.png diff --git a/src/afd/sprites-canonical/front-shiny/0800-420-Necrozma-Ultra.png b/newsrc/afd/25603.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0800-420-Necrozma-Ultra.png rename to newsrc/afd/25603.png diff --git a/src/afd/sprites-canonical/back-shiny/0800-420-Necrozma-Ultra.png b/newsrc/afd/25603b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0800-420-Necrozma-Ultra.png rename to newsrc/afd/25603b.png diff --git a/src/afd/sprites-canonical/back/0800-420-Necrozma-Ultra.png b/newsrc/afd/25603bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0800-420-Necrozma-Ultra.png rename to newsrc/afd/25603bs.png diff --git a/src/afd/sprites-canonical/front/0800-420-Necrozma-Ultra.png b/newsrc/afd/25603s.png similarity index 100% rename from src/afd/sprites-canonical/front/0800-420-Necrozma-Ultra.png rename to newsrc/afd/25603s.png diff --git a/src/afd/sprites-canonical/back/0080-000-Slowbro.png b/newsrc/afd/2560b.png similarity index 100% rename from src/afd/sprites-canonical/back/0080-000-Slowbro.png rename to newsrc/afd/2560b.png diff --git a/src/afd/sprites-canonical/back-shiny/0080-000-Slowbro.png b/newsrc/afd/2560bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0080-000-Slowbro.png rename to newsrc/afd/2560bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0080-000-Slowbro.png b/newsrc/afd/2560s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0080-000-Slowbro.png rename to newsrc/afd/2560s.png diff --git a/src/afd/sprites-canonical/front/0080-420-Slowbro-Mega.png b/newsrc/afd/2561.png similarity index 100% rename from src/afd/sprites-canonical/front/0080-420-Slowbro-Mega.png rename to newsrc/afd/2561.png diff --git a/src/afd/sprites-canonical/back/0080-420-Slowbro-Mega.png b/newsrc/afd/2561b.png similarity index 100% rename from src/afd/sprites-canonical/back/0080-420-Slowbro-Mega.png rename to newsrc/afd/2561b.png diff --git a/src/afd/sprites-canonical/back-shiny/0080-420-Slowbro-Mega.png b/newsrc/afd/2561bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0080-420-Slowbro-Mega.png rename to newsrc/afd/2561bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0080-420-Slowbro-Mega.png b/newsrc/afd/2561s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0080-420-Slowbro-Mega.png rename to newsrc/afd/2561s.png diff --git a/src/afd/sprites-canonical/front-shiny/0801-000-Magearna.png b/newsrc/afd/25632.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0801-000-Magearna.png rename to newsrc/afd/25632.png diff --git a/src/afd/sprites-canonical/back-shiny/0801-000-Magearna.png b/newsrc/afd/25632b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0801-000-Magearna.png rename to newsrc/afd/25632b.png diff --git a/src/afd/sprites-canonical/back/0801-000-Magearna.png b/newsrc/afd/25632bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0801-000-Magearna.png rename to newsrc/afd/25632bs.png diff --git a/src/afd/sprites-canonical/front/0801-000-Magearna.png b/newsrc/afd/25632s.png similarity index 100% rename from src/afd/sprites-canonical/front/0801-000-Magearna.png rename to newsrc/afd/25632s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0801-420-Magearna-Original.png b/newsrc/afd/25633.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0801-420-Magearna-Original.png rename to newsrc/afd/25633.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0801-420-Magearna-Original.png b/newsrc/afd/25633b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0801-420-Magearna-Original.png rename to newsrc/afd/25633b.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0801-420-Magearna-Original.png b/newsrc/afd/25633bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0801-420-Magearna-Original.png rename to newsrc/afd/25633bs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0801-420-Magearna-Original.png b/newsrc/afd/25633s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0801-420-Magearna-Original.png rename to newsrc/afd/25633s.png diff --git a/src/afd/sprites-canonical/front-shiny/0802-000-Marshadow.png b/newsrc/afd/25664.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0802-000-Marshadow.png rename to newsrc/afd/25664.png diff --git a/src/afd/sprites-canonical/back-shiny/0802-000-Marshadow.png b/newsrc/afd/25664b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0802-000-Marshadow.png rename to newsrc/afd/25664b.png diff --git a/src/afd/sprites-canonical/back/0802-000-Marshadow.png b/newsrc/afd/25664bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0802-000-Marshadow.png rename to newsrc/afd/25664bs.png diff --git a/src/afd/sprites-canonical/front/0802-000-Marshadow.png b/newsrc/afd/25664s.png similarity index 100% rename from src/afd/sprites-canonical/front/0802-000-Marshadow.png rename to newsrc/afd/25664s.png diff --git a/src/afd/sprites-canonical/front-shiny/0803-000-Poipole.png b/newsrc/afd/25696.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0803-000-Poipole.png rename to newsrc/afd/25696.png diff --git a/src/afd/sprites-canonical/back-shiny/0803-000-Poipole.png b/newsrc/afd/25696b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0803-000-Poipole.png rename to newsrc/afd/25696b.png diff --git a/src/afd/sprites-canonical/back/0803-000-Poipole.png b/newsrc/afd/25696bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0803-000-Poipole.png rename to newsrc/afd/25696bs.png diff --git a/src/afd/sprites-canonical/front/0803-000-Poipole.png b/newsrc/afd/25696s.png similarity index 100% rename from src/afd/sprites-canonical/front/0803-000-Poipole.png rename to newsrc/afd/25696s.png diff --git a/src/afd/sprites-canonical/back/0008-000-Wartortle.png b/newsrc/afd/256b.png similarity index 100% rename from src/afd/sprites-canonical/back/0008-000-Wartortle.png rename to newsrc/afd/256b.png diff --git a/src/afd/sprites-canonical/back-shiny/0008-000-Wartortle.png b/newsrc/afd/256bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0008-000-Wartortle.png rename to newsrc/afd/256bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0008-000-Wartortle.png b/newsrc/afd/256s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0008-000-Wartortle.png rename to newsrc/afd/256s.png diff --git a/src/afd/sprites-canonical/front-shiny/0804-000-Naganadel.png b/newsrc/afd/25728.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0804-000-Naganadel.png rename to newsrc/afd/25728.png diff --git a/src/afd/sprites-canonical/back-shiny/0804-000-Naganadel.png b/newsrc/afd/25728b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0804-000-Naganadel.png rename to newsrc/afd/25728b.png diff --git a/src/afd/sprites-canonical/back/0804-000-Naganadel.png b/newsrc/afd/25728bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0804-000-Naganadel.png rename to newsrc/afd/25728bs.png diff --git a/src/afd/sprites-canonical/front/0804-000-Naganadel.png b/newsrc/afd/25728s.png similarity index 100% rename from src/afd/sprites-canonical/front/0804-000-Naganadel.png rename to newsrc/afd/25728s.png diff --git a/src/afd/sprites-canonical/front-shiny/0805-000-Stakataka.png b/newsrc/afd/25760.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0805-000-Stakataka.png rename to newsrc/afd/25760.png diff --git a/src/afd/sprites-canonical/back-shiny/0805-000-Stakataka.png b/newsrc/afd/25760b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0805-000-Stakataka.png rename to newsrc/afd/25760b.png diff --git a/src/afd/sprites-canonical/back/0805-000-Stakataka.png b/newsrc/afd/25760bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0805-000-Stakataka.png rename to newsrc/afd/25760bs.png diff --git a/src/afd/sprites-canonical/front/0805-000-Stakataka.png b/newsrc/afd/25760s.png similarity index 100% rename from src/afd/sprites-canonical/front/0805-000-Stakataka.png rename to newsrc/afd/25760s.png diff --git a/src/afd/sprites-canonical/front-shiny/0806-000-Blacephalon.png b/newsrc/afd/25792.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0806-000-Blacephalon.png rename to newsrc/afd/25792.png diff --git a/src/afd/sprites-canonical/back-shiny/0806-000-Blacephalon.png b/newsrc/afd/25792b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0806-000-Blacephalon.png rename to newsrc/afd/25792b.png diff --git a/src/afd/sprites-canonical/back/0806-000-Blacephalon.png b/newsrc/afd/25792bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0806-000-Blacephalon.png rename to newsrc/afd/25792bs.png diff --git a/src/afd/sprites-canonical/front/0806-000-Blacephalon.png b/newsrc/afd/25792s.png similarity index 100% rename from src/afd/sprites-canonical/front/0806-000-Blacephalon.png rename to newsrc/afd/25792s.png diff --git a/src/afd/sprites-canonical/front-shiny/0807-000-Zeraora.png b/newsrc/afd/25824.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0807-000-Zeraora.png rename to newsrc/afd/25824.png diff --git a/src/afd/sprites-canonical/back-shiny/0807-000-Zeraora.png b/newsrc/afd/25824b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0807-000-Zeraora.png rename to newsrc/afd/25824b.png diff --git a/src/afd/sprites-canonical/back/0807-000-Zeraora.png b/newsrc/afd/25824bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0807-000-Zeraora.png rename to newsrc/afd/25824bs.png diff --git a/src/afd/sprites-canonical/front/0807-000-Zeraora.png b/newsrc/afd/25824s.png similarity index 100% rename from src/afd/sprites-canonical/front/0807-000-Zeraora.png rename to newsrc/afd/25824s.png diff --git a/src/afd/sprites-canonical/front/0808-000-Meltan.png b/newsrc/afd/25856.png similarity index 100% rename from src/afd/sprites-canonical/front/0808-000-Meltan.png rename to newsrc/afd/25856.png diff --git a/src/afd/sprites-canonical/back/0808-000-Meltan.png b/newsrc/afd/25856b.png similarity index 100% rename from src/afd/sprites-canonical/back/0808-000-Meltan.png rename to newsrc/afd/25856b.png diff --git a/src/afd/sprites-canonical/back-shiny/0808-000-Meltan.png b/newsrc/afd/25856bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0808-000-Meltan.png rename to newsrc/afd/25856bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0808-000-Meltan.png b/newsrc/afd/25856s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0808-000-Meltan.png rename to newsrc/afd/25856s.png diff --git a/src/afd/sprites-canonical/back/0809-000-Melmetal.png b/newsrc/afd/25888.png similarity index 100% rename from src/afd/sprites-canonical/back/0809-000-Melmetal.png rename to newsrc/afd/25888.png diff --git a/src/afd/sprites-canonical/front/0809-000-Melmetal.png b/newsrc/afd/25888b.png similarity index 100% rename from src/afd/sprites-canonical/front/0809-000-Melmetal.png rename to newsrc/afd/25888b.png diff --git a/src/afd/sprites-canonical/back/0809-420-Melmetal-Gmax.png b/newsrc/afd/25888bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0809-420-Melmetal-Gmax.png rename to newsrc/afd/25888bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0809-420-Melmetal-Gmax.png b/newsrc/afd/25888bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0809-420-Melmetal-Gmax.png rename to newsrc/afd/25888bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0809-000-Melmetal.png b/newsrc/afd/25888bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0809-000-Melmetal.png rename to newsrc/afd/25888bs.png diff --git a/src/afd/sprites-canonical/front/0809-420-Melmetal-Gmax.png b/newsrc/afd/25888g.png similarity index 100% rename from src/afd/sprites-canonical/front/0809-420-Melmetal-Gmax.png rename to newsrc/afd/25888g.png diff --git a/src/afd/sprites-canonical/front-shiny/0809-420-Melmetal-Gmax.png b/newsrc/afd/25888gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0809-420-Melmetal-Gmax.png rename to newsrc/afd/25888gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0809-000-Melmetal.png b/newsrc/afd/25888s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0809-000-Melmetal.png rename to newsrc/afd/25888s.png diff --git a/src/afd/sprites-canonical/front/0081-000-Magnemite.png b/newsrc/afd/2592.png similarity index 100% rename from src/afd/sprites-canonical/front/0081-000-Magnemite.png rename to newsrc/afd/2592.png diff --git a/src/afd/sprites-canonical/front/0810-000-Grookey.png b/newsrc/afd/25920.png similarity index 100% rename from src/afd/sprites-canonical/front/0810-000-Grookey.png rename to newsrc/afd/25920.png diff --git a/src/afd/sprites-canonical/back/0810-000-Grookey.png b/newsrc/afd/25920b.png similarity index 100% rename from src/afd/sprites-canonical/back/0810-000-Grookey.png rename to newsrc/afd/25920b.png diff --git a/src/afd/sprites-canonical/back-shiny/0810-000-Grookey.png b/newsrc/afd/25920bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0810-000-Grookey.png rename to newsrc/afd/25920bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0810-000-Grookey.png b/newsrc/afd/25920s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0810-000-Grookey.png rename to newsrc/afd/25920s.png diff --git a/src/afd/sprites-canonical/back/0081-000-Magnemite.png b/newsrc/afd/2592b.png similarity index 100% rename from src/afd/sprites-canonical/back/0081-000-Magnemite.png rename to newsrc/afd/2592b.png diff --git a/src/afd/sprites-canonical/back-shiny/0081-000-Magnemite.png b/newsrc/afd/2592bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0081-000-Magnemite.png rename to newsrc/afd/2592bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0081-000-Magnemite.png b/newsrc/afd/2592s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0081-000-Magnemite.png rename to newsrc/afd/2592s.png diff --git a/src/afd/sprites-canonical/front/0811-000-Thwackey.png b/newsrc/afd/25952.png similarity index 100% rename from src/afd/sprites-canonical/front/0811-000-Thwackey.png rename to newsrc/afd/25952.png diff --git a/src/afd/sprites-canonical/back/0811-000-Thwackey.png b/newsrc/afd/25952b.png similarity index 100% rename from src/afd/sprites-canonical/back/0811-000-Thwackey.png rename to newsrc/afd/25952b.png diff --git a/src/afd/sprites-canonical/back-shiny/0811-000-Thwackey.png b/newsrc/afd/25952bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0811-000-Thwackey.png rename to newsrc/afd/25952bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0811-000-Thwackey.png b/newsrc/afd/25952s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0811-000-Thwackey.png rename to newsrc/afd/25952s.png diff --git a/src/afd/sprites-canonical/front/0812-000-Rillaboom.png b/newsrc/afd/25984.png similarity index 100% rename from src/afd/sprites-canonical/front/0812-000-Rillaboom.png rename to newsrc/afd/25984.png diff --git a/src/afd/sprites-canonical/back/0812-000-Rillaboom.png b/newsrc/afd/25984b.png similarity index 100% rename from src/afd/sprites-canonical/back/0812-000-Rillaboom.png rename to newsrc/afd/25984b.png diff --git a/src/afd/sprites-canonical/back-shiny/0812-000-Rillaboom.png b/newsrc/afd/25984bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0812-000-Rillaboom.png rename to newsrc/afd/25984bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0812-000-Rillaboom.png b/newsrc/afd/25984s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0812-000-Rillaboom.png rename to newsrc/afd/25984s.png diff --git a/src/afd/sprites-canonical/front/0813-000-Scorbunny.png b/newsrc/afd/26016.png similarity index 100% rename from src/afd/sprites-canonical/front/0813-000-Scorbunny.png rename to newsrc/afd/26016.png diff --git a/src/afd/sprites-canonical/back/0813-000-Scorbunny.png b/newsrc/afd/26016b.png similarity index 100% rename from src/afd/sprites-canonical/back/0813-000-Scorbunny.png rename to newsrc/afd/26016b.png diff --git a/src/afd/sprites-canonical/back-shiny/0813-000-Scorbunny.png b/newsrc/afd/26016bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0813-000-Scorbunny.png rename to newsrc/afd/26016bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0813-000-Scorbunny.png b/newsrc/afd/26016s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0813-000-Scorbunny.png rename to newsrc/afd/26016s.png diff --git a/src/afd/sprites-canonical/front/0814-000-Raboot.png b/newsrc/afd/26048.png similarity index 100% rename from src/afd/sprites-canonical/front/0814-000-Raboot.png rename to newsrc/afd/26048.png diff --git a/src/afd/sprites-canonical/back/0814-000-Raboot.png b/newsrc/afd/26048b.png similarity index 100% rename from src/afd/sprites-canonical/back/0814-000-Raboot.png rename to newsrc/afd/26048b.png diff --git a/src/afd/sprites-canonical/back-shiny/0814-000-Raboot.png b/newsrc/afd/26048bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0814-000-Raboot.png rename to newsrc/afd/26048bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0814-000-Raboot.png b/newsrc/afd/26048s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0814-000-Raboot.png rename to newsrc/afd/26048s.png diff --git a/src/afd/sprites-canonical/front/0815-000-Cinderace.png b/newsrc/afd/26080.png similarity index 100% rename from src/afd/sprites-canonical/front/0815-000-Cinderace.png rename to newsrc/afd/26080.png diff --git a/src/afd/sprites-canonical/back/0815-000-Cinderace.png b/newsrc/afd/26080b.png similarity index 100% rename from src/afd/sprites-canonical/back/0815-000-Cinderace.png rename to newsrc/afd/26080b.png diff --git a/src/afd/sprites-canonical/back-shiny/0815-000-Cinderace.png b/newsrc/afd/26080bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0815-000-Cinderace.png rename to newsrc/afd/26080bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0815-000-Cinderace.png b/newsrc/afd/26080s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0815-000-Cinderace.png rename to newsrc/afd/26080s.png diff --git a/src/afd/sprites-canonical/front/0816-000-Sobble.png b/newsrc/afd/26112.png similarity index 100% rename from src/afd/sprites-canonical/front/0816-000-Sobble.png rename to newsrc/afd/26112.png diff --git a/src/afd/sprites-canonical/back/0816-000-Sobble.png b/newsrc/afd/26112b.png similarity index 100% rename from src/afd/sprites-canonical/back/0816-000-Sobble.png rename to newsrc/afd/26112b.png diff --git a/src/afd/sprites-canonical/back-shiny/0816-000-Sobble.png b/newsrc/afd/26112bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0816-000-Sobble.png rename to newsrc/afd/26112bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0816-000-Sobble.png b/newsrc/afd/26112s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0816-000-Sobble.png rename to newsrc/afd/26112s.png diff --git a/src/afd/sprites-canonical/front/0817-000-Drizzile.png b/newsrc/afd/26144.png similarity index 100% rename from src/afd/sprites-canonical/front/0817-000-Drizzile.png rename to newsrc/afd/26144.png diff --git a/src/afd/sprites-canonical/back/0817-000-Drizzile.png b/newsrc/afd/26144b.png similarity index 100% rename from src/afd/sprites-canonical/back/0817-000-Drizzile.png rename to newsrc/afd/26144b.png diff --git a/src/afd/sprites-canonical/back-shiny/0817-000-Drizzile.png b/newsrc/afd/26144bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0817-000-Drizzile.png rename to newsrc/afd/26144bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0817-000-Drizzile.png b/newsrc/afd/26144s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0817-000-Drizzile.png rename to newsrc/afd/26144s.png diff --git a/src/afd/sprites-canonical/front/0818-000-Inteleon.png b/newsrc/afd/26176.png similarity index 100% rename from src/afd/sprites-canonical/front/0818-000-Inteleon.png rename to newsrc/afd/26176.png diff --git a/src/afd/sprites-canonical/back/0818-000-Inteleon.png b/newsrc/afd/26176b.png similarity index 100% rename from src/afd/sprites-canonical/back/0818-000-Inteleon.png rename to newsrc/afd/26176b.png diff --git a/src/afd/sprites-canonical/back-shiny/0818-000-Inteleon.png b/newsrc/afd/26176bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0818-000-Inteleon.png rename to newsrc/afd/26176bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0818-000-Inteleon.png b/newsrc/afd/26176s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0818-000-Inteleon.png rename to newsrc/afd/26176s.png diff --git a/src/afd/sprites-canonical/front/0819-000-Skwovet.png b/newsrc/afd/26208.png similarity index 100% rename from src/afd/sprites-canonical/front/0819-000-Skwovet.png rename to newsrc/afd/26208.png diff --git a/src/afd/sprites-canonical/back/0819-000-Skwovet.png b/newsrc/afd/26208b.png similarity index 100% rename from src/afd/sprites-canonical/back/0819-000-Skwovet.png rename to newsrc/afd/26208b.png diff --git a/src/afd/sprites-canonical/back-shiny/0819-000-Skwovet.png b/newsrc/afd/26208bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0819-000-Skwovet.png rename to newsrc/afd/26208bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0819-000-Skwovet.png b/newsrc/afd/26208s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0819-000-Skwovet.png rename to newsrc/afd/26208s.png diff --git a/src/afd/sprites-canonical/front/0082-000-Magneton.png b/newsrc/afd/2624.png similarity index 100% rename from src/afd/sprites-canonical/front/0082-000-Magneton.png rename to newsrc/afd/2624.png diff --git a/src/afd/sprites-canonical/front/0820-000-Greedent.png b/newsrc/afd/26240.png similarity index 100% rename from src/afd/sprites-canonical/front/0820-000-Greedent.png rename to newsrc/afd/26240.png diff --git a/src/afd/sprites-canonical/back/0820-000-Greedent.png b/newsrc/afd/26240b.png similarity index 100% rename from src/afd/sprites-canonical/back/0820-000-Greedent.png rename to newsrc/afd/26240b.png diff --git a/src/afd/sprites-canonical/back-shiny/0820-000-Greedent.png b/newsrc/afd/26240bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0820-000-Greedent.png rename to newsrc/afd/26240bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0820-000-Greedent.png b/newsrc/afd/26240s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0820-000-Greedent.png rename to newsrc/afd/26240s.png diff --git a/src/afd/sprites-canonical/back/0082-000-Magneton.png b/newsrc/afd/2624b.png similarity index 100% rename from src/afd/sprites-canonical/back/0082-000-Magneton.png rename to newsrc/afd/2624b.png diff --git a/src/afd/sprites-canonical/back-shiny/0082-000-Magneton.png b/newsrc/afd/2624bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0082-000-Magneton.png rename to newsrc/afd/2624bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0082-000-Magneton.png b/newsrc/afd/2624s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0082-000-Magneton.png rename to newsrc/afd/2624s.png diff --git a/src/afd/sprites-canonical/front/0821-000-Rookidee.png b/newsrc/afd/26272.png similarity index 100% rename from src/afd/sprites-canonical/front/0821-000-Rookidee.png rename to newsrc/afd/26272.png diff --git a/src/afd/sprites-canonical/back/0821-000-Rookidee.png b/newsrc/afd/26272b.png similarity index 100% rename from src/afd/sprites-canonical/back/0821-000-Rookidee.png rename to newsrc/afd/26272b.png diff --git a/src/afd/sprites-canonical/back-shiny/0821-000-Rookidee.png b/newsrc/afd/26272bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0821-000-Rookidee.png rename to newsrc/afd/26272bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0821-000-Rookidee.png b/newsrc/afd/26272s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0821-000-Rookidee.png rename to newsrc/afd/26272s.png diff --git a/src/afd/sprites-canonical/front/0822-000-Corvisquire.png b/newsrc/afd/26304.png similarity index 100% rename from src/afd/sprites-canonical/front/0822-000-Corvisquire.png rename to newsrc/afd/26304.png diff --git a/src/afd/sprites-canonical/back/0822-000-Corvisquire.png b/newsrc/afd/26304b.png similarity index 100% rename from src/afd/sprites-canonical/back/0822-000-Corvisquire.png rename to newsrc/afd/26304b.png diff --git a/src/afd/sprites-canonical/back-shiny/0822-000-Corvisquire.png b/newsrc/afd/26304bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0822-000-Corvisquire.png rename to newsrc/afd/26304bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0822-000-Corvisquire.png b/newsrc/afd/26304s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0822-000-Corvisquire.png rename to newsrc/afd/26304s.png diff --git a/src/afd/sprites-canonical/front/0823-000-Corviknight.png b/newsrc/afd/26336.png similarity index 100% rename from src/afd/sprites-canonical/front/0823-000-Corviknight.png rename to newsrc/afd/26336.png diff --git a/src/afd/sprites-canonical/back/0823-000-Corviknight.png b/newsrc/afd/26336b.png similarity index 100% rename from src/afd/sprites-canonical/back/0823-000-Corviknight.png rename to newsrc/afd/26336b.png diff --git a/src/afd/sprites-canonical/back/0823-420-Corviknight-Gmax.png b/newsrc/afd/26336bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0823-420-Corviknight-Gmax.png rename to newsrc/afd/26336bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0823-420-Corviknight-Gmax.png b/newsrc/afd/26336bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0823-420-Corviknight-Gmax.png rename to newsrc/afd/26336bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0823-000-Corviknight.png b/newsrc/afd/26336bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0823-000-Corviknight.png rename to newsrc/afd/26336bs.png diff --git a/src/afd/sprites-canonical/front/0823-420-Corviknight-Gmax.png b/newsrc/afd/26336g.png similarity index 100% rename from src/afd/sprites-canonical/front/0823-420-Corviknight-Gmax.png rename to newsrc/afd/26336g.png diff --git a/src/afd/sprites-canonical/front-shiny/0823-420-Corviknight-Gmax.png b/newsrc/afd/26336gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0823-420-Corviknight-Gmax.png rename to newsrc/afd/26336gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0823-000-Corviknight.png b/newsrc/afd/26336s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0823-000-Corviknight.png rename to newsrc/afd/26336s.png diff --git a/src/afd/sprites-canonical/front/0824-000-Blipbug.png b/newsrc/afd/26368.png similarity index 100% rename from src/afd/sprites-canonical/front/0824-000-Blipbug.png rename to newsrc/afd/26368.png diff --git a/src/afd/sprites-canonical/back/0824-000-Blipbug.png b/newsrc/afd/26368b.png similarity index 100% rename from src/afd/sprites-canonical/back/0824-000-Blipbug.png rename to newsrc/afd/26368b.png diff --git a/src/afd/sprites-canonical/back-shiny/0824-000-Blipbug.png b/newsrc/afd/26368bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0824-000-Blipbug.png rename to newsrc/afd/26368bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0824-000-Blipbug.png b/newsrc/afd/26368s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0824-000-Blipbug.png rename to newsrc/afd/26368s.png diff --git a/src/afd/sprites-canonical/front/0825-000-Dottler.png b/newsrc/afd/26400.png similarity index 100% rename from src/afd/sprites-canonical/front/0825-000-Dottler.png rename to newsrc/afd/26400.png diff --git a/src/afd/sprites-canonical/back/0825-000-Dottler.png b/newsrc/afd/26400b.png similarity index 100% rename from src/afd/sprites-canonical/back/0825-000-Dottler.png rename to newsrc/afd/26400b.png diff --git a/src/afd/sprites-canonical/back-shiny/0825-000-Dottler.png b/newsrc/afd/26400bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0825-000-Dottler.png rename to newsrc/afd/26400bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0825-000-Dottler.png b/newsrc/afd/26400s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0825-000-Dottler.png rename to newsrc/afd/26400s.png diff --git a/src/afd/sprites-canonical/front/0826-000-Orbeetle.png b/newsrc/afd/26432.png similarity index 100% rename from src/afd/sprites-canonical/front/0826-000-Orbeetle.png rename to newsrc/afd/26432.png diff --git a/src/afd/sprites-canonical/back/0826-000-Orbeetle.png b/newsrc/afd/26432b.png similarity index 100% rename from src/afd/sprites-canonical/back/0826-000-Orbeetle.png rename to newsrc/afd/26432b.png diff --git a/src/afd/sprites-canonical/back/0826-420-Orbeetle-Gmax.png b/newsrc/afd/26432bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0826-420-Orbeetle-Gmax.png rename to newsrc/afd/26432bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0826-420-Orbeetle-Gmax.png b/newsrc/afd/26432bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0826-420-Orbeetle-Gmax.png rename to newsrc/afd/26432bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0826-000-Orbeetle.png b/newsrc/afd/26432bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0826-000-Orbeetle.png rename to newsrc/afd/26432bs.png diff --git a/src/afd/sprites-canonical/front/0826-420-Orbeetle-Gmax.png b/newsrc/afd/26432g.png similarity index 100% rename from src/afd/sprites-canonical/front/0826-420-Orbeetle-Gmax.png rename to newsrc/afd/26432g.png diff --git a/src/afd/sprites-canonical/front-shiny/0826-420-Orbeetle-Gmax.png b/newsrc/afd/26432gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0826-420-Orbeetle-Gmax.png rename to newsrc/afd/26432gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0826-000-Orbeetle.png b/newsrc/afd/26432s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0826-000-Orbeetle.png rename to newsrc/afd/26432s.png diff --git a/src/afd/sprites-canonical/front/0827-000-Nickit.png b/newsrc/afd/26464.png similarity index 100% rename from src/afd/sprites-canonical/front/0827-000-Nickit.png rename to newsrc/afd/26464.png diff --git a/src/afd/sprites-canonical/back/0827-000-Nickit.png b/newsrc/afd/26464b.png similarity index 100% rename from src/afd/sprites-canonical/back/0827-000-Nickit.png rename to newsrc/afd/26464b.png diff --git a/src/afd/sprites-canonical/back-shiny/0827-000-Nickit.png b/newsrc/afd/26464bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0827-000-Nickit.png rename to newsrc/afd/26464bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0827-000-Nickit.png b/newsrc/afd/26464s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0827-000-Nickit.png rename to newsrc/afd/26464s.png diff --git a/src/afd/sprites-canonical/front/0828-000-Thievul.png b/newsrc/afd/26496.png similarity index 100% rename from src/afd/sprites-canonical/front/0828-000-Thievul.png rename to newsrc/afd/26496.png diff --git a/src/afd/sprites-canonical/back/0828-000-Thievul.png b/newsrc/afd/26496b.png similarity index 100% rename from src/afd/sprites-canonical/back/0828-000-Thievul.png rename to newsrc/afd/26496b.png diff --git a/src/afd/sprites-canonical/back-shiny/0828-000-Thievul.png b/newsrc/afd/26496bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0828-000-Thievul.png rename to newsrc/afd/26496bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0828-000-Thievul.png b/newsrc/afd/26496s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0828-000-Thievul.png rename to newsrc/afd/26496s.png diff --git a/src/afd/sprites-canonical/front/0829-000-Gossifleur.png b/newsrc/afd/26528.png similarity index 100% rename from src/afd/sprites-canonical/front/0829-000-Gossifleur.png rename to newsrc/afd/26528.png diff --git a/src/afd/sprites-canonical/back/0829-000-Gossifleur.png b/newsrc/afd/26528b.png similarity index 100% rename from src/afd/sprites-canonical/back/0829-000-Gossifleur.png rename to newsrc/afd/26528b.png diff --git a/src/afd/sprites-canonical/back-shiny/0829-000-Gossifleur.png b/newsrc/afd/26528bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0829-000-Gossifleur.png rename to newsrc/afd/26528bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0829-000-Gossifleur.png b/newsrc/afd/26528s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0829-000-Gossifleur.png rename to newsrc/afd/26528s.png diff --git a/src/afd/sprites-canonical/front/0083-000-Farfetch__0027d.png b/newsrc/afd/2656.png similarity index 100% rename from src/afd/sprites-canonical/front/0083-000-Farfetch__0027d.png rename to newsrc/afd/2656.png diff --git a/src/afd/sprites-canonical/front/0830-000-Eldegoss.png b/newsrc/afd/26560.png similarity index 100% rename from src/afd/sprites-canonical/front/0830-000-Eldegoss.png rename to newsrc/afd/26560.png diff --git a/src/afd/sprites-canonical/back/0830-000-Eldegoss.png b/newsrc/afd/26560b.png similarity index 100% rename from src/afd/sprites-canonical/back/0830-000-Eldegoss.png rename to newsrc/afd/26560b.png diff --git a/src/afd/sprites-canonical/back-shiny/0830-000-Eldegoss.png b/newsrc/afd/26560bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0830-000-Eldegoss.png rename to newsrc/afd/26560bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0830-000-Eldegoss.png b/newsrc/afd/26560s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0830-000-Eldegoss.png rename to newsrc/afd/26560s.png diff --git a/src/afd/sprites-canonical/back/0083-000-Farfetch__0027d.png b/newsrc/afd/2656b.png similarity index 100% rename from src/afd/sprites-canonical/back/0083-000-Farfetch__0027d.png rename to newsrc/afd/2656b.png diff --git a/src/afd/sprites-canonical/back-shiny/0083-000-Farfetch__0027d.png b/newsrc/afd/2656bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0083-000-Farfetch__0027d.png rename to newsrc/afd/2656bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0083-000-Farfetch__0027d.png b/newsrc/afd/2656s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0083-000-Farfetch__0027d.png rename to newsrc/afd/2656s.png diff --git a/src/afd/sprites-canonical/front/0083-420-Farfetch__0027d-Galar.png b/newsrc/afd/2657.png similarity index 100% rename from src/afd/sprites-canonical/front/0083-420-Farfetch__0027d-Galar.png rename to newsrc/afd/2657.png diff --git a/src/afd/sprites-canonical/back/0083-420-Farfetch__0027d-Galar.png b/newsrc/afd/2657b.png similarity index 100% rename from src/afd/sprites-canonical/back/0083-420-Farfetch__0027d-Galar.png rename to newsrc/afd/2657b.png diff --git a/src/afd/sprites-canonical/back-shiny/0083-420-Farfetch__0027d-Galar.png b/newsrc/afd/2657bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0083-420-Farfetch__0027d-Galar.png rename to newsrc/afd/2657bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0083-420-Farfetch__0027d-Galar.png b/newsrc/afd/2657s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0083-420-Farfetch__0027d-Galar.png rename to newsrc/afd/2657s.png diff --git a/src/afd/sprites-canonical/front/0831-000-Wooloo.png b/newsrc/afd/26592.png similarity index 100% rename from src/afd/sprites-canonical/front/0831-000-Wooloo.png rename to newsrc/afd/26592.png diff --git a/src/afd/sprites-canonical/back/0831-000-Wooloo.png b/newsrc/afd/26592b.png similarity index 100% rename from src/afd/sprites-canonical/back/0831-000-Wooloo.png rename to newsrc/afd/26592b.png diff --git a/src/afd/sprites-canonical/back-shiny/0831-000-Wooloo.png b/newsrc/afd/26592bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0831-000-Wooloo.png rename to newsrc/afd/26592bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0831-000-Wooloo.png b/newsrc/afd/26592s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0831-000-Wooloo.png rename to newsrc/afd/26592s.png diff --git a/src/afd/sprites-canonical/front/0832-000-Dubwool.png b/newsrc/afd/26624.png similarity index 100% rename from src/afd/sprites-canonical/front/0832-000-Dubwool.png rename to newsrc/afd/26624.png diff --git a/src/afd/sprites-canonical/back/0832-000-Dubwool.png b/newsrc/afd/26624b.png similarity index 100% rename from src/afd/sprites-canonical/back/0832-000-Dubwool.png rename to newsrc/afd/26624b.png diff --git a/src/afd/sprites-canonical/back-shiny/0832-000-Dubwool.png b/newsrc/afd/26624bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0832-000-Dubwool.png rename to newsrc/afd/26624bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0832-000-Dubwool.png b/newsrc/afd/26624s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0832-000-Dubwool.png rename to newsrc/afd/26624s.png diff --git a/src/afd/sprites-canonical/front/0833-000-Chewtle.png b/newsrc/afd/26656.png similarity index 100% rename from src/afd/sprites-canonical/front/0833-000-Chewtle.png rename to newsrc/afd/26656.png diff --git a/src/afd/sprites-canonical/back/0833-000-Chewtle.png b/newsrc/afd/26656b.png similarity index 100% rename from src/afd/sprites-canonical/back/0833-000-Chewtle.png rename to newsrc/afd/26656b.png diff --git a/src/afd/sprites-canonical/back-shiny/0833-000-Chewtle.png b/newsrc/afd/26656bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0833-000-Chewtle.png rename to newsrc/afd/26656bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0833-000-Chewtle.png b/newsrc/afd/26656s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0833-000-Chewtle.png rename to newsrc/afd/26656s.png diff --git a/src/afd/sprites-canonical/front/0834-000-Drednaw.png b/newsrc/afd/26688.png similarity index 100% rename from src/afd/sprites-canonical/front/0834-000-Drednaw.png rename to newsrc/afd/26688.png diff --git a/src/afd/sprites-canonical/back/0834-000-Drednaw.png b/newsrc/afd/26688b.png similarity index 100% rename from src/afd/sprites-canonical/back/0834-000-Drednaw.png rename to newsrc/afd/26688b.png diff --git a/src/afd/sprites-canonical/back/0834-420-Drednaw-Gmax.png b/newsrc/afd/26688bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0834-420-Drednaw-Gmax.png rename to newsrc/afd/26688bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0834-420-Drednaw-Gmax.png b/newsrc/afd/26688bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0834-420-Drednaw-Gmax.png rename to newsrc/afd/26688bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0834-000-Drednaw.png b/newsrc/afd/26688bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0834-000-Drednaw.png rename to newsrc/afd/26688bs.png diff --git a/src/afd/sprites-canonical/front/0834-420-Drednaw-Gmax.png b/newsrc/afd/26688g.png similarity index 100% rename from src/afd/sprites-canonical/front/0834-420-Drednaw-Gmax.png rename to newsrc/afd/26688g.png diff --git a/src/afd/sprites-canonical/front-shiny/0834-420-Drednaw-Gmax.png b/newsrc/afd/26688gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0834-420-Drednaw-Gmax.png rename to newsrc/afd/26688gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0834-000-Drednaw.png b/newsrc/afd/26688s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0834-000-Drednaw.png rename to newsrc/afd/26688s.png diff --git a/src/afd/sprites-canonical/front/0835-000-Yamper.png b/newsrc/afd/26720.png similarity index 100% rename from src/afd/sprites-canonical/front/0835-000-Yamper.png rename to newsrc/afd/26720.png diff --git a/src/afd/sprites-canonical/back/0835-000-Yamper.png b/newsrc/afd/26720b.png similarity index 100% rename from src/afd/sprites-canonical/back/0835-000-Yamper.png rename to newsrc/afd/26720b.png diff --git a/src/afd/sprites-canonical/back-shiny/0835-000-Yamper.png b/newsrc/afd/26720bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0835-000-Yamper.png rename to newsrc/afd/26720bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0835-000-Yamper.png b/newsrc/afd/26720s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0835-000-Yamper.png rename to newsrc/afd/26720s.png diff --git a/src/afd/sprites-canonical/front/0836-000-Boltund.png b/newsrc/afd/26752.png similarity index 100% rename from src/afd/sprites-canonical/front/0836-000-Boltund.png rename to newsrc/afd/26752.png diff --git a/src/afd/sprites-canonical/back/0836-000-Boltund.png b/newsrc/afd/26752b.png similarity index 100% rename from src/afd/sprites-canonical/back/0836-000-Boltund.png rename to newsrc/afd/26752b.png diff --git a/src/afd/sprites-canonical/back-shiny/0836-000-Boltund.png b/newsrc/afd/26752bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0836-000-Boltund.png rename to newsrc/afd/26752bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0836-000-Boltund.png b/newsrc/afd/26752s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0836-000-Boltund.png rename to newsrc/afd/26752s.png diff --git a/src/afd/sprites-canonical/front/0837-000-Rolycoly.png b/newsrc/afd/26784.png similarity index 100% rename from src/afd/sprites-canonical/front/0837-000-Rolycoly.png rename to newsrc/afd/26784.png diff --git a/src/afd/sprites-canonical/back/0837-000-Rolycoly.png b/newsrc/afd/26784b.png similarity index 100% rename from src/afd/sprites-canonical/back/0837-000-Rolycoly.png rename to newsrc/afd/26784b.png diff --git a/src/afd/sprites-canonical/back-shiny/0837-000-Rolycoly.png b/newsrc/afd/26784bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0837-000-Rolycoly.png rename to newsrc/afd/26784bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0837-000-Rolycoly.png b/newsrc/afd/26784s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0837-000-Rolycoly.png rename to newsrc/afd/26784s.png diff --git a/src/afd/sprites-canonical/front/0838-000-Carkol.png b/newsrc/afd/26816.png similarity index 100% rename from src/afd/sprites-canonical/front/0838-000-Carkol.png rename to newsrc/afd/26816.png diff --git a/src/afd/sprites-canonical/back/0838-000-Carkol.png b/newsrc/afd/26816b.png similarity index 100% rename from src/afd/sprites-canonical/back/0838-000-Carkol.png rename to newsrc/afd/26816b.png diff --git a/src/afd/sprites-canonical/back-shiny/0838-000-Carkol.png b/newsrc/afd/26816bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0838-000-Carkol.png rename to newsrc/afd/26816bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0838-000-Carkol.png b/newsrc/afd/26816s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0838-000-Carkol.png rename to newsrc/afd/26816s.png diff --git a/src/afd/sprites-canonical/front/0839-000-Coalossal.png b/newsrc/afd/26848.png similarity index 100% rename from src/afd/sprites-canonical/front/0839-000-Coalossal.png rename to newsrc/afd/26848.png diff --git a/src/afd/sprites-canonical/back/0839-000-Coalossal.png b/newsrc/afd/26848b.png similarity index 100% rename from src/afd/sprites-canonical/back/0839-000-Coalossal.png rename to newsrc/afd/26848b.png diff --git a/src/afd/sprites-canonical/back/0839-420-Coalossal-Gmax.png b/newsrc/afd/26848bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0839-420-Coalossal-Gmax.png rename to newsrc/afd/26848bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0839-420-Coalossal-Gmax.png b/newsrc/afd/26848bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0839-420-Coalossal-Gmax.png rename to newsrc/afd/26848bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0839-000-Coalossal.png b/newsrc/afd/26848bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0839-000-Coalossal.png rename to newsrc/afd/26848bs.png diff --git a/src/afd/sprites-canonical/front/0839-420-Coalossal-Gmax.png b/newsrc/afd/26848g.png similarity index 100% rename from src/afd/sprites-canonical/front/0839-420-Coalossal-Gmax.png rename to newsrc/afd/26848g.png diff --git a/src/afd/sprites-canonical/front-shiny/0839-420-Coalossal-Gmax.png b/newsrc/afd/26848gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0839-420-Coalossal-Gmax.png rename to newsrc/afd/26848gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0839-000-Coalossal.png b/newsrc/afd/26848s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0839-000-Coalossal.png rename to newsrc/afd/26848s.png diff --git a/src/afd/sprites-canonical/front/0084-000-Doduo.png b/newsrc/afd/2688.png similarity index 100% rename from src/afd/sprites-canonical/front/0084-000-Doduo.png rename to newsrc/afd/2688.png diff --git a/src/afd/sprites-canonical/front/0840-000-Applin.png b/newsrc/afd/26880.png similarity index 100% rename from src/afd/sprites-canonical/front/0840-000-Applin.png rename to newsrc/afd/26880.png diff --git a/src/afd/sprites-canonical/back/0840-000-Applin.png b/newsrc/afd/26880b.png similarity index 100% rename from src/afd/sprites-canonical/back/0840-000-Applin.png rename to newsrc/afd/26880b.png diff --git a/src/afd/sprites-canonical/back-shiny/0840-000-Applin.png b/newsrc/afd/26880bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0840-000-Applin.png rename to newsrc/afd/26880bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0840-000-Applin.png b/newsrc/afd/26880s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0840-000-Applin.png rename to newsrc/afd/26880s.png diff --git a/src/afd/sprites-canonical/back/0084-000-Doduo.png b/newsrc/afd/2688b.png similarity index 100% rename from src/afd/sprites-canonical/back/0084-000-Doduo.png rename to newsrc/afd/2688b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0084-000-Doduo-Female.png b/newsrc/afd/2688bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0084-000-Doduo-Female.png rename to newsrc/afd/2688bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0084-000-Doduo-Female.png b/newsrc/afd/2688bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0084-000-Doduo-Female.png rename to newsrc/afd/2688bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0084-000-Doduo.png b/newsrc/afd/2688bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0084-000-Doduo.png rename to newsrc/afd/2688bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0084-000-Doduo-Female.png b/newsrc/afd/2688f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0084-000-Doduo-Female.png rename to newsrc/afd/2688f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0084-000-Doduo-Female.png b/newsrc/afd/2688fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0084-000-Doduo-Female.png rename to newsrc/afd/2688fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0084-000-Doduo.png b/newsrc/afd/2688s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0084-000-Doduo.png rename to newsrc/afd/2688s.png diff --git a/src/afd/sprites-canonical/back/0841-000-Flapple.png b/newsrc/afd/26912.png similarity index 100% rename from src/afd/sprites-canonical/back/0841-000-Flapple.png rename to newsrc/afd/26912.png diff --git a/src/afd/sprites-canonical/front/0841-000-Flapple.png b/newsrc/afd/26912b.png similarity index 100% rename from src/afd/sprites-canonical/front/0841-000-Flapple.png rename to newsrc/afd/26912b.png diff --git a/src/afd/sprites-canonical/back/0841-420-Flapple-Gmax.png b/newsrc/afd/26912bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0841-420-Flapple-Gmax.png rename to newsrc/afd/26912bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0841-420-Flapple-Gmax.png b/newsrc/afd/26912bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0841-420-Flapple-Gmax.png rename to newsrc/afd/26912bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0841-000-Flapple.png b/newsrc/afd/26912bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0841-000-Flapple.png rename to newsrc/afd/26912bs.png diff --git a/src/afd/sprites-canonical/front/0841-420-Flapple-Gmax.png b/newsrc/afd/26912g.png similarity index 100% rename from src/afd/sprites-canonical/front/0841-420-Flapple-Gmax.png rename to newsrc/afd/26912g.png diff --git a/src/afd/sprites-canonical/front-shiny/0841-420-Flapple-Gmax.png b/newsrc/afd/26912gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0841-420-Flapple-Gmax.png rename to newsrc/afd/26912gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0841-000-Flapple.png b/newsrc/afd/26912s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0841-000-Flapple.png rename to newsrc/afd/26912s.png diff --git a/src/afd/sprites-canonical/front/0842-000-Appletun.png b/newsrc/afd/26944.png similarity index 100% rename from src/afd/sprites-canonical/front/0842-000-Appletun.png rename to newsrc/afd/26944.png diff --git a/src/afd/sprites-canonical/back/0842-000-Appletun.png b/newsrc/afd/26944b.png similarity index 100% rename from src/afd/sprites-canonical/back/0842-000-Appletun.png rename to newsrc/afd/26944b.png diff --git a/src/afd/sprites-canonical/back/0842-420-Appletun-Gmax.png b/newsrc/afd/26944bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0842-420-Appletun-Gmax.png rename to newsrc/afd/26944bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0842-420-Appletun-Gmax.png b/newsrc/afd/26944bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0842-420-Appletun-Gmax.png rename to newsrc/afd/26944bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0842-000-Appletun.png b/newsrc/afd/26944bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0842-000-Appletun.png rename to newsrc/afd/26944bs.png diff --git a/src/afd/sprites-canonical/front/0842-420-Appletun-Gmax.png b/newsrc/afd/26944g.png similarity index 100% rename from src/afd/sprites-canonical/front/0842-420-Appletun-Gmax.png rename to newsrc/afd/26944g.png diff --git a/src/afd/sprites-canonical/front-shiny/0842-420-Appletun-Gmax.png b/newsrc/afd/26944gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0842-420-Appletun-Gmax.png rename to newsrc/afd/26944gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0842-000-Appletun.png b/newsrc/afd/26944s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0842-000-Appletun.png rename to newsrc/afd/26944s.png diff --git a/src/afd/sprites-canonical/front/0843-000-Silicobra.png b/newsrc/afd/26976.png similarity index 100% rename from src/afd/sprites-canonical/front/0843-000-Silicobra.png rename to newsrc/afd/26976.png diff --git a/src/afd/sprites-canonical/back/0843-000-Silicobra.png b/newsrc/afd/26976b.png similarity index 100% rename from src/afd/sprites-canonical/back/0843-000-Silicobra.png rename to newsrc/afd/26976b.png diff --git a/src/afd/sprites-canonical/back-shiny/0843-000-Silicobra.png b/newsrc/afd/26976bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0843-000-Silicobra.png rename to newsrc/afd/26976bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0843-000-Silicobra.png b/newsrc/afd/26976s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0843-000-Silicobra.png rename to newsrc/afd/26976s.png diff --git a/src/afd/sprites-canonical/front/0844-000-Sandaconda.png b/newsrc/afd/27008.png similarity index 100% rename from src/afd/sprites-canonical/front/0844-000-Sandaconda.png rename to newsrc/afd/27008.png diff --git a/src/afd/sprites-canonical/back/0844-000-Sandaconda.png b/newsrc/afd/27008b.png similarity index 100% rename from src/afd/sprites-canonical/back/0844-000-Sandaconda.png rename to newsrc/afd/27008b.png diff --git a/src/afd/sprites-canonical/back/0844-420-Sandaconda-Gmax.png b/newsrc/afd/27008bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0844-420-Sandaconda-Gmax.png rename to newsrc/afd/27008bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0844-420-Sandaconda-Gmax.png b/newsrc/afd/27008bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0844-420-Sandaconda-Gmax.png rename to newsrc/afd/27008bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0844-000-Sandaconda.png b/newsrc/afd/27008bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0844-000-Sandaconda.png rename to newsrc/afd/27008bs.png diff --git a/src/afd/sprites-canonical/front/0844-420-Sandaconda-Gmax.png b/newsrc/afd/27008g.png similarity index 100% rename from src/afd/sprites-canonical/front/0844-420-Sandaconda-Gmax.png rename to newsrc/afd/27008g.png diff --git a/src/afd/sprites-canonical/front-shiny/0844-420-Sandaconda-Gmax.png b/newsrc/afd/27008gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0844-420-Sandaconda-Gmax.png rename to newsrc/afd/27008gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0844-000-Sandaconda.png b/newsrc/afd/27008s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0844-000-Sandaconda.png rename to newsrc/afd/27008s.png diff --git a/src/afd/sprites-canonical/front/0845-000-Cramorant.png b/newsrc/afd/27040.png similarity index 100% rename from src/afd/sprites-canonical/front/0845-000-Cramorant.png rename to newsrc/afd/27040.png diff --git a/src/afd/sprites-canonical/back/0845-000-Cramorant.png b/newsrc/afd/27040b.png similarity index 100% rename from src/afd/sprites-canonical/back/0845-000-Cramorant.png rename to newsrc/afd/27040b.png diff --git a/src/afd/sprites-canonical/back-shiny/0845-000-Cramorant.png b/newsrc/afd/27040bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0845-000-Cramorant.png rename to newsrc/afd/27040bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0845-000-Cramorant.png b/newsrc/afd/27040s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0845-000-Cramorant.png rename to newsrc/afd/27040s.png diff --git a/src/afd/sprites-canonical/front/0845-420-Cramorant-Gulping.png b/newsrc/afd/27041.png similarity index 100% rename from src/afd/sprites-canonical/front/0845-420-Cramorant-Gulping.png rename to newsrc/afd/27041.png diff --git a/src/afd/sprites-canonical/back/0845-420-Cramorant-Gulping.png b/newsrc/afd/27041b.png similarity index 100% rename from src/afd/sprites-canonical/back/0845-420-Cramorant-Gulping.png rename to newsrc/afd/27041b.png diff --git a/src/afd/sprites-canonical/back-shiny/0845-420-Cramorant-Gulping.png b/newsrc/afd/27041bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0845-420-Cramorant-Gulping.png rename to newsrc/afd/27041bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0845-420-Cramorant-Gulping.png b/newsrc/afd/27041s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0845-420-Cramorant-Gulping.png rename to newsrc/afd/27041s.png diff --git a/src/afd/sprites-canonical/front/0845-420-Cramorant-Gorging.png b/newsrc/afd/27042.png similarity index 100% rename from src/afd/sprites-canonical/front/0845-420-Cramorant-Gorging.png rename to newsrc/afd/27042.png diff --git a/src/afd/sprites-canonical/back/0845-420-Cramorant-Gorging.png b/newsrc/afd/27042b.png similarity index 100% rename from src/afd/sprites-canonical/back/0845-420-Cramorant-Gorging.png rename to newsrc/afd/27042b.png diff --git a/src/afd/sprites-canonical/back-shiny/0845-420-Cramorant-Gorging.png b/newsrc/afd/27042bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0845-420-Cramorant-Gorging.png rename to newsrc/afd/27042bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0845-420-Cramorant-Gorging.png b/newsrc/afd/27042s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0845-420-Cramorant-Gorging.png rename to newsrc/afd/27042s.png diff --git a/src/afd/sprites-canonical/front/0846-000-Arrokuda.png b/newsrc/afd/27072.png similarity index 100% rename from src/afd/sprites-canonical/front/0846-000-Arrokuda.png rename to newsrc/afd/27072.png diff --git a/src/afd/sprites-canonical/back/0846-000-Arrokuda.png b/newsrc/afd/27072b.png similarity index 100% rename from src/afd/sprites-canonical/back/0846-000-Arrokuda.png rename to newsrc/afd/27072b.png diff --git a/src/afd/sprites-canonical/back-shiny/0846-000-Arrokuda.png b/newsrc/afd/27072bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0846-000-Arrokuda.png rename to newsrc/afd/27072bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0846-000-Arrokuda.png b/newsrc/afd/27072s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0846-000-Arrokuda.png rename to newsrc/afd/27072s.png diff --git a/src/afd/sprites-canonical/front/0847-000-Barraskewda.png b/newsrc/afd/27104.png similarity index 100% rename from src/afd/sprites-canonical/front/0847-000-Barraskewda.png rename to newsrc/afd/27104.png diff --git a/src/afd/sprites-canonical/back/0847-000-Barraskewda.png b/newsrc/afd/27104b.png similarity index 100% rename from src/afd/sprites-canonical/back/0847-000-Barraskewda.png rename to newsrc/afd/27104b.png diff --git a/src/afd/sprites-canonical/back-shiny/0847-000-Barraskewda.png b/newsrc/afd/27104bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0847-000-Barraskewda.png rename to newsrc/afd/27104bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0847-000-Barraskewda.png b/newsrc/afd/27104s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0847-000-Barraskewda.png rename to newsrc/afd/27104s.png diff --git a/src/afd/sprites-canonical/front/0848-000-Toxel.png b/newsrc/afd/27136.png similarity index 100% rename from src/afd/sprites-canonical/front/0848-000-Toxel.png rename to newsrc/afd/27136.png diff --git a/src/afd/sprites-canonical/back/0848-000-Toxel.png b/newsrc/afd/27136b.png similarity index 100% rename from src/afd/sprites-canonical/back/0848-000-Toxel.png rename to newsrc/afd/27136b.png diff --git a/src/afd/sprites-canonical/back-shiny/0848-000-Toxel.png b/newsrc/afd/27136bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0848-000-Toxel.png rename to newsrc/afd/27136bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0848-000-Toxel.png b/newsrc/afd/27136s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0848-000-Toxel.png rename to newsrc/afd/27136s.png diff --git a/src/afd/sprites-canonical/back/0849-000-Toxtricity.png b/newsrc/afd/27168.png similarity index 100% rename from src/afd/sprites-canonical/back/0849-000-Toxtricity.png rename to newsrc/afd/27168.png diff --git a/src/afd/sprites-canonical/front/0849-000-Toxtricity.png b/newsrc/afd/27168b.png similarity index 100% rename from src/afd/sprites-canonical/front/0849-000-Toxtricity.png rename to newsrc/afd/27168b.png diff --git a/src/afd/sprites-canonical/back/0849-420-Toxtricity-Gmax.png b/newsrc/afd/27168bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0849-420-Toxtricity-Gmax.png rename to newsrc/afd/27168bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0849-420-Toxtricity-Gmax.png b/newsrc/afd/27168bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0849-420-Toxtricity-Gmax.png rename to newsrc/afd/27168bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0849-000-Toxtricity.png b/newsrc/afd/27168bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0849-000-Toxtricity.png rename to newsrc/afd/27168bs.png diff --git a/src/afd/sprites-canonical/front/0849-420-Toxtricity-Gmax.png b/newsrc/afd/27168g.png similarity index 100% rename from src/afd/sprites-canonical/front/0849-420-Toxtricity-Gmax.png rename to newsrc/afd/27168g.png diff --git a/src/afd/sprites-canonical/front-shiny/0849-420-Toxtricity-Gmax.png b/newsrc/afd/27168gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0849-420-Toxtricity-Gmax.png rename to newsrc/afd/27168gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0849-000-Toxtricity.png b/newsrc/afd/27168s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0849-000-Toxtricity.png rename to newsrc/afd/27168s.png diff --git a/src/afd/sprites-canonical/front/0849-420-Toxtricity-Low~Key.png b/newsrc/afd/27169.png similarity index 100% rename from src/afd/sprites-canonical/front/0849-420-Toxtricity-Low~Key.png rename to newsrc/afd/27169.png diff --git a/src/afd/sprites-canonical/back/0849-420-Toxtricity-Low~Key.png b/newsrc/afd/27169b.png similarity index 100% rename from src/afd/sprites-canonical/back/0849-420-Toxtricity-Low~Key.png rename to newsrc/afd/27169b.png diff --git a/src/afd/sprites-canonical/back/0849-420-Toxtricity-Low~Key~Gmax.png b/newsrc/afd/27169bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0849-420-Toxtricity-Low~Key~Gmax.png rename to newsrc/afd/27169bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0849-420-Toxtricity-Low~Key~Gmax.png b/newsrc/afd/27169bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0849-420-Toxtricity-Low~Key~Gmax.png rename to newsrc/afd/27169bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0849-420-Toxtricity-Low~Key.png b/newsrc/afd/27169bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0849-420-Toxtricity-Low~Key.png rename to newsrc/afd/27169bs.png diff --git a/src/afd/sprites-canonical/front/0849-420-Toxtricity-Low~Key~Gmax.png b/newsrc/afd/27169g.png similarity index 100% rename from src/afd/sprites-canonical/front/0849-420-Toxtricity-Low~Key~Gmax.png rename to newsrc/afd/27169g.png diff --git a/src/afd/sprites-canonical/front-shiny/0849-420-Toxtricity-Low~Key~Gmax.png b/newsrc/afd/27169gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0849-420-Toxtricity-Low~Key~Gmax.png rename to newsrc/afd/27169gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0849-420-Toxtricity-Low~Key.png b/newsrc/afd/27169s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0849-420-Toxtricity-Low~Key.png rename to newsrc/afd/27169s.png diff --git a/src/afd/sprites-canonical/front/0085-000-Dodrio.png b/newsrc/afd/2720.png similarity index 100% rename from src/afd/sprites-canonical/front/0085-000-Dodrio.png rename to newsrc/afd/2720.png diff --git a/src/afd/sprites-canonical/front/0850-000-Sizzlipede.png b/newsrc/afd/27200.png similarity index 100% rename from src/afd/sprites-canonical/front/0850-000-Sizzlipede.png rename to newsrc/afd/27200.png diff --git a/src/afd/sprites-canonical/back/0850-000-Sizzlipede.png b/newsrc/afd/27200b.png similarity index 100% rename from src/afd/sprites-canonical/back/0850-000-Sizzlipede.png rename to newsrc/afd/27200b.png diff --git a/src/afd/sprites-canonical/back-shiny/0850-000-Sizzlipede.png b/newsrc/afd/27200bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0850-000-Sizzlipede.png rename to newsrc/afd/27200bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0850-000-Sizzlipede.png b/newsrc/afd/27200s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0850-000-Sizzlipede.png rename to newsrc/afd/27200s.png diff --git a/src/afd/sprites-canonical/back/0085-000-Dodrio.png b/newsrc/afd/2720b.png similarity index 100% rename from src/afd/sprites-canonical/back/0085-000-Dodrio.png rename to newsrc/afd/2720b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0085-000-Dodrio-Female.png b/newsrc/afd/2720bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0085-000-Dodrio-Female.png rename to newsrc/afd/2720bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0085-000-Dodrio-Female.png b/newsrc/afd/2720bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0085-000-Dodrio-Female.png rename to newsrc/afd/2720bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0085-000-Dodrio.png b/newsrc/afd/2720bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0085-000-Dodrio.png rename to newsrc/afd/2720bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0085-000-Dodrio-Female.png b/newsrc/afd/2720f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0085-000-Dodrio-Female.png rename to newsrc/afd/2720f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0085-000-Dodrio-Female.png b/newsrc/afd/2720fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0085-000-Dodrio-Female.png rename to newsrc/afd/2720fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0085-000-Dodrio.png b/newsrc/afd/2720s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0085-000-Dodrio.png rename to newsrc/afd/2720s.png diff --git a/src/afd/sprites-canonical/front/0851-000-Centiskorch.png b/newsrc/afd/27232.png similarity index 100% rename from src/afd/sprites-canonical/front/0851-000-Centiskorch.png rename to newsrc/afd/27232.png diff --git a/src/afd/sprites-canonical/back/0851-000-Centiskorch.png b/newsrc/afd/27232b.png similarity index 100% rename from src/afd/sprites-canonical/back/0851-000-Centiskorch.png rename to newsrc/afd/27232b.png diff --git a/src/afd/sprites-canonical/back/0851-420-Centiskorch-Gmax.png b/newsrc/afd/27232bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0851-420-Centiskorch-Gmax.png rename to newsrc/afd/27232bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0851-420-Centiskorch-Gmax.png b/newsrc/afd/27232bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0851-420-Centiskorch-Gmax.png rename to newsrc/afd/27232bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0851-000-Centiskorch.png b/newsrc/afd/27232bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0851-000-Centiskorch.png rename to newsrc/afd/27232bs.png diff --git a/src/afd/sprites-canonical/front/0851-420-Centiskorch-Gmax.png b/newsrc/afd/27232g.png similarity index 100% rename from src/afd/sprites-canonical/front/0851-420-Centiskorch-Gmax.png rename to newsrc/afd/27232g.png diff --git a/src/afd/sprites-canonical/front-shiny/0851-420-Centiskorch-Gmax.png b/newsrc/afd/27232gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0851-420-Centiskorch-Gmax.png rename to newsrc/afd/27232gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0851-000-Centiskorch.png b/newsrc/afd/27232s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0851-000-Centiskorch.png rename to newsrc/afd/27232s.png diff --git a/src/afd/sprites-canonical/front/0852-000-Clobbopus.png b/newsrc/afd/27264.png similarity index 100% rename from src/afd/sprites-canonical/front/0852-000-Clobbopus.png rename to newsrc/afd/27264.png diff --git a/src/afd/sprites-canonical/back/0852-000-Clobbopus.png b/newsrc/afd/27264b.png similarity index 100% rename from src/afd/sprites-canonical/back/0852-000-Clobbopus.png rename to newsrc/afd/27264b.png diff --git a/src/afd/sprites-canonical/back-shiny/0852-000-Clobbopus.png b/newsrc/afd/27264bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0852-000-Clobbopus.png rename to newsrc/afd/27264bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0852-000-Clobbopus.png b/newsrc/afd/27264s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0852-000-Clobbopus.png rename to newsrc/afd/27264s.png diff --git a/src/afd/sprites-canonical/front/0853-000-Grapploct.png b/newsrc/afd/27296.png similarity index 100% rename from src/afd/sprites-canonical/front/0853-000-Grapploct.png rename to newsrc/afd/27296.png diff --git a/src/afd/sprites-canonical/back/0853-000-Grapploct.png b/newsrc/afd/27296b.png similarity index 100% rename from src/afd/sprites-canonical/back/0853-000-Grapploct.png rename to newsrc/afd/27296b.png diff --git a/src/afd/sprites-canonical/back-shiny/0853-000-Grapploct.png b/newsrc/afd/27296bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0853-000-Grapploct.png rename to newsrc/afd/27296bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0853-000-Grapploct.png b/newsrc/afd/27296s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0853-000-Grapploct.png rename to newsrc/afd/27296s.png diff --git a/src/afd/sprites-canonical/front/0854-000-Sinistea.png b/newsrc/afd/27328.png similarity index 100% rename from src/afd/sprites-canonical/front/0854-000-Sinistea.png rename to newsrc/afd/27328.png diff --git a/src/afd/sprites-canonical/back/0854-000-Sinistea.png b/newsrc/afd/27328b.png similarity index 100% rename from src/afd/sprites-canonical/back/0854-000-Sinistea.png rename to newsrc/afd/27328b.png diff --git a/src/afd/sprites-canonical/back-shiny/0854-000-Sinistea.png b/newsrc/afd/27328bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0854-000-Sinistea.png rename to newsrc/afd/27328bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0854-000-Sinistea.png b/newsrc/afd/27328s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0854-000-Sinistea.png rename to newsrc/afd/27328s.png diff --git a/src/afd/sprites-canonical/front/0855-000-Polteageist.png b/newsrc/afd/27360.png similarity index 100% rename from src/afd/sprites-canonical/front/0855-000-Polteageist.png rename to newsrc/afd/27360.png diff --git a/src/afd/sprites-canonical/back/0855-000-Polteageist.png b/newsrc/afd/27360b.png similarity index 100% rename from src/afd/sprites-canonical/back/0855-000-Polteageist.png rename to newsrc/afd/27360b.png diff --git a/src/afd/sprites-canonical/back-shiny/0855-000-Polteageist.png b/newsrc/afd/27360bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0855-000-Polteageist.png rename to newsrc/afd/27360bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0855-000-Polteageist.png b/newsrc/afd/27360s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0855-000-Polteageist.png rename to newsrc/afd/27360s.png diff --git a/src/afd/sprites-canonical/front/0856-000-Hatenna.png b/newsrc/afd/27392.png similarity index 100% rename from src/afd/sprites-canonical/front/0856-000-Hatenna.png rename to newsrc/afd/27392.png diff --git a/src/afd/sprites-canonical/back/0856-000-Hatenna.png b/newsrc/afd/27392b.png similarity index 100% rename from src/afd/sprites-canonical/back/0856-000-Hatenna.png rename to newsrc/afd/27392b.png diff --git a/src/afd/sprites-canonical/back-shiny/0856-000-Hatenna.png b/newsrc/afd/27392bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0856-000-Hatenna.png rename to newsrc/afd/27392bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0856-000-Hatenna.png b/newsrc/afd/27392s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0856-000-Hatenna.png rename to newsrc/afd/27392s.png diff --git a/src/afd/sprites-canonical/front/0857-000-Hattrem.png b/newsrc/afd/27424.png similarity index 100% rename from src/afd/sprites-canonical/front/0857-000-Hattrem.png rename to newsrc/afd/27424.png diff --git a/src/afd/sprites-canonical/back/0857-000-Hattrem.png b/newsrc/afd/27424b.png similarity index 100% rename from src/afd/sprites-canonical/back/0857-000-Hattrem.png rename to newsrc/afd/27424b.png diff --git a/src/afd/sprites-canonical/back-shiny/0857-000-Hattrem.png b/newsrc/afd/27424bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0857-000-Hattrem.png rename to newsrc/afd/27424bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0857-000-Hattrem.png b/newsrc/afd/27424s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0857-000-Hattrem.png rename to newsrc/afd/27424s.png diff --git a/src/afd/sprites-canonical/front/0858-000-Hatterene.png b/newsrc/afd/27456.png similarity index 100% rename from src/afd/sprites-canonical/front/0858-000-Hatterene.png rename to newsrc/afd/27456.png diff --git a/src/afd/sprites-canonical/back/0858-000-Hatterene.png b/newsrc/afd/27456b.png similarity index 100% rename from src/afd/sprites-canonical/back/0858-000-Hatterene.png rename to newsrc/afd/27456b.png diff --git a/src/afd/sprites-canonical/back-shiny/0858-420-Hatterene-Gmax.png b/newsrc/afd/27456bg.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0858-420-Hatterene-Gmax.png rename to newsrc/afd/27456bg.png diff --git a/src/afd/sprites-canonical/back/0858-420-Hatterene-Gmax.png b/newsrc/afd/27456bgs.png similarity index 100% rename from src/afd/sprites-canonical/back/0858-420-Hatterene-Gmax.png rename to newsrc/afd/27456bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0858-000-Hatterene.png b/newsrc/afd/27456bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0858-000-Hatterene.png rename to newsrc/afd/27456bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0858-420-Hatterene-Gmax.png b/newsrc/afd/27456g.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0858-420-Hatterene-Gmax.png rename to newsrc/afd/27456g.png diff --git a/src/afd/sprites-canonical/front/0858-420-Hatterene-Gmax.png b/newsrc/afd/27456gs.png similarity index 100% rename from src/afd/sprites-canonical/front/0858-420-Hatterene-Gmax.png rename to newsrc/afd/27456gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0858-000-Hatterene.png b/newsrc/afd/27456s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0858-000-Hatterene.png rename to newsrc/afd/27456s.png diff --git a/src/afd/sprites-canonical/front/0859-000-Impidimp.png b/newsrc/afd/27488.png similarity index 100% rename from src/afd/sprites-canonical/front/0859-000-Impidimp.png rename to newsrc/afd/27488.png diff --git a/src/afd/sprites-canonical/back/0859-000-Impidimp.png b/newsrc/afd/27488b.png similarity index 100% rename from src/afd/sprites-canonical/back/0859-000-Impidimp.png rename to newsrc/afd/27488b.png diff --git a/src/afd/sprites-canonical/back-shiny/0859-000-Impidimp.png b/newsrc/afd/27488bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0859-000-Impidimp.png rename to newsrc/afd/27488bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0859-000-Impidimp.png b/newsrc/afd/27488s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0859-000-Impidimp.png rename to newsrc/afd/27488s.png diff --git a/src/afd/sprites-canonical/front/0086-000-Seel.png b/newsrc/afd/2752.png similarity index 100% rename from src/afd/sprites-canonical/front/0086-000-Seel.png rename to newsrc/afd/2752.png diff --git a/src/afd/sprites-canonical/front/0860-000-Morgrem.png b/newsrc/afd/27520.png similarity index 100% rename from src/afd/sprites-canonical/front/0860-000-Morgrem.png rename to newsrc/afd/27520.png diff --git a/src/afd/sprites-canonical/back/0860-000-Morgrem.png b/newsrc/afd/27520b.png similarity index 100% rename from src/afd/sprites-canonical/back/0860-000-Morgrem.png rename to newsrc/afd/27520b.png diff --git a/src/afd/sprites-canonical/back-shiny/0860-000-Morgrem.png b/newsrc/afd/27520bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0860-000-Morgrem.png rename to newsrc/afd/27520bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0860-000-Morgrem.png b/newsrc/afd/27520s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0860-000-Morgrem.png rename to newsrc/afd/27520s.png diff --git a/src/afd/sprites-canonical/back/0086-000-Seel.png b/newsrc/afd/2752b.png similarity index 100% rename from src/afd/sprites-canonical/back/0086-000-Seel.png rename to newsrc/afd/2752b.png diff --git a/src/afd/sprites-canonical/back-shiny/0086-000-Seel.png b/newsrc/afd/2752bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0086-000-Seel.png rename to newsrc/afd/2752bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0086-000-Seel.png b/newsrc/afd/2752s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0086-000-Seel.png rename to newsrc/afd/2752s.png diff --git a/src/afd/sprites-canonical/front/0861-000-Grimmsnarl.png b/newsrc/afd/27552.png similarity index 100% rename from src/afd/sprites-canonical/front/0861-000-Grimmsnarl.png rename to newsrc/afd/27552.png diff --git a/src/afd/sprites-canonical/back/0861-000-Grimmsnarl.png b/newsrc/afd/27552b.png similarity index 100% rename from src/afd/sprites-canonical/back/0861-000-Grimmsnarl.png rename to newsrc/afd/27552b.png diff --git a/src/afd/sprites-canonical/back/0861-420-Grimmsnarl-Gmax.png b/newsrc/afd/27552bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0861-420-Grimmsnarl-Gmax.png rename to newsrc/afd/27552bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0861-420-Grimmsnarl-Gmax.png b/newsrc/afd/27552bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0861-420-Grimmsnarl-Gmax.png rename to newsrc/afd/27552bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0861-000-Grimmsnarl.png b/newsrc/afd/27552bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0861-000-Grimmsnarl.png rename to newsrc/afd/27552bs.png diff --git a/src/afd/sprites-canonical/front/0861-420-Grimmsnarl-Gmax.png b/newsrc/afd/27552g.png similarity index 100% rename from src/afd/sprites-canonical/front/0861-420-Grimmsnarl-Gmax.png rename to newsrc/afd/27552g.png diff --git a/src/afd/sprites-canonical/front-shiny/0861-420-Grimmsnarl-Gmax.png b/newsrc/afd/27552gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0861-420-Grimmsnarl-Gmax.png rename to newsrc/afd/27552gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0861-000-Grimmsnarl.png b/newsrc/afd/27552s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0861-000-Grimmsnarl.png rename to newsrc/afd/27552s.png diff --git a/src/afd/sprites-canonical/back/0862-000-Obstagoon.png b/newsrc/afd/27584.png similarity index 100% rename from src/afd/sprites-canonical/back/0862-000-Obstagoon.png rename to newsrc/afd/27584.png diff --git a/src/afd/sprites-canonical/front/0862-000-Obstagoon.png b/newsrc/afd/27584b.png similarity index 100% rename from src/afd/sprites-canonical/front/0862-000-Obstagoon.png rename to newsrc/afd/27584b.png diff --git a/src/afd/sprites-canonical/back-shiny/0862-000-Obstagoon.png b/newsrc/afd/27584bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0862-000-Obstagoon.png rename to newsrc/afd/27584bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0862-000-Obstagoon.png b/newsrc/afd/27584s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0862-000-Obstagoon.png rename to newsrc/afd/27584s.png diff --git a/src/afd/sprites-canonical/front/0863-000-Perrserker.png b/newsrc/afd/27616.png similarity index 100% rename from src/afd/sprites-canonical/front/0863-000-Perrserker.png rename to newsrc/afd/27616.png diff --git a/src/afd/sprites-canonical/back/0863-000-Perrserker.png b/newsrc/afd/27616b.png similarity index 100% rename from src/afd/sprites-canonical/back/0863-000-Perrserker.png rename to newsrc/afd/27616b.png diff --git a/src/afd/sprites-canonical/back-shiny/0863-000-Perrserker.png b/newsrc/afd/27616bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0863-000-Perrserker.png rename to newsrc/afd/27616bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0863-000-Perrserker.png b/newsrc/afd/27616s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0863-000-Perrserker.png rename to newsrc/afd/27616s.png diff --git a/src/afd/sprites-canonical/front/0864-000-Cursola.png b/newsrc/afd/27648.png similarity index 100% rename from src/afd/sprites-canonical/front/0864-000-Cursola.png rename to newsrc/afd/27648.png diff --git a/src/afd/sprites-canonical/back/0864-000-Cursola.png b/newsrc/afd/27648b.png similarity index 100% rename from src/afd/sprites-canonical/back/0864-000-Cursola.png rename to newsrc/afd/27648b.png diff --git a/src/afd/sprites-canonical/back-shiny/0864-000-Cursola.png b/newsrc/afd/27648bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0864-000-Cursola.png rename to newsrc/afd/27648bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0864-000-Cursola.png b/newsrc/afd/27648s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0864-000-Cursola.png rename to newsrc/afd/27648s.png diff --git a/src/afd/sprites-canonical/front/0865-000-Sirfetch__0027d.png b/newsrc/afd/27680.png similarity index 100% rename from src/afd/sprites-canonical/front/0865-000-Sirfetch__0027d.png rename to newsrc/afd/27680.png diff --git a/src/afd/sprites-canonical/back/0865-000-Sirfetch__0027d.png b/newsrc/afd/27680b.png similarity index 100% rename from src/afd/sprites-canonical/back/0865-000-Sirfetch__0027d.png rename to newsrc/afd/27680b.png diff --git a/src/afd/sprites-canonical/back-shiny/0865-000-Sirfetch__0027d.png b/newsrc/afd/27680bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0865-000-Sirfetch__0027d.png rename to newsrc/afd/27680bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0865-000-Sirfetch__0027d.png b/newsrc/afd/27680s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0865-000-Sirfetch__0027d.png rename to newsrc/afd/27680s.png diff --git a/src/afd/sprites-canonical/front/0866-000-Mr._Rime.png b/newsrc/afd/27712.png similarity index 100% rename from src/afd/sprites-canonical/front/0866-000-Mr._Rime.png rename to newsrc/afd/27712.png diff --git a/src/afd/sprites-canonical/back/0866-000-Mr._Rime.png b/newsrc/afd/27712b.png similarity index 100% rename from src/afd/sprites-canonical/back/0866-000-Mr._Rime.png rename to newsrc/afd/27712b.png diff --git a/src/afd/sprites-canonical/back-shiny/0866-000-Mr._Rime.png b/newsrc/afd/27712bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0866-000-Mr._Rime.png rename to newsrc/afd/27712bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0866-000-Mr._Rime.png b/newsrc/afd/27712s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0866-000-Mr._Rime.png rename to newsrc/afd/27712s.png diff --git a/src/afd/sprites-canonical/front/0867-000-Runerigus.png b/newsrc/afd/27744.png similarity index 100% rename from src/afd/sprites-canonical/front/0867-000-Runerigus.png rename to newsrc/afd/27744.png diff --git a/src/afd/sprites-canonical/back/0867-000-Runerigus.png b/newsrc/afd/27744b.png similarity index 100% rename from src/afd/sprites-canonical/back/0867-000-Runerigus.png rename to newsrc/afd/27744b.png diff --git a/src/afd/sprites-canonical/back-shiny/0867-000-Runerigus.png b/newsrc/afd/27744bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0867-000-Runerigus.png rename to newsrc/afd/27744bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0867-000-Runerigus.png b/newsrc/afd/27744s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0867-000-Runerigus.png rename to newsrc/afd/27744s.png diff --git a/src/afd/sprites-canonical/front/0868-000-Milcery.png b/newsrc/afd/27776.png similarity index 100% rename from src/afd/sprites-canonical/front/0868-000-Milcery.png rename to newsrc/afd/27776.png diff --git a/src/afd/sprites-canonical/back/0868-000-Milcery.png b/newsrc/afd/27776b.png similarity index 100% rename from src/afd/sprites-canonical/back/0868-000-Milcery.png rename to newsrc/afd/27776b.png diff --git a/src/afd/sprites-canonical/back-shiny/0868-000-Milcery.png b/newsrc/afd/27776bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0868-000-Milcery.png rename to newsrc/afd/27776bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0868-000-Milcery.png b/newsrc/afd/27776s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0868-000-Milcery.png rename to newsrc/afd/27776s.png diff --git a/src/afd/sprites-canonical/front/0869-000-Alcremie.png b/newsrc/afd/27808.png similarity index 100% rename from src/afd/sprites-canonical/front/0869-000-Alcremie.png rename to newsrc/afd/27808.png diff --git a/src/afd/sprites-canonical/back/0869-000-Alcremie.png b/newsrc/afd/27808b.png similarity index 100% rename from src/afd/sprites-canonical/back/0869-000-Alcremie.png rename to newsrc/afd/27808b.png diff --git a/src/afd/sprites-canonical/back/0869-420-Alcremie-Gmax.png b/newsrc/afd/27808bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0869-420-Alcremie-Gmax.png rename to newsrc/afd/27808bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0869-420-Alcremie-Gmax.png b/newsrc/afd/27808bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0869-420-Alcremie-Gmax.png rename to newsrc/afd/27808bgs.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Caramel_Swirl.png b/newsrc/afd/27808bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Caramel_Swirl.png rename to newsrc/afd/27808bs.png diff --git a/src/afd/sprites-canonical/front/0869-420-Alcremie-Gmax.png b/newsrc/afd/27808g.png similarity index 100% rename from src/afd/sprites-canonical/front/0869-420-Alcremie-Gmax.png rename to newsrc/afd/27808g.png diff --git a/src/afd/sprites-canonical/front-shiny/0869-420-Alcremie-Gmax.png b/newsrc/afd/27808gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0869-420-Alcremie-Gmax.png rename to newsrc/afd/27808gs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Caramel_Swirl.png b/newsrc/afd/27808s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Caramel_Swirl.png rename to newsrc/afd/27808s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Ruby_Cream.png b/newsrc/afd/27809.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Ruby_Cream.png rename to newsrc/afd/27809.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Ruby_Cream.png b/newsrc/afd/27809b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Ruby_Cream.png rename to newsrc/afd/27809b.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Lemon_Cream.png b/newsrc/afd/27809bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Lemon_Cream.png rename to newsrc/afd/27809bs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Lemon_Cream.png b/newsrc/afd/27809s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Lemon_Cream.png rename to newsrc/afd/27809s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Matcha_Cream.png b/newsrc/afd/27810.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Matcha_Cream.png rename to newsrc/afd/27810.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Matcha_Cream.png b/newsrc/afd/27810b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Matcha_Cream.png rename to newsrc/afd/27810b.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Matcha_Cream.png b/newsrc/afd/27810bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Matcha_Cream.png rename to newsrc/afd/27810bs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Matcha_Cream.png b/newsrc/afd/27810s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Matcha_Cream.png rename to newsrc/afd/27810s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Mint_Cream.png b/newsrc/afd/27811.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Mint_Cream.png rename to newsrc/afd/27811.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Mint_Cream.png b/newsrc/afd/27811b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Mint_Cream.png rename to newsrc/afd/27811b.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Mint_Cream.png b/newsrc/afd/27811bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Mint_Cream.png rename to newsrc/afd/27811bs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Mint_Cream.png b/newsrc/afd/27811s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Mint_Cream.png rename to newsrc/afd/27811s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Lemon_Cream.png b/newsrc/afd/27812.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Lemon_Cream.png rename to newsrc/afd/27812.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Lemon_Cream.png b/newsrc/afd/27812b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Lemon_Cream.png rename to newsrc/afd/27812b.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png b/newsrc/afd/27812bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png rename to newsrc/afd/27812bs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png b/newsrc/afd/27812s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png rename to newsrc/afd/27812s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Salted_Cream.png b/newsrc/afd/27813.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Salted_Cream.png rename to newsrc/afd/27813.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Salted_Cream.png b/newsrc/afd/27813b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Salted_Cream.png rename to newsrc/afd/27813b.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Ruby_Cream.png b/newsrc/afd/27813bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Ruby_Cream.png rename to newsrc/afd/27813bs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Cream.png b/newsrc/afd/27813s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Cream.png rename to newsrc/afd/27813s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Ruby_Swirl.png b/newsrc/afd/27814.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Ruby_Swirl.png rename to newsrc/afd/27814.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Ruby_Swirl.png b/newsrc/afd/27814b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Ruby_Swirl.png rename to newsrc/afd/27814b.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Ruby_Swirl.png b/newsrc/afd/27814bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Ruby_Swirl.png rename to newsrc/afd/27814bs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Swirl.png b/newsrc/afd/27814s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Ruby_Swirl.png rename to newsrc/afd/27814s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Caramel_Swirl.png b/newsrc/afd/27815.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Caramel_Swirl.png rename to newsrc/afd/27815.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Caramel_Swirl.png b/newsrc/afd/27815b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Caramel_Swirl.png rename to newsrc/afd/27815b.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Salted_Cream.png b/newsrc/afd/27815bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0869-420-Alcremie-Salted_Cream.png rename to newsrc/afd/27815bs.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Salted_Cream.png b/newsrc/afd/27815s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0869-420-Alcremie-Salted_Cream.png rename to newsrc/afd/27815s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png b/newsrc/afd/27816.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png rename to newsrc/afd/27816.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png b/newsrc/afd/27816b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0869-420-Alcremie-Rainbow_Swirl.png rename to newsrc/afd/27816b.png diff --git a/src/afd/sprites-canonical/back-shiny/0869-000-Alcremie.png b/newsrc/afd/27816bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0869-000-Alcremie.png rename to newsrc/afd/27816bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0869-000-Alcremie.png b/newsrc/afd/27816s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0869-000-Alcremie.png rename to newsrc/afd/27816s.png diff --git a/src/afd/sprites-canonical/front/0087-000-Dewgong.png b/newsrc/afd/2784.png similarity index 100% rename from src/afd/sprites-canonical/front/0087-000-Dewgong.png rename to newsrc/afd/2784.png diff --git a/src/afd/sprites-canonical/front/0870-000-Falinks.png b/newsrc/afd/27840.png similarity index 100% rename from src/afd/sprites-canonical/front/0870-000-Falinks.png rename to newsrc/afd/27840.png diff --git a/src/afd/sprites-canonical/back/0870-000-Falinks.png b/newsrc/afd/27840b.png similarity index 100% rename from src/afd/sprites-canonical/back/0870-000-Falinks.png rename to newsrc/afd/27840b.png diff --git a/src/afd/sprites-canonical/back-shiny/0870-000-Falinks.png b/newsrc/afd/27840bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0870-000-Falinks.png rename to newsrc/afd/27840bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0870-000-Falinks.png b/newsrc/afd/27840s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0870-000-Falinks.png rename to newsrc/afd/27840s.png diff --git a/src/afd/sprites-canonical/back/0087-000-Dewgong.png b/newsrc/afd/2784b.png similarity index 100% rename from src/afd/sprites-canonical/back/0087-000-Dewgong.png rename to newsrc/afd/2784b.png diff --git a/src/afd/sprites-canonical/back-shiny/0087-000-Dewgong.png b/newsrc/afd/2784bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0087-000-Dewgong.png rename to newsrc/afd/2784bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0087-000-Dewgong.png b/newsrc/afd/2784s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0087-000-Dewgong.png rename to newsrc/afd/2784s.png diff --git a/src/afd/sprites-canonical/front/0871-000-Pincurchin.png b/newsrc/afd/27872.png similarity index 100% rename from src/afd/sprites-canonical/front/0871-000-Pincurchin.png rename to newsrc/afd/27872.png diff --git a/src/afd/sprites-canonical/back/0871-000-Pincurchin.png b/newsrc/afd/27872b.png similarity index 100% rename from src/afd/sprites-canonical/back/0871-000-Pincurchin.png rename to newsrc/afd/27872b.png diff --git a/src/afd/sprites-canonical/back-shiny/0871-000-Pincurchin.png b/newsrc/afd/27872bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0871-000-Pincurchin.png rename to newsrc/afd/27872bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0871-000-Pincurchin.png b/newsrc/afd/27872s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0871-000-Pincurchin.png rename to newsrc/afd/27872s.png diff --git a/src/afd/sprites-canonical/front/0872-000-Snom.png b/newsrc/afd/27904.png similarity index 100% rename from src/afd/sprites-canonical/front/0872-000-Snom.png rename to newsrc/afd/27904.png diff --git a/src/afd/sprites-canonical/back/0872-000-Snom.png b/newsrc/afd/27904b.png similarity index 100% rename from src/afd/sprites-canonical/back/0872-000-Snom.png rename to newsrc/afd/27904b.png diff --git a/src/afd/sprites-canonical/back-shiny/0872-000-Snom.png b/newsrc/afd/27904bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0872-000-Snom.png rename to newsrc/afd/27904bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0872-000-Snom.png b/newsrc/afd/27904s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0872-000-Snom.png rename to newsrc/afd/27904s.png diff --git a/src/afd/sprites-canonical/front/0873-000-Frosmoth.png b/newsrc/afd/27936.png similarity index 100% rename from src/afd/sprites-canonical/front/0873-000-Frosmoth.png rename to newsrc/afd/27936.png diff --git a/src/afd/sprites-canonical/back/0873-000-Frosmoth.png b/newsrc/afd/27936b.png similarity index 100% rename from src/afd/sprites-canonical/back/0873-000-Frosmoth.png rename to newsrc/afd/27936b.png diff --git a/src/afd/sprites-canonical/back-shiny/0873-000-Frosmoth.png b/newsrc/afd/27936bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0873-000-Frosmoth.png rename to newsrc/afd/27936bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0873-000-Frosmoth.png b/newsrc/afd/27936s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0873-000-Frosmoth.png rename to newsrc/afd/27936s.png diff --git a/src/afd/sprites-canonical/front/0874-000-Stonjourner.png b/newsrc/afd/27968.png similarity index 100% rename from src/afd/sprites-canonical/front/0874-000-Stonjourner.png rename to newsrc/afd/27968.png diff --git a/src/afd/sprites-canonical/back/0874-000-Stonjourner.png b/newsrc/afd/27968b.png similarity index 100% rename from src/afd/sprites-canonical/back/0874-000-Stonjourner.png rename to newsrc/afd/27968b.png diff --git a/src/afd/sprites-canonical/back-shiny/0874-000-Stonjourner.png b/newsrc/afd/27968bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0874-000-Stonjourner.png rename to newsrc/afd/27968bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0874-000-Stonjourner.png b/newsrc/afd/27968s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0874-000-Stonjourner.png rename to newsrc/afd/27968s.png diff --git a/src/afd/sprites-canonical/front/0875-000-Eiscue.png b/newsrc/afd/28000.png similarity index 100% rename from src/afd/sprites-canonical/front/0875-000-Eiscue.png rename to newsrc/afd/28000.png diff --git a/src/afd/sprites-canonical/back/0875-000-Eiscue.png b/newsrc/afd/28000b.png similarity index 100% rename from src/afd/sprites-canonical/back/0875-000-Eiscue.png rename to newsrc/afd/28000b.png diff --git a/src/afd/sprites-canonical/back-shiny/0875-000-Eiscue.png b/newsrc/afd/28000bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0875-000-Eiscue.png rename to newsrc/afd/28000bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0875-000-Eiscue.png b/newsrc/afd/28000s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0875-000-Eiscue.png rename to newsrc/afd/28000s.png diff --git a/src/afd/sprites-canonical/back/0875-420-Eiscue-Noice.png b/newsrc/afd/28001.png similarity index 100% rename from src/afd/sprites-canonical/back/0875-420-Eiscue-Noice.png rename to newsrc/afd/28001.png diff --git a/src/afd/sprites-canonical/front/0875-420-Eiscue-Noice.png b/newsrc/afd/28001b.png similarity index 100% rename from src/afd/sprites-canonical/front/0875-420-Eiscue-Noice.png rename to newsrc/afd/28001b.png diff --git a/src/afd/sprites-canonical/back-shiny/0875-420-Eiscue-Noice.png b/newsrc/afd/28001bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0875-420-Eiscue-Noice.png rename to newsrc/afd/28001bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0875-420-Eiscue-Noice.png b/newsrc/afd/28001s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0875-420-Eiscue-Noice.png rename to newsrc/afd/28001s.png diff --git a/src/afd/sprites-canonical/front/0876-000-Indeedee.png b/newsrc/afd/28032.png similarity index 100% rename from src/afd/sprites-canonical/front/0876-000-Indeedee.png rename to newsrc/afd/28032.png diff --git a/src/afd/sprites-canonical/back/0876-000-Indeedee.png b/newsrc/afd/28032b.png similarity index 100% rename from src/afd/sprites-canonical/back/0876-000-Indeedee.png rename to newsrc/afd/28032b.png diff --git a/src/afd/sprites-canonical/back-shiny/0876-000-Indeedee.png b/newsrc/afd/28032bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0876-000-Indeedee.png rename to newsrc/afd/28032bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0876-000-Indeedee.png b/newsrc/afd/28032s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0876-000-Indeedee.png rename to newsrc/afd/28032s.png diff --git a/src/afd/sprites-canonical/front/0876-420-Indeedee-F.png b/newsrc/afd/28033.png similarity index 100% rename from src/afd/sprites-canonical/front/0876-420-Indeedee-F.png rename to newsrc/afd/28033.png diff --git a/src/afd/sprites-canonical/back/0876-420-Indeedee-F.png b/newsrc/afd/28033b.png similarity index 100% rename from src/afd/sprites-canonical/back/0876-420-Indeedee-F.png rename to newsrc/afd/28033b.png diff --git a/src/afd/sprites-canonical/back-shiny/0876-420-Indeedee-F.png b/newsrc/afd/28033bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0876-420-Indeedee-F.png rename to newsrc/afd/28033bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0876-420-Indeedee-F.png b/newsrc/afd/28033s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0876-420-Indeedee-F.png rename to newsrc/afd/28033s.png diff --git a/src/afd/sprites-canonical/front/0877-000-Morpeko.png b/newsrc/afd/28064.png similarity index 100% rename from src/afd/sprites-canonical/front/0877-000-Morpeko.png rename to newsrc/afd/28064.png diff --git a/src/afd/sprites-canonical/back/0877-000-Morpeko.png b/newsrc/afd/28064b.png similarity index 100% rename from src/afd/sprites-canonical/back/0877-000-Morpeko.png rename to newsrc/afd/28064b.png diff --git a/src/afd/sprites-canonical/back-shiny/0877-000-Morpeko.png b/newsrc/afd/28064bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0877-000-Morpeko.png rename to newsrc/afd/28064bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0877-000-Morpeko.png b/newsrc/afd/28064s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0877-000-Morpeko.png rename to newsrc/afd/28064s.png diff --git a/src/afd/sprites-canonical/front/0877-420-Morpeko-Hangry.png b/newsrc/afd/28065.png similarity index 100% rename from src/afd/sprites-canonical/front/0877-420-Morpeko-Hangry.png rename to newsrc/afd/28065.png diff --git a/src/afd/sprites-canonical/back/0877-420-Morpeko-Hangry.png b/newsrc/afd/28065b.png similarity index 100% rename from src/afd/sprites-canonical/back/0877-420-Morpeko-Hangry.png rename to newsrc/afd/28065b.png diff --git a/src/afd/sprites-canonical/back-shiny/0877-420-Morpeko-Hangry.png b/newsrc/afd/28065bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0877-420-Morpeko-Hangry.png rename to newsrc/afd/28065bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0877-420-Morpeko-Hangry.png b/newsrc/afd/28065s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0877-420-Morpeko-Hangry.png rename to newsrc/afd/28065s.png diff --git a/src/afd/sprites-canonical/front/0878-000-Cufant.png b/newsrc/afd/28096.png similarity index 100% rename from src/afd/sprites-canonical/front/0878-000-Cufant.png rename to newsrc/afd/28096.png diff --git a/src/afd/sprites-canonical/back/0878-000-Cufant.png b/newsrc/afd/28096b.png similarity index 100% rename from src/afd/sprites-canonical/back/0878-000-Cufant.png rename to newsrc/afd/28096b.png diff --git a/src/afd/sprites-canonical/back-shiny/0878-000-Cufant.png b/newsrc/afd/28096bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0878-000-Cufant.png rename to newsrc/afd/28096bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0878-000-Cufant.png b/newsrc/afd/28096s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0878-000-Cufant.png rename to newsrc/afd/28096s.png diff --git a/src/afd/sprites-canonical/front/0879-000-Copperajah.png b/newsrc/afd/28128.png similarity index 100% rename from src/afd/sprites-canonical/front/0879-000-Copperajah.png rename to newsrc/afd/28128.png diff --git a/src/afd/sprites-canonical/back/0879-000-Copperajah.png b/newsrc/afd/28128b.png similarity index 100% rename from src/afd/sprites-canonical/back/0879-000-Copperajah.png rename to newsrc/afd/28128b.png diff --git a/src/afd/sprites-canonical/back/0879-420-Copperajah-Gmax.png b/newsrc/afd/28128bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0879-420-Copperajah-Gmax.png rename to newsrc/afd/28128bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0879-420-Copperajah-Gmax.png b/newsrc/afd/28128bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0879-420-Copperajah-Gmax.png rename to newsrc/afd/28128bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0879-000-Copperajah.png b/newsrc/afd/28128bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0879-000-Copperajah.png rename to newsrc/afd/28128bs.png diff --git a/src/afd/sprites-canonical/front/0879-420-Copperajah-Gmax.png b/newsrc/afd/28128g.png similarity index 100% rename from src/afd/sprites-canonical/front/0879-420-Copperajah-Gmax.png rename to newsrc/afd/28128g.png diff --git a/src/afd/sprites-canonical/front-shiny/0879-420-Copperajah-Gmax.png b/newsrc/afd/28128gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0879-420-Copperajah-Gmax.png rename to newsrc/afd/28128gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0879-000-Copperajah.png b/newsrc/afd/28128s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0879-000-Copperajah.png rename to newsrc/afd/28128s.png diff --git a/src/afd/sprites-canonical/front/0088-000-Grimer.png b/newsrc/afd/2816.png similarity index 100% rename from src/afd/sprites-canonical/front/0088-000-Grimer.png rename to newsrc/afd/2816.png diff --git a/src/afd/sprites-canonical/back/0880-000-Dracozolt.png b/newsrc/afd/28160.png similarity index 100% rename from src/afd/sprites-canonical/back/0880-000-Dracozolt.png rename to newsrc/afd/28160.png diff --git a/src/afd/sprites-canonical/front/0880-000-Dracozolt.png b/newsrc/afd/28160b.png similarity index 100% rename from src/afd/sprites-canonical/front/0880-000-Dracozolt.png rename to newsrc/afd/28160b.png diff --git a/src/afd/sprites-canonical/back-shiny/0880-000-Dracozolt.png b/newsrc/afd/28160bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0880-000-Dracozolt.png rename to newsrc/afd/28160bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0880-000-Dracozolt.png b/newsrc/afd/28160s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0880-000-Dracozolt.png rename to newsrc/afd/28160s.png diff --git a/src/afd/sprites-canonical/back/0088-000-Grimer.png b/newsrc/afd/2816b.png similarity index 100% rename from src/afd/sprites-canonical/back/0088-000-Grimer.png rename to newsrc/afd/2816b.png diff --git a/src/afd/sprites-canonical/back-shiny/0088-000-Grimer.png b/newsrc/afd/2816bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0088-000-Grimer.png rename to newsrc/afd/2816bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0088-000-Grimer.png b/newsrc/afd/2816s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0088-000-Grimer.png rename to newsrc/afd/2816s.png diff --git a/src/afd/sprites-canonical/front/0088-420-Grimer-Alola.png b/newsrc/afd/2817.png similarity index 100% rename from src/afd/sprites-canonical/front/0088-420-Grimer-Alola.png rename to newsrc/afd/2817.png diff --git a/src/afd/sprites-canonical/back/0088-420-Grimer-Alola.png b/newsrc/afd/2817b.png similarity index 100% rename from src/afd/sprites-canonical/back/0088-420-Grimer-Alola.png rename to newsrc/afd/2817b.png diff --git a/src/afd/sprites-canonical/back-shiny/0088-420-Grimer-Alola.png b/newsrc/afd/2817bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0088-420-Grimer-Alola.png rename to newsrc/afd/2817bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0088-420-Grimer-Alola.png b/newsrc/afd/2817s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0088-420-Grimer-Alola.png rename to newsrc/afd/2817s.png diff --git a/src/afd/sprites-canonical/front/0881-000-Arctozolt.png b/newsrc/afd/28192.png similarity index 100% rename from src/afd/sprites-canonical/front/0881-000-Arctozolt.png rename to newsrc/afd/28192.png diff --git a/src/afd/sprites-canonical/back/0881-000-Arctozolt.png b/newsrc/afd/28192b.png similarity index 100% rename from src/afd/sprites-canonical/back/0881-000-Arctozolt.png rename to newsrc/afd/28192b.png diff --git a/src/afd/sprites-canonical/back-shiny/0881-000-Arctozolt.png b/newsrc/afd/28192bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0881-000-Arctozolt.png rename to newsrc/afd/28192bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0881-000-Arctozolt.png b/newsrc/afd/28192s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0881-000-Arctozolt.png rename to newsrc/afd/28192s.png diff --git a/src/afd/sprites-canonical/front/0882-000-Dracovish.png b/newsrc/afd/28224.png similarity index 100% rename from src/afd/sprites-canonical/front/0882-000-Dracovish.png rename to newsrc/afd/28224.png diff --git a/src/afd/sprites-canonical/back/0882-000-Dracovish.png b/newsrc/afd/28224b.png similarity index 100% rename from src/afd/sprites-canonical/back/0882-000-Dracovish.png rename to newsrc/afd/28224b.png diff --git a/src/afd/sprites-canonical/back-shiny/0882-000-Dracovish.png b/newsrc/afd/28224bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0882-000-Dracovish.png rename to newsrc/afd/28224bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0882-000-Dracovish.png b/newsrc/afd/28224s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0882-000-Dracovish.png rename to newsrc/afd/28224s.png diff --git a/src/afd/sprites-canonical/front/0883-000-Arctovish.png b/newsrc/afd/28256.png similarity index 100% rename from src/afd/sprites-canonical/front/0883-000-Arctovish.png rename to newsrc/afd/28256.png diff --git a/src/afd/sprites-canonical/back/0883-000-Arctovish.png b/newsrc/afd/28256b.png similarity index 100% rename from src/afd/sprites-canonical/back/0883-000-Arctovish.png rename to newsrc/afd/28256b.png diff --git a/src/afd/sprites-canonical/back-shiny/0883-000-Arctovish.png b/newsrc/afd/28256bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0883-000-Arctovish.png rename to newsrc/afd/28256bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0883-000-Arctovish.png b/newsrc/afd/28256s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0883-000-Arctovish.png rename to newsrc/afd/28256s.png diff --git a/src/afd/sprites-canonical/front/0884-000-Duraludon.png b/newsrc/afd/28288.png similarity index 100% rename from src/afd/sprites-canonical/front/0884-000-Duraludon.png rename to newsrc/afd/28288.png diff --git a/src/afd/sprites-canonical/back/0884-000-Duraludon.png b/newsrc/afd/28288b.png similarity index 100% rename from src/afd/sprites-canonical/back/0884-000-Duraludon.png rename to newsrc/afd/28288b.png diff --git a/src/afd/sprites-canonical/back/0884-420-Duraludon-Gmax.png b/newsrc/afd/28288bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0884-420-Duraludon-Gmax.png rename to newsrc/afd/28288bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0884-420-Duraludon-Gmax.png b/newsrc/afd/28288bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0884-420-Duraludon-Gmax.png rename to newsrc/afd/28288bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0884-000-Duraludon.png b/newsrc/afd/28288bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0884-000-Duraludon.png rename to newsrc/afd/28288bs.png diff --git a/src/afd/sprites-canonical/front/0884-420-Duraludon-Gmax.png b/newsrc/afd/28288g.png similarity index 100% rename from src/afd/sprites-canonical/front/0884-420-Duraludon-Gmax.png rename to newsrc/afd/28288g.png diff --git a/src/afd/sprites-canonical/front-shiny/0884-420-Duraludon-Gmax.png b/newsrc/afd/28288gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0884-420-Duraludon-Gmax.png rename to newsrc/afd/28288gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0884-000-Duraludon.png b/newsrc/afd/28288s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0884-000-Duraludon.png rename to newsrc/afd/28288s.png diff --git a/src/afd/sprites-canonical/front/0885-000-Dreepy.png b/newsrc/afd/28320.png similarity index 100% rename from src/afd/sprites-canonical/front/0885-000-Dreepy.png rename to newsrc/afd/28320.png diff --git a/src/afd/sprites-canonical/back/0885-000-Dreepy.png b/newsrc/afd/28320b.png similarity index 100% rename from src/afd/sprites-canonical/back/0885-000-Dreepy.png rename to newsrc/afd/28320b.png diff --git a/src/afd/sprites-canonical/back-shiny/0885-000-Dreepy.png b/newsrc/afd/28320bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0885-000-Dreepy.png rename to newsrc/afd/28320bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0885-000-Dreepy.png b/newsrc/afd/28320s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0885-000-Dreepy.png rename to newsrc/afd/28320s.png diff --git a/src/afd/sprites-canonical/front/0886-000-Drakloak.png b/newsrc/afd/28352.png similarity index 100% rename from src/afd/sprites-canonical/front/0886-000-Drakloak.png rename to newsrc/afd/28352.png diff --git a/src/afd/sprites-canonical/back/0886-000-Drakloak.png b/newsrc/afd/28352b.png similarity index 100% rename from src/afd/sprites-canonical/back/0886-000-Drakloak.png rename to newsrc/afd/28352b.png diff --git a/src/afd/sprites-canonical/back-shiny/0886-000-Drakloak.png b/newsrc/afd/28352bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0886-000-Drakloak.png rename to newsrc/afd/28352bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0886-000-Drakloak.png b/newsrc/afd/28352s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0886-000-Drakloak.png rename to newsrc/afd/28352s.png diff --git a/src/afd/sprites-canonical/front/0887-000-Dragapult.png b/newsrc/afd/28384.png similarity index 100% rename from src/afd/sprites-canonical/front/0887-000-Dragapult.png rename to newsrc/afd/28384.png diff --git a/src/afd/sprites-canonical/back/0887-000-Dragapult.png b/newsrc/afd/28384b.png similarity index 100% rename from src/afd/sprites-canonical/back/0887-000-Dragapult.png rename to newsrc/afd/28384b.png diff --git a/src/afd/sprites-canonical/back-shiny/0887-000-Dragapult.png b/newsrc/afd/28384bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0887-000-Dragapult.png rename to newsrc/afd/28384bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0887-000-Dragapult.png b/newsrc/afd/28384s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0887-000-Dragapult.png rename to newsrc/afd/28384s.png diff --git a/src/afd/sprites-canonical/front/0888-000-Zacian.png b/newsrc/afd/28416.png similarity index 100% rename from src/afd/sprites-canonical/front/0888-000-Zacian.png rename to newsrc/afd/28416.png diff --git a/src/afd/sprites-canonical/back/0888-000-Zacian.png b/newsrc/afd/28416b.png similarity index 100% rename from src/afd/sprites-canonical/back/0888-000-Zacian.png rename to newsrc/afd/28416b.png diff --git a/src/afd/sprites-canonical/back-shiny/0888-000-Zacian.png b/newsrc/afd/28416bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0888-000-Zacian.png rename to newsrc/afd/28416bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0888-000-Zacian.png b/newsrc/afd/28416s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0888-000-Zacian.png rename to newsrc/afd/28416s.png diff --git a/src/afd/sprites-canonical/front/0888-420-Zacian-Crowned.png b/newsrc/afd/28417.png similarity index 100% rename from src/afd/sprites-canonical/front/0888-420-Zacian-Crowned.png rename to newsrc/afd/28417.png diff --git a/src/afd/sprites-canonical/back/0888-420-Zacian-Crowned.png b/newsrc/afd/28417b.png similarity index 100% rename from src/afd/sprites-canonical/back/0888-420-Zacian-Crowned.png rename to newsrc/afd/28417b.png diff --git a/src/afd/sprites-canonical/back-shiny/0888-420-Zacian-Crowned.png b/newsrc/afd/28417bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0888-420-Zacian-Crowned.png rename to newsrc/afd/28417bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0888-420-Zacian-Crowned.png b/newsrc/afd/28417s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0888-420-Zacian-Crowned.png rename to newsrc/afd/28417s.png diff --git a/src/afd/sprites-canonical/front/0889-000-Zamazenta.png b/newsrc/afd/28448.png similarity index 100% rename from src/afd/sprites-canonical/front/0889-000-Zamazenta.png rename to newsrc/afd/28448.png diff --git a/src/afd/sprites-canonical/back/0889-000-Zamazenta.png b/newsrc/afd/28448b.png similarity index 100% rename from src/afd/sprites-canonical/back/0889-000-Zamazenta.png rename to newsrc/afd/28448b.png diff --git a/src/afd/sprites-canonical/back-shiny/0889-000-Zamazenta.png b/newsrc/afd/28448bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0889-000-Zamazenta.png rename to newsrc/afd/28448bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0889-000-Zamazenta.png b/newsrc/afd/28448s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0889-000-Zamazenta.png rename to newsrc/afd/28448s.png diff --git a/src/afd/sprites-canonical/front/0889-420-Zamazenta-Crowned.png b/newsrc/afd/28449.png similarity index 100% rename from src/afd/sprites-canonical/front/0889-420-Zamazenta-Crowned.png rename to newsrc/afd/28449.png diff --git a/src/afd/sprites-canonical/back/0889-420-Zamazenta-Crowned.png b/newsrc/afd/28449b.png similarity index 100% rename from src/afd/sprites-canonical/back/0889-420-Zamazenta-Crowned.png rename to newsrc/afd/28449b.png diff --git a/src/afd/sprites-canonical/back-shiny/0889-420-Zamazenta-Crowned.png b/newsrc/afd/28449bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0889-420-Zamazenta-Crowned.png rename to newsrc/afd/28449bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0889-420-Zamazenta-Crowned.png b/newsrc/afd/28449s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0889-420-Zamazenta-Crowned.png rename to newsrc/afd/28449s.png diff --git a/src/afd/sprites-canonical/front/0089-000-Muk.png b/newsrc/afd/2848.png similarity index 100% rename from src/afd/sprites-canonical/front/0089-000-Muk.png rename to newsrc/afd/2848.png diff --git a/src/afd/sprites-canonical/back/0890-000-Eternatus.png b/newsrc/afd/28480.png similarity index 100% rename from src/afd/sprites-canonical/back/0890-000-Eternatus.png rename to newsrc/afd/28480.png diff --git a/src/afd/sprites-canonical/front/0890-000-Eternatus.png b/newsrc/afd/28480b.png similarity index 100% rename from src/afd/sprites-canonical/front/0890-000-Eternatus.png rename to newsrc/afd/28480b.png diff --git a/src/afd/sprites-canonical/back-shiny/0890-000-Eternatus.png b/newsrc/afd/28480bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0890-000-Eternatus.png rename to newsrc/afd/28480bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0890-000-Eternatus.png b/newsrc/afd/28480s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0890-000-Eternatus.png rename to newsrc/afd/28480s.png diff --git a/src/afd/sprites-canonical/back/0890-420-Eternatus-Eternamax.png b/newsrc/afd/28481.png similarity index 100% rename from src/afd/sprites-canonical/back/0890-420-Eternatus-Eternamax.png rename to newsrc/afd/28481.png diff --git a/src/afd/sprites-canonical/front/0890-420-Eternatus-Eternamax.png b/newsrc/afd/28481b.png similarity index 100% rename from src/afd/sprites-canonical/front/0890-420-Eternatus-Eternamax.png rename to newsrc/afd/28481b.png diff --git a/src/afd/sprites-canonical/back-shiny/0890-420-Eternatus-Eternamax.png b/newsrc/afd/28481bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0890-420-Eternatus-Eternamax.png rename to newsrc/afd/28481bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0890-420-Eternatus-Eternamax.png b/newsrc/afd/28481s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0890-420-Eternatus-Eternamax.png rename to newsrc/afd/28481s.png diff --git a/src/afd/sprites-canonical/back/0089-000-Muk.png b/newsrc/afd/2848b.png similarity index 100% rename from src/afd/sprites-canonical/back/0089-000-Muk.png rename to newsrc/afd/2848b.png diff --git a/src/afd/sprites-canonical/back-shiny/0089-000-Muk.png b/newsrc/afd/2848bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0089-000-Muk.png rename to newsrc/afd/2848bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0089-000-Muk.png b/newsrc/afd/2848s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0089-000-Muk.png rename to newsrc/afd/2848s.png diff --git a/src/afd/sprites-canonical/front/0089-420-Muk-Alola.png b/newsrc/afd/2849.png similarity index 100% rename from src/afd/sprites-canonical/front/0089-420-Muk-Alola.png rename to newsrc/afd/2849.png diff --git a/src/afd/sprites-canonical/back/0089-420-Muk-Alola.png b/newsrc/afd/2849b.png similarity index 100% rename from src/afd/sprites-canonical/back/0089-420-Muk-Alola.png rename to newsrc/afd/2849b.png diff --git a/src/afd/sprites-canonical/back-shiny/0089-420-Muk-Alola.png b/newsrc/afd/2849bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0089-420-Muk-Alola.png rename to newsrc/afd/2849bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0089-420-Muk-Alola.png b/newsrc/afd/2849s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0089-420-Muk-Alola.png rename to newsrc/afd/2849s.png diff --git a/src/afd/sprites-canonical/front/0009-000-Blastoise.png b/newsrc/afd/288.png similarity index 100% rename from src/afd/sprites-canonical/front/0009-000-Blastoise.png rename to newsrc/afd/288.png diff --git a/src/afd/sprites-canonical/front/0090-000-Shellder.png b/newsrc/afd/2880.png similarity index 100% rename from src/afd/sprites-canonical/front/0090-000-Shellder.png rename to newsrc/afd/2880.png diff --git a/src/afd/sprites-canonical/back/0090-000-Shellder.png b/newsrc/afd/2880b.png similarity index 100% rename from src/afd/sprites-canonical/back/0090-000-Shellder.png rename to newsrc/afd/2880b.png diff --git a/src/afd/sprites-canonical/back-shiny/0090-000-Shellder.png b/newsrc/afd/2880bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0090-000-Shellder.png rename to newsrc/afd/2880bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0090-000-Shellder.png b/newsrc/afd/2880s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0090-000-Shellder.png rename to newsrc/afd/2880s.png diff --git a/src/afd/sprites-canonical/back/0009-000-Blastoise.png b/newsrc/afd/288b.png similarity index 100% rename from src/afd/sprites-canonical/back/0009-000-Blastoise.png rename to newsrc/afd/288b.png diff --git a/src/afd/sprites-canonical/back-shiny/0009-000-Blastoise.png b/newsrc/afd/288bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0009-000-Blastoise.png rename to newsrc/afd/288bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0009-000-Blastoise.png b/newsrc/afd/288s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0009-000-Blastoise.png rename to newsrc/afd/288s.png diff --git a/src/afd/sprites-canonical/front/0009-420-Blastoise-Mega.png b/newsrc/afd/289.png similarity index 100% rename from src/afd/sprites-canonical/front/0009-420-Blastoise-Mega.png rename to newsrc/afd/289.png diff --git a/src/afd/sprites-canonical/back/0009-420-Blastoise-Mega.png b/newsrc/afd/289b.png similarity index 100% rename from src/afd/sprites-canonical/back/0009-420-Blastoise-Mega.png rename to newsrc/afd/289b.png diff --git a/src/afd/sprites-canonical/back-shiny/0009-420-Blastoise-Mega.png b/newsrc/afd/289bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0009-420-Blastoise-Mega.png rename to newsrc/afd/289bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0009-420-Blastoise-Mega.png b/newsrc/afd/289s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0009-420-Blastoise-Mega.png rename to newsrc/afd/289s.png diff --git a/src/afd/sprites-canonical/front/0091-000-Cloyster.png b/newsrc/afd/2912.png similarity index 100% rename from src/afd/sprites-canonical/front/0091-000-Cloyster.png rename to newsrc/afd/2912.png diff --git a/src/afd/sprites-canonical/back/0091-000-Cloyster.png b/newsrc/afd/2912b.png similarity index 100% rename from src/afd/sprites-canonical/back/0091-000-Cloyster.png rename to newsrc/afd/2912b.png diff --git a/src/afd/sprites-canonical/back-shiny/0091-000-Cloyster.png b/newsrc/afd/2912bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0091-000-Cloyster.png rename to newsrc/afd/2912bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0091-000-Cloyster.png b/newsrc/afd/2912s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0091-000-Cloyster.png rename to newsrc/afd/2912s.png diff --git a/src/afd/sprites-canonical/front/0092-000-Gastly.png b/newsrc/afd/2944.png similarity index 100% rename from src/afd/sprites-canonical/front/0092-000-Gastly.png rename to newsrc/afd/2944.png diff --git a/src/afd/sprites-canonical/back/0092-000-Gastly.png b/newsrc/afd/2944b.png similarity index 100% rename from src/afd/sprites-canonical/back/0092-000-Gastly.png rename to newsrc/afd/2944b.png diff --git a/src/afd/sprites-canonical/back-shiny/0092-000-Gastly.png b/newsrc/afd/2944bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0092-000-Gastly.png rename to newsrc/afd/2944bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0092-000-Gastly.png b/newsrc/afd/2944s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0092-000-Gastly.png rename to newsrc/afd/2944s.png diff --git a/src/afd/sprites-canonical/front/0093-000-Haunter.png b/newsrc/afd/2976.png similarity index 100% rename from src/afd/sprites-canonical/front/0093-000-Haunter.png rename to newsrc/afd/2976.png diff --git a/src/afd/sprites-canonical/back/0093-000-Haunter.png b/newsrc/afd/2976b.png similarity index 100% rename from src/afd/sprites-canonical/back/0093-000-Haunter.png rename to newsrc/afd/2976b.png diff --git a/src/afd/sprites-canonical/back-shiny/0093-000-Haunter.png b/newsrc/afd/2976bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0093-000-Haunter.png rename to newsrc/afd/2976bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0093-000-Haunter.png b/newsrc/afd/2976s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0093-000-Haunter.png rename to newsrc/afd/2976s.png diff --git a/src/afd/sprites-canonical/front/0094-000-Gengar.png b/newsrc/afd/3008.png similarity index 100% rename from src/afd/sprites-canonical/front/0094-000-Gengar.png rename to newsrc/afd/3008.png diff --git a/src/afd/sprites-canonical/back/0094-000-Gengar.png b/newsrc/afd/3008b.png similarity index 100% rename from src/afd/sprites-canonical/back/0094-000-Gengar.png rename to newsrc/afd/3008b.png diff --git a/src/afd/sprites-canonical/back/0094-420-Gengar-Gmax.png b/newsrc/afd/3008bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0094-420-Gengar-Gmax.png rename to newsrc/afd/3008bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0094-420-Gengar-Gmax.png b/newsrc/afd/3008bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0094-420-Gengar-Gmax.png rename to newsrc/afd/3008bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0094-000-Gengar.png b/newsrc/afd/3008bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0094-000-Gengar.png rename to newsrc/afd/3008bs.png diff --git a/src/afd/sprites-canonical/front/0094-420-Gengar-Gmax.png b/newsrc/afd/3008g.png similarity index 100% rename from src/afd/sprites-canonical/front/0094-420-Gengar-Gmax.png rename to newsrc/afd/3008g.png diff --git a/src/afd/sprites-canonical/front-shiny/0094-420-Gengar-Gmax.png b/newsrc/afd/3008gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0094-420-Gengar-Gmax.png rename to newsrc/afd/3008gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0094-000-Gengar.png b/newsrc/afd/3008s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0094-000-Gengar.png rename to newsrc/afd/3008s.png diff --git a/src/afd/sprites-canonical/front/0094-420-Gengar-Mega.png b/newsrc/afd/3009.png similarity index 100% rename from src/afd/sprites-canonical/front/0094-420-Gengar-Mega.png rename to newsrc/afd/3009.png diff --git a/src/afd/sprites-canonical/back/0094-420-Gengar-Mega.png b/newsrc/afd/3009b.png similarity index 100% rename from src/afd/sprites-canonical/back/0094-420-Gengar-Mega.png rename to newsrc/afd/3009b.png diff --git a/src/afd/sprites-canonical/back-shiny/0094-420-Gengar-Mega.png b/newsrc/afd/3009bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0094-420-Gengar-Mega.png rename to newsrc/afd/3009bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0094-420-Gengar-Mega.png b/newsrc/afd/3009s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0094-420-Gengar-Mega.png rename to newsrc/afd/3009s.png diff --git a/src/afd/sprites-canonical/front/0095-000-Onix.png b/newsrc/afd/3040.png similarity index 100% rename from src/afd/sprites-canonical/front/0095-000-Onix.png rename to newsrc/afd/3040.png diff --git a/src/afd/sprites-canonical/back/0095-000-Onix.png b/newsrc/afd/3040b.png similarity index 100% rename from src/afd/sprites-canonical/back/0095-000-Onix.png rename to newsrc/afd/3040b.png diff --git a/src/afd/sprites-canonical/back-shiny/0095-000-Onix.png b/newsrc/afd/3040bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0095-000-Onix.png rename to newsrc/afd/3040bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0095-000-Onix.png b/newsrc/afd/3040s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0095-000-Onix.png rename to newsrc/afd/3040s.png diff --git a/src/afd/sprites-canonical/front/0096-000-Drowzee.png b/newsrc/afd/3072.png similarity index 100% rename from src/afd/sprites-canonical/front/0096-000-Drowzee.png rename to newsrc/afd/3072.png diff --git a/src/afd/sprites-canonical/back/0096-000-Drowzee.png b/newsrc/afd/3072b.png similarity index 100% rename from src/afd/sprites-canonical/back/0096-000-Drowzee.png rename to newsrc/afd/3072b.png diff --git a/src/afd/sprites-canonical/back-shiny/0096-000-Drowzee.png b/newsrc/afd/3072bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0096-000-Drowzee.png rename to newsrc/afd/3072bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0096-000-Drowzee.png b/newsrc/afd/3072s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0096-000-Drowzee.png rename to newsrc/afd/3072s.png diff --git a/src/afd/sprites-canonical/front/0097-000-Hypno.png b/newsrc/afd/3104.png similarity index 100% rename from src/afd/sprites-canonical/front/0097-000-Hypno.png rename to newsrc/afd/3104.png diff --git a/src/afd/sprites-canonical/back/0097-000-Hypno.png b/newsrc/afd/3104b.png similarity index 100% rename from src/afd/sprites-canonical/back/0097-000-Hypno.png rename to newsrc/afd/3104b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0097-000-Hypno-Female.png b/newsrc/afd/3104bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0097-000-Hypno-Female.png rename to newsrc/afd/3104bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0097-000-Hypno-Female.png b/newsrc/afd/3104bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0097-000-Hypno-Female.png rename to newsrc/afd/3104bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0097-000-Hypno.png b/newsrc/afd/3104bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0097-000-Hypno.png rename to newsrc/afd/3104bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0097-000-Hypno-Female.png b/newsrc/afd/3104f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0097-000-Hypno-Female.png rename to newsrc/afd/3104f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0097-000-Hypno-Female.png b/newsrc/afd/3104fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0097-000-Hypno-Female.png rename to newsrc/afd/3104fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0097-000-Hypno.png b/newsrc/afd/3104s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0097-000-Hypno.png rename to newsrc/afd/3104s.png diff --git a/src/afd/sprites-canonical/front/0098-000-Krabby.png b/newsrc/afd/3136.png similarity index 100% rename from src/afd/sprites-canonical/front/0098-000-Krabby.png rename to newsrc/afd/3136.png diff --git a/src/afd/sprites-canonical/back/0098-000-Krabby.png b/newsrc/afd/3136b.png similarity index 100% rename from src/afd/sprites-canonical/back/0098-000-Krabby.png rename to newsrc/afd/3136b.png diff --git a/src/afd/sprites-canonical/back-shiny/0098-000-Krabby.png b/newsrc/afd/3136bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0098-000-Krabby.png rename to newsrc/afd/3136bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0098-000-Krabby.png b/newsrc/afd/3136s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0098-000-Krabby.png rename to newsrc/afd/3136s.png diff --git a/src/afd/sprites-canonical/front/0099-000-Kingler.png b/newsrc/afd/3168.png similarity index 100% rename from src/afd/sprites-canonical/front/0099-000-Kingler.png rename to newsrc/afd/3168.png diff --git a/src/afd/sprites-canonical/back/0099-000-Kingler.png b/newsrc/afd/3168b.png similarity index 100% rename from src/afd/sprites-canonical/back/0099-000-Kingler.png rename to newsrc/afd/3168b.png diff --git a/src/afd/sprites-canonical/back/0099-420-Kingler-Gmax.png b/newsrc/afd/3168bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0099-420-Kingler-Gmax.png rename to newsrc/afd/3168bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0099-420-Kingler-Gmax.png b/newsrc/afd/3168bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0099-420-Kingler-Gmax.png rename to newsrc/afd/3168bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0099-000-Kingler.png b/newsrc/afd/3168bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0099-000-Kingler.png rename to newsrc/afd/3168bs.png diff --git a/src/afd/sprites-canonical/front/0099-420-Kingler-Gmax.png b/newsrc/afd/3168g.png similarity index 100% rename from src/afd/sprites-canonical/front/0099-420-Kingler-Gmax.png rename to newsrc/afd/3168g.png diff --git a/src/afd/sprites-canonical/front-shiny/0099-420-Kingler-Gmax.png b/newsrc/afd/3168gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0099-420-Kingler-Gmax.png rename to newsrc/afd/3168gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0099-000-Kingler.png b/newsrc/afd/3168s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0099-000-Kingler.png rename to newsrc/afd/3168s.png diff --git a/src/afd/sprites-canonical/front/0001-000-Bulbasaur.png b/newsrc/afd/32.png similarity index 100% rename from src/afd/sprites-canonical/front/0001-000-Bulbasaur.png rename to newsrc/afd/32.png diff --git a/src/afd/sprites-canonical/front/0010-000-Caterpie.png b/newsrc/afd/320.png similarity index 100% rename from src/afd/sprites-canonical/front/0010-000-Caterpie.png rename to newsrc/afd/320.png diff --git a/src/afd/sprites-canonical/front/0100-000-Voltorb.png b/newsrc/afd/3200.png similarity index 100% rename from src/afd/sprites-canonical/front/0100-000-Voltorb.png rename to newsrc/afd/3200.png diff --git a/src/afd/sprites-canonical/back/0100-000-Voltorb.png b/newsrc/afd/3200b.png similarity index 100% rename from src/afd/sprites-canonical/back/0100-000-Voltorb.png rename to newsrc/afd/3200b.png diff --git a/src/afd/sprites-canonical/back-shiny/0100-000-Voltorb.png b/newsrc/afd/3200bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0100-000-Voltorb.png rename to newsrc/afd/3200bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0100-000-Voltorb.png b/newsrc/afd/3200s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0100-000-Voltorb.png rename to newsrc/afd/3200s.png diff --git a/src/afd/sprites-canonical/back/0010-000-Caterpie.png b/newsrc/afd/320b.png similarity index 100% rename from src/afd/sprites-canonical/back/0010-000-Caterpie.png rename to newsrc/afd/320b.png diff --git a/src/afd/sprites-canonical/back-shiny/0010-000-Caterpie.png b/newsrc/afd/320bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0010-000-Caterpie.png rename to newsrc/afd/320bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0010-000-Caterpie.png b/newsrc/afd/320s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0010-000-Caterpie.png rename to newsrc/afd/320s.png diff --git a/src/afd/sprites-canonical/front/0101-000-Electrode.png b/newsrc/afd/3232.png similarity index 100% rename from src/afd/sprites-canonical/front/0101-000-Electrode.png rename to newsrc/afd/3232.png diff --git a/src/afd/sprites-canonical/back/0101-000-Electrode.png b/newsrc/afd/3232b.png similarity index 100% rename from src/afd/sprites-canonical/back/0101-000-Electrode.png rename to newsrc/afd/3232b.png diff --git a/src/afd/sprites-canonical/back-shiny/0101-000-Electrode.png b/newsrc/afd/3232bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0101-000-Electrode.png rename to newsrc/afd/3232bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0101-000-Electrode.png b/newsrc/afd/3232s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0101-000-Electrode.png rename to newsrc/afd/3232s.png diff --git a/src/afd/sprites-canonical/front/0102-000-Exeggcute.png b/newsrc/afd/3264.png similarity index 100% rename from src/afd/sprites-canonical/front/0102-000-Exeggcute.png rename to newsrc/afd/3264.png diff --git a/src/afd/sprites-canonical/back/0102-000-Exeggcute.png b/newsrc/afd/3264b.png similarity index 100% rename from src/afd/sprites-canonical/back/0102-000-Exeggcute.png rename to newsrc/afd/3264b.png diff --git a/src/afd/sprites-canonical/back-shiny/0102-000-Exeggcute.png b/newsrc/afd/3264bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0102-000-Exeggcute.png rename to newsrc/afd/3264bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0102-000-Exeggcute.png b/newsrc/afd/3264s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0102-000-Exeggcute.png rename to newsrc/afd/3264s.png diff --git a/src/afd/sprites-canonical/front/0103-000-Exeggutor.png b/newsrc/afd/3296.png similarity index 100% rename from src/afd/sprites-canonical/front/0103-000-Exeggutor.png rename to newsrc/afd/3296.png diff --git a/src/afd/sprites-canonical/back/0103-000-Exeggutor.png b/newsrc/afd/3296b.png similarity index 100% rename from src/afd/sprites-canonical/back/0103-000-Exeggutor.png rename to newsrc/afd/3296b.png diff --git a/src/afd/sprites-canonical/back-shiny/0103-000-Exeggutor.png b/newsrc/afd/3296bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0103-000-Exeggutor.png rename to newsrc/afd/3296bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0103-000-Exeggutor.png b/newsrc/afd/3296s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0103-000-Exeggutor.png rename to newsrc/afd/3296s.png diff --git a/src/afd/sprites-canonical/front/0103-420-Exeggutor-Alola.png b/newsrc/afd/3297.png similarity index 100% rename from src/afd/sprites-canonical/front/0103-420-Exeggutor-Alola.png rename to newsrc/afd/3297.png diff --git a/src/afd/sprites-canonical/back/0103-420-Exeggutor-Alola.png b/newsrc/afd/3297b.png similarity index 100% rename from src/afd/sprites-canonical/back/0103-420-Exeggutor-Alola.png rename to newsrc/afd/3297b.png diff --git a/src/afd/sprites-canonical/back-shiny/0103-420-Exeggutor-Alola.png b/newsrc/afd/3297bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0103-420-Exeggutor-Alola.png rename to newsrc/afd/3297bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0103-420-Exeggutor-Alola.png b/newsrc/afd/3297s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0103-420-Exeggutor-Alola.png rename to newsrc/afd/3297s.png diff --git a/src/afd/sprites-canonical/back/0001-000-Bulbasaur.png b/newsrc/afd/32b.png similarity index 100% rename from src/afd/sprites-canonical/back/0001-000-Bulbasaur.png rename to newsrc/afd/32b.png diff --git a/src/afd/sprites-canonical/back-shiny/0001-000-Bulbasaur.png b/newsrc/afd/32bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0001-000-Bulbasaur.png rename to newsrc/afd/32bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0001-000-Bulbasaur.png b/newsrc/afd/32s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0001-000-Bulbasaur.png rename to newsrc/afd/32s.png diff --git a/src/afd/sprites-canonical/front/0104-000-Cubone.png b/newsrc/afd/3328.png similarity index 100% rename from src/afd/sprites-canonical/front/0104-000-Cubone.png rename to newsrc/afd/3328.png diff --git a/src/afd/sprites-canonical/back/0104-000-Cubone.png b/newsrc/afd/3328b.png similarity index 100% rename from src/afd/sprites-canonical/back/0104-000-Cubone.png rename to newsrc/afd/3328b.png diff --git a/src/afd/sprites-canonical/back-shiny/0104-000-Cubone.png b/newsrc/afd/3328bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0104-000-Cubone.png rename to newsrc/afd/3328bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0104-000-Cubone.png b/newsrc/afd/3328s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0104-000-Cubone.png rename to newsrc/afd/3328s.png diff --git a/src/afd/sprites-canonical/front/0105-000-Marowak.png b/newsrc/afd/3360.png similarity index 100% rename from src/afd/sprites-canonical/front/0105-000-Marowak.png rename to newsrc/afd/3360.png diff --git a/src/afd/sprites-canonical/back/0105-000-Marowak.png b/newsrc/afd/3360b.png similarity index 100% rename from src/afd/sprites-canonical/back/0105-000-Marowak.png rename to newsrc/afd/3360b.png diff --git a/src/afd/sprites-canonical/back-shiny/0105-000-Marowak.png b/newsrc/afd/3360bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0105-000-Marowak.png rename to newsrc/afd/3360bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0105-000-Marowak.png b/newsrc/afd/3360s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0105-000-Marowak.png rename to newsrc/afd/3360s.png diff --git a/src/afd/sprites-canonical/front/0105-420-Marowak-Alola.png b/newsrc/afd/3361.png similarity index 100% rename from src/afd/sprites-canonical/front/0105-420-Marowak-Alola.png rename to newsrc/afd/3361.png diff --git a/src/afd/sprites-canonical/back/0105-420-Marowak-Alola.png b/newsrc/afd/3361b.png similarity index 100% rename from src/afd/sprites-canonical/back/0105-420-Marowak-Alola.png rename to newsrc/afd/3361b.png diff --git a/src/afd/sprites-canonical/back-shiny/0105-420-Marowak-Alola.png b/newsrc/afd/3361bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0105-420-Marowak-Alola.png rename to newsrc/afd/3361bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0105-420-Marowak-Alola.png b/newsrc/afd/3361s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0105-420-Marowak-Alola.png rename to newsrc/afd/3361s.png diff --git a/src/afd/sprites-canonical/front/0106-000-Hitmonlee.png b/newsrc/afd/3392.png similarity index 100% rename from src/afd/sprites-canonical/front/0106-000-Hitmonlee.png rename to newsrc/afd/3392.png diff --git a/src/afd/sprites-canonical/back/0106-000-Hitmonlee.png b/newsrc/afd/3392b.png similarity index 100% rename from src/afd/sprites-canonical/back/0106-000-Hitmonlee.png rename to newsrc/afd/3392b.png diff --git a/src/afd/sprites-canonical/back-shiny/0106-000-Hitmonlee.png b/newsrc/afd/3392bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0106-000-Hitmonlee.png rename to newsrc/afd/3392bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0106-000-Hitmonlee.png b/newsrc/afd/3392s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0106-000-Hitmonlee.png rename to newsrc/afd/3392s.png diff --git a/src/afd/sprites-canonical/front/0107-000-Hitmonchan.png b/newsrc/afd/3424.png similarity index 100% rename from src/afd/sprites-canonical/front/0107-000-Hitmonchan.png rename to newsrc/afd/3424.png diff --git a/src/afd/sprites-canonical/back/0107-000-Hitmonchan.png b/newsrc/afd/3424b.png similarity index 100% rename from src/afd/sprites-canonical/back/0107-000-Hitmonchan.png rename to newsrc/afd/3424b.png diff --git a/src/afd/sprites-canonical/back-shiny/0107-000-Hitmonchan.png b/newsrc/afd/3424bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0107-000-Hitmonchan.png rename to newsrc/afd/3424bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0107-000-Hitmonchan.png b/newsrc/afd/3424s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0107-000-Hitmonchan.png rename to newsrc/afd/3424s.png diff --git a/src/afd/sprites-canonical/front/0108-000-Lickitung.png b/newsrc/afd/3456.png similarity index 100% rename from src/afd/sprites-canonical/front/0108-000-Lickitung.png rename to newsrc/afd/3456.png diff --git a/src/afd/sprites-canonical/back/0108-000-Lickitung.png b/newsrc/afd/3456b.png similarity index 100% rename from src/afd/sprites-canonical/back/0108-000-Lickitung.png rename to newsrc/afd/3456b.png diff --git a/src/afd/sprites-canonical/back-shiny/0108-000-Lickitung.png b/newsrc/afd/3456bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0108-000-Lickitung.png rename to newsrc/afd/3456bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0108-000-Lickitung.png b/newsrc/afd/3456s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0108-000-Lickitung.png rename to newsrc/afd/3456s.png diff --git a/src/afd/sprites-canonical/front/0109-000-Koffing.png b/newsrc/afd/3488.png similarity index 100% rename from src/afd/sprites-canonical/front/0109-000-Koffing.png rename to newsrc/afd/3488.png diff --git a/src/afd/sprites-canonical/back/0109-000-Koffing.png b/newsrc/afd/3488b.png similarity index 100% rename from src/afd/sprites-canonical/back/0109-000-Koffing.png rename to newsrc/afd/3488b.png diff --git a/src/afd/sprites-canonical/back-shiny/0109-000-Koffing.png b/newsrc/afd/3488bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0109-000-Koffing.png rename to newsrc/afd/3488bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0109-000-Koffing.png b/newsrc/afd/3488s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0109-000-Koffing.png rename to newsrc/afd/3488s.png diff --git a/src/afd/sprites-canonical/front/0011-000-Metapod.png b/newsrc/afd/352.png similarity index 100% rename from src/afd/sprites-canonical/front/0011-000-Metapod.png rename to newsrc/afd/352.png diff --git a/src/afd/sprites-canonical/front/0110-000-Weezing.png b/newsrc/afd/3520.png similarity index 100% rename from src/afd/sprites-canonical/front/0110-000-Weezing.png rename to newsrc/afd/3520.png diff --git a/src/afd/sprites-canonical/back/0110-000-Weezing.png b/newsrc/afd/3520b.png similarity index 100% rename from src/afd/sprites-canonical/back/0110-000-Weezing.png rename to newsrc/afd/3520b.png diff --git a/src/afd/sprites-canonical/back-shiny/0110-000-Weezing.png b/newsrc/afd/3520bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0110-000-Weezing.png rename to newsrc/afd/3520bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0110-000-Weezing.png b/newsrc/afd/3520s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0110-000-Weezing.png rename to newsrc/afd/3520s.png diff --git a/src/afd/sprites-canonical/front/0110-420-Weezing-Galar.png b/newsrc/afd/3521.png similarity index 100% rename from src/afd/sprites-canonical/front/0110-420-Weezing-Galar.png rename to newsrc/afd/3521.png diff --git a/src/afd/sprites-canonical/back/0110-420-Weezing-Galar.png b/newsrc/afd/3521b.png similarity index 100% rename from src/afd/sprites-canonical/back/0110-420-Weezing-Galar.png rename to newsrc/afd/3521b.png diff --git a/src/afd/sprites-canonical/back-shiny/0110-420-Weezing-Galar.png b/newsrc/afd/3521bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0110-420-Weezing-Galar.png rename to newsrc/afd/3521bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0110-420-Weezing-Galar.png b/newsrc/afd/3521s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0110-420-Weezing-Galar.png rename to newsrc/afd/3521s.png diff --git a/src/afd/sprites-canonical/back/0011-000-Metapod.png b/newsrc/afd/352b.png similarity index 100% rename from src/afd/sprites-canonical/back/0011-000-Metapod.png rename to newsrc/afd/352b.png diff --git a/src/afd/sprites-canonical/back-shiny/0011-000-Metapod.png b/newsrc/afd/352bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0011-000-Metapod.png rename to newsrc/afd/352bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0011-000-Metapod.png b/newsrc/afd/352s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0011-000-Metapod.png rename to newsrc/afd/352s.png diff --git a/src/afd/sprites-canonical/front/0111-000-Rhyhorn.png b/newsrc/afd/3552.png similarity index 100% rename from src/afd/sprites-canonical/front/0111-000-Rhyhorn.png rename to newsrc/afd/3552.png diff --git a/src/afd/sprites-canonical/back/0111-000-Rhyhorn.png b/newsrc/afd/3552b.png similarity index 100% rename from src/afd/sprites-canonical/back/0111-000-Rhyhorn.png rename to newsrc/afd/3552b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0111-000-Rhyhorn-Female.png b/newsrc/afd/3552bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0111-000-Rhyhorn-Female.png rename to newsrc/afd/3552bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0111-000-Rhyhorn-Female.png b/newsrc/afd/3552bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0111-000-Rhyhorn-Female.png rename to newsrc/afd/3552bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0111-000-Rhyhorn.png b/newsrc/afd/3552bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0111-000-Rhyhorn.png rename to newsrc/afd/3552bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0111-000-Rhyhorn-Female.png b/newsrc/afd/3552f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0111-000-Rhyhorn-Female.png rename to newsrc/afd/3552f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0111-000-Rhyhorn-Female.png b/newsrc/afd/3552fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0111-000-Rhyhorn-Female.png rename to newsrc/afd/3552fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0111-000-Rhyhorn.png b/newsrc/afd/3552s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0111-000-Rhyhorn.png rename to newsrc/afd/3552s.png diff --git a/src/afd/sprites-canonical/front/0112-000-Rhydon.png b/newsrc/afd/3584.png similarity index 100% rename from src/afd/sprites-canonical/front/0112-000-Rhydon.png rename to newsrc/afd/3584.png diff --git a/src/afd/sprites-canonical/back/0112-000-Rhydon.png b/newsrc/afd/3584b.png similarity index 100% rename from src/afd/sprites-canonical/back/0112-000-Rhydon.png rename to newsrc/afd/3584b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0112-000-Rhydon-Female.png b/newsrc/afd/3584bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0112-000-Rhydon-Female.png rename to newsrc/afd/3584bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0112-000-Rhydon-Female.png b/newsrc/afd/3584bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0112-000-Rhydon-Female.png rename to newsrc/afd/3584bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0112-000-Rhydon.png b/newsrc/afd/3584bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0112-000-Rhydon.png rename to newsrc/afd/3584bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0112-000-Rhydon-Female.png b/newsrc/afd/3584f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0112-000-Rhydon-Female.png rename to newsrc/afd/3584f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0112-000-Rhydon-Female.png b/newsrc/afd/3584fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0112-000-Rhydon-Female.png rename to newsrc/afd/3584fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0112-000-Rhydon.png b/newsrc/afd/3584s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0112-000-Rhydon.png rename to newsrc/afd/3584s.png diff --git a/src/afd/sprites-canonical/front/0113-000-Chansey.png b/newsrc/afd/3616.png similarity index 100% rename from src/afd/sprites-canonical/front/0113-000-Chansey.png rename to newsrc/afd/3616.png diff --git a/src/afd/sprites-canonical/back/0113-000-Chansey.png b/newsrc/afd/3616b.png similarity index 100% rename from src/afd/sprites-canonical/back/0113-000-Chansey.png rename to newsrc/afd/3616b.png diff --git a/src/afd/sprites-canonical/back-shiny/0113-000-Chansey.png b/newsrc/afd/3616bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0113-000-Chansey.png rename to newsrc/afd/3616bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0113-000-Chansey.png b/newsrc/afd/3616s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0113-000-Chansey.png rename to newsrc/afd/3616s.png diff --git a/src/afd/sprites-canonical/front/0114-000-Tangela.png b/newsrc/afd/3648.png similarity index 100% rename from src/afd/sprites-canonical/front/0114-000-Tangela.png rename to newsrc/afd/3648.png diff --git a/src/afd/sprites-canonical/back/0114-000-Tangela.png b/newsrc/afd/3648b.png similarity index 100% rename from src/afd/sprites-canonical/back/0114-000-Tangela.png rename to newsrc/afd/3648b.png diff --git a/src/afd/sprites-canonical/back-shiny/0114-000-Tangela.png b/newsrc/afd/3648bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0114-000-Tangela.png rename to newsrc/afd/3648bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0114-000-Tangela.png b/newsrc/afd/3648s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0114-000-Tangela.png rename to newsrc/afd/3648s.png diff --git a/src/afd/sprites-canonical/front/0115-000-Kangaskhan.png b/newsrc/afd/3680.png similarity index 100% rename from src/afd/sprites-canonical/front/0115-000-Kangaskhan.png rename to newsrc/afd/3680.png diff --git a/src/afd/sprites-canonical/back/0115-000-Kangaskhan.png b/newsrc/afd/3680b.png similarity index 100% rename from src/afd/sprites-canonical/back/0115-000-Kangaskhan.png rename to newsrc/afd/3680b.png diff --git a/src/afd/sprites-canonical/back-shiny/0115-000-Kangaskhan.png b/newsrc/afd/3680bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0115-000-Kangaskhan.png rename to newsrc/afd/3680bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0115-000-Kangaskhan.png b/newsrc/afd/3680s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0115-000-Kangaskhan.png rename to newsrc/afd/3680s.png diff --git a/src/afd/sprites-canonical/front/0115-420-Kangaskhan-Mega.png b/newsrc/afd/3681.png similarity index 100% rename from src/afd/sprites-canonical/front/0115-420-Kangaskhan-Mega.png rename to newsrc/afd/3681.png diff --git a/src/afd/sprites-canonical/back/0115-420-Kangaskhan-Mega.png b/newsrc/afd/3681b.png similarity index 100% rename from src/afd/sprites-canonical/back/0115-420-Kangaskhan-Mega.png rename to newsrc/afd/3681b.png diff --git a/src/afd/sprites-canonical/back-shiny/0115-420-Kangaskhan-Mega.png b/newsrc/afd/3681bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0115-420-Kangaskhan-Mega.png rename to newsrc/afd/3681bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0115-420-Kangaskhan-Mega.png b/newsrc/afd/3681s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0115-420-Kangaskhan-Mega.png rename to newsrc/afd/3681s.png diff --git a/src/afd/sprites-canonical/front/0116-000-Horsea.png b/newsrc/afd/3712.png similarity index 100% rename from src/afd/sprites-canonical/front/0116-000-Horsea.png rename to newsrc/afd/3712.png diff --git a/src/afd/sprites-canonical/back/0116-000-Horsea.png b/newsrc/afd/3712b.png similarity index 100% rename from src/afd/sprites-canonical/back/0116-000-Horsea.png rename to newsrc/afd/3712b.png diff --git a/src/afd/sprites-canonical/back-shiny/0116-000-Horsea.png b/newsrc/afd/3712bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0116-000-Horsea.png rename to newsrc/afd/3712bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0116-000-Horsea.png b/newsrc/afd/3712s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0116-000-Horsea.png rename to newsrc/afd/3712s.png diff --git a/src/afd/sprites-canonical/front/0117-000-Seadra.png b/newsrc/afd/3744.png similarity index 100% rename from src/afd/sprites-canonical/front/0117-000-Seadra.png rename to newsrc/afd/3744.png diff --git a/src/afd/sprites-canonical/back/0117-000-Seadra.png b/newsrc/afd/3744b.png similarity index 100% rename from src/afd/sprites-canonical/back/0117-000-Seadra.png rename to newsrc/afd/3744b.png diff --git a/src/afd/sprites-canonical/back-shiny/0117-000-Seadra.png b/newsrc/afd/3744bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0117-000-Seadra.png rename to newsrc/afd/3744bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0117-000-Seadra.png b/newsrc/afd/3744s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0117-000-Seadra.png rename to newsrc/afd/3744s.png diff --git a/src/afd/sprites-canonical/front/0118-000-Goldeen.png b/newsrc/afd/3776.png similarity index 100% rename from src/afd/sprites-canonical/front/0118-000-Goldeen.png rename to newsrc/afd/3776.png diff --git a/src/afd/sprites-canonical/back/0118-000-Goldeen.png b/newsrc/afd/3776b.png similarity index 100% rename from src/afd/sprites-canonical/back/0118-000-Goldeen.png rename to newsrc/afd/3776b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0118-000-Goldeen-Female.png b/newsrc/afd/3776bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0118-000-Goldeen-Female.png rename to newsrc/afd/3776bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0118-000-Goldeen-Female.png b/newsrc/afd/3776bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0118-000-Goldeen-Female.png rename to newsrc/afd/3776bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0118-000-Goldeen.png b/newsrc/afd/3776bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0118-000-Goldeen.png rename to newsrc/afd/3776bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0118-000-Goldeen-Female.png b/newsrc/afd/3776f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0118-000-Goldeen-Female.png rename to newsrc/afd/3776f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0118-000-Goldeen-Female.png b/newsrc/afd/3776fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0118-000-Goldeen-Female.png rename to newsrc/afd/3776fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0118-000-Goldeen.png b/newsrc/afd/3776s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0118-000-Goldeen.png rename to newsrc/afd/3776s.png diff --git a/src/afd/sprites-canonical/front/0119-000-Seaking.png b/newsrc/afd/3808.png similarity index 100% rename from src/afd/sprites-canonical/front/0119-000-Seaking.png rename to newsrc/afd/3808.png diff --git a/src/afd/sprites-canonical/back/0119-000-Seaking.png b/newsrc/afd/3808b.png similarity index 100% rename from src/afd/sprites-canonical/back/0119-000-Seaking.png rename to newsrc/afd/3808b.png diff --git a/src/afd/sprites-canonical/back-shiny/0119-000-Seaking.png b/newsrc/afd/3808bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0119-000-Seaking.png rename to newsrc/afd/3808bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0119-000-Seaking.png b/newsrc/afd/3808s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0119-000-Seaking.png rename to newsrc/afd/3808s.png diff --git a/src/afd/sprites-canonical/front/0012-000-Butterfree.png b/newsrc/afd/384.png similarity index 100% rename from src/afd/sprites-canonical/front/0012-000-Butterfree.png rename to newsrc/afd/384.png diff --git a/src/afd/sprites-canonical/front/0120-000-Staryu.png b/newsrc/afd/3840.png similarity index 100% rename from src/afd/sprites-canonical/front/0120-000-Staryu.png rename to newsrc/afd/3840.png diff --git a/src/afd/sprites-canonical/back/0120-000-Staryu.png b/newsrc/afd/3840b.png similarity index 100% rename from src/afd/sprites-canonical/back/0120-000-Staryu.png rename to newsrc/afd/3840b.png diff --git a/src/afd/sprites-canonical/back-shiny/0120-000-Staryu.png b/newsrc/afd/3840bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0120-000-Staryu.png rename to newsrc/afd/3840bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0120-000-Staryu.png b/newsrc/afd/3840s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0120-000-Staryu.png rename to newsrc/afd/3840s.png diff --git a/src/afd/sprites-canonical/back/0012-000-Butterfree.png b/newsrc/afd/384b.png similarity index 100% rename from src/afd/sprites-canonical/back/0012-000-Butterfree.png rename to newsrc/afd/384b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0012-000-Butterfree-Female.png b/newsrc/afd/384bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0012-000-Butterfree-Female.png rename to newsrc/afd/384bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0012-000-Butterfree-Female.png b/newsrc/afd/384bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0012-000-Butterfree-Female.png rename to newsrc/afd/384bfs.png diff --git a/src/afd/sprites-canonical/back/0012-420-Butterfree-Gmax.png b/newsrc/afd/384bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0012-420-Butterfree-Gmax.png rename to newsrc/afd/384bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0012-420-Butterfree-Gmax.png b/newsrc/afd/384bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0012-420-Butterfree-Gmax.png rename to newsrc/afd/384bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0012-000-Butterfree.png b/newsrc/afd/384bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0012-000-Butterfree.png rename to newsrc/afd/384bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0012-000-Butterfree-Female.png b/newsrc/afd/384f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0012-000-Butterfree-Female.png rename to newsrc/afd/384f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0012-000-Butterfree-Female.png b/newsrc/afd/384fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0012-000-Butterfree-Female.png rename to newsrc/afd/384fs.png diff --git a/src/afd/sprites-canonical/front/0012-420-Butterfree-Gmax.png b/newsrc/afd/384g.png similarity index 100% rename from src/afd/sprites-canonical/front/0012-420-Butterfree-Gmax.png rename to newsrc/afd/384g.png diff --git a/src/afd/sprites-canonical/front-shiny/0012-420-Butterfree-Gmax.png b/newsrc/afd/384gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0012-420-Butterfree-Gmax.png rename to newsrc/afd/384gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0012-000-Butterfree.png b/newsrc/afd/384s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0012-000-Butterfree.png rename to newsrc/afd/384s.png diff --git a/src/afd/sprites-canonical/front/0121-000-Starmie.png b/newsrc/afd/3872.png similarity index 100% rename from src/afd/sprites-canonical/front/0121-000-Starmie.png rename to newsrc/afd/3872.png diff --git a/src/afd/sprites-canonical/back/0121-000-Starmie.png b/newsrc/afd/3872b.png similarity index 100% rename from src/afd/sprites-canonical/back/0121-000-Starmie.png rename to newsrc/afd/3872b.png diff --git a/src/afd/sprites-canonical/back-shiny/0121-000-Starmie.png b/newsrc/afd/3872bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0121-000-Starmie.png rename to newsrc/afd/3872bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0121-000-Starmie.png b/newsrc/afd/3872s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0121-000-Starmie.png rename to newsrc/afd/3872s.png diff --git a/src/afd/sprites-canonical/front/0122-000-Mr._Mime.png b/newsrc/afd/3904.png similarity index 100% rename from src/afd/sprites-canonical/front/0122-000-Mr._Mime.png rename to newsrc/afd/3904.png diff --git a/src/afd/sprites-canonical/back/0122-000-Mr._Mime.png b/newsrc/afd/3904b.png similarity index 100% rename from src/afd/sprites-canonical/back/0122-000-Mr._Mime.png rename to newsrc/afd/3904b.png diff --git a/src/afd/sprites-canonical/back-shiny/0122-000-Mr._Mime.png b/newsrc/afd/3904bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0122-000-Mr._Mime.png rename to newsrc/afd/3904bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0122-000-Mr._Mime.png b/newsrc/afd/3904s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0122-000-Mr._Mime.png rename to newsrc/afd/3904s.png diff --git a/src/afd/sprites-canonical/front/0122-420-Mr._Mime-Galar.png b/newsrc/afd/3905.png similarity index 100% rename from src/afd/sprites-canonical/front/0122-420-Mr._Mime-Galar.png rename to newsrc/afd/3905.png diff --git a/src/afd/sprites-canonical/back/0122-420-Mr._Mime-Galar.png b/newsrc/afd/3905b.png similarity index 100% rename from src/afd/sprites-canonical/back/0122-420-Mr._Mime-Galar.png rename to newsrc/afd/3905b.png diff --git a/src/afd/sprites-canonical/back-shiny/0122-420-Mr._Mime-Galar.png b/newsrc/afd/3905bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0122-420-Mr._Mime-Galar.png rename to newsrc/afd/3905bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0122-420-Mr._Mime-Galar.png b/newsrc/afd/3905s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0122-420-Mr._Mime-Galar.png rename to newsrc/afd/3905s.png diff --git a/src/afd/sprites-canonical/front/0123-000-Scyther.png b/newsrc/afd/3936.png similarity index 100% rename from src/afd/sprites-canonical/front/0123-000-Scyther.png rename to newsrc/afd/3936.png diff --git a/src/afd/sprites-canonical/back/0123-000-Scyther.png b/newsrc/afd/3936b.png similarity index 100% rename from src/afd/sprites-canonical/back/0123-000-Scyther.png rename to newsrc/afd/3936b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0123-000-Scyther-Female.png b/newsrc/afd/3936bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0123-000-Scyther-Female.png rename to newsrc/afd/3936bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0123-000-Scyther-Female.png b/newsrc/afd/3936bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0123-000-Scyther-Female.png rename to newsrc/afd/3936bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0123-000-Scyther.png b/newsrc/afd/3936bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0123-000-Scyther.png rename to newsrc/afd/3936bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0123-000-Scyther-Female.png b/newsrc/afd/3936f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0123-000-Scyther-Female.png rename to newsrc/afd/3936f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0123-000-Scyther-Female.png b/newsrc/afd/3936fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0123-000-Scyther-Female.png rename to newsrc/afd/3936fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0123-000-Scyther.png b/newsrc/afd/3936s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0123-000-Scyther.png rename to newsrc/afd/3936s.png diff --git a/src/afd/sprites-canonical/front/0124-000-Jynx.png b/newsrc/afd/3968.png similarity index 100% rename from src/afd/sprites-canonical/front/0124-000-Jynx.png rename to newsrc/afd/3968.png diff --git a/src/afd/sprites-canonical/back/0124-000-Jynx.png b/newsrc/afd/3968b.png similarity index 100% rename from src/afd/sprites-canonical/back/0124-000-Jynx.png rename to newsrc/afd/3968b.png diff --git a/src/afd/sprites-canonical/back-shiny/0124-000-Jynx.png b/newsrc/afd/3968bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0124-000-Jynx.png rename to newsrc/afd/3968bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0124-000-Jynx.png b/newsrc/afd/3968s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0124-000-Jynx.png rename to newsrc/afd/3968s.png diff --git a/src/afd/sprites-canonical/front/0125-000-Electabuzz.png b/newsrc/afd/4000.png similarity index 100% rename from src/afd/sprites-canonical/front/0125-000-Electabuzz.png rename to newsrc/afd/4000.png diff --git a/src/afd/sprites-canonical/back/0125-000-Electabuzz.png b/newsrc/afd/4000b.png similarity index 100% rename from src/afd/sprites-canonical/back/0125-000-Electabuzz.png rename to newsrc/afd/4000b.png diff --git a/src/afd/sprites-canonical/back-shiny/0125-000-Electabuzz.png b/newsrc/afd/4000bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0125-000-Electabuzz.png rename to newsrc/afd/4000bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0125-000-Electabuzz.png b/newsrc/afd/4000s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0125-000-Electabuzz.png rename to newsrc/afd/4000s.png diff --git a/src/afd/sprites-canonical/front/0126-000-Magmar.png b/newsrc/afd/4032.png similarity index 100% rename from src/afd/sprites-canonical/front/0126-000-Magmar.png rename to newsrc/afd/4032.png diff --git a/src/afd/sprites-canonical/back/0126-000-Magmar.png b/newsrc/afd/4032b.png similarity index 100% rename from src/afd/sprites-canonical/back/0126-000-Magmar.png rename to newsrc/afd/4032b.png diff --git a/src/afd/sprites-canonical/back-shiny/0126-000-Magmar.png b/newsrc/afd/4032bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0126-000-Magmar.png rename to newsrc/afd/4032bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0126-000-Magmar.png b/newsrc/afd/4032s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0126-000-Magmar.png rename to newsrc/afd/4032s.png diff --git a/src/afd/sprites-canonical/front/0127-000-Pinsir.png b/newsrc/afd/4064.png similarity index 100% rename from src/afd/sprites-canonical/front/0127-000-Pinsir.png rename to newsrc/afd/4064.png diff --git a/src/afd/sprites-canonical/back/0127-000-Pinsir.png b/newsrc/afd/4064b.png similarity index 100% rename from src/afd/sprites-canonical/back/0127-000-Pinsir.png rename to newsrc/afd/4064b.png diff --git a/src/afd/sprites-canonical/back-shiny/0127-000-Pinsir.png b/newsrc/afd/4064bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0127-000-Pinsir.png rename to newsrc/afd/4064bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0127-000-Pinsir.png b/newsrc/afd/4064s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0127-000-Pinsir.png rename to newsrc/afd/4064s.png diff --git a/src/afd/sprites-canonical/front/0127-420-Pinsir-Mega.png b/newsrc/afd/4065.png similarity index 100% rename from src/afd/sprites-canonical/front/0127-420-Pinsir-Mega.png rename to newsrc/afd/4065.png diff --git a/src/afd/sprites-canonical/back/0127-420-Pinsir-Mega.png b/newsrc/afd/4065b.png similarity index 100% rename from src/afd/sprites-canonical/back/0127-420-Pinsir-Mega.png rename to newsrc/afd/4065b.png diff --git a/src/afd/sprites-canonical/back-shiny/0127-420-Pinsir-Mega.png b/newsrc/afd/4065bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0127-420-Pinsir-Mega.png rename to newsrc/afd/4065bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0127-420-Pinsir-Mega.png b/newsrc/afd/4065s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0127-420-Pinsir-Mega.png rename to newsrc/afd/4065s.png diff --git a/src/afd/sprites-canonical/front/0128-000-Tauros.png b/newsrc/afd/4096.png similarity index 100% rename from src/afd/sprites-canonical/front/0128-000-Tauros.png rename to newsrc/afd/4096.png diff --git a/src/afd/sprites-canonical/back/0128-000-Tauros.png b/newsrc/afd/4096b.png similarity index 100% rename from src/afd/sprites-canonical/back/0128-000-Tauros.png rename to newsrc/afd/4096b.png diff --git a/src/afd/sprites-canonical/back-shiny/0128-000-Tauros.png b/newsrc/afd/4096bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0128-000-Tauros.png rename to newsrc/afd/4096bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0128-000-Tauros.png b/newsrc/afd/4096s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0128-000-Tauros.png rename to newsrc/afd/4096s.png diff --git a/src/afd/sprites-canonical/front/0129-000-Magikarp.png b/newsrc/afd/4128.png similarity index 100% rename from src/afd/sprites-canonical/front/0129-000-Magikarp.png rename to newsrc/afd/4128.png diff --git a/src/afd/sprites-canonical/back/0129-000-Magikarp.png b/newsrc/afd/4128b.png similarity index 100% rename from src/afd/sprites-canonical/back/0129-000-Magikarp.png rename to newsrc/afd/4128b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0129-000-Magikarp-Female.png b/newsrc/afd/4128bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0129-000-Magikarp-Female.png rename to newsrc/afd/4128bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0129-000-Magikarp-Female.png b/newsrc/afd/4128bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0129-000-Magikarp-Female.png rename to newsrc/afd/4128bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0129-000-Magikarp.png b/newsrc/afd/4128bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0129-000-Magikarp.png rename to newsrc/afd/4128bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0129-000-Magikarp-Female.png b/newsrc/afd/4128f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0129-000-Magikarp-Female.png rename to newsrc/afd/4128f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0129-000-Magikarp-Female.png b/newsrc/afd/4128fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0129-000-Magikarp-Female.png rename to newsrc/afd/4128fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0129-000-Magikarp.png b/newsrc/afd/4128s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0129-000-Magikarp.png rename to newsrc/afd/4128s.png diff --git a/src/afd/sprites-canonical/front/0013-000-Weedle.png b/newsrc/afd/416.png similarity index 100% rename from src/afd/sprites-canonical/front/0013-000-Weedle.png rename to newsrc/afd/416.png diff --git a/src/afd/sprites-canonical/front/0130-000-Gyarados.png b/newsrc/afd/4160.png similarity index 100% rename from src/afd/sprites-canonical/front/0130-000-Gyarados.png rename to newsrc/afd/4160.png diff --git a/src/afd/sprites-canonical/back/0130-000-Gyarados.png b/newsrc/afd/4160b.png similarity index 100% rename from src/afd/sprites-canonical/back/0130-000-Gyarados.png rename to newsrc/afd/4160b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0130-000-Gyarados-Female.png b/newsrc/afd/4160bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0130-000-Gyarados-Female.png rename to newsrc/afd/4160bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0130-000-Gyarados-Female.png b/newsrc/afd/4160bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0130-000-Gyarados-Female.png rename to newsrc/afd/4160bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0130-000-Gyarados.png b/newsrc/afd/4160bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0130-000-Gyarados.png rename to newsrc/afd/4160bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0130-000-Gyarados-Female.png b/newsrc/afd/4160f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0130-000-Gyarados-Female.png rename to newsrc/afd/4160f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0130-000-Gyarados-Female.png b/newsrc/afd/4160fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0130-000-Gyarados-Female.png rename to newsrc/afd/4160fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0130-000-Gyarados.png b/newsrc/afd/4160s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0130-000-Gyarados.png rename to newsrc/afd/4160s.png diff --git a/src/afd/sprites-canonical/front/0130-420-Gyarados-Mega.png b/newsrc/afd/4161.png similarity index 100% rename from src/afd/sprites-canonical/front/0130-420-Gyarados-Mega.png rename to newsrc/afd/4161.png diff --git a/src/afd/sprites-canonical/back/0130-420-Gyarados-Mega.png b/newsrc/afd/4161b.png similarity index 100% rename from src/afd/sprites-canonical/back/0130-420-Gyarados-Mega.png rename to newsrc/afd/4161b.png diff --git a/src/afd/sprites-canonical/back-shiny/0130-420-Gyarados-Mega.png b/newsrc/afd/4161bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0130-420-Gyarados-Mega.png rename to newsrc/afd/4161bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0130-420-Gyarados-Mega.png b/newsrc/afd/4161s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0130-420-Gyarados-Mega.png rename to newsrc/afd/4161s.png diff --git a/src/afd/sprites-canonical/back/0013-000-Weedle.png b/newsrc/afd/416b.png similarity index 100% rename from src/afd/sprites-canonical/back/0013-000-Weedle.png rename to newsrc/afd/416b.png diff --git a/src/afd/sprites-canonical/back-shiny/0013-000-Weedle.png b/newsrc/afd/416bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0013-000-Weedle.png rename to newsrc/afd/416bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0013-000-Weedle.png b/newsrc/afd/416s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0013-000-Weedle.png rename to newsrc/afd/416s.png diff --git a/src/afd/sprites-canonical/front/0131-000-Lapras.png b/newsrc/afd/4192.png similarity index 100% rename from src/afd/sprites-canonical/front/0131-000-Lapras.png rename to newsrc/afd/4192.png diff --git a/src/afd/sprites-canonical/back/0131-000-Lapras.png b/newsrc/afd/4192b.png similarity index 100% rename from src/afd/sprites-canonical/back/0131-000-Lapras.png rename to newsrc/afd/4192b.png diff --git a/src/afd/sprites-canonical/back/0131-420-Lapras-Gmax.png b/newsrc/afd/4192bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0131-420-Lapras-Gmax.png rename to newsrc/afd/4192bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0131-420-Lapras-Gmax.png b/newsrc/afd/4192bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0131-420-Lapras-Gmax.png rename to newsrc/afd/4192bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0131-000-Lapras.png b/newsrc/afd/4192bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0131-000-Lapras.png rename to newsrc/afd/4192bs.png diff --git a/src/afd/sprites-canonical/front/0131-420-Lapras-Gmax.png b/newsrc/afd/4192g.png similarity index 100% rename from src/afd/sprites-canonical/front/0131-420-Lapras-Gmax.png rename to newsrc/afd/4192g.png diff --git a/src/afd/sprites-canonical/front-shiny/0131-420-Lapras-Gmax.png b/newsrc/afd/4192gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0131-420-Lapras-Gmax.png rename to newsrc/afd/4192gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0131-000-Lapras.png b/newsrc/afd/4192s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0131-000-Lapras.png rename to newsrc/afd/4192s.png diff --git a/src/afd/sprites-canonical/front/0132-000-Ditto.png b/newsrc/afd/4224.png similarity index 100% rename from src/afd/sprites-canonical/front/0132-000-Ditto.png rename to newsrc/afd/4224.png diff --git a/src/afd/sprites-canonical/back/0132-000-Ditto.png b/newsrc/afd/4224b.png similarity index 100% rename from src/afd/sprites-canonical/back/0132-000-Ditto.png rename to newsrc/afd/4224b.png diff --git a/src/afd/sprites-canonical/back-shiny/0132-000-Ditto.png b/newsrc/afd/4224bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0132-000-Ditto.png rename to newsrc/afd/4224bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0132-000-Ditto.png b/newsrc/afd/4224s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0132-000-Ditto.png rename to newsrc/afd/4224s.png diff --git a/src/afd/sprites-canonical/front/0133-000-Eevee.png b/newsrc/afd/4256.png similarity index 100% rename from src/afd/sprites-canonical/front/0133-000-Eevee.png rename to newsrc/afd/4256.png diff --git a/src/afd/sprites-canonical/back/0133-000-Eevee.png b/newsrc/afd/4256b.png similarity index 100% rename from src/afd/sprites-canonical/back/0133-000-Eevee.png rename to newsrc/afd/4256b.png diff --git a/src/afd/sprites-canonical/back/0133-420-Eevee-Gmax.png b/newsrc/afd/4256bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0133-420-Eevee-Gmax.png rename to newsrc/afd/4256bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0133-420-Eevee-Gmax.png b/newsrc/afd/4256bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0133-420-Eevee-Gmax.png rename to newsrc/afd/4256bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0133-000-Eevee.png b/newsrc/afd/4256bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0133-000-Eevee.png rename to newsrc/afd/4256bs.png diff --git a/src/afd/sprites-canonical/front/0133-420-Eevee-Gmax.png b/newsrc/afd/4256g.png similarity index 100% rename from src/afd/sprites-canonical/front/0133-420-Eevee-Gmax.png rename to newsrc/afd/4256g.png diff --git a/src/afd/sprites-canonical/front-shiny/0133-420-Eevee-Gmax.png b/newsrc/afd/4256gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0133-420-Eevee-Gmax.png rename to newsrc/afd/4256gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0133-000-Eevee.png b/newsrc/afd/4256s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0133-000-Eevee.png rename to newsrc/afd/4256s.png diff --git a/src/afd/sprites-canonical/front/0133-420-Eevee-Starter.png b/newsrc/afd/4257.png similarity index 100% rename from src/afd/sprites-canonical/front/0133-420-Eevee-Starter.png rename to newsrc/afd/4257.png diff --git a/src/afd/sprites-canonical/back/0133-420-Eevee-Starter.png b/newsrc/afd/4257b.png similarity index 100% rename from src/afd/sprites-canonical/back/0133-420-Eevee-Starter.png rename to newsrc/afd/4257b.png diff --git a/src/afd/sprites-canonical/back-shiny/0133-420-Eevee-Starter.png b/newsrc/afd/4257bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0133-420-Eevee-Starter.png rename to newsrc/afd/4257bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0133-420-Eevee-Starter.png b/newsrc/afd/4257s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0133-420-Eevee-Starter.png rename to newsrc/afd/4257s.png diff --git a/src/afd/sprites-canonical/front/0134-000-Vaporeon.png b/newsrc/afd/4288.png similarity index 100% rename from src/afd/sprites-canonical/front/0134-000-Vaporeon.png rename to newsrc/afd/4288.png diff --git a/src/afd/sprites-canonical/back/0134-000-Vaporeon.png b/newsrc/afd/4288b.png similarity index 100% rename from src/afd/sprites-canonical/back/0134-000-Vaporeon.png rename to newsrc/afd/4288b.png diff --git a/src/afd/sprites-canonical/back-shiny/0134-000-Vaporeon.png b/newsrc/afd/4288bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0134-000-Vaporeon.png rename to newsrc/afd/4288bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0134-000-Vaporeon.png b/newsrc/afd/4288s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0134-000-Vaporeon.png rename to newsrc/afd/4288s.png diff --git a/src/afd/sprites-canonical/front/0135-000-Jolteon.png b/newsrc/afd/4320.png similarity index 100% rename from src/afd/sprites-canonical/front/0135-000-Jolteon.png rename to newsrc/afd/4320.png diff --git a/src/afd/sprites-canonical/back/0135-000-Jolteon.png b/newsrc/afd/4320b.png similarity index 100% rename from src/afd/sprites-canonical/back/0135-000-Jolteon.png rename to newsrc/afd/4320b.png diff --git a/src/afd/sprites-canonical/back-shiny/0135-000-Jolteon.png b/newsrc/afd/4320bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0135-000-Jolteon.png rename to newsrc/afd/4320bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0135-000-Jolteon.png b/newsrc/afd/4320s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0135-000-Jolteon.png rename to newsrc/afd/4320s.png diff --git a/src/afd/sprites-canonical/front/0136-000-Flareon.png b/newsrc/afd/4352.png similarity index 100% rename from src/afd/sprites-canonical/front/0136-000-Flareon.png rename to newsrc/afd/4352.png diff --git a/src/afd/sprites-canonical/back/0136-000-Flareon.png b/newsrc/afd/4352b.png similarity index 100% rename from src/afd/sprites-canonical/back/0136-000-Flareon.png rename to newsrc/afd/4352b.png diff --git a/src/afd/sprites-canonical/back-shiny/0136-000-Flareon.png b/newsrc/afd/4352bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0136-000-Flareon.png rename to newsrc/afd/4352bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0136-000-Flareon.png b/newsrc/afd/4352s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0136-000-Flareon.png rename to newsrc/afd/4352s.png diff --git a/src/afd/sprites-canonical/front/0137-000-Porygon.png b/newsrc/afd/4384.png similarity index 100% rename from src/afd/sprites-canonical/front/0137-000-Porygon.png rename to newsrc/afd/4384.png diff --git a/src/afd/sprites-canonical/back/0137-000-Porygon.png b/newsrc/afd/4384b.png similarity index 100% rename from src/afd/sprites-canonical/back/0137-000-Porygon.png rename to newsrc/afd/4384b.png diff --git a/src/afd/sprites-canonical/back-shiny/0137-000-Porygon.png b/newsrc/afd/4384bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0137-000-Porygon.png rename to newsrc/afd/4384bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0137-000-Porygon.png b/newsrc/afd/4384s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0137-000-Porygon.png rename to newsrc/afd/4384s.png diff --git a/src/afd/sprites-canonical/front/0138-000-Omanyte.png b/newsrc/afd/4416.png similarity index 100% rename from src/afd/sprites-canonical/front/0138-000-Omanyte.png rename to newsrc/afd/4416.png diff --git a/src/afd/sprites-canonical/back/0138-000-Omanyte.png b/newsrc/afd/4416b.png similarity index 100% rename from src/afd/sprites-canonical/back/0138-000-Omanyte.png rename to newsrc/afd/4416b.png diff --git a/src/afd/sprites-canonical/back-shiny/0138-000-Omanyte.png b/newsrc/afd/4416bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0138-000-Omanyte.png rename to newsrc/afd/4416bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0138-000-Omanyte.png b/newsrc/afd/4416s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0138-000-Omanyte.png rename to newsrc/afd/4416s.png diff --git a/src/afd/sprites-canonical/front/0139-000-Omastar.png b/newsrc/afd/4448.png similarity index 100% rename from src/afd/sprites-canonical/front/0139-000-Omastar.png rename to newsrc/afd/4448.png diff --git a/src/afd/sprites-canonical/back/0139-000-Omastar.png b/newsrc/afd/4448b.png similarity index 100% rename from src/afd/sprites-canonical/back/0139-000-Omastar.png rename to newsrc/afd/4448b.png diff --git a/src/afd/sprites-canonical/back-shiny/0139-000-Omastar.png b/newsrc/afd/4448bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0139-000-Omastar.png rename to newsrc/afd/4448bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0139-000-Omastar.png b/newsrc/afd/4448s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0139-000-Omastar.png rename to newsrc/afd/4448s.png diff --git a/src/afd/sprites-canonical/front/0014-000-Kakuna.png b/newsrc/afd/448.png similarity index 100% rename from src/afd/sprites-canonical/front/0014-000-Kakuna.png rename to newsrc/afd/448.png diff --git a/src/afd/sprites-canonical/front/0140-000-Kabuto.png b/newsrc/afd/4480.png similarity index 100% rename from src/afd/sprites-canonical/front/0140-000-Kabuto.png rename to newsrc/afd/4480.png diff --git a/src/afd/sprites-canonical/back/0140-000-Kabuto.png b/newsrc/afd/4480b.png similarity index 100% rename from src/afd/sprites-canonical/back/0140-000-Kabuto.png rename to newsrc/afd/4480b.png diff --git a/src/afd/sprites-canonical/back-shiny/0140-000-Kabuto.png b/newsrc/afd/4480bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0140-000-Kabuto.png rename to newsrc/afd/4480bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0140-000-Kabuto.png b/newsrc/afd/4480s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0140-000-Kabuto.png rename to newsrc/afd/4480s.png diff --git a/src/afd/sprites-canonical/back/0014-000-Kakuna.png b/newsrc/afd/448b.png similarity index 100% rename from src/afd/sprites-canonical/back/0014-000-Kakuna.png rename to newsrc/afd/448b.png diff --git a/src/afd/sprites-canonical/back-shiny/0014-000-Kakuna.png b/newsrc/afd/448bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0014-000-Kakuna.png rename to newsrc/afd/448bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0014-000-Kakuna.png b/newsrc/afd/448s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0014-000-Kakuna.png rename to newsrc/afd/448s.png diff --git a/src/afd/sprites-canonical/front/0141-000-Kabutops.png b/newsrc/afd/4512.png similarity index 100% rename from src/afd/sprites-canonical/front/0141-000-Kabutops.png rename to newsrc/afd/4512.png diff --git a/src/afd/sprites-canonical/back/0141-000-Kabutops.png b/newsrc/afd/4512b.png similarity index 100% rename from src/afd/sprites-canonical/back/0141-000-Kabutops.png rename to newsrc/afd/4512b.png diff --git a/src/afd/sprites-canonical/back-shiny/0141-000-Kabutops.png b/newsrc/afd/4512bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0141-000-Kabutops.png rename to newsrc/afd/4512bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0141-000-Kabutops.png b/newsrc/afd/4512s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0141-000-Kabutops.png rename to newsrc/afd/4512s.png diff --git a/src/afd/sprites-canonical/front/0142-000-Aerodactyl.png b/newsrc/afd/4544.png similarity index 100% rename from src/afd/sprites-canonical/front/0142-000-Aerodactyl.png rename to newsrc/afd/4544.png diff --git a/src/afd/sprites-canonical/back/0142-000-Aerodactyl.png b/newsrc/afd/4544b.png similarity index 100% rename from src/afd/sprites-canonical/back/0142-000-Aerodactyl.png rename to newsrc/afd/4544b.png diff --git a/src/afd/sprites-canonical/front/0142-420-Aerodactyl-Mega.png b/newsrc/afd/4545.png similarity index 100% rename from src/afd/sprites-canonical/front/0142-420-Aerodactyl-Mega.png rename to newsrc/afd/4545.png diff --git a/src/afd/sprites-canonical/back/0142-420-Aerodactyl-Mega.png b/newsrc/afd/4545b.png similarity index 100% rename from src/afd/sprites-canonical/back/0142-420-Aerodactyl-Mega.png rename to newsrc/afd/4545b.png diff --git a/src/afd/sprites-canonical/back-shiny/0142-420-Aerodactyl-Mega.png b/newsrc/afd/4545bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0142-420-Aerodactyl-Mega.png rename to newsrc/afd/4545bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0142-420-Aerodactyl-Mega.png b/newsrc/afd/4545s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0142-420-Aerodactyl-Mega.png rename to newsrc/afd/4545s.png diff --git a/src/afd/sprites-canonical/front/0143-000-Snorlax.png b/newsrc/afd/4576.png similarity index 100% rename from src/afd/sprites-canonical/front/0143-000-Snorlax.png rename to newsrc/afd/4576.png diff --git a/src/afd/sprites-canonical/back/0143-000-Snorlax.png b/newsrc/afd/4576b.png similarity index 100% rename from src/afd/sprites-canonical/back/0143-000-Snorlax.png rename to newsrc/afd/4576b.png diff --git a/src/afd/sprites-canonical/back/0143-420-Snorlax-Gmax.png b/newsrc/afd/4576bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0143-420-Snorlax-Gmax.png rename to newsrc/afd/4576bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0143-420-Snorlax-Gmax.png b/newsrc/afd/4576bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0143-420-Snorlax-Gmax.png rename to newsrc/afd/4576bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0143-000-Snorlax.png b/newsrc/afd/4576bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0143-000-Snorlax.png rename to newsrc/afd/4576bs.png diff --git a/src/afd/sprites-canonical/front/0143-420-Snorlax-Gmax.png b/newsrc/afd/4576g.png similarity index 100% rename from src/afd/sprites-canonical/front/0143-420-Snorlax-Gmax.png rename to newsrc/afd/4576g.png diff --git a/src/afd/sprites-canonical/front-shiny/0143-420-Snorlax-Gmax.png b/newsrc/afd/4576gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0143-420-Snorlax-Gmax.png rename to newsrc/afd/4576gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0143-000-Snorlax.png b/newsrc/afd/4576s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0143-000-Snorlax.png rename to newsrc/afd/4576s.png diff --git a/src/afd/sprites-canonical/front/0144-000-Articuno.png b/newsrc/afd/4608.png similarity index 100% rename from src/afd/sprites-canonical/front/0144-000-Articuno.png rename to newsrc/afd/4608.png diff --git a/src/afd/sprites-canonical/back/0144-000-Articuno.png b/newsrc/afd/4608b.png similarity index 100% rename from src/afd/sprites-canonical/back/0144-000-Articuno.png rename to newsrc/afd/4608b.png diff --git a/src/afd/sprites-canonical/back-shiny/0144-000-Articuno.png b/newsrc/afd/4608bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0144-000-Articuno.png rename to newsrc/afd/4608bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0144-000-Articuno.png b/newsrc/afd/4608s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0144-000-Articuno.png rename to newsrc/afd/4608s.png diff --git a/src/afd/sprites-canonical/front/0145-000-Zapdos.png b/newsrc/afd/4640.png similarity index 100% rename from src/afd/sprites-canonical/front/0145-000-Zapdos.png rename to newsrc/afd/4640.png diff --git a/src/afd/sprites-canonical/back/0145-000-Zapdos.png b/newsrc/afd/4640b.png similarity index 100% rename from src/afd/sprites-canonical/back/0145-000-Zapdos.png rename to newsrc/afd/4640b.png diff --git a/src/afd/sprites-canonical/back-shiny/0145-000-Zapdos.png b/newsrc/afd/4640bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0145-000-Zapdos.png rename to newsrc/afd/4640bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0145-000-Zapdos.png b/newsrc/afd/4640s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0145-000-Zapdos.png rename to newsrc/afd/4640s.png diff --git a/src/afd/sprites-canonical/front/0146-000-Moltres.png b/newsrc/afd/4672.png similarity index 100% rename from src/afd/sprites-canonical/front/0146-000-Moltres.png rename to newsrc/afd/4672.png diff --git a/src/afd/sprites-canonical/back/0146-000-Moltres.png b/newsrc/afd/4672b.png similarity index 100% rename from src/afd/sprites-canonical/back/0146-000-Moltres.png rename to newsrc/afd/4672b.png diff --git a/src/afd/sprites-canonical/back-shiny/0146-000-Moltres.png b/newsrc/afd/4672bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0146-000-Moltres.png rename to newsrc/afd/4672bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0146-000-Moltres.png b/newsrc/afd/4672s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0146-000-Moltres.png rename to newsrc/afd/4672s.png diff --git a/src/afd/sprites-canonical/front/0147-000-Dratini.png b/newsrc/afd/4704.png similarity index 100% rename from src/afd/sprites-canonical/front/0147-000-Dratini.png rename to newsrc/afd/4704.png diff --git a/src/afd/sprites-canonical/back/0147-000-Dratini.png b/newsrc/afd/4704b.png similarity index 100% rename from src/afd/sprites-canonical/back/0147-000-Dratini.png rename to newsrc/afd/4704b.png diff --git a/src/afd/sprites-canonical/back-shiny/0147-000-Dratini.png b/newsrc/afd/4704bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0147-000-Dratini.png rename to newsrc/afd/4704bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0147-000-Dratini.png b/newsrc/afd/4704s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0147-000-Dratini.png rename to newsrc/afd/4704s.png diff --git a/src/afd/sprites-canonical/front/0148-000-Dragonair.png b/newsrc/afd/4736.png similarity index 100% rename from src/afd/sprites-canonical/front/0148-000-Dragonair.png rename to newsrc/afd/4736.png diff --git a/src/afd/sprites-canonical/back/0148-000-Dragonair.png b/newsrc/afd/4736b.png similarity index 100% rename from src/afd/sprites-canonical/back/0148-000-Dragonair.png rename to newsrc/afd/4736b.png diff --git a/src/afd/sprites-canonical/back-shiny/0148-000-Dragonair.png b/newsrc/afd/4736bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0148-000-Dragonair.png rename to newsrc/afd/4736bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0148-000-Dragonair.png b/newsrc/afd/4736s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0148-000-Dragonair.png rename to newsrc/afd/4736s.png diff --git a/src/afd/sprites-canonical/front/0149-000-Dragonite.png b/newsrc/afd/4768.png similarity index 100% rename from src/afd/sprites-canonical/front/0149-000-Dragonite.png rename to newsrc/afd/4768.png diff --git a/src/afd/sprites-canonical/back/0149-000-Dragonite.png b/newsrc/afd/4768b.png similarity index 100% rename from src/afd/sprites-canonical/back/0149-000-Dragonite.png rename to newsrc/afd/4768b.png diff --git a/src/afd/sprites-canonical/back-shiny/0149-000-Dragonite.png b/newsrc/afd/4768bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0149-000-Dragonite.png rename to newsrc/afd/4768bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0149-000-Dragonite.png b/newsrc/afd/4768s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0149-000-Dragonite.png rename to newsrc/afd/4768s.png diff --git a/src/afd/sprites-canonical/front/0015-000-Beedrill.png b/newsrc/afd/480.png similarity index 100% rename from src/afd/sprites-canonical/front/0015-000-Beedrill.png rename to newsrc/afd/480.png diff --git a/src/afd/sprites-canonical/front/0150-000-Mewtwo.png b/newsrc/afd/4800.png similarity index 100% rename from src/afd/sprites-canonical/front/0150-000-Mewtwo.png rename to newsrc/afd/4800.png diff --git a/src/afd/sprites-canonical/back/0150-000-Mewtwo.png b/newsrc/afd/4800b.png similarity index 100% rename from src/afd/sprites-canonical/back/0150-000-Mewtwo.png rename to newsrc/afd/4800b.png diff --git a/src/afd/sprites-canonical/back-shiny/0150-000-Mewtwo.png b/newsrc/afd/4800bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0150-000-Mewtwo.png rename to newsrc/afd/4800bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0150-000-Mewtwo.png b/newsrc/afd/4800s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0150-000-Mewtwo.png rename to newsrc/afd/4800s.png diff --git a/src/afd/sprites-canonical/front/0150-420-Mewtwo-Mega~X.png b/newsrc/afd/4801.png similarity index 100% rename from src/afd/sprites-canonical/front/0150-420-Mewtwo-Mega~X.png rename to newsrc/afd/4801.png diff --git a/src/afd/sprites-canonical/back/0150-420-Mewtwo-Mega~X.png b/newsrc/afd/4801b.png similarity index 100% rename from src/afd/sprites-canonical/back/0150-420-Mewtwo-Mega~X.png rename to newsrc/afd/4801b.png diff --git a/src/afd/sprites-canonical/back-shiny/0150-420-Mewtwo-Mega~X.png b/newsrc/afd/4801bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0150-420-Mewtwo-Mega~X.png rename to newsrc/afd/4801bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0150-420-Mewtwo-Mega~X.png b/newsrc/afd/4801s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0150-420-Mewtwo-Mega~X.png rename to newsrc/afd/4801s.png diff --git a/src/afd/sprites-canonical/front/0150-420-Mewtwo-Mega~Y.png b/newsrc/afd/4802.png similarity index 100% rename from src/afd/sprites-canonical/front/0150-420-Mewtwo-Mega~Y.png rename to newsrc/afd/4802.png diff --git a/src/afd/sprites-canonical/back/0150-420-Mewtwo-Mega~Y.png b/newsrc/afd/4802b.png similarity index 100% rename from src/afd/sprites-canonical/back/0150-420-Mewtwo-Mega~Y.png rename to newsrc/afd/4802b.png diff --git a/src/afd/sprites-canonical/back-shiny/0150-420-Mewtwo-Mega~Y.png b/newsrc/afd/4802bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0150-420-Mewtwo-Mega~Y.png rename to newsrc/afd/4802bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0150-420-Mewtwo-Mega~Y.png b/newsrc/afd/4802s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0150-420-Mewtwo-Mega~Y.png rename to newsrc/afd/4802s.png diff --git a/src/afd/sprites-canonical/back/0015-000-Beedrill.png b/newsrc/afd/480b.png similarity index 100% rename from src/afd/sprites-canonical/back/0015-000-Beedrill.png rename to newsrc/afd/480b.png diff --git a/src/afd/sprites-canonical/back-shiny/0015-000-Beedrill.png b/newsrc/afd/480bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0015-000-Beedrill.png rename to newsrc/afd/480bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0015-000-Beedrill.png b/newsrc/afd/480s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0015-000-Beedrill.png rename to newsrc/afd/480s.png diff --git a/src/afd/sprites-canonical/front/0015-420-Beedrill-Mega.png b/newsrc/afd/481.png similarity index 100% rename from src/afd/sprites-canonical/front/0015-420-Beedrill-Mega.png rename to newsrc/afd/481.png diff --git a/src/afd/sprites-canonical/back/0015-420-Beedrill-Mega.png b/newsrc/afd/481b.png similarity index 100% rename from src/afd/sprites-canonical/back/0015-420-Beedrill-Mega.png rename to newsrc/afd/481b.png diff --git a/src/afd/sprites-canonical/back-shiny/0015-420-Beedrill-Mega.png b/newsrc/afd/481bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0015-420-Beedrill-Mega.png rename to newsrc/afd/481bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0015-420-Beedrill-Mega.png b/newsrc/afd/481s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0015-420-Beedrill-Mega.png rename to newsrc/afd/481s.png diff --git a/src/afd/sprites-canonical/front/0151-000-Mew.png b/newsrc/afd/4832.png similarity index 100% rename from src/afd/sprites-canonical/front/0151-000-Mew.png rename to newsrc/afd/4832.png diff --git a/src/afd/sprites-canonical/back/0151-000-Mew.png b/newsrc/afd/4832b.png similarity index 100% rename from src/afd/sprites-canonical/back/0151-000-Mew.png rename to newsrc/afd/4832b.png diff --git a/src/afd/sprites-canonical/back-shiny/0151-000-Mew.png b/newsrc/afd/4832bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0151-000-Mew.png rename to newsrc/afd/4832bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0151-000-Mew.png b/newsrc/afd/4832s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0151-000-Mew.png rename to newsrc/afd/4832s.png diff --git a/src/afd/sprites-canonical/front/0152-000-Chikorita.png b/newsrc/afd/4864.png similarity index 100% rename from src/afd/sprites-canonical/front/0152-000-Chikorita.png rename to newsrc/afd/4864.png diff --git a/src/afd/sprites-canonical/back/0152-000-Chikorita.png b/newsrc/afd/4864b.png similarity index 100% rename from src/afd/sprites-canonical/back/0152-000-Chikorita.png rename to newsrc/afd/4864b.png diff --git a/src/afd/sprites-canonical/back-shiny/0152-000-Chikorita.png b/newsrc/afd/4864bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0152-000-Chikorita.png rename to newsrc/afd/4864bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0152-000-Chikorita.png b/newsrc/afd/4864s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0152-000-Chikorita.png rename to newsrc/afd/4864s.png diff --git a/src/afd/sprites-canonical/front/0153-000-Bayleef.png b/newsrc/afd/4896.png similarity index 100% rename from src/afd/sprites-canonical/front/0153-000-Bayleef.png rename to newsrc/afd/4896.png diff --git a/src/afd/sprites-canonical/back/0153-000-Bayleef.png b/newsrc/afd/4896b.png similarity index 100% rename from src/afd/sprites-canonical/back/0153-000-Bayleef.png rename to newsrc/afd/4896b.png diff --git a/src/afd/sprites-canonical/back-shiny/0153-000-Bayleef.png b/newsrc/afd/4896bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0153-000-Bayleef.png rename to newsrc/afd/4896bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0153-000-Bayleef.png b/newsrc/afd/4896s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0153-000-Bayleef.png rename to newsrc/afd/4896s.png diff --git a/src/afd/sprites-canonical/front/0154-000-Meganium.png b/newsrc/afd/4928.png similarity index 100% rename from src/afd/sprites-canonical/front/0154-000-Meganium.png rename to newsrc/afd/4928.png diff --git a/src/afd/sprites-canonical/back/0154-000-Meganium.png b/newsrc/afd/4928b.png similarity index 100% rename from src/afd/sprites-canonical/back/0154-000-Meganium.png rename to newsrc/afd/4928b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0154-000-Meganium-Female.png b/newsrc/afd/4928bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0154-000-Meganium-Female.png rename to newsrc/afd/4928bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0154-000-Meganium-Female.png b/newsrc/afd/4928bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0154-000-Meganium-Female.png rename to newsrc/afd/4928bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0154-000-Meganium.png b/newsrc/afd/4928bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0154-000-Meganium.png rename to newsrc/afd/4928bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0154-000-Meganium-Female.png b/newsrc/afd/4928f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0154-000-Meganium-Female.png rename to newsrc/afd/4928f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0154-000-Meganium-Female.png b/newsrc/afd/4928fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0154-000-Meganium-Female.png rename to newsrc/afd/4928fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0154-000-Meganium.png b/newsrc/afd/4928s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0154-000-Meganium.png rename to newsrc/afd/4928s.png diff --git a/src/afd/sprites-canonical/front/0155-000-Cyndaquil.png b/newsrc/afd/4960.png similarity index 100% rename from src/afd/sprites-canonical/front/0155-000-Cyndaquil.png rename to newsrc/afd/4960.png diff --git a/src/afd/sprites-canonical/back/0155-000-Cyndaquil.png b/newsrc/afd/4960b.png similarity index 100% rename from src/afd/sprites-canonical/back/0155-000-Cyndaquil.png rename to newsrc/afd/4960b.png diff --git a/src/afd/sprites-canonical/back-shiny/0155-000-Cyndaquil.png b/newsrc/afd/4960bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0155-000-Cyndaquil.png rename to newsrc/afd/4960bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0155-000-Cyndaquil.png b/newsrc/afd/4960s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0155-000-Cyndaquil.png rename to newsrc/afd/4960s.png diff --git a/src/afd/sprites-canonical/front/0156-000-Quilava.png b/newsrc/afd/4992.png similarity index 100% rename from src/afd/sprites-canonical/front/0156-000-Quilava.png rename to newsrc/afd/4992.png diff --git a/src/afd/sprites-canonical/back/0156-000-Quilava.png b/newsrc/afd/4992b.png similarity index 100% rename from src/afd/sprites-canonical/back/0156-000-Quilava.png rename to newsrc/afd/4992b.png diff --git a/src/afd/sprites-canonical/back-shiny/0156-000-Quilava.png b/newsrc/afd/4992bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0156-000-Quilava.png rename to newsrc/afd/4992bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0156-000-Quilava.png b/newsrc/afd/4992s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0156-000-Quilava.png rename to newsrc/afd/4992s.png diff --git a/src/afd/sprites-canonical/front/0157-000-Typhlosion.png b/newsrc/afd/5024.png similarity index 100% rename from src/afd/sprites-canonical/front/0157-000-Typhlosion.png rename to newsrc/afd/5024.png diff --git a/src/afd/sprites-canonical/back/0157-000-Typhlosion.png b/newsrc/afd/5024b.png similarity index 100% rename from src/afd/sprites-canonical/back/0157-000-Typhlosion.png rename to newsrc/afd/5024b.png diff --git a/src/afd/sprites-canonical/back-shiny/0157-000-Typhlosion.png b/newsrc/afd/5024bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0157-000-Typhlosion.png rename to newsrc/afd/5024bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0157-000-Typhlosion.png b/newsrc/afd/5024s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0157-000-Typhlosion.png rename to newsrc/afd/5024s.png diff --git a/src/afd/sprites-canonical/front/0158-000-Totodile.png b/newsrc/afd/5056.png similarity index 100% rename from src/afd/sprites-canonical/front/0158-000-Totodile.png rename to newsrc/afd/5056.png diff --git a/src/afd/sprites-canonical/back/0158-000-Totodile.png b/newsrc/afd/5056b.png similarity index 100% rename from src/afd/sprites-canonical/back/0158-000-Totodile.png rename to newsrc/afd/5056b.png diff --git a/src/afd/sprites-canonical/back-shiny/0158-000-Totodile.png b/newsrc/afd/5056bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0158-000-Totodile.png rename to newsrc/afd/5056bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0158-000-Totodile.png b/newsrc/afd/5056s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0158-000-Totodile.png rename to newsrc/afd/5056s.png diff --git a/src/afd/sprites-canonical/front/0159-000-Croconaw.png b/newsrc/afd/5088.png similarity index 100% rename from src/afd/sprites-canonical/front/0159-000-Croconaw.png rename to newsrc/afd/5088.png diff --git a/src/afd/sprites-canonical/back/0159-000-Croconaw.png b/newsrc/afd/5088b.png similarity index 100% rename from src/afd/sprites-canonical/back/0159-000-Croconaw.png rename to newsrc/afd/5088b.png diff --git a/src/afd/sprites-canonical/back-shiny/0159-000-Croconaw.png b/newsrc/afd/5088bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0159-000-Croconaw.png rename to newsrc/afd/5088bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0159-000-Croconaw.png b/newsrc/afd/5088s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0159-000-Croconaw.png rename to newsrc/afd/5088s.png diff --git a/src/afd/sprites-canonical/front/0016-000-Pidgey.png b/newsrc/afd/512.png similarity index 100% rename from src/afd/sprites-canonical/front/0016-000-Pidgey.png rename to newsrc/afd/512.png diff --git a/src/afd/sprites-canonical/front/0160-000-Feraligatr.png b/newsrc/afd/5120.png similarity index 100% rename from src/afd/sprites-canonical/front/0160-000-Feraligatr.png rename to newsrc/afd/5120.png diff --git a/src/afd/sprites-canonical/back/0160-000-Feraligatr.png b/newsrc/afd/5120b.png similarity index 100% rename from src/afd/sprites-canonical/back/0160-000-Feraligatr.png rename to newsrc/afd/5120b.png diff --git a/src/afd/sprites-canonical/back-shiny/0160-000-Feraligatr.png b/newsrc/afd/5120bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0160-000-Feraligatr.png rename to newsrc/afd/5120bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0160-000-Feraligatr.png b/newsrc/afd/5120s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0160-000-Feraligatr.png rename to newsrc/afd/5120s.png diff --git a/src/afd/sprites-canonical/back/0016-000-Pidgey.png b/newsrc/afd/512b.png similarity index 100% rename from src/afd/sprites-canonical/back/0016-000-Pidgey.png rename to newsrc/afd/512b.png diff --git a/src/afd/sprites-canonical/back-shiny/0016-000-Pidgey.png b/newsrc/afd/512bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0016-000-Pidgey.png rename to newsrc/afd/512bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0016-000-Pidgey.png b/newsrc/afd/512s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0016-000-Pidgey.png rename to newsrc/afd/512s.png diff --git a/src/afd/sprites-canonical/front/0161-000-Sentret.png b/newsrc/afd/5152.png similarity index 100% rename from src/afd/sprites-canonical/front/0161-000-Sentret.png rename to newsrc/afd/5152.png diff --git a/src/afd/sprites-canonical/back/0161-000-Sentret.png b/newsrc/afd/5152b.png similarity index 100% rename from src/afd/sprites-canonical/back/0161-000-Sentret.png rename to newsrc/afd/5152b.png diff --git a/src/afd/sprites-canonical/back-shiny/0161-000-Sentret.png b/newsrc/afd/5152bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0161-000-Sentret.png rename to newsrc/afd/5152bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0161-000-Sentret.png b/newsrc/afd/5152s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0161-000-Sentret.png rename to newsrc/afd/5152s.png diff --git a/src/afd/sprites-canonical/front/0162-000-Furret.png b/newsrc/afd/5184.png similarity index 100% rename from src/afd/sprites-canonical/front/0162-000-Furret.png rename to newsrc/afd/5184.png diff --git a/src/afd/sprites-canonical/back/0162-000-Furret.png b/newsrc/afd/5184b.png similarity index 100% rename from src/afd/sprites-canonical/back/0162-000-Furret.png rename to newsrc/afd/5184b.png diff --git a/src/afd/sprites-canonical/back-shiny/0162-000-Furret.png b/newsrc/afd/5184bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0162-000-Furret.png rename to newsrc/afd/5184bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0162-000-Furret.png b/newsrc/afd/5184s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0162-000-Furret.png rename to newsrc/afd/5184s.png diff --git a/src/afd/sprites-canonical/front/0163-000-Hoothoot.png b/newsrc/afd/5216.png similarity index 100% rename from src/afd/sprites-canonical/front/0163-000-Hoothoot.png rename to newsrc/afd/5216.png diff --git a/src/afd/sprites-canonical/back/0163-000-Hoothoot.png b/newsrc/afd/5216b.png similarity index 100% rename from src/afd/sprites-canonical/back/0163-000-Hoothoot.png rename to newsrc/afd/5216b.png diff --git a/src/afd/sprites-canonical/back-shiny/0163-000-Hoothoot.png b/newsrc/afd/5216bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0163-000-Hoothoot.png rename to newsrc/afd/5216bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0163-000-Hoothoot.png b/newsrc/afd/5216s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0163-000-Hoothoot.png rename to newsrc/afd/5216s.png diff --git a/src/afd/sprites-canonical/front/0164-000-Noctowl.png b/newsrc/afd/5248.png similarity index 100% rename from src/afd/sprites-canonical/front/0164-000-Noctowl.png rename to newsrc/afd/5248.png diff --git a/src/afd/sprites-canonical/back/0164-000-Noctowl.png b/newsrc/afd/5248b.png similarity index 100% rename from src/afd/sprites-canonical/back/0164-000-Noctowl.png rename to newsrc/afd/5248b.png diff --git a/src/afd/sprites-canonical/back-shiny/0164-000-Noctowl.png b/newsrc/afd/5248bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0164-000-Noctowl.png rename to newsrc/afd/5248bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0164-000-Noctowl.png b/newsrc/afd/5248s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0164-000-Noctowl.png rename to newsrc/afd/5248s.png diff --git a/src/afd/sprites-canonical/front/0165-000-Ledyba.png b/newsrc/afd/5280.png similarity index 100% rename from src/afd/sprites-canonical/front/0165-000-Ledyba.png rename to newsrc/afd/5280.png diff --git a/src/afd/sprites-canonical/back/0165-000-Ledyba.png b/newsrc/afd/5280b.png similarity index 100% rename from src/afd/sprites-canonical/back/0165-000-Ledyba.png rename to newsrc/afd/5280b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0165-000-Ledyba-Female.png b/newsrc/afd/5280bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0165-000-Ledyba-Female.png rename to newsrc/afd/5280bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0165-000-Ledyba-Female.png b/newsrc/afd/5280bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0165-000-Ledyba-Female.png rename to newsrc/afd/5280bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0165-000-Ledyba.png b/newsrc/afd/5280bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0165-000-Ledyba.png rename to newsrc/afd/5280bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0165-000-Ledyba-Female.png b/newsrc/afd/5280f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0165-000-Ledyba-Female.png rename to newsrc/afd/5280f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0165-000-Ledyba-Female.png b/newsrc/afd/5280fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0165-000-Ledyba-Female.png rename to newsrc/afd/5280fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0165-000-Ledyba.png b/newsrc/afd/5280s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0165-000-Ledyba.png rename to newsrc/afd/5280s.png diff --git a/src/afd/sprites-canonical/front/0166-000-Ledian.png b/newsrc/afd/5312.png similarity index 100% rename from src/afd/sprites-canonical/front/0166-000-Ledian.png rename to newsrc/afd/5312.png diff --git a/src/afd/sprites-canonical/back/0166-000-Ledian.png b/newsrc/afd/5312b.png similarity index 100% rename from src/afd/sprites-canonical/back/0166-000-Ledian.png rename to newsrc/afd/5312b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0166-000-Ledian-Female.png b/newsrc/afd/5312bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0166-000-Ledian-Female.png rename to newsrc/afd/5312bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0166-000-Ledian-Female.png b/newsrc/afd/5312bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0166-000-Ledian-Female.png rename to newsrc/afd/5312bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0166-000-Ledian.png b/newsrc/afd/5312bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0166-000-Ledian.png rename to newsrc/afd/5312bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0166-000-Ledian-Female.png b/newsrc/afd/5312f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0166-000-Ledian-Female.png rename to newsrc/afd/5312f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0166-000-Ledian-Female.png b/newsrc/afd/5312fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0166-000-Ledian-Female.png rename to newsrc/afd/5312fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0166-000-Ledian.png b/newsrc/afd/5312s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0166-000-Ledian.png rename to newsrc/afd/5312s.png diff --git a/src/afd/sprites-canonical/front/0167-000-Spinarak.png b/newsrc/afd/5344.png similarity index 100% rename from src/afd/sprites-canonical/front/0167-000-Spinarak.png rename to newsrc/afd/5344.png diff --git a/src/afd/sprites-canonical/back/0167-000-Spinarak.png b/newsrc/afd/5344b.png similarity index 100% rename from src/afd/sprites-canonical/back/0167-000-Spinarak.png rename to newsrc/afd/5344b.png diff --git a/src/afd/sprites-canonical/back-shiny/0167-000-Spinarak.png b/newsrc/afd/5344bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0167-000-Spinarak.png rename to newsrc/afd/5344bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0167-000-Spinarak.png b/newsrc/afd/5344s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0167-000-Spinarak.png rename to newsrc/afd/5344s.png diff --git a/src/afd/sprites-cap/front/0002-000-Syclant.png b/newsrc/afd/536870976.png similarity index 100% rename from src/afd/sprites-cap/front/0002-000-Syclant.png rename to newsrc/afd/536870976.png diff --git a/src/afd/sprites-cap/back/0002-000-Syclant.png b/newsrc/afd/536870976b.png similarity index 100% rename from src/afd/sprites-cap/back/0002-000-Syclant.png rename to newsrc/afd/536870976b.png diff --git a/src/afd/sprites-cap/back-cosmetic/0002-000-Syclant-Female.png b/newsrc/afd/536870976bf.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0002-000-Syclant-Female.png rename to newsrc/afd/536870976bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0002-000-Syclant-Female.png b/newsrc/afd/536870976bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0002-000-Syclant-Female.png rename to newsrc/afd/536870976bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0002-000-Syclant.png b/newsrc/afd/536870976bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0002-000-Syclant.png rename to newsrc/afd/536870976bs.png diff --git a/src/afd/sprites-cap/front-cosmetic/0002-000-Syclant-Female.png b/newsrc/afd/536870976f.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0002-000-Syclant-Female.png rename to newsrc/afd/536870976f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0002-000-Syclant-Female.png b/newsrc/afd/536870976fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0002-000-Syclant-Female.png rename to newsrc/afd/536870976fs.png diff --git a/src/afd/sprites-cap/front-shiny/0002-000-Syclant.png b/newsrc/afd/536870976s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0002-000-Syclant.png rename to newsrc/afd/536870976s.png diff --git a/src/afd/sprites-cap/front/0003-000-Revenankh.png b/newsrc/afd/536871008.png similarity index 100% rename from src/afd/sprites-cap/front/0003-000-Revenankh.png rename to newsrc/afd/536871008.png diff --git a/src/afd/sprites-cap/back/0003-000-Revenankh.png b/newsrc/afd/536871008b.png similarity index 100% rename from src/afd/sprites-cap/back/0003-000-Revenankh.png rename to newsrc/afd/536871008b.png diff --git a/src/afd/sprites-cap/back-cosmetic/0003-000-Revenankh-Female.png b/newsrc/afd/536871008bf.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0003-000-Revenankh-Female.png rename to newsrc/afd/536871008bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0003-000-Revenankh-Female.png b/newsrc/afd/536871008bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0003-000-Revenankh-Female.png rename to newsrc/afd/536871008bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0003-000-Revenankh.png b/newsrc/afd/536871008bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0003-000-Revenankh.png rename to newsrc/afd/536871008bs.png diff --git a/src/afd/sprites-cap/front-cosmetic/0003-000-Revenankh-Female.png b/newsrc/afd/536871008f.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0003-000-Revenankh-Female.png rename to newsrc/afd/536871008f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0003-000-Revenankh-Female.png b/newsrc/afd/536871008fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0003-000-Revenankh-Female.png rename to newsrc/afd/536871008fs.png diff --git a/src/afd/sprites-cap/front-shiny/0003-000-Revenankh.png b/newsrc/afd/536871008s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0003-000-Revenankh.png rename to newsrc/afd/536871008s.png diff --git a/src/afd/sprites-cap/front/0006-000-Pyroak.png b/newsrc/afd/536871104.png similarity index 100% rename from src/afd/sprites-cap/front/0006-000-Pyroak.png rename to newsrc/afd/536871104.png diff --git a/src/afd/sprites-cap/back/0006-000-Pyroak.png b/newsrc/afd/536871104b.png similarity index 100% rename from src/afd/sprites-cap/back/0006-000-Pyroak.png rename to newsrc/afd/536871104b.png diff --git a/src/afd/sprites-cap/back-cosmetic/0006-000-Pyroak-Female.png b/newsrc/afd/536871104bf.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0006-000-Pyroak-Female.png rename to newsrc/afd/536871104bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0006-000-Pyroak-Female.png b/newsrc/afd/536871104bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0006-000-Pyroak-Female.png rename to newsrc/afd/536871104bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0006-000-Pyroak.png b/newsrc/afd/536871104bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0006-000-Pyroak.png rename to newsrc/afd/536871104bs.png diff --git a/src/afd/sprites-cap/front-cosmetic/0006-000-Pyroak-Female.png b/newsrc/afd/536871104f.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0006-000-Pyroak-Female.png rename to newsrc/afd/536871104f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0006-000-Pyroak-Female.png b/newsrc/afd/536871104fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0006-000-Pyroak-Female.png rename to newsrc/afd/536871104fs.png diff --git a/src/afd/sprites-cap/front-shiny/0006-000-Pyroak.png b/newsrc/afd/536871104s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0006-000-Pyroak.png rename to newsrc/afd/536871104s.png diff --git a/src/afd/sprites-cap/front-cosmetic/0008-000-Fidgit-Female.png b/newsrc/afd/536871168.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0008-000-Fidgit-Female.png rename to newsrc/afd/536871168.png diff --git a/src/afd/sprites-cap/back-cosmetic/0008-000-Fidgit-Female.png b/newsrc/afd/536871168b.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0008-000-Fidgit-Female.png rename to newsrc/afd/536871168b.png diff --git a/src/afd/sprites-cap/back/0008-000-Fidgit.png b/newsrc/afd/536871168bf.png similarity index 100% rename from src/afd/sprites-cap/back/0008-000-Fidgit.png rename to newsrc/afd/536871168bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0008-000-Fidgit-Female.png b/newsrc/afd/536871168bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0008-000-Fidgit-Female.png rename to newsrc/afd/536871168bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0008-000-Fidgit.png b/newsrc/afd/536871168bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0008-000-Fidgit.png rename to newsrc/afd/536871168bs.png diff --git a/src/afd/sprites-cap/front/0008-000-Fidgit.png b/newsrc/afd/536871168f.png similarity index 100% rename from src/afd/sprites-cap/front/0008-000-Fidgit.png rename to newsrc/afd/536871168f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0008-000-Fidgit-Female.png b/newsrc/afd/536871168fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0008-000-Fidgit-Female.png rename to newsrc/afd/536871168fs.png diff --git a/src/afd/sprites-cap/front-shiny/0008-000-Fidgit.png b/newsrc/afd/536871168s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0008-000-Fidgit.png rename to newsrc/afd/536871168s.png diff --git a/src/afd/sprites-cap/front/0011-000-Stratagem.png b/newsrc/afd/536871264.png similarity index 100% rename from src/afd/sprites-cap/front/0011-000-Stratagem.png rename to newsrc/afd/536871264.png diff --git a/src/afd/sprites-cap/back/0011-000-Stratagem.png b/newsrc/afd/536871264b.png similarity index 100% rename from src/afd/sprites-cap/back/0011-000-Stratagem.png rename to newsrc/afd/536871264b.png diff --git a/src/afd/sprites-cap/back-shiny/0011-000-Stratagem.png b/newsrc/afd/536871264bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0011-000-Stratagem.png rename to newsrc/afd/536871264bs.png diff --git a/src/afd/sprites-cap/front-shiny/0011-000-Stratagem.png b/newsrc/afd/536871264s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0011-000-Stratagem.png rename to newsrc/afd/536871264s.png diff --git a/src/afd/sprites-cap/front-cosmetic/0013-000-Arghonaut-Female.png b/newsrc/afd/536871328.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0013-000-Arghonaut-Female.png rename to newsrc/afd/536871328.png diff --git a/src/afd/sprites-cap/back-cosmetic/0013-000-Arghonaut-Female.png b/newsrc/afd/536871328b.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0013-000-Arghonaut-Female.png rename to newsrc/afd/536871328b.png diff --git a/src/afd/sprites-cap/back/0013-000-Arghonaut.png b/newsrc/afd/536871328bf.png similarity index 100% rename from src/afd/sprites-cap/back/0013-000-Arghonaut.png rename to newsrc/afd/536871328bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0013-000-Arghonaut-Female.png b/newsrc/afd/536871328bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0013-000-Arghonaut-Female.png rename to newsrc/afd/536871328bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0013-000-Arghonaut.png b/newsrc/afd/536871328bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0013-000-Arghonaut.png rename to newsrc/afd/536871328bs.png diff --git a/src/afd/sprites-cap/front/0013-000-Arghonaut.png b/newsrc/afd/536871328f.png similarity index 100% rename from src/afd/sprites-cap/front/0013-000-Arghonaut.png rename to newsrc/afd/536871328f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0013-000-Arghonaut-Female.png b/newsrc/afd/536871328fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0013-000-Arghonaut-Female.png rename to newsrc/afd/536871328fs.png diff --git a/src/afd/sprites-cap/front-shiny/0013-000-Arghonaut.png b/newsrc/afd/536871328s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0013-000-Arghonaut.png rename to newsrc/afd/536871328s.png diff --git a/src/afd/sprites-cap/front/0014-000-Kitsunoh.png b/newsrc/afd/536871360.png similarity index 100% rename from src/afd/sprites-cap/front/0014-000-Kitsunoh.png rename to newsrc/afd/536871360.png diff --git a/src/afd/sprites-cap/back-cosmetic/0014-000-Kitsunoh-Female.png b/newsrc/afd/536871360b.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0014-000-Kitsunoh-Female.png rename to newsrc/afd/536871360b.png diff --git a/src/afd/sprites-cap/back/0014-000-Kitsunoh.png b/newsrc/afd/536871360bf.png similarity index 100% rename from src/afd/sprites-cap/back/0014-000-Kitsunoh.png rename to newsrc/afd/536871360bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0014-000-Kitsunoh-Female.png b/newsrc/afd/536871360bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0014-000-Kitsunoh-Female.png rename to newsrc/afd/536871360bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0014-000-Kitsunoh.png b/newsrc/afd/536871360bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0014-000-Kitsunoh.png rename to newsrc/afd/536871360bs.png diff --git a/src/afd/sprites-cap/front-cosmetic/0014-000-Kitsunoh-Female.png b/newsrc/afd/536871360f.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0014-000-Kitsunoh-Female.png rename to newsrc/afd/536871360f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0014-000-Kitsunoh-Female.png b/newsrc/afd/536871360fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0014-000-Kitsunoh-Female.png rename to newsrc/afd/536871360fs.png diff --git a/src/afd/sprites-cap/front-shiny/0014-000-Kitsunoh.png b/newsrc/afd/536871360s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0014-000-Kitsunoh.png rename to newsrc/afd/536871360s.png diff --git a/src/afd/sprites-cap/front/0015-000-Cyclohm.png b/newsrc/afd/536871392.png similarity index 100% rename from src/afd/sprites-cap/front/0015-000-Cyclohm.png rename to newsrc/afd/536871392.png diff --git a/src/afd/sprites-cap/back/0015-000-Cyclohm.png b/newsrc/afd/536871392b.png similarity index 100% rename from src/afd/sprites-cap/back/0015-000-Cyclohm.png rename to newsrc/afd/536871392b.png diff --git a/src/afd/sprites-cap/back-cosmetic/0015-000-Cyclohm-Female.png b/newsrc/afd/536871392bf.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0015-000-Cyclohm-Female.png rename to newsrc/afd/536871392bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0015-000-Cyclohm-Female.png b/newsrc/afd/536871392bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0015-000-Cyclohm-Female.png rename to newsrc/afd/536871392bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0015-000-Cyclohm.png b/newsrc/afd/536871392bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0015-000-Cyclohm.png rename to newsrc/afd/536871392bs.png diff --git a/src/afd/sprites-cap/front-cosmetic/0015-000-Cyclohm-Female.png b/newsrc/afd/536871392f.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0015-000-Cyclohm-Female.png rename to newsrc/afd/536871392f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0015-000-Cyclohm-Female.png b/newsrc/afd/536871392fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0015-000-Cyclohm-Female.png rename to newsrc/afd/536871392fs.png diff --git a/src/afd/sprites-cap/front-shiny/0015-000-Cyclohm.png b/newsrc/afd/536871392s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0015-000-Cyclohm.png rename to newsrc/afd/536871392s.png diff --git a/src/afd/sprites-cap/front/0016-000-Colossoil.png b/newsrc/afd/536871424.png similarity index 100% rename from src/afd/sprites-cap/front/0016-000-Colossoil.png rename to newsrc/afd/536871424.png diff --git a/src/afd/sprites-cap/back/0016-000-Colossoil.png b/newsrc/afd/536871424b.png similarity index 100% rename from src/afd/sprites-cap/back/0016-000-Colossoil.png rename to newsrc/afd/536871424b.png diff --git a/src/afd/sprites-cap/back-cosmetic/0016-000-Colossoil-Female.png b/newsrc/afd/536871424bf.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0016-000-Colossoil-Female.png rename to newsrc/afd/536871424bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0016-000-Colossoil-Female.png b/newsrc/afd/536871424bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0016-000-Colossoil-Female.png rename to newsrc/afd/536871424bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0016-000-Colossoil.png b/newsrc/afd/536871424bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0016-000-Colossoil.png rename to newsrc/afd/536871424bs.png diff --git a/src/afd/sprites-cap/front-cosmetic/0016-000-Colossoil-Female.png b/newsrc/afd/536871424f.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0016-000-Colossoil-Female.png rename to newsrc/afd/536871424f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0016-000-Colossoil-Female.png b/newsrc/afd/536871424fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0016-000-Colossoil-Female.png rename to newsrc/afd/536871424fs.png diff --git a/src/afd/sprites-cap/front-shiny/0016-000-Colossoil.png b/newsrc/afd/536871424s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0016-000-Colossoil.png rename to newsrc/afd/536871424s.png diff --git a/src/afd/sprites-cap/front/0017-000-Krilowatt.png b/newsrc/afd/536871456.png similarity index 100% rename from src/afd/sprites-cap/front/0017-000-Krilowatt.png rename to newsrc/afd/536871456.png diff --git a/src/afd/sprites-cap/back/0017-000-Krilowatt.png b/newsrc/afd/536871456b.png similarity index 100% rename from src/afd/sprites-cap/back/0017-000-Krilowatt.png rename to newsrc/afd/536871456b.png diff --git a/src/afd/sprites-cap/back-cosmetic/0017-000-Krilowatt-Female.png b/newsrc/afd/536871456bf.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0017-000-Krilowatt-Female.png rename to newsrc/afd/536871456bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0017-000-Krilowatt-Female.png b/newsrc/afd/536871456bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0017-000-Krilowatt-Female.png rename to newsrc/afd/536871456bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0017-000-Krilowatt.png b/newsrc/afd/536871456bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0017-000-Krilowatt.png rename to newsrc/afd/536871456bs.png diff --git a/src/afd/sprites-cap/front-cosmetic/0017-000-Krilowatt-Female.png b/newsrc/afd/536871456f.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0017-000-Krilowatt-Female.png rename to newsrc/afd/536871456f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0017-000-Krilowatt-Female.png b/newsrc/afd/536871456fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0017-000-Krilowatt-Female.png rename to newsrc/afd/536871456fs.png diff --git a/src/afd/sprites-cap/front-shiny/0017-000-Krilowatt.png b/newsrc/afd/536871456s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0017-000-Krilowatt.png rename to newsrc/afd/536871456s.png diff --git a/src/afd/sprites-cap/front/0019-000-Voodoom.png b/newsrc/afd/536871520.png similarity index 100% rename from src/afd/sprites-cap/front/0019-000-Voodoom.png rename to newsrc/afd/536871520.png diff --git a/src/afd/sprites-cap/back/0019-000-Voodoom.png b/newsrc/afd/536871520b.png similarity index 100% rename from src/afd/sprites-cap/back/0019-000-Voodoom.png rename to newsrc/afd/536871520b.png diff --git a/src/afd/sprites-cap/back-cosmetic/0019-000-Voodoom-Female.png b/newsrc/afd/536871520bf.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0019-000-Voodoom-Female.png rename to newsrc/afd/536871520bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0019-000-Voodoom-Female.png b/newsrc/afd/536871520bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0019-000-Voodoom-Female.png rename to newsrc/afd/536871520bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0019-000-Voodoom.png b/newsrc/afd/536871520bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0019-000-Voodoom.png rename to newsrc/afd/536871520bs.png diff --git a/src/afd/sprites-cap/front-cosmetic/0019-000-Voodoom-Female.png b/newsrc/afd/536871520f.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0019-000-Voodoom-Female.png rename to newsrc/afd/536871520f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0019-000-Voodoom-Female.png b/newsrc/afd/536871520fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0019-000-Voodoom-Female.png rename to newsrc/afd/536871520fs.png diff --git a/src/afd/sprites-cap/front-shiny/0019-000-Voodoom.png b/newsrc/afd/536871520s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0019-000-Voodoom.png rename to newsrc/afd/536871520s.png diff --git a/src/afd/sprites-cap/front/0021-000-Tomohawk.png b/newsrc/afd/536871584.png similarity index 100% rename from src/afd/sprites-cap/front/0021-000-Tomohawk.png rename to newsrc/afd/536871584.png diff --git a/src/afd/sprites-cap/back/0021-000-Tomohawk.png b/newsrc/afd/536871584b.png similarity index 100% rename from src/afd/sprites-cap/back/0021-000-Tomohawk.png rename to newsrc/afd/536871584b.png diff --git a/src/afd/sprites-cap/back-cosmetic/0021-000-Tomohawk-Female.png b/newsrc/afd/536871584bf.png similarity index 100% rename from src/afd/sprites-cap/back-cosmetic/0021-000-Tomohawk-Female.png rename to newsrc/afd/536871584bf.png diff --git a/src/afd/sprites-cap/back-shiny-cosmetic/0021-000-Tomohawk-Female.png b/newsrc/afd/536871584bfs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny-cosmetic/0021-000-Tomohawk-Female.png rename to newsrc/afd/536871584bfs.png diff --git a/src/afd/sprites-cap/back-shiny/0021-000-Tomohawk.png b/newsrc/afd/536871584bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0021-000-Tomohawk.png rename to newsrc/afd/536871584bs.png diff --git a/src/afd/sprites-cap/front-cosmetic/0021-000-Tomohawk-Female.png b/newsrc/afd/536871584f.png similarity index 100% rename from src/afd/sprites-cap/front-cosmetic/0021-000-Tomohawk-Female.png rename to newsrc/afd/536871584f.png diff --git a/src/afd/sprites-cap/front-shiny-cosmetic/0021-000-Tomohawk-Female.png b/newsrc/afd/536871584fs.png similarity index 100% rename from src/afd/sprites-cap/front-shiny-cosmetic/0021-000-Tomohawk-Female.png rename to newsrc/afd/536871584fs.png diff --git a/src/afd/sprites-cap/front-shiny/0021-000-Tomohawk.png b/newsrc/afd/536871584s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0021-000-Tomohawk.png rename to newsrc/afd/536871584s.png diff --git a/src/afd/sprites-cap/front/0023-000-Necturna.png b/newsrc/afd/536871648.png similarity index 100% rename from src/afd/sprites-cap/front/0023-000-Necturna.png rename to newsrc/afd/536871648.png diff --git a/src/afd/sprites-cap/back/0023-000-Necturna.png b/newsrc/afd/536871648b.png similarity index 100% rename from src/afd/sprites-cap/back/0023-000-Necturna.png rename to newsrc/afd/536871648b.png diff --git a/src/afd/sprites-cap/back-shiny/0023-000-Necturna.png b/newsrc/afd/536871648bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0023-000-Necturna.png rename to newsrc/afd/536871648bs.png diff --git a/src/afd/sprites-cap/front-shiny/0023-000-Necturna.png b/newsrc/afd/536871648s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0023-000-Necturna.png rename to newsrc/afd/536871648s.png diff --git a/src/afd/sprites-cap/front/0024-000-Mollux.png b/newsrc/afd/536871680.png similarity index 100% rename from src/afd/sprites-cap/front/0024-000-Mollux.png rename to newsrc/afd/536871680.png diff --git a/src/afd/sprites-cap/back/0024-000-Mollux.png b/newsrc/afd/536871680b.png similarity index 100% rename from src/afd/sprites-cap/back/0024-000-Mollux.png rename to newsrc/afd/536871680b.png diff --git a/src/afd/sprites-cap/back-shiny/0024-000-Mollux.png b/newsrc/afd/536871680bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0024-000-Mollux.png rename to newsrc/afd/536871680bs.png diff --git a/src/afd/sprites-cap/front-shiny/0024-000-Mollux.png b/newsrc/afd/536871680s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0024-000-Mollux.png rename to newsrc/afd/536871680s.png diff --git a/src/afd/sprites-cap/front/0027-000-Aurumoth.png b/newsrc/afd/536871776.png similarity index 100% rename from src/afd/sprites-cap/front/0027-000-Aurumoth.png rename to newsrc/afd/536871776.png diff --git a/src/afd/sprites-cap/back/0027-000-Aurumoth.png b/newsrc/afd/536871776b.png similarity index 100% rename from src/afd/sprites-cap/back/0027-000-Aurumoth.png rename to newsrc/afd/536871776b.png diff --git a/src/afd/sprites-cap/back-shiny/0027-000-Aurumoth.png b/newsrc/afd/536871776bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0027-000-Aurumoth.png rename to newsrc/afd/536871776bs.png diff --git a/src/afd/sprites-cap/front-shiny/0027-000-Aurumoth.png b/newsrc/afd/536871776s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0027-000-Aurumoth.png rename to newsrc/afd/536871776s.png diff --git a/src/afd/sprites-cap/front/0029-000-Malaconda.png b/newsrc/afd/536871840.png similarity index 100% rename from src/afd/sprites-cap/front/0029-000-Malaconda.png rename to newsrc/afd/536871840.png diff --git a/src/afd/sprites-cap/back/0029-000-Malaconda.png b/newsrc/afd/536871840b.png similarity index 100% rename from src/afd/sprites-cap/back/0029-000-Malaconda.png rename to newsrc/afd/536871840b.png diff --git a/src/afd/sprites-cap/back-shiny/0029-000-Malaconda.png b/newsrc/afd/536871840bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0029-000-Malaconda.png rename to newsrc/afd/536871840bs.png diff --git a/src/afd/sprites-cap/front-shiny/0029-000-Malaconda.png b/newsrc/afd/536871840s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0029-000-Malaconda.png rename to newsrc/afd/536871840s.png diff --git a/src/afd/sprites-cap/front/0031-000-Cawmodore.png b/newsrc/afd/536871904.png similarity index 100% rename from src/afd/sprites-cap/front/0031-000-Cawmodore.png rename to newsrc/afd/536871904.png diff --git a/src/afd/sprites-cap/back/0031-000-Cawmodore.png b/newsrc/afd/536871904b.png similarity index 100% rename from src/afd/sprites-cap/back/0031-000-Cawmodore.png rename to newsrc/afd/536871904b.png diff --git a/src/afd/sprites-cap/back-shiny/0031-000-Cawmodore.png b/newsrc/afd/536871904bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0031-000-Cawmodore.png rename to newsrc/afd/536871904bs.png diff --git a/src/afd/sprites-cap/front-shiny/0031-000-Cawmodore.png b/newsrc/afd/536871904s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0031-000-Cawmodore.png rename to newsrc/afd/536871904s.png diff --git a/src/afd/sprites-cap/front/0035-000-Plasmanta.png b/newsrc/afd/536872032.png similarity index 100% rename from src/afd/sprites-cap/front/0035-000-Plasmanta.png rename to newsrc/afd/536872032.png diff --git a/src/afd/sprites-cap/back/0035-000-Plasmanta.png b/newsrc/afd/536872032b.png similarity index 100% rename from src/afd/sprites-cap/back/0035-000-Plasmanta.png rename to newsrc/afd/536872032b.png diff --git a/src/afd/sprites-cap/back-shiny/0035-000-Plasmanta.png b/newsrc/afd/536872032bs.png similarity index 100% rename from src/afd/sprites-cap/back-shiny/0035-000-Plasmanta.png rename to newsrc/afd/536872032bs.png diff --git a/src/afd/sprites-cap/front-shiny/0035-000-Plasmanta.png b/newsrc/afd/536872032s.png similarity index 100% rename from src/afd/sprites-cap/front-shiny/0035-000-Plasmanta.png rename to newsrc/afd/536872032s.png diff --git a/src/afd/sprites-canonical/front/0168-000-Ariados.png b/newsrc/afd/5376.png similarity index 100% rename from src/afd/sprites-canonical/front/0168-000-Ariados.png rename to newsrc/afd/5376.png diff --git a/src/afd/sprites-canonical/back/0168-000-Ariados.png b/newsrc/afd/5376b.png similarity index 100% rename from src/afd/sprites-canonical/back/0168-000-Ariados.png rename to newsrc/afd/5376b.png diff --git a/src/afd/sprites-canonical/back-shiny/0168-000-Ariados.png b/newsrc/afd/5376bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0168-000-Ariados.png rename to newsrc/afd/5376bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0168-000-Ariados.png b/newsrc/afd/5376s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0168-000-Ariados.png rename to newsrc/afd/5376s.png diff --git a/src/afd/sprites-canonical/front/0169-000-Crobat.png b/newsrc/afd/5408.png similarity index 100% rename from src/afd/sprites-canonical/front/0169-000-Crobat.png rename to newsrc/afd/5408.png diff --git a/src/afd/sprites-canonical/back/0169-000-Crobat.png b/newsrc/afd/5408b.png similarity index 100% rename from src/afd/sprites-canonical/back/0169-000-Crobat.png rename to newsrc/afd/5408b.png diff --git a/src/afd/sprites-canonical/back-shiny/0169-000-Crobat.png b/newsrc/afd/5408bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0169-000-Crobat.png rename to newsrc/afd/5408bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0169-000-Crobat.png b/newsrc/afd/5408s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0169-000-Crobat.png rename to newsrc/afd/5408s.png diff --git a/src/afd/sprites-canonical/front/0017-000-Pidgeotto.png b/newsrc/afd/544.png similarity index 100% rename from src/afd/sprites-canonical/front/0017-000-Pidgeotto.png rename to newsrc/afd/544.png diff --git a/src/afd/sprites-canonical/front/0170-000-Chinchou.png b/newsrc/afd/5440.png similarity index 100% rename from src/afd/sprites-canonical/front/0170-000-Chinchou.png rename to newsrc/afd/5440.png diff --git a/src/afd/sprites-canonical/back/0170-000-Chinchou.png b/newsrc/afd/5440b.png similarity index 100% rename from src/afd/sprites-canonical/back/0170-000-Chinchou.png rename to newsrc/afd/5440b.png diff --git a/src/afd/sprites-canonical/back-shiny/0170-000-Chinchou.png b/newsrc/afd/5440bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0170-000-Chinchou.png rename to newsrc/afd/5440bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0170-000-Chinchou.png b/newsrc/afd/5440s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0170-000-Chinchou.png rename to newsrc/afd/5440s.png diff --git a/src/afd/sprites-canonical/back/0017-000-Pidgeotto.png b/newsrc/afd/544b.png similarity index 100% rename from src/afd/sprites-canonical/back/0017-000-Pidgeotto.png rename to newsrc/afd/544b.png diff --git a/src/afd/sprites-canonical/back-shiny/0017-000-Pidgeotto.png b/newsrc/afd/544bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0017-000-Pidgeotto.png rename to newsrc/afd/544bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0017-000-Pidgeotto.png b/newsrc/afd/544s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0017-000-Pidgeotto.png rename to newsrc/afd/544s.png diff --git a/src/afd/sprites-canonical/front/0171-000-Lanturn.png b/newsrc/afd/5472.png similarity index 100% rename from src/afd/sprites-canonical/front/0171-000-Lanturn.png rename to newsrc/afd/5472.png diff --git a/src/afd/sprites-canonical/back/0171-000-Lanturn.png b/newsrc/afd/5472b.png similarity index 100% rename from src/afd/sprites-canonical/back/0171-000-Lanturn.png rename to newsrc/afd/5472b.png diff --git a/src/afd/sprites-canonical/back-shiny/0171-000-Lanturn.png b/newsrc/afd/5472bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0171-000-Lanturn.png rename to newsrc/afd/5472bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0171-000-Lanturn.png b/newsrc/afd/5472s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0171-000-Lanturn.png rename to newsrc/afd/5472s.png diff --git a/src/afd/sprites-canonical/front/0172-000-Pichu.png b/newsrc/afd/5504.png similarity index 100% rename from src/afd/sprites-canonical/front/0172-000-Pichu.png rename to newsrc/afd/5504.png diff --git a/src/afd/sprites-canonical/back/0172-000-Pichu.png b/newsrc/afd/5504b.png similarity index 100% rename from src/afd/sprites-canonical/back/0172-000-Pichu.png rename to newsrc/afd/5504b.png diff --git a/src/afd/sprites-canonical/back-shiny/0172-000-Pichu.png b/newsrc/afd/5504bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0172-000-Pichu.png rename to newsrc/afd/5504bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0172-000-Pichu.png b/newsrc/afd/5504s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0172-000-Pichu.png rename to newsrc/afd/5504s.png diff --git a/src/afd/sprites-canonical/front/0173-000-Cleffa.png b/newsrc/afd/5536.png similarity index 100% rename from src/afd/sprites-canonical/front/0173-000-Cleffa.png rename to newsrc/afd/5536.png diff --git a/src/afd/sprites-canonical/back/0173-000-Cleffa.png b/newsrc/afd/5536b.png similarity index 100% rename from src/afd/sprites-canonical/back/0173-000-Cleffa.png rename to newsrc/afd/5536b.png diff --git a/src/afd/sprites-canonical/back-shiny/0173-000-Cleffa.png b/newsrc/afd/5536bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0173-000-Cleffa.png rename to newsrc/afd/5536bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0173-000-Cleffa.png b/newsrc/afd/5536s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0173-000-Cleffa.png rename to newsrc/afd/5536s.png diff --git a/src/afd/sprites-canonical/front/0174-000-Igglybuff.png b/newsrc/afd/5568.png similarity index 100% rename from src/afd/sprites-canonical/front/0174-000-Igglybuff.png rename to newsrc/afd/5568.png diff --git a/src/afd/sprites-canonical/back/0174-000-Igglybuff.png b/newsrc/afd/5568b.png similarity index 100% rename from src/afd/sprites-canonical/back/0174-000-Igglybuff.png rename to newsrc/afd/5568b.png diff --git a/src/afd/sprites-canonical/back-shiny/0174-000-Igglybuff.png b/newsrc/afd/5568bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0174-000-Igglybuff.png rename to newsrc/afd/5568bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0174-000-Igglybuff.png b/newsrc/afd/5568s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0174-000-Igglybuff.png rename to newsrc/afd/5568s.png diff --git a/src/afd/sprites-canonical/front/0175-000-Togepi.png b/newsrc/afd/5600.png similarity index 100% rename from src/afd/sprites-canonical/front/0175-000-Togepi.png rename to newsrc/afd/5600.png diff --git a/src/afd/sprites-canonical/back/0175-000-Togepi.png b/newsrc/afd/5600b.png similarity index 100% rename from src/afd/sprites-canonical/back/0175-000-Togepi.png rename to newsrc/afd/5600b.png diff --git a/src/afd/sprites-canonical/back-shiny/0175-000-Togepi.png b/newsrc/afd/5600bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0175-000-Togepi.png rename to newsrc/afd/5600bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0175-000-Togepi.png b/newsrc/afd/5600s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0175-000-Togepi.png rename to newsrc/afd/5600s.png diff --git a/src/afd/sprites-canonical/front/0176-000-Togetic.png b/newsrc/afd/5632.png similarity index 100% rename from src/afd/sprites-canonical/front/0176-000-Togetic.png rename to newsrc/afd/5632.png diff --git a/src/afd/sprites-canonical/back/0176-000-Togetic.png b/newsrc/afd/5632b.png similarity index 100% rename from src/afd/sprites-canonical/back/0176-000-Togetic.png rename to newsrc/afd/5632b.png diff --git a/src/afd/sprites-canonical/back-shiny/0176-000-Togetic.png b/newsrc/afd/5632bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0176-000-Togetic.png rename to newsrc/afd/5632bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0176-000-Togetic.png b/newsrc/afd/5632s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0176-000-Togetic.png rename to newsrc/afd/5632s.png diff --git a/src/afd/sprites-canonical/front/0177-000-Natu.png b/newsrc/afd/5664.png similarity index 100% rename from src/afd/sprites-canonical/front/0177-000-Natu.png rename to newsrc/afd/5664.png diff --git a/src/afd/sprites-canonical/back/0177-000-Natu.png b/newsrc/afd/5664b.png similarity index 100% rename from src/afd/sprites-canonical/back/0177-000-Natu.png rename to newsrc/afd/5664b.png diff --git a/src/afd/sprites-canonical/back-shiny/0177-000-Natu.png b/newsrc/afd/5664bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0177-000-Natu.png rename to newsrc/afd/5664bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0177-000-Natu.png b/newsrc/afd/5664s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0177-000-Natu.png rename to newsrc/afd/5664s.png diff --git a/src/afd/sprites-canonical/front/0178-000-Xatu.png b/newsrc/afd/5696.png similarity index 100% rename from src/afd/sprites-canonical/front/0178-000-Xatu.png rename to newsrc/afd/5696.png diff --git a/src/afd/sprites-canonical/back/0178-000-Xatu.png b/newsrc/afd/5696b.png similarity index 100% rename from src/afd/sprites-canonical/back/0178-000-Xatu.png rename to newsrc/afd/5696b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0178-000-Xatu-Female.png b/newsrc/afd/5696bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0178-000-Xatu-Female.png rename to newsrc/afd/5696bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0178-000-Xatu-Female.png b/newsrc/afd/5696bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0178-000-Xatu-Female.png rename to newsrc/afd/5696bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0178-000-Xatu.png b/newsrc/afd/5696bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0178-000-Xatu.png rename to newsrc/afd/5696bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0178-000-Xatu-Female.png b/newsrc/afd/5696f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0178-000-Xatu-Female.png rename to newsrc/afd/5696f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0178-000-Xatu-Female.png b/newsrc/afd/5696fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0178-000-Xatu-Female.png rename to newsrc/afd/5696fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0178-000-Xatu.png b/newsrc/afd/5696s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0178-000-Xatu.png rename to newsrc/afd/5696s.png diff --git a/src/afd/sprites-canonical/front/0179-000-Mareep.png b/newsrc/afd/5728.png similarity index 100% rename from src/afd/sprites-canonical/front/0179-000-Mareep.png rename to newsrc/afd/5728.png diff --git a/src/afd/sprites-canonical/back/0179-000-Mareep.png b/newsrc/afd/5728b.png similarity index 100% rename from src/afd/sprites-canonical/back/0179-000-Mareep.png rename to newsrc/afd/5728b.png diff --git a/src/afd/sprites-canonical/back-shiny/0179-000-Mareep.png b/newsrc/afd/5728bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0179-000-Mareep.png rename to newsrc/afd/5728bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0179-000-Mareep.png b/newsrc/afd/5728s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0179-000-Mareep.png rename to newsrc/afd/5728s.png diff --git a/src/afd/sprites-canonical/front/0018-000-Pidgeot.png b/newsrc/afd/576.png similarity index 100% rename from src/afd/sprites-canonical/front/0018-000-Pidgeot.png rename to newsrc/afd/576.png diff --git a/src/afd/sprites-canonical/front/0180-000-Flaaffy.png b/newsrc/afd/5760.png similarity index 100% rename from src/afd/sprites-canonical/front/0180-000-Flaaffy.png rename to newsrc/afd/5760.png diff --git a/src/afd/sprites-canonical/back/0180-000-Flaaffy.png b/newsrc/afd/5760b.png similarity index 100% rename from src/afd/sprites-canonical/back/0180-000-Flaaffy.png rename to newsrc/afd/5760b.png diff --git a/src/afd/sprites-canonical/back/0018-000-Pidgeot.png b/newsrc/afd/576b.png similarity index 100% rename from src/afd/sprites-canonical/back/0018-000-Pidgeot.png rename to newsrc/afd/576b.png diff --git a/src/afd/sprites-canonical/back-shiny/0018-000-Pidgeot.png b/newsrc/afd/576bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0018-000-Pidgeot.png rename to newsrc/afd/576bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0018-000-Pidgeot.png b/newsrc/afd/576s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0018-000-Pidgeot.png rename to newsrc/afd/576s.png diff --git a/src/afd/sprites-canonical/front-shiny/0018-420-Pidgeot-Mega.gif b/newsrc/afd/577.gif similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0018-420-Pidgeot-Mega.gif rename to newsrc/afd/577.gif diff --git a/src/afd/sprites-canonical/back-shiny/0018-420-Pidgeot-Mega.png b/newsrc/afd/577b.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0018-420-Pidgeot-Mega.png rename to newsrc/afd/577b.png diff --git a/src/afd/sprites-canonical/back/0018-420-Pidgeot-Mega.png b/newsrc/afd/577bs.png similarity index 100% rename from src/afd/sprites-canonical/back/0018-420-Pidgeot-Mega.png rename to newsrc/afd/577bs.png diff --git a/src/afd/sprites-canonical/front/0018-420-Pidgeot-Mega.gif b/newsrc/afd/577s.gif similarity index 100% rename from src/afd/sprites-canonical/front/0018-420-Pidgeot-Mega.gif rename to newsrc/afd/577s.gif diff --git a/src/afd/sprites-canonical/front/0181-000-Ampharos.png b/newsrc/afd/5792.png similarity index 100% rename from src/afd/sprites-canonical/front/0181-000-Ampharos.png rename to newsrc/afd/5792.png diff --git a/src/afd/sprites-canonical/back/0181-000-Ampharos.png b/newsrc/afd/5792b.png similarity index 100% rename from src/afd/sprites-canonical/back/0181-000-Ampharos.png rename to newsrc/afd/5792b.png diff --git a/src/afd/sprites-canonical/back-shiny/0181-000-Ampharos.png b/newsrc/afd/5792bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0181-000-Ampharos.png rename to newsrc/afd/5792bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0181-000-Ampharos.png b/newsrc/afd/5792s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0181-000-Ampharos.png rename to newsrc/afd/5792s.png diff --git a/src/afd/sprites-canonical/front/0181-420-Ampharos-Mega.png b/newsrc/afd/5793.png similarity index 100% rename from src/afd/sprites-canonical/front/0181-420-Ampharos-Mega.png rename to newsrc/afd/5793.png diff --git a/src/afd/sprites-canonical/back/0181-420-Ampharos-Mega.png b/newsrc/afd/5793b.png similarity index 100% rename from src/afd/sprites-canonical/back/0181-420-Ampharos-Mega.png rename to newsrc/afd/5793b.png diff --git a/src/afd/sprites-canonical/back-shiny/0181-420-Ampharos-Mega.png b/newsrc/afd/5793bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0181-420-Ampharos-Mega.png rename to newsrc/afd/5793bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0181-420-Ampharos-Mega.png b/newsrc/afd/5793s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0181-420-Ampharos-Mega.png rename to newsrc/afd/5793s.png diff --git a/src/afd/sprites-canonical/front/0182-000-Bellossom.png b/newsrc/afd/5824.png similarity index 100% rename from src/afd/sprites-canonical/front/0182-000-Bellossom.png rename to newsrc/afd/5824.png diff --git a/src/afd/sprites-canonical/back/0182-000-Bellossom.png b/newsrc/afd/5824b.png similarity index 100% rename from src/afd/sprites-canonical/back/0182-000-Bellossom.png rename to newsrc/afd/5824b.png diff --git a/src/afd/sprites-canonical/back-shiny/0182-000-Bellossom.png b/newsrc/afd/5824bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0182-000-Bellossom.png rename to newsrc/afd/5824bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0182-000-Bellossom.png b/newsrc/afd/5824s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0182-000-Bellossom.png rename to newsrc/afd/5824s.png diff --git a/src/afd/sprites-canonical/front/0183-000-Marill.png b/newsrc/afd/5856.png similarity index 100% rename from src/afd/sprites-canonical/front/0183-000-Marill.png rename to newsrc/afd/5856.png diff --git a/src/afd/sprites-canonical/back/0183-000-Marill.png b/newsrc/afd/5856b.png similarity index 100% rename from src/afd/sprites-canonical/back/0183-000-Marill.png rename to newsrc/afd/5856b.png diff --git a/src/afd/sprites-canonical/back-shiny/0183-000-Marill.png b/newsrc/afd/5856bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0183-000-Marill.png rename to newsrc/afd/5856bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0183-000-Marill.png b/newsrc/afd/5856s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0183-000-Marill.png rename to newsrc/afd/5856s.png diff --git a/src/afd/sprites-canonical/front/0184-000-Azumarill.png b/newsrc/afd/5888.png similarity index 100% rename from src/afd/sprites-canonical/front/0184-000-Azumarill.png rename to newsrc/afd/5888.png diff --git a/src/afd/sprites-canonical/back/0184-000-Azumarill.png b/newsrc/afd/5888b.png similarity index 100% rename from src/afd/sprites-canonical/back/0184-000-Azumarill.png rename to newsrc/afd/5888b.png diff --git a/src/afd/sprites-canonical/back-shiny/0184-000-Azumarill.png b/newsrc/afd/5888bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0184-000-Azumarill.png rename to newsrc/afd/5888bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0184-000-Azumarill.png b/newsrc/afd/5888s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0184-000-Azumarill.png rename to newsrc/afd/5888s.png diff --git a/src/afd/sprites-canonical/front/0185-000-Sudowoodo.png b/newsrc/afd/5920.png similarity index 100% rename from src/afd/sprites-canonical/front/0185-000-Sudowoodo.png rename to newsrc/afd/5920.png diff --git a/src/afd/sprites-canonical/back/0185-000-Sudowoodo.png b/newsrc/afd/5920b.png similarity index 100% rename from src/afd/sprites-canonical/back/0185-000-Sudowoodo.png rename to newsrc/afd/5920b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0185-000-Sudowoodo-Female.png b/newsrc/afd/5920bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0185-000-Sudowoodo-Female.png rename to newsrc/afd/5920bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0185-000-Sudowoodo-Female.png b/newsrc/afd/5920bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0185-000-Sudowoodo-Female.png rename to newsrc/afd/5920bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0185-000-Sudowoodo.png b/newsrc/afd/5920bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0185-000-Sudowoodo.png rename to newsrc/afd/5920bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0185-000-Sudowoodo-Female.png b/newsrc/afd/5920f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0185-000-Sudowoodo-Female.png rename to newsrc/afd/5920f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0185-000-Sudowoodo-Female.png b/newsrc/afd/5920fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0185-000-Sudowoodo-Female.png rename to newsrc/afd/5920fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0185-000-Sudowoodo.png b/newsrc/afd/5920s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0185-000-Sudowoodo.png rename to newsrc/afd/5920s.png diff --git a/src/afd/sprites-canonical/front/0186-000-Politoed.png b/newsrc/afd/5952.png similarity index 100% rename from src/afd/sprites-canonical/front/0186-000-Politoed.png rename to newsrc/afd/5952.png diff --git a/src/afd/sprites-canonical/back/0186-000-Politoed.png b/newsrc/afd/5952b.png similarity index 100% rename from src/afd/sprites-canonical/back/0186-000-Politoed.png rename to newsrc/afd/5952b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0186-000-Politoed-Female.png b/newsrc/afd/5952bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0186-000-Politoed-Female.png rename to newsrc/afd/5952bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0186-000-Politoed-Female.png b/newsrc/afd/5952bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0186-000-Politoed-Female.png rename to newsrc/afd/5952bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0186-000-Politoed.png b/newsrc/afd/5952bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0186-000-Politoed.png rename to newsrc/afd/5952bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0186-000-Politoed-Female.png b/newsrc/afd/5952f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0186-000-Politoed-Female.png rename to newsrc/afd/5952f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0186-000-Politoed-Female.png b/newsrc/afd/5952fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0186-000-Politoed-Female.png rename to newsrc/afd/5952fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0186-000-Politoed.png b/newsrc/afd/5952s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0186-000-Politoed.png rename to newsrc/afd/5952s.png diff --git a/src/afd/sprites-canonical/front/0187-000-Hoppip.png b/newsrc/afd/5984.png similarity index 100% rename from src/afd/sprites-canonical/front/0187-000-Hoppip.png rename to newsrc/afd/5984.png diff --git a/src/afd/sprites-canonical/back/0187-000-Hoppip.png b/newsrc/afd/5984b.png similarity index 100% rename from src/afd/sprites-canonical/back/0187-000-Hoppip.png rename to newsrc/afd/5984b.png diff --git a/src/afd/sprites-canonical/back-shiny/0187-000-Hoppip.png b/newsrc/afd/5984bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0187-000-Hoppip.png rename to newsrc/afd/5984bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0187-000-Hoppip.png b/newsrc/afd/5984s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0187-000-Hoppip.png rename to newsrc/afd/5984s.png diff --git a/src/afd/sprites-canonical/front/0188-000-Skiploom.png b/newsrc/afd/6016.png similarity index 100% rename from src/afd/sprites-canonical/front/0188-000-Skiploom.png rename to newsrc/afd/6016.png diff --git a/src/afd/sprites-canonical/back/0188-000-Skiploom.png b/newsrc/afd/6016b.png similarity index 100% rename from src/afd/sprites-canonical/back/0188-000-Skiploom.png rename to newsrc/afd/6016b.png diff --git a/src/afd/sprites-canonical/back-shiny/0188-000-Skiploom.png b/newsrc/afd/6016bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0188-000-Skiploom.png rename to newsrc/afd/6016bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0188-000-Skiploom.png b/newsrc/afd/6016s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0188-000-Skiploom.png rename to newsrc/afd/6016s.png diff --git a/src/afd/sprites-canonical/front/0189-000-Jumpluff.png b/newsrc/afd/6048.png similarity index 100% rename from src/afd/sprites-canonical/front/0189-000-Jumpluff.png rename to newsrc/afd/6048.png diff --git a/src/afd/sprites-canonical/back/0189-000-Jumpluff.png b/newsrc/afd/6048b.png similarity index 100% rename from src/afd/sprites-canonical/back/0189-000-Jumpluff.png rename to newsrc/afd/6048b.png diff --git a/src/afd/sprites-canonical/back-shiny/0189-000-Jumpluff.png b/newsrc/afd/6048bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0189-000-Jumpluff.png rename to newsrc/afd/6048bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0189-000-Jumpluff.png b/newsrc/afd/6048s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0189-000-Jumpluff.png rename to newsrc/afd/6048s.png diff --git a/src/afd/sprites-canonical/front/0019-000-Rattata.png b/newsrc/afd/608.png similarity index 100% rename from src/afd/sprites-canonical/front/0019-000-Rattata.png rename to newsrc/afd/608.png diff --git a/src/afd/sprites-canonical/front/0190-000-Aipom.png b/newsrc/afd/6080.png similarity index 100% rename from src/afd/sprites-canonical/front/0190-000-Aipom.png rename to newsrc/afd/6080.png diff --git a/src/afd/sprites-canonical/back/0190-000-Aipom.png b/newsrc/afd/6080b.png similarity index 100% rename from src/afd/sprites-canonical/back/0190-000-Aipom.png rename to newsrc/afd/6080b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0190-000-Aipom-Female.png b/newsrc/afd/6080bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0190-000-Aipom-Female.png rename to newsrc/afd/6080bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0190-000-Aipom-Female.png b/newsrc/afd/6080bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0190-000-Aipom-Female.png rename to newsrc/afd/6080bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0190-000-Aipom.png b/newsrc/afd/6080bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0190-000-Aipom.png rename to newsrc/afd/6080bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0190-000-Aipom-Female.png b/newsrc/afd/6080f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0190-000-Aipom-Female.png rename to newsrc/afd/6080f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0190-000-Aipom-Female.png b/newsrc/afd/6080fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0190-000-Aipom-Female.png rename to newsrc/afd/6080fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0190-000-Aipom.png b/newsrc/afd/6080s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0190-000-Aipom.png rename to newsrc/afd/6080s.png diff --git a/src/afd/sprites-canonical/back/0019-000-Rattata.png b/newsrc/afd/608b.png similarity index 100% rename from src/afd/sprites-canonical/back/0019-000-Rattata.png rename to newsrc/afd/608b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0019-000-Rattata-Female.png b/newsrc/afd/608bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0019-000-Rattata-Female.png rename to newsrc/afd/608bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0019-000-Rattata-Female.png b/newsrc/afd/608bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0019-000-Rattata-Female.png rename to newsrc/afd/608bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0019-000-Rattata.png b/newsrc/afd/608bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0019-000-Rattata.png rename to newsrc/afd/608bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0019-000-Rattata-Female.png b/newsrc/afd/608f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0019-000-Rattata-Female.png rename to newsrc/afd/608f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0019-000-Rattata-Female.png b/newsrc/afd/608fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0019-000-Rattata-Female.png rename to newsrc/afd/608fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0019-000-Rattata.png b/newsrc/afd/608s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0019-000-Rattata.png rename to newsrc/afd/608s.png diff --git a/src/afd/sprites-canonical/front/0019-420-Rattata-Alola.png b/newsrc/afd/609.png similarity index 100% rename from src/afd/sprites-canonical/front/0019-420-Rattata-Alola.png rename to newsrc/afd/609.png diff --git a/src/afd/sprites-canonical/back/0019-420-Rattata-Alola.png b/newsrc/afd/609b.png similarity index 100% rename from src/afd/sprites-canonical/back/0019-420-Rattata-Alola.png rename to newsrc/afd/609b.png diff --git a/src/afd/sprites-canonical/back-shiny/0019-420-Rattata-Alola.png b/newsrc/afd/609bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0019-420-Rattata-Alola.png rename to newsrc/afd/609bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0019-420-Rattata-Alola.png b/newsrc/afd/609s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0019-420-Rattata-Alola.png rename to newsrc/afd/609s.png diff --git a/src/afd/sprites-canonical/front/0191-000-Sunkern.png b/newsrc/afd/6112.png similarity index 100% rename from src/afd/sprites-canonical/front/0191-000-Sunkern.png rename to newsrc/afd/6112.png diff --git a/src/afd/sprites-canonical/back/0191-000-Sunkern.png b/newsrc/afd/6112b.png similarity index 100% rename from src/afd/sprites-canonical/back/0191-000-Sunkern.png rename to newsrc/afd/6112b.png diff --git a/src/afd/sprites-canonical/back-shiny/0191-000-Sunkern.png b/newsrc/afd/6112bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0191-000-Sunkern.png rename to newsrc/afd/6112bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0191-000-Sunkern.png b/newsrc/afd/6112s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0191-000-Sunkern.png rename to newsrc/afd/6112s.png diff --git a/src/afd/sprites-canonical/front/0192-000-Sunflora.png b/newsrc/afd/6144.png similarity index 100% rename from src/afd/sprites-canonical/front/0192-000-Sunflora.png rename to newsrc/afd/6144.png diff --git a/src/afd/sprites-canonical/back/0192-000-Sunflora.png b/newsrc/afd/6144b.png similarity index 100% rename from src/afd/sprites-canonical/back/0192-000-Sunflora.png rename to newsrc/afd/6144b.png diff --git a/src/afd/sprites-canonical/back-shiny/0192-000-Sunflora.png b/newsrc/afd/6144bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0192-000-Sunflora.png rename to newsrc/afd/6144bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0192-000-Sunflora.png b/newsrc/afd/6144s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0192-000-Sunflora.png rename to newsrc/afd/6144s.png diff --git a/src/afd/sprites-canonical/front/0193-000-Yanma.png b/newsrc/afd/6176.png similarity index 100% rename from src/afd/sprites-canonical/front/0193-000-Yanma.png rename to newsrc/afd/6176.png diff --git a/src/afd/sprites-canonical/back/0193-000-Yanma.png b/newsrc/afd/6176b.png similarity index 100% rename from src/afd/sprites-canonical/back/0193-000-Yanma.png rename to newsrc/afd/6176b.png diff --git a/src/afd/sprites-canonical/back-shiny/0193-000-Yanma.png b/newsrc/afd/6176bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0193-000-Yanma.png rename to newsrc/afd/6176bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0193-000-Yanma.png b/newsrc/afd/6176s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0193-000-Yanma.png rename to newsrc/afd/6176s.png diff --git a/src/afd/sprites-canonical/front/0194-000-Wooper.png b/newsrc/afd/6208.png similarity index 100% rename from src/afd/sprites-canonical/front/0194-000-Wooper.png rename to newsrc/afd/6208.png diff --git a/src/afd/sprites-canonical/back/0194-000-Wooper.png b/newsrc/afd/6208b.png similarity index 100% rename from src/afd/sprites-canonical/back/0194-000-Wooper.png rename to newsrc/afd/6208b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0194-000-Wooper-Female.png b/newsrc/afd/6208bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0194-000-Wooper-Female.png rename to newsrc/afd/6208bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0194-000-Wooper-Female.png b/newsrc/afd/6208bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0194-000-Wooper-Female.png rename to newsrc/afd/6208bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0194-000-Wooper.png b/newsrc/afd/6208bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0194-000-Wooper.png rename to newsrc/afd/6208bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0194-000-Wooper-Female.png b/newsrc/afd/6208f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0194-000-Wooper-Female.png rename to newsrc/afd/6208f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0194-000-Wooper-Female.png b/newsrc/afd/6208fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0194-000-Wooper-Female.png rename to newsrc/afd/6208fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0194-000-Wooper.png b/newsrc/afd/6208s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0194-000-Wooper.png rename to newsrc/afd/6208s.png diff --git a/src/afd/sprites-canonical/front/0195-000-Quagsire.png b/newsrc/afd/6240.png similarity index 100% rename from src/afd/sprites-canonical/front/0195-000-Quagsire.png rename to newsrc/afd/6240.png diff --git a/src/afd/sprites-canonical/back/0195-000-Quagsire.png b/newsrc/afd/6240b.png similarity index 100% rename from src/afd/sprites-canonical/back/0195-000-Quagsire.png rename to newsrc/afd/6240b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0195-000-Quagsire-Female.png b/newsrc/afd/6240bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0195-000-Quagsire-Female.png rename to newsrc/afd/6240bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0195-000-Quagsire-Female.png b/newsrc/afd/6240bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0195-000-Quagsire-Female.png rename to newsrc/afd/6240bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0195-000-Quagsire.png b/newsrc/afd/6240bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0195-000-Quagsire.png rename to newsrc/afd/6240bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0195-000-Quagsire-Female.png b/newsrc/afd/6240f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0195-000-Quagsire-Female.png rename to newsrc/afd/6240f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0195-000-Quagsire-Female.png b/newsrc/afd/6240fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0195-000-Quagsire-Female.png rename to newsrc/afd/6240fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0195-000-Quagsire.png b/newsrc/afd/6240s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0195-000-Quagsire.png rename to newsrc/afd/6240s.png diff --git a/src/afd/sprites-canonical/front/0196-000-Espeon.png b/newsrc/afd/6272.png similarity index 100% rename from src/afd/sprites-canonical/front/0196-000-Espeon.png rename to newsrc/afd/6272.png diff --git a/src/afd/sprites-canonical/back/0196-000-Espeon.png b/newsrc/afd/6272b.png similarity index 100% rename from src/afd/sprites-canonical/back/0196-000-Espeon.png rename to newsrc/afd/6272b.png diff --git a/src/afd/sprites-canonical/back-shiny/0196-000-Espeon.png b/newsrc/afd/6272bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0196-000-Espeon.png rename to newsrc/afd/6272bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0196-000-Espeon.png b/newsrc/afd/6272s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0196-000-Espeon.png rename to newsrc/afd/6272s.png diff --git a/src/afd/sprites-canonical/front/0197-000-Umbreon.png b/newsrc/afd/6304.png similarity index 100% rename from src/afd/sprites-canonical/front/0197-000-Umbreon.png rename to newsrc/afd/6304.png diff --git a/src/afd/sprites-canonical/back/0197-000-Umbreon.png b/newsrc/afd/6304b.png similarity index 100% rename from src/afd/sprites-canonical/back/0197-000-Umbreon.png rename to newsrc/afd/6304b.png diff --git a/src/afd/sprites-canonical/back-shiny/0197-000-Umbreon.png b/newsrc/afd/6304bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0197-000-Umbreon.png rename to newsrc/afd/6304bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0197-000-Umbreon.png b/newsrc/afd/6304s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0197-000-Umbreon.png rename to newsrc/afd/6304s.png diff --git a/src/afd/sprites-canonical/front/0198-000-Murkrow.png b/newsrc/afd/6336.png similarity index 100% rename from src/afd/sprites-canonical/front/0198-000-Murkrow.png rename to newsrc/afd/6336.png diff --git a/src/afd/sprites-canonical/back/0198-000-Murkrow.png b/newsrc/afd/6336b.png similarity index 100% rename from src/afd/sprites-canonical/back/0198-000-Murkrow.png rename to newsrc/afd/6336b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0198-000-Murkrow-Female.png b/newsrc/afd/6336bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0198-000-Murkrow-Female.png rename to newsrc/afd/6336bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0198-000-Murkrow-Female.png b/newsrc/afd/6336bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0198-000-Murkrow-Female.png rename to newsrc/afd/6336bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0198-000-Murkrow.png b/newsrc/afd/6336bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0198-000-Murkrow.png rename to newsrc/afd/6336bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0198-000-Murkrow-Female.png b/newsrc/afd/6336f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0198-000-Murkrow-Female.png rename to newsrc/afd/6336f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0198-000-Murkrow-Female.png b/newsrc/afd/6336fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0198-000-Murkrow-Female.png rename to newsrc/afd/6336fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0198-000-Murkrow.png b/newsrc/afd/6336s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0198-000-Murkrow.png rename to newsrc/afd/6336s.png diff --git a/src/afd/sprites-canonical/front/0199-000-Slowking.png b/newsrc/afd/6368.png similarity index 100% rename from src/afd/sprites-canonical/front/0199-000-Slowking.png rename to newsrc/afd/6368.png diff --git a/src/afd/sprites-canonical/back/0199-000-Slowking.png b/newsrc/afd/6368b.png similarity index 100% rename from src/afd/sprites-canonical/back/0199-000-Slowking.png rename to newsrc/afd/6368b.png diff --git a/src/afd/sprites-canonical/back-shiny/0199-000-Slowking.png b/newsrc/afd/6368bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0199-000-Slowking.png rename to newsrc/afd/6368bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0199-000-Slowking.png b/newsrc/afd/6368s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0199-000-Slowking.png rename to newsrc/afd/6368s.png diff --git a/src/afd/sprites-canonical/front/0002-000-Ivysaur.png b/newsrc/afd/64.png similarity index 100% rename from src/afd/sprites-canonical/front/0002-000-Ivysaur.png rename to newsrc/afd/64.png diff --git a/src/afd/sprites-canonical/front/0020-000-Raticate.png b/newsrc/afd/640.png similarity index 100% rename from src/afd/sprites-canonical/front/0020-000-Raticate.png rename to newsrc/afd/640.png diff --git a/src/afd/sprites-canonical/front/0200-000-Misdreavus.png b/newsrc/afd/6400.png similarity index 100% rename from src/afd/sprites-canonical/front/0200-000-Misdreavus.png rename to newsrc/afd/6400.png diff --git a/src/afd/sprites-canonical/back/0200-000-Misdreavus.png b/newsrc/afd/6400b.png similarity index 100% rename from src/afd/sprites-canonical/back/0200-000-Misdreavus.png rename to newsrc/afd/6400b.png diff --git a/src/afd/sprites-canonical/back-shiny/0200-000-Misdreavus.png b/newsrc/afd/6400bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0200-000-Misdreavus.png rename to newsrc/afd/6400bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0200-000-Misdreavus.png b/newsrc/afd/6400s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0200-000-Misdreavus.png rename to newsrc/afd/6400s.png diff --git a/src/afd/sprites-canonical/back/0020-000-Raticate.png b/newsrc/afd/640b.png similarity index 100% rename from src/afd/sprites-canonical/back/0020-000-Raticate.png rename to newsrc/afd/640b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0020-000-Raticate-Female.png b/newsrc/afd/640bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0020-000-Raticate-Female.png rename to newsrc/afd/640bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0020-000-Raticate-Female.png b/newsrc/afd/640bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0020-000-Raticate-Female.png rename to newsrc/afd/640bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0020-000-Raticate.png b/newsrc/afd/640bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0020-000-Raticate.png rename to newsrc/afd/640bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0020-000-Raticate-Female.png b/newsrc/afd/640f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0020-000-Raticate-Female.png rename to newsrc/afd/640f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0020-000-Raticate-Female.png b/newsrc/afd/640fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0020-000-Raticate-Female.png rename to newsrc/afd/640fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0020-000-Raticate.png b/newsrc/afd/640s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0020-000-Raticate.png rename to newsrc/afd/640s.png diff --git a/src/afd/sprites-canonical/front/0020-420-Raticate-Alola.png b/newsrc/afd/641.png similarity index 100% rename from src/afd/sprites-canonical/front/0020-420-Raticate-Alola.png rename to newsrc/afd/641.png diff --git a/src/afd/sprites-canonical/back/0020-420-Raticate-Alola.png b/newsrc/afd/641b.png similarity index 100% rename from src/afd/sprites-canonical/back/0020-420-Raticate-Alola.png rename to newsrc/afd/641b.png diff --git a/src/afd/sprites-canonical/back-shiny/0020-420-Raticate-Alola.png b/newsrc/afd/641bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0020-420-Raticate-Alola.png rename to newsrc/afd/641bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0020-420-Raticate-Alola.png b/newsrc/afd/641s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0020-420-Raticate-Alola.png rename to newsrc/afd/641s.png diff --git a/src/afd/sprites-canonical/front/0201-000-Unown.png b/newsrc/afd/6432.png similarity index 100% rename from src/afd/sprites-canonical/front/0201-000-Unown.png rename to newsrc/afd/6432.png diff --git a/src/afd/sprites-canonical/back/0201-000-Unown.png b/newsrc/afd/6432b.png similarity index 100% rename from src/afd/sprites-canonical/back/0201-000-Unown.png rename to newsrc/afd/6432b.png diff --git a/src/afd/sprites-canonical/back-shiny/0201-000-Unown.png b/newsrc/afd/6432bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0201-000-Unown.png rename to newsrc/afd/6432bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0201-000-Unown.png b/newsrc/afd/6432s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0201-000-Unown.png rename to newsrc/afd/6432s.png diff --git a/src/afd/sprites-canonical/front/0202-000-Wobbuffet.png b/newsrc/afd/6464.png similarity index 100% rename from src/afd/sprites-canonical/front/0202-000-Wobbuffet.png rename to newsrc/afd/6464.png diff --git a/src/afd/sprites-canonical/back/0202-000-Wobbuffet.png b/newsrc/afd/6464b.png similarity index 100% rename from src/afd/sprites-canonical/back/0202-000-Wobbuffet.png rename to newsrc/afd/6464b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0202-000-Wobbuffet-Female.png b/newsrc/afd/6464bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0202-000-Wobbuffet-Female.png rename to newsrc/afd/6464bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0202-000-Wobbuffet-Female.png b/newsrc/afd/6464bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0202-000-Wobbuffet-Female.png rename to newsrc/afd/6464bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0202-000-Wobbuffet.png b/newsrc/afd/6464bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0202-000-Wobbuffet.png rename to newsrc/afd/6464bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0202-000-Wobbuffet-Female.png b/newsrc/afd/6464f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0202-000-Wobbuffet-Female.png rename to newsrc/afd/6464f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0202-000-Wobbuffet-Female.png b/newsrc/afd/6464fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0202-000-Wobbuffet-Female.png rename to newsrc/afd/6464fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0202-000-Wobbuffet.png b/newsrc/afd/6464s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0202-000-Wobbuffet.png rename to newsrc/afd/6464s.png diff --git a/src/afd/sprites-canonical/front/0203-000-Girafarig.png b/newsrc/afd/6496.png similarity index 100% rename from src/afd/sprites-canonical/front/0203-000-Girafarig.png rename to newsrc/afd/6496.png diff --git a/src/afd/sprites-canonical/back/0203-000-Girafarig.png b/newsrc/afd/6496b.png similarity index 100% rename from src/afd/sprites-canonical/back/0203-000-Girafarig.png rename to newsrc/afd/6496b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0203-000-Girafarig-Female.png b/newsrc/afd/6496bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0203-000-Girafarig-Female.png rename to newsrc/afd/6496bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0203-000-Girafarig-Female.png b/newsrc/afd/6496bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0203-000-Girafarig-Female.png rename to newsrc/afd/6496bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0203-000-Girafarig.png b/newsrc/afd/6496bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0203-000-Girafarig.png rename to newsrc/afd/6496bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0203-000-Girafarig-Female.png b/newsrc/afd/6496f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0203-000-Girafarig-Female.png rename to newsrc/afd/6496f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0203-000-Girafarig-Female.png b/newsrc/afd/6496fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0203-000-Girafarig-Female.png rename to newsrc/afd/6496fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0203-000-Girafarig.png b/newsrc/afd/6496s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0203-000-Girafarig.png rename to newsrc/afd/6496s.png diff --git a/src/afd/sprites-canonical/back/0002-000-Ivysaur.png b/newsrc/afd/64b.png similarity index 100% rename from src/afd/sprites-canonical/back/0002-000-Ivysaur.png rename to newsrc/afd/64b.png diff --git a/src/afd/sprites-canonical/back-shiny/0002-000-Ivysaur.png b/newsrc/afd/64bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0002-000-Ivysaur.png rename to newsrc/afd/64bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0002-000-Ivysaur.png b/newsrc/afd/64s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0002-000-Ivysaur.png rename to newsrc/afd/64s.png diff --git a/src/afd/sprites-canonical/front/0204-000-Pineco.png b/newsrc/afd/6528.png similarity index 100% rename from src/afd/sprites-canonical/front/0204-000-Pineco.png rename to newsrc/afd/6528.png diff --git a/src/afd/sprites-canonical/back/0204-000-Pineco.png b/newsrc/afd/6528b.png similarity index 100% rename from src/afd/sprites-canonical/back/0204-000-Pineco.png rename to newsrc/afd/6528b.png diff --git a/src/afd/sprites-canonical/back-shiny/0204-000-Pineco.png b/newsrc/afd/6528bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0204-000-Pineco.png rename to newsrc/afd/6528bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0204-000-Pineco.png b/newsrc/afd/6528s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0204-000-Pineco.png rename to newsrc/afd/6528s.png diff --git a/src/afd/sprites-canonical/front/0205-000-Forretress.png b/newsrc/afd/6560.png similarity index 100% rename from src/afd/sprites-canonical/front/0205-000-Forretress.png rename to newsrc/afd/6560.png diff --git a/src/afd/sprites-canonical/back/0205-000-Forretress.png b/newsrc/afd/6560b.png similarity index 100% rename from src/afd/sprites-canonical/back/0205-000-Forretress.png rename to newsrc/afd/6560b.png diff --git a/src/afd/sprites-canonical/back-shiny/0205-000-Forretress.png b/newsrc/afd/6560bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0205-000-Forretress.png rename to newsrc/afd/6560bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0205-000-Forretress.png b/newsrc/afd/6560s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0205-000-Forretress.png rename to newsrc/afd/6560s.png diff --git a/src/afd/sprites-canonical/front/0206-000-Dunsparce.png b/newsrc/afd/6592.png similarity index 100% rename from src/afd/sprites-canonical/front/0206-000-Dunsparce.png rename to newsrc/afd/6592.png diff --git a/src/afd/sprites-canonical/back/0206-000-Dunsparce.png b/newsrc/afd/6592b.png similarity index 100% rename from src/afd/sprites-canonical/back/0206-000-Dunsparce.png rename to newsrc/afd/6592b.png diff --git a/src/afd/sprites-canonical/back-shiny/0206-000-Dunsparce.png b/newsrc/afd/6592bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0206-000-Dunsparce.png rename to newsrc/afd/6592bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0206-000-Dunsparce.png b/newsrc/afd/6592s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0206-000-Dunsparce.png rename to newsrc/afd/6592s.png diff --git a/src/afd/sprites-canonical/front/0207-000-Gligar.png b/newsrc/afd/6624.png similarity index 100% rename from src/afd/sprites-canonical/front/0207-000-Gligar.png rename to newsrc/afd/6624.png diff --git a/src/afd/sprites-canonical/back/0207-000-Gligar.png b/newsrc/afd/6624b.png similarity index 100% rename from src/afd/sprites-canonical/back/0207-000-Gligar.png rename to newsrc/afd/6624b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0207-000-Gligar-Female.png b/newsrc/afd/6624bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0207-000-Gligar-Female.png rename to newsrc/afd/6624bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0207-000-Gligar-Female.png b/newsrc/afd/6624bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0207-000-Gligar-Female.png rename to newsrc/afd/6624bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0207-000-Gligar.png b/newsrc/afd/6624bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0207-000-Gligar.png rename to newsrc/afd/6624bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0207-000-Gligar-Female.png b/newsrc/afd/6624f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0207-000-Gligar-Female.png rename to newsrc/afd/6624f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0207-000-Gligar-Female.png b/newsrc/afd/6624fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0207-000-Gligar-Female.png rename to newsrc/afd/6624fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0207-000-Gligar.png b/newsrc/afd/6624s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0207-000-Gligar.png rename to newsrc/afd/6624s.png diff --git a/src/afd/sprites-canonical/front/0208-000-Steelix.png b/newsrc/afd/6656.png similarity index 100% rename from src/afd/sprites-canonical/front/0208-000-Steelix.png rename to newsrc/afd/6656.png diff --git a/src/afd/sprites-canonical/back/0208-000-Steelix.png b/newsrc/afd/6656b.png similarity index 100% rename from src/afd/sprites-canonical/back/0208-000-Steelix.png rename to newsrc/afd/6656b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0208-000-Steelix-Female.png b/newsrc/afd/6656bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0208-000-Steelix-Female.png rename to newsrc/afd/6656bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0208-000-Steelix-Female.png b/newsrc/afd/6656bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0208-000-Steelix-Female.png rename to newsrc/afd/6656bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0208-000-Steelix.png b/newsrc/afd/6656bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0208-000-Steelix.png rename to newsrc/afd/6656bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0208-000-Steelix-Female.png b/newsrc/afd/6656f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0208-000-Steelix-Female.png rename to newsrc/afd/6656f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0208-000-Steelix-Female.png b/newsrc/afd/6656fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0208-000-Steelix-Female.png rename to newsrc/afd/6656fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0208-000-Steelix.png b/newsrc/afd/6656s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0208-000-Steelix.png rename to newsrc/afd/6656s.png diff --git a/src/afd/sprites-canonical/front/0208-420-Steelix-Mega.png b/newsrc/afd/6657.png similarity index 100% rename from src/afd/sprites-canonical/front/0208-420-Steelix-Mega.png rename to newsrc/afd/6657.png diff --git a/src/afd/sprites-canonical/back/0208-420-Steelix-Mega.png b/newsrc/afd/6657b.png similarity index 100% rename from src/afd/sprites-canonical/back/0208-420-Steelix-Mega.png rename to newsrc/afd/6657b.png diff --git a/src/afd/sprites-canonical/back-shiny/0208-420-Steelix-Mega.png b/newsrc/afd/6657bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0208-420-Steelix-Mega.png rename to newsrc/afd/6657bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0208-420-Steelix-Mega.png b/newsrc/afd/6657s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0208-420-Steelix-Mega.png rename to newsrc/afd/6657s.png diff --git a/src/afd/sprites-canonical/front/0209-000-Snubbull.png b/newsrc/afd/6688.png similarity index 100% rename from src/afd/sprites-canonical/front/0209-000-Snubbull.png rename to newsrc/afd/6688.png diff --git a/src/afd/sprites-canonical/back/0209-000-Snubbull.png b/newsrc/afd/6688b.png similarity index 100% rename from src/afd/sprites-canonical/back/0209-000-Snubbull.png rename to newsrc/afd/6688b.png diff --git a/src/afd/sprites-canonical/back-shiny/0209-000-Snubbull.png b/newsrc/afd/6688bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0209-000-Snubbull.png rename to newsrc/afd/6688bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0209-000-Snubbull.png b/newsrc/afd/6688s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0209-000-Snubbull.png rename to newsrc/afd/6688s.png diff --git a/src/afd/sprites-canonical/front/0021-000-Spearow.png b/newsrc/afd/672.png similarity index 100% rename from src/afd/sprites-canonical/front/0021-000-Spearow.png rename to newsrc/afd/672.png diff --git a/src/afd/sprites-canonical/front/0210-000-Granbull.png b/newsrc/afd/6720.png similarity index 100% rename from src/afd/sprites-canonical/front/0210-000-Granbull.png rename to newsrc/afd/6720.png diff --git a/src/afd/sprites-canonical/back/0210-000-Granbull.png b/newsrc/afd/6720b.png similarity index 100% rename from src/afd/sprites-canonical/back/0210-000-Granbull.png rename to newsrc/afd/6720b.png diff --git a/src/afd/sprites-canonical/back-shiny/0210-000-Granbull.png b/newsrc/afd/6720bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0210-000-Granbull.png rename to newsrc/afd/6720bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0210-000-Granbull.png b/newsrc/afd/6720s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0210-000-Granbull.png rename to newsrc/afd/6720s.png diff --git a/src/afd/sprites-canonical/back/0021-000-Spearow.png b/newsrc/afd/672b.png similarity index 100% rename from src/afd/sprites-canonical/back/0021-000-Spearow.png rename to newsrc/afd/672b.png diff --git a/src/afd/sprites-canonical/back-shiny/0021-000-Spearow.png b/newsrc/afd/672bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0021-000-Spearow.png rename to newsrc/afd/672bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0021-000-Spearow.png b/newsrc/afd/672s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0021-000-Spearow.png rename to newsrc/afd/672s.png diff --git a/src/afd/sprites-canonical/front/0211-000-Qwilfish.png b/newsrc/afd/6752.png similarity index 100% rename from src/afd/sprites-canonical/front/0211-000-Qwilfish.png rename to newsrc/afd/6752.png diff --git a/src/afd/sprites-canonical/back/0211-000-Qwilfish.png b/newsrc/afd/6752b.png similarity index 100% rename from src/afd/sprites-canonical/back/0211-000-Qwilfish.png rename to newsrc/afd/6752b.png diff --git a/src/afd/sprites-canonical/back-shiny/0211-000-Qwilfish.png b/newsrc/afd/6752bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0211-000-Qwilfish.png rename to newsrc/afd/6752bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0211-000-Qwilfish.png b/newsrc/afd/6752s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0211-000-Qwilfish.png rename to newsrc/afd/6752s.png diff --git a/src/afd/sprites-canonical/front/0212-000-Scizor.png b/newsrc/afd/6784.png similarity index 100% rename from src/afd/sprites-canonical/front/0212-000-Scizor.png rename to newsrc/afd/6784.png diff --git a/src/afd/sprites-canonical/back/0212-000-Scizor.png b/newsrc/afd/6784b.png similarity index 100% rename from src/afd/sprites-canonical/back/0212-000-Scizor.png rename to newsrc/afd/6784b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0212-000-Scizor-Female.png b/newsrc/afd/6784bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0212-000-Scizor-Female.png rename to newsrc/afd/6784bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0212-000-Scizor-Female.png b/newsrc/afd/6784bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0212-000-Scizor-Female.png rename to newsrc/afd/6784bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0212-000-Scizor.png b/newsrc/afd/6784bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0212-000-Scizor.png rename to newsrc/afd/6784bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0212-000-Scizor-Female.png b/newsrc/afd/6784f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0212-000-Scizor-Female.png rename to newsrc/afd/6784f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0212-000-Scizor-Female.png b/newsrc/afd/6784fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0212-000-Scizor-Female.png rename to newsrc/afd/6784fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0212-000-Scizor.png b/newsrc/afd/6784s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0212-000-Scizor.png rename to newsrc/afd/6784s.png diff --git a/src/afd/sprites-canonical/front/0212-420-Scizor-Mega.png b/newsrc/afd/6785.png similarity index 100% rename from src/afd/sprites-canonical/front/0212-420-Scizor-Mega.png rename to newsrc/afd/6785.png diff --git a/src/afd/sprites-canonical/back/0212-420-Scizor-Mega.png b/newsrc/afd/6785b.png similarity index 100% rename from src/afd/sprites-canonical/back/0212-420-Scizor-Mega.png rename to newsrc/afd/6785b.png diff --git a/src/afd/sprites-canonical/back-shiny/0212-420-Scizor-Mega.png b/newsrc/afd/6785bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0212-420-Scizor-Mega.png rename to newsrc/afd/6785bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0212-420-Scizor-Mega.png b/newsrc/afd/6785s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0212-420-Scizor-Mega.png rename to newsrc/afd/6785s.png diff --git a/src/afd/sprites-canonical/front/0213-000-Shuckle.png b/newsrc/afd/6816.png similarity index 100% rename from src/afd/sprites-canonical/front/0213-000-Shuckle.png rename to newsrc/afd/6816.png diff --git a/src/afd/sprites-canonical/back/0213-000-Shuckle.png b/newsrc/afd/6816b.png similarity index 100% rename from src/afd/sprites-canonical/back/0213-000-Shuckle.png rename to newsrc/afd/6816b.png diff --git a/src/afd/sprites-canonical/back-shiny/0213-000-Shuckle.png b/newsrc/afd/6816bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0213-000-Shuckle.png rename to newsrc/afd/6816bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0213-000-Shuckle.png b/newsrc/afd/6816s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0213-000-Shuckle.png rename to newsrc/afd/6816s.png diff --git a/src/afd/sprites-canonical/front/0214-000-Heracross.png b/newsrc/afd/6848.png similarity index 100% rename from src/afd/sprites-canonical/front/0214-000-Heracross.png rename to newsrc/afd/6848.png diff --git a/src/afd/sprites-canonical/back/0214-000-Heracross.png b/newsrc/afd/6848b.png similarity index 100% rename from src/afd/sprites-canonical/back/0214-000-Heracross.png rename to newsrc/afd/6848b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0214-000-Heracross-Female.png b/newsrc/afd/6848bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0214-000-Heracross-Female.png rename to newsrc/afd/6848bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0214-000-Heracross-Female.png b/newsrc/afd/6848bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0214-000-Heracross-Female.png rename to newsrc/afd/6848bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0214-000-Heracross.png b/newsrc/afd/6848bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0214-000-Heracross.png rename to newsrc/afd/6848bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0214-000-Heracross-Female.png b/newsrc/afd/6848f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0214-000-Heracross-Female.png rename to newsrc/afd/6848f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0214-000-Heracross-Female.png b/newsrc/afd/6848fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0214-000-Heracross-Female.png rename to newsrc/afd/6848fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0214-000-Heracross.png b/newsrc/afd/6848s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0214-000-Heracross.png rename to newsrc/afd/6848s.png diff --git a/src/afd/sprites-canonical/front/0214-420-Heracross-Mega.png b/newsrc/afd/6849.png similarity index 100% rename from src/afd/sprites-canonical/front/0214-420-Heracross-Mega.png rename to newsrc/afd/6849.png diff --git a/src/afd/sprites-canonical/back/0214-420-Heracross-Mega.png b/newsrc/afd/6849b.png similarity index 100% rename from src/afd/sprites-canonical/back/0214-420-Heracross-Mega.png rename to newsrc/afd/6849b.png diff --git a/src/afd/sprites-canonical/back-shiny/0214-420-Heracross-Mega.png b/newsrc/afd/6849bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0214-420-Heracross-Mega.png rename to newsrc/afd/6849bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0214-420-Heracross-Mega.png b/newsrc/afd/6849s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0214-420-Heracross-Mega.png rename to newsrc/afd/6849s.png diff --git a/src/afd/sprites-canonical/front/0215-000-Sneasel.png b/newsrc/afd/6880.png similarity index 100% rename from src/afd/sprites-canonical/front/0215-000-Sneasel.png rename to newsrc/afd/6880.png diff --git a/src/afd/sprites-canonical/back/0215-000-Sneasel.png b/newsrc/afd/6880b.png similarity index 100% rename from src/afd/sprites-canonical/back/0215-000-Sneasel.png rename to newsrc/afd/6880b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0215-000-Sneasel-Female.png b/newsrc/afd/6880bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0215-000-Sneasel-Female.png rename to newsrc/afd/6880bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0215-000-Sneasel-Female.png b/newsrc/afd/6880bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0215-000-Sneasel-Female.png rename to newsrc/afd/6880bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0215-000-Sneasel.png b/newsrc/afd/6880bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0215-000-Sneasel.png rename to newsrc/afd/6880bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0215-000-Sneasel-Female.png b/newsrc/afd/6880f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0215-000-Sneasel-Female.png rename to newsrc/afd/6880f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0215-000-Sneasel-Female.png b/newsrc/afd/6880fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0215-000-Sneasel-Female.png rename to newsrc/afd/6880fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0215-000-Sneasel.png b/newsrc/afd/6880s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0215-000-Sneasel.png rename to newsrc/afd/6880s.png diff --git a/src/afd/sprites-canonical/front/0216-000-Teddiursa.png b/newsrc/afd/6912.png similarity index 100% rename from src/afd/sprites-canonical/front/0216-000-Teddiursa.png rename to newsrc/afd/6912.png diff --git a/src/afd/sprites-canonical/back/0216-000-Teddiursa.png b/newsrc/afd/6912b.png similarity index 100% rename from src/afd/sprites-canonical/back/0216-000-Teddiursa.png rename to newsrc/afd/6912b.png diff --git a/src/afd/sprites-canonical/back-shiny/0216-000-Teddiursa.png b/newsrc/afd/6912bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0216-000-Teddiursa.png rename to newsrc/afd/6912bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0216-000-Teddiursa.png b/newsrc/afd/6912s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0216-000-Teddiursa.png rename to newsrc/afd/6912s.png diff --git a/src/afd/sprites-canonical/front/0217-000-Ursaring.png b/newsrc/afd/6944.png similarity index 100% rename from src/afd/sprites-canonical/front/0217-000-Ursaring.png rename to newsrc/afd/6944.png diff --git a/src/afd/sprites-canonical/back/0217-000-Ursaring.png b/newsrc/afd/6944b.png similarity index 100% rename from src/afd/sprites-canonical/back/0217-000-Ursaring.png rename to newsrc/afd/6944b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0217-000-Ursaring-Female.png b/newsrc/afd/6944bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0217-000-Ursaring-Female.png rename to newsrc/afd/6944bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0217-000-Ursaring-Female.png b/newsrc/afd/6944bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0217-000-Ursaring-Female.png rename to newsrc/afd/6944bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0217-000-Ursaring.png b/newsrc/afd/6944bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0217-000-Ursaring.png rename to newsrc/afd/6944bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0217-000-Ursaring-Female.png b/newsrc/afd/6944f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0217-000-Ursaring-Female.png rename to newsrc/afd/6944f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0217-000-Ursaring-Female.png b/newsrc/afd/6944fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0217-000-Ursaring-Female.png rename to newsrc/afd/6944fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0217-000-Ursaring.png b/newsrc/afd/6944s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0217-000-Ursaring.png rename to newsrc/afd/6944s.png diff --git a/src/afd/sprites-canonical/front/0218-000-Slugma.png b/newsrc/afd/6976.png similarity index 100% rename from src/afd/sprites-canonical/front/0218-000-Slugma.png rename to newsrc/afd/6976.png diff --git a/src/afd/sprites-canonical/back/0218-000-Slugma.png b/newsrc/afd/6976b.png similarity index 100% rename from src/afd/sprites-canonical/back/0218-000-Slugma.png rename to newsrc/afd/6976b.png diff --git a/src/afd/sprites-canonical/back-shiny/0218-000-Slugma.png b/newsrc/afd/6976bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0218-000-Slugma.png rename to newsrc/afd/6976bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0218-000-Slugma.png b/newsrc/afd/6976s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0218-000-Slugma.png rename to newsrc/afd/6976s.png diff --git a/src/afd/sprites-canonical/front/0219-000-Magcargo.png b/newsrc/afd/7008.png similarity index 100% rename from src/afd/sprites-canonical/front/0219-000-Magcargo.png rename to newsrc/afd/7008.png diff --git a/src/afd/sprites-canonical/back/0219-000-Magcargo.png b/newsrc/afd/7008b.png similarity index 100% rename from src/afd/sprites-canonical/back/0219-000-Magcargo.png rename to newsrc/afd/7008b.png diff --git a/src/afd/sprites-canonical/back-shiny/0219-000-Magcargo.png b/newsrc/afd/7008bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0219-000-Magcargo.png rename to newsrc/afd/7008bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0219-000-Magcargo.png b/newsrc/afd/7008s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0219-000-Magcargo.png rename to newsrc/afd/7008s.png diff --git a/src/afd/sprites-canonical/front/0022-000-Fearow.png b/newsrc/afd/704.png similarity index 100% rename from src/afd/sprites-canonical/front/0022-000-Fearow.png rename to newsrc/afd/704.png diff --git a/src/afd/sprites-canonical/front/0220-000-Swinub.png b/newsrc/afd/7040.png similarity index 100% rename from src/afd/sprites-canonical/front/0220-000-Swinub.png rename to newsrc/afd/7040.png diff --git a/src/afd/sprites-canonical/back/0220-000-Swinub.png b/newsrc/afd/7040b.png similarity index 100% rename from src/afd/sprites-canonical/back/0220-000-Swinub.png rename to newsrc/afd/7040b.png diff --git a/src/afd/sprites-canonical/back-shiny/0220-000-Swinub.png b/newsrc/afd/7040bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0220-000-Swinub.png rename to newsrc/afd/7040bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0220-000-Swinub.png b/newsrc/afd/7040s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0220-000-Swinub.png rename to newsrc/afd/7040s.png diff --git a/src/afd/sprites-canonical/back/0022-000-Fearow.png b/newsrc/afd/704b.png similarity index 100% rename from src/afd/sprites-canonical/back/0022-000-Fearow.png rename to newsrc/afd/704b.png diff --git a/src/afd/sprites-canonical/back-shiny/0022-000-Fearow.png b/newsrc/afd/704bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0022-000-Fearow.png rename to newsrc/afd/704bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0022-000-Fearow.png b/newsrc/afd/704s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0022-000-Fearow.png rename to newsrc/afd/704s.png diff --git a/src/afd/sprites-canonical/front/0221-000-Piloswine.png b/newsrc/afd/7072.png similarity index 100% rename from src/afd/sprites-canonical/front/0221-000-Piloswine.png rename to newsrc/afd/7072.png diff --git a/src/afd/sprites-canonical/back/0221-000-Piloswine.png b/newsrc/afd/7072b.png similarity index 100% rename from src/afd/sprites-canonical/back/0221-000-Piloswine.png rename to newsrc/afd/7072b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0221-000-Piloswine-Female.png b/newsrc/afd/7072bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0221-000-Piloswine-Female.png rename to newsrc/afd/7072bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0221-000-Piloswine-Female.png b/newsrc/afd/7072bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0221-000-Piloswine-Female.png rename to newsrc/afd/7072bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0221-000-Piloswine.png b/newsrc/afd/7072bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0221-000-Piloswine.png rename to newsrc/afd/7072bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0221-000-Piloswine-Female.png b/newsrc/afd/7072f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0221-000-Piloswine-Female.png rename to newsrc/afd/7072f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0221-000-Piloswine-Female.png b/newsrc/afd/7072fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0221-000-Piloswine-Female.png rename to newsrc/afd/7072fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0221-000-Piloswine.png b/newsrc/afd/7072s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0221-000-Piloswine.png rename to newsrc/afd/7072s.png diff --git a/src/afd/sprites-canonical/front/0222-000-Corsola.png b/newsrc/afd/7104.png similarity index 100% rename from src/afd/sprites-canonical/front/0222-000-Corsola.png rename to newsrc/afd/7104.png diff --git a/src/afd/sprites-canonical/back/0222-000-Corsola.png b/newsrc/afd/7104b.png similarity index 100% rename from src/afd/sprites-canonical/back/0222-000-Corsola.png rename to newsrc/afd/7104b.png diff --git a/src/afd/sprites-canonical/back-shiny/0222-000-Corsola.png b/newsrc/afd/7104bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0222-000-Corsola.png rename to newsrc/afd/7104bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0222-000-Corsola.png b/newsrc/afd/7104s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0222-000-Corsola.png rename to newsrc/afd/7104s.png diff --git a/src/afd/sprites-canonical/front/0222-420-Corsola-Galar.png b/newsrc/afd/7105.png similarity index 100% rename from src/afd/sprites-canonical/front/0222-420-Corsola-Galar.png rename to newsrc/afd/7105.png diff --git a/src/afd/sprites-canonical/back/0222-420-Corsola-Galar.png b/newsrc/afd/7105b.png similarity index 100% rename from src/afd/sprites-canonical/back/0222-420-Corsola-Galar.png rename to newsrc/afd/7105b.png diff --git a/src/afd/sprites-canonical/back-shiny/0222-420-Corsola-Galar.png b/newsrc/afd/7105bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0222-420-Corsola-Galar.png rename to newsrc/afd/7105bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0222-420-Corsola-Galar.png b/newsrc/afd/7105s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0222-420-Corsola-Galar.png rename to newsrc/afd/7105s.png diff --git a/src/afd/sprites-canonical/front/0223-000-Remoraid.png b/newsrc/afd/7136.png similarity index 100% rename from src/afd/sprites-canonical/front/0223-000-Remoraid.png rename to newsrc/afd/7136.png diff --git a/src/afd/sprites-canonical/back/0223-000-Remoraid.png b/newsrc/afd/7136b.png similarity index 100% rename from src/afd/sprites-canonical/back/0223-000-Remoraid.png rename to newsrc/afd/7136b.png diff --git a/src/afd/sprites-canonical/back-shiny/0223-000-Remoraid.png b/newsrc/afd/7136bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0223-000-Remoraid.png rename to newsrc/afd/7136bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0223-000-Remoraid.png b/newsrc/afd/7136s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0223-000-Remoraid.png rename to newsrc/afd/7136s.png diff --git a/src/afd/sprites-canonical/front/0224-000-Octillery.png b/newsrc/afd/7168.png similarity index 100% rename from src/afd/sprites-canonical/front/0224-000-Octillery.png rename to newsrc/afd/7168.png diff --git a/src/afd/sprites-canonical/back/0224-000-Octillery.png b/newsrc/afd/7168b.png similarity index 100% rename from src/afd/sprites-canonical/back/0224-000-Octillery.png rename to newsrc/afd/7168b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0224-000-Octillery-Female.png b/newsrc/afd/7168bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0224-000-Octillery-Female.png rename to newsrc/afd/7168bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0224-000-Octillery-Female.png b/newsrc/afd/7168bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0224-000-Octillery-Female.png rename to newsrc/afd/7168bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0224-000-Octillery.png b/newsrc/afd/7168bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0224-000-Octillery.png rename to newsrc/afd/7168bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0224-000-Octillery-Female.png b/newsrc/afd/7168f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0224-000-Octillery-Female.png rename to newsrc/afd/7168f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0224-000-Octillery-Female.png b/newsrc/afd/7168fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0224-000-Octillery-Female.png rename to newsrc/afd/7168fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0224-000-Octillery.png b/newsrc/afd/7168s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0224-000-Octillery.png rename to newsrc/afd/7168s.png diff --git a/src/afd/sprites-canonical/front/0225-000-Delibird.png b/newsrc/afd/7200.png similarity index 100% rename from src/afd/sprites-canonical/front/0225-000-Delibird.png rename to newsrc/afd/7200.png diff --git a/src/afd/sprites-canonical/back/0225-000-Delibird.png b/newsrc/afd/7200b.png similarity index 100% rename from src/afd/sprites-canonical/back/0225-000-Delibird.png rename to newsrc/afd/7200b.png diff --git a/src/afd/sprites-canonical/back-shiny/0225-000-Delibird.png b/newsrc/afd/7200bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0225-000-Delibird.png rename to newsrc/afd/7200bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0225-000-Delibird.png b/newsrc/afd/7200s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0225-000-Delibird.png rename to newsrc/afd/7200s.png diff --git a/src/afd/sprites-canonical/front/0226-000-Mantine.png b/newsrc/afd/7232.png similarity index 100% rename from src/afd/sprites-canonical/front/0226-000-Mantine.png rename to newsrc/afd/7232.png diff --git a/src/afd/sprites-canonical/back/0226-000-Mantine.png b/newsrc/afd/7232b.png similarity index 100% rename from src/afd/sprites-canonical/back/0226-000-Mantine.png rename to newsrc/afd/7232b.png diff --git a/src/afd/sprites-canonical/back-shiny/0226-000-Mantine.png b/newsrc/afd/7232bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0226-000-Mantine.png rename to newsrc/afd/7232bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0226-000-Mantine.png b/newsrc/afd/7232s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0226-000-Mantine.png rename to newsrc/afd/7232s.png diff --git a/src/afd/sprites-canonical/front/0227-000-Skarmory.png b/newsrc/afd/7264.png similarity index 100% rename from src/afd/sprites-canonical/front/0227-000-Skarmory.png rename to newsrc/afd/7264.png diff --git a/src/afd/sprites-canonical/back/0227-000-Skarmory.png b/newsrc/afd/7264b.png similarity index 100% rename from src/afd/sprites-canonical/back/0227-000-Skarmory.png rename to newsrc/afd/7264b.png diff --git a/src/afd/sprites-canonical/back-shiny/0227-000-Skarmory.png b/newsrc/afd/7264bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0227-000-Skarmory.png rename to newsrc/afd/7264bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0227-000-Skarmory.png b/newsrc/afd/7264s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0227-000-Skarmory.png rename to newsrc/afd/7264s.png diff --git a/src/afd/sprites-canonical/front/0228-000-Houndour.png b/newsrc/afd/7296.png similarity index 100% rename from src/afd/sprites-canonical/front/0228-000-Houndour.png rename to newsrc/afd/7296.png diff --git a/src/afd/sprites-canonical/back/0228-000-Houndour.png b/newsrc/afd/7296b.png similarity index 100% rename from src/afd/sprites-canonical/back/0228-000-Houndour.png rename to newsrc/afd/7296b.png diff --git a/src/afd/sprites-canonical/back-shiny/0228-000-Houndour.png b/newsrc/afd/7296bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0228-000-Houndour.png rename to newsrc/afd/7296bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0228-000-Houndour.png b/newsrc/afd/7296s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0228-000-Houndour.png rename to newsrc/afd/7296s.png diff --git a/src/afd/sprites-canonical/front/0229-000-Houndoom.png b/newsrc/afd/7328.png similarity index 100% rename from src/afd/sprites-canonical/front/0229-000-Houndoom.png rename to newsrc/afd/7328.png diff --git a/src/afd/sprites-canonical/back/0229-000-Houndoom.png b/newsrc/afd/7328b.png similarity index 100% rename from src/afd/sprites-canonical/back/0229-000-Houndoom.png rename to newsrc/afd/7328b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0229-000-Houndoom-Female.png b/newsrc/afd/7328bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0229-000-Houndoom-Female.png rename to newsrc/afd/7328bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0229-000-Houndoom-Female.png b/newsrc/afd/7328bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0229-000-Houndoom-Female.png rename to newsrc/afd/7328bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0229-000-Houndoom.png b/newsrc/afd/7328bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0229-000-Houndoom.png rename to newsrc/afd/7328bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0229-000-Houndoom-Female.png b/newsrc/afd/7328f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0229-000-Houndoom-Female.png rename to newsrc/afd/7328f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0229-000-Houndoom-Female.png b/newsrc/afd/7328fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0229-000-Houndoom-Female.png rename to newsrc/afd/7328fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0229-000-Houndoom.png b/newsrc/afd/7328s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0229-000-Houndoom.png rename to newsrc/afd/7328s.png diff --git a/src/afd/sprites-canonical/front/0229-420-Houndoom-Mega.png b/newsrc/afd/7329.png similarity index 100% rename from src/afd/sprites-canonical/front/0229-420-Houndoom-Mega.png rename to newsrc/afd/7329.png diff --git a/src/afd/sprites-canonical/back/0229-420-Houndoom-Mega.png b/newsrc/afd/7329b.png similarity index 100% rename from src/afd/sprites-canonical/back/0229-420-Houndoom-Mega.png rename to newsrc/afd/7329b.png diff --git a/src/afd/sprites-canonical/back-shiny/0229-420-Houndoom-Mega.png b/newsrc/afd/7329bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0229-420-Houndoom-Mega.png rename to newsrc/afd/7329bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0229-420-Houndoom-Mega.png b/newsrc/afd/7329s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0229-420-Houndoom-Mega.png rename to newsrc/afd/7329s.png diff --git a/src/afd/sprites-canonical/front/0023-000-Ekans.png b/newsrc/afd/736.png similarity index 100% rename from src/afd/sprites-canonical/front/0023-000-Ekans.png rename to newsrc/afd/736.png diff --git a/src/afd/sprites-canonical/front/0230-000-Kingdra.png b/newsrc/afd/7360.png similarity index 100% rename from src/afd/sprites-canonical/front/0230-000-Kingdra.png rename to newsrc/afd/7360.png diff --git a/src/afd/sprites-canonical/back/0230-000-Kingdra.png b/newsrc/afd/7360b.png similarity index 100% rename from src/afd/sprites-canonical/back/0230-000-Kingdra.png rename to newsrc/afd/7360b.png diff --git a/src/afd/sprites-canonical/back/0023-000-Ekans.png b/newsrc/afd/736b.png similarity index 100% rename from src/afd/sprites-canonical/back/0023-000-Ekans.png rename to newsrc/afd/736b.png diff --git a/src/afd/sprites-canonical/back-shiny/0023-000-Ekans.png b/newsrc/afd/736bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0023-000-Ekans.png rename to newsrc/afd/736bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0023-000-Ekans.png b/newsrc/afd/736s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0023-000-Ekans.png rename to newsrc/afd/736s.png diff --git a/src/afd/sprites-canonical/front/0231-000-Phanpy.png b/newsrc/afd/7392.png similarity index 100% rename from src/afd/sprites-canonical/front/0231-000-Phanpy.png rename to newsrc/afd/7392.png diff --git a/src/afd/sprites-canonical/back/0231-000-Phanpy.png b/newsrc/afd/7392b.png similarity index 100% rename from src/afd/sprites-canonical/back/0231-000-Phanpy.png rename to newsrc/afd/7392b.png diff --git a/src/afd/sprites-canonical/back-shiny/0231-000-Phanpy.png b/newsrc/afd/7392bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0231-000-Phanpy.png rename to newsrc/afd/7392bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0231-000-Phanpy.png b/newsrc/afd/7392s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0231-000-Phanpy.png rename to newsrc/afd/7392s.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0232-000-Donphan-Female.png b/newsrc/afd/7424.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0232-000-Donphan-Female.png rename to newsrc/afd/7424.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0232-000-Donphan-Female.png b/newsrc/afd/7424b.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0232-000-Donphan-Female.png rename to newsrc/afd/7424b.png diff --git a/src/afd/sprites-canonical/back/0232-000-Donphan.png b/newsrc/afd/7424bf.png similarity index 100% rename from src/afd/sprites-canonical/back/0232-000-Donphan.png rename to newsrc/afd/7424bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0232-000-Donphan-Female.png b/newsrc/afd/7424bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0232-000-Donphan-Female.png rename to newsrc/afd/7424bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0232-000-Donphan.png b/newsrc/afd/7424bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0232-000-Donphan.png rename to newsrc/afd/7424bs.png diff --git a/src/afd/sprites-canonical/front/0232-000-Donphan.png b/newsrc/afd/7424f.png similarity index 100% rename from src/afd/sprites-canonical/front/0232-000-Donphan.png rename to newsrc/afd/7424f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0232-000-Donphan-Female.png b/newsrc/afd/7424fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0232-000-Donphan-Female.png rename to newsrc/afd/7424fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0232-000-Donphan.png b/newsrc/afd/7424s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0232-000-Donphan.png rename to newsrc/afd/7424s.png diff --git a/src/afd/sprites-canonical/front/0233-000-Porygon2.png b/newsrc/afd/7456.png similarity index 100% rename from src/afd/sprites-canonical/front/0233-000-Porygon2.png rename to newsrc/afd/7456.png diff --git a/src/afd/sprites-canonical/back/0233-000-Porygon2.png b/newsrc/afd/7456b.png similarity index 100% rename from src/afd/sprites-canonical/back/0233-000-Porygon2.png rename to newsrc/afd/7456b.png diff --git a/src/afd/sprites-canonical/back-shiny/0233-000-Porygon2.png b/newsrc/afd/7456bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0233-000-Porygon2.png rename to newsrc/afd/7456bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0233-000-Porygon2.png b/newsrc/afd/7456s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0233-000-Porygon2.png rename to newsrc/afd/7456s.png diff --git a/src/afd/sprites-canonical/front/0234-000-Stantler.png b/newsrc/afd/7488.png similarity index 100% rename from src/afd/sprites-canonical/front/0234-000-Stantler.png rename to newsrc/afd/7488.png diff --git a/src/afd/sprites-canonical/back/0234-000-Stantler.png b/newsrc/afd/7488b.png similarity index 100% rename from src/afd/sprites-canonical/back/0234-000-Stantler.png rename to newsrc/afd/7488b.png diff --git a/src/afd/sprites-canonical/back-shiny/0234-000-Stantler.png b/newsrc/afd/7488bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0234-000-Stantler.png rename to newsrc/afd/7488bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0234-000-Stantler.png b/newsrc/afd/7488s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0234-000-Stantler.png rename to newsrc/afd/7488s.png diff --git a/src/afd/sprites-canonical/front/0235-000-Smeargle.png b/newsrc/afd/7520.png similarity index 100% rename from src/afd/sprites-canonical/front/0235-000-Smeargle.png rename to newsrc/afd/7520.png diff --git a/src/afd/sprites-canonical/back/0235-000-Smeargle.png b/newsrc/afd/7520b.png similarity index 100% rename from src/afd/sprites-canonical/back/0235-000-Smeargle.png rename to newsrc/afd/7520b.png diff --git a/src/afd/sprites-canonical/back-shiny/0235-000-Smeargle.png b/newsrc/afd/7520bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0235-000-Smeargle.png rename to newsrc/afd/7520bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0235-000-Smeargle.png b/newsrc/afd/7520s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0235-000-Smeargle.png rename to newsrc/afd/7520s.png diff --git a/src/afd/sprites-canonical/front/0236-000-Tyrogue.png b/newsrc/afd/7552.png similarity index 100% rename from src/afd/sprites-canonical/front/0236-000-Tyrogue.png rename to newsrc/afd/7552.png diff --git a/src/afd/sprites-canonical/back/0236-000-Tyrogue.png b/newsrc/afd/7552b.png similarity index 100% rename from src/afd/sprites-canonical/back/0236-000-Tyrogue.png rename to newsrc/afd/7552b.png diff --git a/src/afd/sprites-canonical/back-shiny/0236-000-Tyrogue.png b/newsrc/afd/7552bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0236-000-Tyrogue.png rename to newsrc/afd/7552bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0236-000-Tyrogue.png b/newsrc/afd/7552s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0236-000-Tyrogue.png rename to newsrc/afd/7552s.png diff --git a/src/afd/sprites-canonical/front/0237-000-Hitmontop.png b/newsrc/afd/7584.png similarity index 100% rename from src/afd/sprites-canonical/front/0237-000-Hitmontop.png rename to newsrc/afd/7584.png diff --git a/src/afd/sprites-canonical/back/0237-000-Hitmontop.png b/newsrc/afd/7584b.png similarity index 100% rename from src/afd/sprites-canonical/back/0237-000-Hitmontop.png rename to newsrc/afd/7584b.png diff --git a/src/afd/sprites-canonical/back-shiny/0237-000-Hitmontop.png b/newsrc/afd/7584bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0237-000-Hitmontop.png rename to newsrc/afd/7584bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0237-000-Hitmontop.png b/newsrc/afd/7584s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0237-000-Hitmontop.png rename to newsrc/afd/7584s.png diff --git a/src/afd/sprites-canonical/front/0238-000-Smoochum.png b/newsrc/afd/7616.png similarity index 100% rename from src/afd/sprites-canonical/front/0238-000-Smoochum.png rename to newsrc/afd/7616.png diff --git a/src/afd/sprites-canonical/back/0238-000-Smoochum.png b/newsrc/afd/7616b.png similarity index 100% rename from src/afd/sprites-canonical/back/0238-000-Smoochum.png rename to newsrc/afd/7616b.png diff --git a/src/afd/sprites-canonical/back-shiny/0238-000-Smoochum.png b/newsrc/afd/7616bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0238-000-Smoochum.png rename to newsrc/afd/7616bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0238-000-Smoochum.png b/newsrc/afd/7616s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0238-000-Smoochum.png rename to newsrc/afd/7616s.png diff --git a/src/afd/sprites-canonical/front/0239-000-Elekid.png b/newsrc/afd/7648.png similarity index 100% rename from src/afd/sprites-canonical/front/0239-000-Elekid.png rename to newsrc/afd/7648.png diff --git a/src/afd/sprites-canonical/back/0239-000-Elekid.png b/newsrc/afd/7648b.png similarity index 100% rename from src/afd/sprites-canonical/back/0239-000-Elekid.png rename to newsrc/afd/7648b.png diff --git a/src/afd/sprites-canonical/back-shiny/0239-000-Elekid.png b/newsrc/afd/7648bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0239-000-Elekid.png rename to newsrc/afd/7648bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0239-000-Elekid.png b/newsrc/afd/7648s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0239-000-Elekid.png rename to newsrc/afd/7648s.png diff --git a/src/afd/sprites-canonical/front/0024-000-Arbok.png b/newsrc/afd/768.png similarity index 100% rename from src/afd/sprites-canonical/front/0024-000-Arbok.png rename to newsrc/afd/768.png diff --git a/src/afd/sprites-canonical/front/0240-000-Magby.png b/newsrc/afd/7680.png similarity index 100% rename from src/afd/sprites-canonical/front/0240-000-Magby.png rename to newsrc/afd/7680.png diff --git a/src/afd/sprites-canonical/back/0240-000-Magby.png b/newsrc/afd/7680b.png similarity index 100% rename from src/afd/sprites-canonical/back/0240-000-Magby.png rename to newsrc/afd/7680b.png diff --git a/src/afd/sprites-canonical/back-shiny/0240-000-Magby.png b/newsrc/afd/7680bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0240-000-Magby.png rename to newsrc/afd/7680bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0240-000-Magby.png b/newsrc/afd/7680s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0240-000-Magby.png rename to newsrc/afd/7680s.png diff --git a/src/afd/sprites-canonical/back/0024-000-Arbok.png b/newsrc/afd/768b.png similarity index 100% rename from src/afd/sprites-canonical/back/0024-000-Arbok.png rename to newsrc/afd/768b.png diff --git a/src/afd/sprites-canonical/back-shiny/0024-000-Arbok.png b/newsrc/afd/768bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0024-000-Arbok.png rename to newsrc/afd/768bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0024-000-Arbok.png b/newsrc/afd/768s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0024-000-Arbok.png rename to newsrc/afd/768s.png diff --git a/src/afd/sprites-canonical/front/0241-000-Miltank.png b/newsrc/afd/7712.png similarity index 100% rename from src/afd/sprites-canonical/front/0241-000-Miltank.png rename to newsrc/afd/7712.png diff --git a/src/afd/sprites-canonical/back/0241-000-Miltank.png b/newsrc/afd/7712b.png similarity index 100% rename from src/afd/sprites-canonical/back/0241-000-Miltank.png rename to newsrc/afd/7712b.png diff --git a/src/afd/sprites-canonical/back-shiny/0241-000-Miltank.png b/newsrc/afd/7712bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0241-000-Miltank.png rename to newsrc/afd/7712bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0241-000-Miltank.png b/newsrc/afd/7712s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0241-000-Miltank.png rename to newsrc/afd/7712s.png diff --git a/src/afd/sprites-canonical/front/0242-000-Blissey.png b/newsrc/afd/7744.png similarity index 100% rename from src/afd/sprites-canonical/front/0242-000-Blissey.png rename to newsrc/afd/7744.png diff --git a/src/afd/sprites-canonical/back/0242-000-Blissey.png b/newsrc/afd/7744b.png similarity index 100% rename from src/afd/sprites-canonical/back/0242-000-Blissey.png rename to newsrc/afd/7744b.png diff --git a/src/afd/sprites-canonical/back-shiny/0242-000-Blissey.png b/newsrc/afd/7744bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0242-000-Blissey.png rename to newsrc/afd/7744bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0242-000-Blissey.png b/newsrc/afd/7744s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0242-000-Blissey.png rename to newsrc/afd/7744s.png diff --git a/src/afd/sprites-canonical/front/0243-000-Raikou.png b/newsrc/afd/7776.png similarity index 100% rename from src/afd/sprites-canonical/front/0243-000-Raikou.png rename to newsrc/afd/7776.png diff --git a/src/afd/sprites-canonical/back/0243-000-Raikou.png b/newsrc/afd/7776b.png similarity index 100% rename from src/afd/sprites-canonical/back/0243-000-Raikou.png rename to newsrc/afd/7776b.png diff --git a/src/afd/sprites-canonical/back-shiny/0243-000-Raikou.png b/newsrc/afd/7776bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0243-000-Raikou.png rename to newsrc/afd/7776bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0243-000-Raikou.png b/newsrc/afd/7776s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0243-000-Raikou.png rename to newsrc/afd/7776s.png diff --git a/src/afd/sprites-canonical/front/0244-000-Entei.png b/newsrc/afd/7808.png similarity index 100% rename from src/afd/sprites-canonical/front/0244-000-Entei.png rename to newsrc/afd/7808.png diff --git a/src/afd/sprites-canonical/back/0244-000-Entei.png b/newsrc/afd/7808b.png similarity index 100% rename from src/afd/sprites-canonical/back/0244-000-Entei.png rename to newsrc/afd/7808b.png diff --git a/src/afd/sprites-canonical/back-shiny/0244-000-Entei.png b/newsrc/afd/7808bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0244-000-Entei.png rename to newsrc/afd/7808bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0244-000-Entei.png b/newsrc/afd/7808s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0244-000-Entei.png rename to newsrc/afd/7808s.png diff --git a/src/afd/sprites-canonical/front/0245-000-Suicune.png b/newsrc/afd/7840.png similarity index 100% rename from src/afd/sprites-canonical/front/0245-000-Suicune.png rename to newsrc/afd/7840.png diff --git a/src/afd/sprites-canonical/back/0245-000-Suicune.png b/newsrc/afd/7840b.png similarity index 100% rename from src/afd/sprites-canonical/back/0245-000-Suicune.png rename to newsrc/afd/7840b.png diff --git a/src/afd/sprites-canonical/back-shiny/0245-000-Suicune.png b/newsrc/afd/7840bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0245-000-Suicune.png rename to newsrc/afd/7840bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0245-000-Suicune.png b/newsrc/afd/7840s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0245-000-Suicune.png rename to newsrc/afd/7840s.png diff --git a/src/afd/sprites-canonical/front/0246-000-Larvitar.png b/newsrc/afd/7872.png similarity index 100% rename from src/afd/sprites-canonical/front/0246-000-Larvitar.png rename to newsrc/afd/7872.png diff --git a/src/afd/sprites-canonical/back/0246-000-Larvitar.png b/newsrc/afd/7872b.png similarity index 100% rename from src/afd/sprites-canonical/back/0246-000-Larvitar.png rename to newsrc/afd/7872b.png diff --git a/src/afd/sprites-canonical/back-shiny/0246-000-Larvitar.png b/newsrc/afd/7872bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0246-000-Larvitar.png rename to newsrc/afd/7872bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0246-000-Larvitar.png b/newsrc/afd/7872s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0246-000-Larvitar.png rename to newsrc/afd/7872s.png diff --git a/src/afd/sprites-canonical/front/0247-000-Pupitar.png b/newsrc/afd/7904.png similarity index 100% rename from src/afd/sprites-canonical/front/0247-000-Pupitar.png rename to newsrc/afd/7904.png diff --git a/src/afd/sprites-canonical/back/0247-000-Pupitar.png b/newsrc/afd/7904b.png similarity index 100% rename from src/afd/sprites-canonical/back/0247-000-Pupitar.png rename to newsrc/afd/7904b.png diff --git a/src/afd/sprites-canonical/back-shiny/0247-000-Pupitar.png b/newsrc/afd/7904bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0247-000-Pupitar.png rename to newsrc/afd/7904bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0247-000-Pupitar.png b/newsrc/afd/7904s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0247-000-Pupitar.png rename to newsrc/afd/7904s.png diff --git a/src/afd/sprites-canonical/front/0248-000-Tyranitar.png b/newsrc/afd/7936.png similarity index 100% rename from src/afd/sprites-canonical/front/0248-000-Tyranitar.png rename to newsrc/afd/7936.png diff --git a/src/afd/sprites-canonical/back/0248-000-Tyranitar.png b/newsrc/afd/7936b.png similarity index 100% rename from src/afd/sprites-canonical/back/0248-000-Tyranitar.png rename to newsrc/afd/7936b.png diff --git a/src/afd/sprites-canonical/back-shiny/0248-000-Tyranitar.png b/newsrc/afd/7936bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0248-000-Tyranitar.png rename to newsrc/afd/7936bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0248-000-Tyranitar.png b/newsrc/afd/7936s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0248-000-Tyranitar.png rename to newsrc/afd/7936s.png diff --git a/src/afd/sprites-canonical/front/0248-420-Tyranitar-Mega.png b/newsrc/afd/7937.png similarity index 100% rename from src/afd/sprites-canonical/front/0248-420-Tyranitar-Mega.png rename to newsrc/afd/7937.png diff --git a/src/afd/sprites-canonical/back/0248-420-Tyranitar-Mega.png b/newsrc/afd/7937b.png similarity index 100% rename from src/afd/sprites-canonical/back/0248-420-Tyranitar-Mega.png rename to newsrc/afd/7937b.png diff --git a/src/afd/sprites-canonical/back-shiny/0248-420-Tyranitar-Mega.png b/newsrc/afd/7937bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0248-420-Tyranitar-Mega.png rename to newsrc/afd/7937bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0248-420-Tyranitar-Mega.png b/newsrc/afd/7937s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0248-420-Tyranitar-Mega.png rename to newsrc/afd/7937s.png diff --git a/src/afd/sprites-canonical/front/0249-000-Lugia.png b/newsrc/afd/7968.png similarity index 100% rename from src/afd/sprites-canonical/front/0249-000-Lugia.png rename to newsrc/afd/7968.png diff --git a/src/afd/sprites-canonical/back/0249-000-Lugia.png b/newsrc/afd/7968b.png similarity index 100% rename from src/afd/sprites-canonical/back/0249-000-Lugia.png rename to newsrc/afd/7968b.png diff --git a/src/afd/sprites-canonical/back-shiny/0249-000-Lugia.png b/newsrc/afd/7968bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0249-000-Lugia.png rename to newsrc/afd/7968bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0249-000-Lugia.png b/newsrc/afd/7968s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0249-000-Lugia.png rename to newsrc/afd/7968s.png diff --git a/src/afd/sprites-canonical/front/0025-000-Pikachu.png b/newsrc/afd/800.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-000-Pikachu.png rename to newsrc/afd/800.png diff --git a/src/afd/sprites-canonical/front/0250-000-Ho~Oh.png b/newsrc/afd/8000.png similarity index 100% rename from src/afd/sprites-canonical/front/0250-000-Ho~Oh.png rename to newsrc/afd/8000.png diff --git a/src/afd/sprites-canonical/back/0250-000-Ho~Oh.png b/newsrc/afd/8000b.png similarity index 100% rename from src/afd/sprites-canonical/back/0250-000-Ho~Oh.png rename to newsrc/afd/8000b.png diff --git a/src/afd/sprites-canonical/back-shiny/0250-000-Ho~Oh.png b/newsrc/afd/8000bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0250-000-Ho~Oh.png rename to newsrc/afd/8000bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0250-000-Ho~Oh.png b/newsrc/afd/8000s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0250-000-Ho~Oh.png rename to newsrc/afd/8000s.png diff --git a/src/afd/sprites-canonical/back/0025-000-Pikachu.png b/newsrc/afd/800b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-000-Pikachu.png rename to newsrc/afd/800b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0025-000-Pikachu-Female.png b/newsrc/afd/800bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0025-000-Pikachu-Female.png rename to newsrc/afd/800bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0025-000-Pikachu-Female.png b/newsrc/afd/800bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0025-000-Pikachu-Female.png rename to newsrc/afd/800bfs.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Gmax.png b/newsrc/afd/800bg.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Gmax.png rename to newsrc/afd/800bg.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Gmax.png b/newsrc/afd/800bgs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Gmax.png rename to newsrc/afd/800bgs.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-000-Pikachu.png b/newsrc/afd/800bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-000-Pikachu.png rename to newsrc/afd/800bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0025-000-Pikachu-Female.png b/newsrc/afd/800f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0025-000-Pikachu-Female.png rename to newsrc/afd/800f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0025-000-Pikachu-Female.png b/newsrc/afd/800fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0025-000-Pikachu-Female.png rename to newsrc/afd/800fs.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Gmax.png b/newsrc/afd/800g.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Gmax.png rename to newsrc/afd/800g.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Gmax.png b/newsrc/afd/800gs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Gmax.png rename to newsrc/afd/800gs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-000-Pikachu.png b/newsrc/afd/800s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-000-Pikachu.png rename to newsrc/afd/800s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Original.png b/newsrc/afd/801.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Original.png rename to newsrc/afd/801.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Original.png b/newsrc/afd/801b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Original.png rename to newsrc/afd/801b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Original.png b/newsrc/afd/801bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Original.png rename to newsrc/afd/801bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Original.png b/newsrc/afd/801s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Original.png rename to newsrc/afd/801s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Hoenn.png b/newsrc/afd/802.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Hoenn.png rename to newsrc/afd/802.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Hoenn.png b/newsrc/afd/802b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Hoenn.png rename to newsrc/afd/802b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Hoenn.png b/newsrc/afd/802bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Hoenn.png rename to newsrc/afd/802bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Hoenn.png b/newsrc/afd/802s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Hoenn.png rename to newsrc/afd/802s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Sinnoh.png b/newsrc/afd/803.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Sinnoh.png rename to newsrc/afd/803.png diff --git a/src/afd/sprites-canonical/front/0251-000-Celebi.gif b/newsrc/afd/8032.gif similarity index 100% rename from src/afd/sprites-canonical/front/0251-000-Celebi.gif rename to newsrc/afd/8032.gif diff --git a/src/afd/sprites-canonical/back/0251-000-Celebi.gif b/newsrc/afd/8032b.gif similarity index 100% rename from src/afd/sprites-canonical/back/0251-000-Celebi.gif rename to newsrc/afd/8032b.gif diff --git a/src/afd/sprites-canonical/back-shiny/0251-000-Celebi.gif b/newsrc/afd/8032bs.gif similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0251-000-Celebi.gif rename to newsrc/afd/8032bs.gif diff --git a/src/afd/sprites-canonical/front-shiny/0251-000-Celebi.gif b/newsrc/afd/8032s.gif similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0251-000-Celebi.gif rename to newsrc/afd/8032s.gif diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Sinnoh.png b/newsrc/afd/803b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Sinnoh.png rename to newsrc/afd/803b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Sinnoh.png b/newsrc/afd/803bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Sinnoh.png rename to newsrc/afd/803bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Sinnoh.png b/newsrc/afd/803s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Sinnoh.png rename to newsrc/afd/803s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Unova.png b/newsrc/afd/804.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Unova.png rename to newsrc/afd/804.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Unova.png b/newsrc/afd/804b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Unova.png rename to newsrc/afd/804b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Unova.png b/newsrc/afd/804bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Unova.png rename to newsrc/afd/804bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Unova.png b/newsrc/afd/804s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Unova.png rename to newsrc/afd/804s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Kalos.png b/newsrc/afd/805.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Kalos.png rename to newsrc/afd/805.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Kalos.png b/newsrc/afd/805b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Kalos.png rename to newsrc/afd/805b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Kalos.png b/newsrc/afd/805bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Kalos.png rename to newsrc/afd/805bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Kalos.png b/newsrc/afd/805s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Kalos.png rename to newsrc/afd/805s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Alola.png b/newsrc/afd/806.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Alola.png rename to newsrc/afd/806.png diff --git a/src/afd/sprites-canonical/front/0252-000-Treecko.png b/newsrc/afd/8064.png similarity index 100% rename from src/afd/sprites-canonical/front/0252-000-Treecko.png rename to newsrc/afd/8064.png diff --git a/src/afd/sprites-canonical/back/0252-000-Treecko.png b/newsrc/afd/8064b.png similarity index 100% rename from src/afd/sprites-canonical/back/0252-000-Treecko.png rename to newsrc/afd/8064b.png diff --git a/src/afd/sprites-canonical/back-shiny/0252-000-Treecko.png b/newsrc/afd/8064bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0252-000-Treecko.png rename to newsrc/afd/8064bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0252-000-Treecko.png b/newsrc/afd/8064s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0252-000-Treecko.png rename to newsrc/afd/8064s.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Alola.png b/newsrc/afd/806b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Alola.png rename to newsrc/afd/806b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Alola.png b/newsrc/afd/806bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Alola.png rename to newsrc/afd/806bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Alola.png b/newsrc/afd/806s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Alola.png rename to newsrc/afd/806s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Partner.png b/newsrc/afd/807.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Partner.png rename to newsrc/afd/807.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Partner.png b/newsrc/afd/807b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Partner.png rename to newsrc/afd/807b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Partner.png b/newsrc/afd/807bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Partner.png rename to newsrc/afd/807bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Partner.png b/newsrc/afd/807s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Partner.png rename to newsrc/afd/807s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Starter.png b/newsrc/afd/808.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Starter.png rename to newsrc/afd/808.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Starter.png b/newsrc/afd/808b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Starter.png rename to newsrc/afd/808b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Starter.png b/newsrc/afd/808bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Starter.png rename to newsrc/afd/808bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Starter.png b/newsrc/afd/808s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Starter.png rename to newsrc/afd/808s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Rock~Star.png b/newsrc/afd/809.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Rock~Star.png rename to newsrc/afd/809.png diff --git a/src/afd/sprites-canonical/front/0253-000-Grovyle.png b/newsrc/afd/8096.png similarity index 100% rename from src/afd/sprites-canonical/front/0253-000-Grovyle.png rename to newsrc/afd/8096.png diff --git a/src/afd/sprites-canonical/back/0253-000-Grovyle.png b/newsrc/afd/8096b.png similarity index 100% rename from src/afd/sprites-canonical/back/0253-000-Grovyle.png rename to newsrc/afd/8096b.png diff --git a/src/afd/sprites-canonical/back-shiny/0253-000-Grovyle.png b/newsrc/afd/8096bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0253-000-Grovyle.png rename to newsrc/afd/8096bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0253-000-Grovyle.png b/newsrc/afd/8096s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0253-000-Grovyle.png rename to newsrc/afd/8096s.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Rock~Star.png b/newsrc/afd/809b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Rock~Star.png rename to newsrc/afd/809b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Rock~Star.png b/newsrc/afd/809bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Rock~Star.png rename to newsrc/afd/809bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Rock~Star.png b/newsrc/afd/809s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Rock~Star.png rename to newsrc/afd/809s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Belle.png b/newsrc/afd/810.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Belle.png rename to newsrc/afd/810.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Belle.png b/newsrc/afd/810b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Belle.png rename to newsrc/afd/810b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Belle.png b/newsrc/afd/810bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Belle.png rename to newsrc/afd/810bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Belle.png b/newsrc/afd/810s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Belle.png rename to newsrc/afd/810s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Pop~Star.png b/newsrc/afd/811.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Pop~Star.png rename to newsrc/afd/811.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Pop~Star.png b/newsrc/afd/811b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Pop~Star.png rename to newsrc/afd/811b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Pop~Star.png b/newsrc/afd/811bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Pop~Star.png rename to newsrc/afd/811bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Pop~Star.png b/newsrc/afd/811s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Pop~Star.png rename to newsrc/afd/811s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-PhD.png b/newsrc/afd/812.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-PhD.png rename to newsrc/afd/812.png diff --git a/src/afd/sprites-canonical/front/0254-000-Sceptile.png b/newsrc/afd/8128.png similarity index 100% rename from src/afd/sprites-canonical/front/0254-000-Sceptile.png rename to newsrc/afd/8128.png diff --git a/src/afd/sprites-canonical/back/0254-000-Sceptile.png b/newsrc/afd/8128b.png similarity index 100% rename from src/afd/sprites-canonical/back/0254-000-Sceptile.png rename to newsrc/afd/8128b.png diff --git a/src/afd/sprites-canonical/back-shiny/0254-000-Sceptile.png b/newsrc/afd/8128bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0254-000-Sceptile.png rename to newsrc/afd/8128bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0254-000-Sceptile.png b/newsrc/afd/8128s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0254-000-Sceptile.png rename to newsrc/afd/8128s.png diff --git a/src/afd/sprites-canonical/front/0254-420-Sceptile-Mega.gif b/newsrc/afd/8129.gif similarity index 100% rename from src/afd/sprites-canonical/front/0254-420-Sceptile-Mega.gif rename to newsrc/afd/8129.gif diff --git a/src/afd/sprites-canonical/back/0254-420-Sceptile-Mega.png b/newsrc/afd/8129.png similarity index 100% rename from src/afd/sprites-canonical/back/0254-420-Sceptile-Mega.png rename to newsrc/afd/8129.png diff --git a/src/afd/sprites-canonical/front/0254-420-Sceptile-Mega.png b/newsrc/afd/8129b.png similarity index 100% rename from src/afd/sprites-canonical/front/0254-420-Sceptile-Mega.png rename to newsrc/afd/8129b.png diff --git a/src/afd/sprites-canonical/back-shiny/0254-420-Sceptile-Mega.png b/newsrc/afd/8129bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0254-420-Sceptile-Mega.png rename to newsrc/afd/8129bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0254-420-Sceptile-Mega.gif b/newsrc/afd/8129s.gif similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0254-420-Sceptile-Mega.gif rename to newsrc/afd/8129s.gif diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-PhD.png b/newsrc/afd/812b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-PhD.png rename to newsrc/afd/812b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-PhD.png b/newsrc/afd/812bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-PhD.png rename to newsrc/afd/812bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-PhD.png b/newsrc/afd/812s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-PhD.png rename to newsrc/afd/812s.png diff --git a/src/afd/sprites-canonical/front/0025-420-Pikachu-Libre.png b/newsrc/afd/813.png similarity index 100% rename from src/afd/sprites-canonical/front/0025-420-Pikachu-Libre.png rename to newsrc/afd/813.png diff --git a/src/afd/sprites-canonical/back/0025-420-Pikachu-Libre.png b/newsrc/afd/813b.png similarity index 100% rename from src/afd/sprites-canonical/back/0025-420-Pikachu-Libre.png rename to newsrc/afd/813b.png diff --git a/src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Libre.png b/newsrc/afd/813bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0025-420-Pikachu-Libre.png rename to newsrc/afd/813bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Libre.png b/newsrc/afd/813s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0025-420-Pikachu-Libre.png rename to newsrc/afd/813s.png diff --git a/src/afd/sprites-canonical/front/0255-000-Torchic.png b/newsrc/afd/8160.png similarity index 100% rename from src/afd/sprites-canonical/front/0255-000-Torchic.png rename to newsrc/afd/8160.png diff --git a/src/afd/sprites-canonical/back/0255-000-Torchic.png b/newsrc/afd/8160b.png similarity index 100% rename from src/afd/sprites-canonical/back/0255-000-Torchic.png rename to newsrc/afd/8160b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0255-000-Torchic-Female.png b/newsrc/afd/8160bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0255-000-Torchic-Female.png rename to newsrc/afd/8160bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0255-000-Torchic-Female.png b/newsrc/afd/8160bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0255-000-Torchic-Female.png rename to newsrc/afd/8160bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0255-000-Torchic.png b/newsrc/afd/8160bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0255-000-Torchic.png rename to newsrc/afd/8160bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0255-000-Torchic-Female.png b/newsrc/afd/8160f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0255-000-Torchic-Female.png rename to newsrc/afd/8160f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0255-000-Torchic-Female.png b/newsrc/afd/8160fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0255-000-Torchic-Female.png rename to newsrc/afd/8160fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0255-000-Torchic.png b/newsrc/afd/8160s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0255-000-Torchic.png rename to newsrc/afd/8160s.png diff --git a/src/afd/sprites-canonical/front/0256-000-Combusken.png b/newsrc/afd/8192.png similarity index 100% rename from src/afd/sprites-canonical/front/0256-000-Combusken.png rename to newsrc/afd/8192.png diff --git a/src/afd/sprites-canonical/back/0256-000-Combusken.png b/newsrc/afd/8192b.png similarity index 100% rename from src/afd/sprites-canonical/back/0256-000-Combusken.png rename to newsrc/afd/8192b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0256-000-Combusken-Female.png b/newsrc/afd/8192bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0256-000-Combusken-Female.png rename to newsrc/afd/8192bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0256-000-Combusken-Female.png b/newsrc/afd/8192bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0256-000-Combusken-Female.png rename to newsrc/afd/8192bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0256-000-Combusken.png b/newsrc/afd/8192bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0256-000-Combusken.png rename to newsrc/afd/8192bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0256-000-Combusken-Female.png b/newsrc/afd/8192f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0256-000-Combusken-Female.png rename to newsrc/afd/8192f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0256-000-Combusken-Female.png b/newsrc/afd/8192fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0256-000-Combusken-Female.png rename to newsrc/afd/8192fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0256-000-Combusken.png b/newsrc/afd/8192s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0256-000-Combusken.png rename to newsrc/afd/8192s.png diff --git a/src/afd/sprites-canonical/front/0257-000-Blaziken.png b/newsrc/afd/8224.png similarity index 100% rename from src/afd/sprites-canonical/front/0257-000-Blaziken.png rename to newsrc/afd/8224.png diff --git a/src/afd/sprites-canonical/back/0257-000-Blaziken.png b/newsrc/afd/8224b.png similarity index 100% rename from src/afd/sprites-canonical/back/0257-000-Blaziken.png rename to newsrc/afd/8224b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0257-000-Blaziken-Female.png b/newsrc/afd/8224bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0257-000-Blaziken-Female.png rename to newsrc/afd/8224bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0257-000-Blaziken-Female.png b/newsrc/afd/8224bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0257-000-Blaziken-Female.png rename to newsrc/afd/8224bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0257-000-Blaziken.png b/newsrc/afd/8224bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0257-000-Blaziken.png rename to newsrc/afd/8224bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0257-000-Blaziken-Female.png b/newsrc/afd/8224f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0257-000-Blaziken-Female.png rename to newsrc/afd/8224f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0257-000-Blaziken-Female.png b/newsrc/afd/8224fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0257-000-Blaziken-Female.png rename to newsrc/afd/8224fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0257-000-Blaziken.png b/newsrc/afd/8224s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0257-000-Blaziken.png rename to newsrc/afd/8224s.png diff --git a/src/afd/sprites-canonical/front/0257-420-Blaziken-Mega.png b/newsrc/afd/8225.png similarity index 100% rename from src/afd/sprites-canonical/front/0257-420-Blaziken-Mega.png rename to newsrc/afd/8225.png diff --git a/src/afd/sprites-canonical/back/0257-420-Blaziken-Mega.png b/newsrc/afd/8225b.png similarity index 100% rename from src/afd/sprites-canonical/back/0257-420-Blaziken-Mega.png rename to newsrc/afd/8225b.png diff --git a/src/afd/sprites-canonical/back-shiny/0257-420-Blaziken-Mega.png b/newsrc/afd/8225bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0257-420-Blaziken-Mega.png rename to newsrc/afd/8225bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0257-420-Blaziken-Mega.png b/newsrc/afd/8225s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0257-420-Blaziken-Mega.png rename to newsrc/afd/8225s.png diff --git a/src/afd/sprites-canonical/front/0258-000-Mudkip.png b/newsrc/afd/8256.png similarity index 100% rename from src/afd/sprites-canonical/front/0258-000-Mudkip.png rename to newsrc/afd/8256.png diff --git a/src/afd/sprites-canonical/back/0258-000-Mudkip.png b/newsrc/afd/8256b.png similarity index 100% rename from src/afd/sprites-canonical/back/0258-000-Mudkip.png rename to newsrc/afd/8256b.png diff --git a/src/afd/sprites-canonical/back-shiny/0258-000-Mudkip.png b/newsrc/afd/8256bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0258-000-Mudkip.png rename to newsrc/afd/8256bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0258-000-Mudkip.png b/newsrc/afd/8256s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0258-000-Mudkip.png rename to newsrc/afd/8256s.png diff --git a/src/afd/sprites-canonical/front/0259-000-Marshtomp.png b/newsrc/afd/8288.png similarity index 100% rename from src/afd/sprites-canonical/front/0259-000-Marshtomp.png rename to newsrc/afd/8288.png diff --git a/src/afd/sprites-canonical/back/0259-000-Marshtomp.png b/newsrc/afd/8288b.png similarity index 100% rename from src/afd/sprites-canonical/back/0259-000-Marshtomp.png rename to newsrc/afd/8288b.png diff --git a/src/afd/sprites-canonical/back-shiny/0259-000-Marshtomp.png b/newsrc/afd/8288bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0259-000-Marshtomp.png rename to newsrc/afd/8288bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0259-000-Marshtomp.png b/newsrc/afd/8288s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0259-000-Marshtomp.png rename to newsrc/afd/8288s.png diff --git a/src/afd/sprites-canonical/front/0026-000-Raichu.png b/newsrc/afd/832.png similarity index 100% rename from src/afd/sprites-canonical/front/0026-000-Raichu.png rename to newsrc/afd/832.png diff --git a/src/afd/sprites-canonical/front/0260-000-Swampert.png b/newsrc/afd/8320.png similarity index 100% rename from src/afd/sprites-canonical/front/0260-000-Swampert.png rename to newsrc/afd/8320.png diff --git a/src/afd/sprites-canonical/back/0260-000-Swampert.png b/newsrc/afd/8320b.png similarity index 100% rename from src/afd/sprites-canonical/back/0260-000-Swampert.png rename to newsrc/afd/8320b.png diff --git a/src/afd/sprites-canonical/back-shiny/0260-000-Swampert.png b/newsrc/afd/8320bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0260-000-Swampert.png rename to newsrc/afd/8320bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0260-000-Swampert.png b/newsrc/afd/8320s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0260-000-Swampert.png rename to newsrc/afd/8320s.png diff --git a/src/afd/sprites-canonical/front/0260-420-Swampert-Mega.png b/newsrc/afd/8321.png similarity index 100% rename from src/afd/sprites-canonical/front/0260-420-Swampert-Mega.png rename to newsrc/afd/8321.png diff --git a/src/afd/sprites-canonical/back/0260-420-Swampert-Mega.png b/newsrc/afd/8321b.png similarity index 100% rename from src/afd/sprites-canonical/back/0260-420-Swampert-Mega.png rename to newsrc/afd/8321b.png diff --git a/src/afd/sprites-canonical/back-shiny/0260-420-Swampert-Mega.png b/newsrc/afd/8321bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0260-420-Swampert-Mega.png rename to newsrc/afd/8321bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0260-420-Swampert-Mega.png b/newsrc/afd/8321s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0260-420-Swampert-Mega.png rename to newsrc/afd/8321s.png diff --git a/src/afd/sprites-canonical/back/0026-000-Raichu.png b/newsrc/afd/832b.png similarity index 100% rename from src/afd/sprites-canonical/back/0026-000-Raichu.png rename to newsrc/afd/832b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0026-000-Raichu-Female.png b/newsrc/afd/832bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0026-000-Raichu-Female.png rename to newsrc/afd/832bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0026-000-Raichu-Female.png b/newsrc/afd/832bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0026-000-Raichu-Female.png rename to newsrc/afd/832bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0026-000-Raichu.png b/newsrc/afd/832bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0026-000-Raichu.png rename to newsrc/afd/832bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0026-000-Raichu-Female.png b/newsrc/afd/832f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0026-000-Raichu-Female.png rename to newsrc/afd/832f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0026-000-Raichu-Female.png b/newsrc/afd/832fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0026-000-Raichu-Female.png rename to newsrc/afd/832fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0026-000-Raichu.png b/newsrc/afd/832s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0026-000-Raichu.png rename to newsrc/afd/832s.png diff --git a/src/afd/sprites-canonical/front/0026-420-Raichu-Alola.png b/newsrc/afd/833.png similarity index 100% rename from src/afd/sprites-canonical/front/0026-420-Raichu-Alola.png rename to newsrc/afd/833.png diff --git a/src/afd/sprites-canonical/back/0026-420-Raichu-Alola.png b/newsrc/afd/833b.png similarity index 100% rename from src/afd/sprites-canonical/back/0026-420-Raichu-Alola.png rename to newsrc/afd/833b.png diff --git a/src/afd/sprites-canonical/back-shiny/0026-420-Raichu-Alola.png b/newsrc/afd/833bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0026-420-Raichu-Alola.png rename to newsrc/afd/833bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0026-420-Raichu-Alola.png b/newsrc/afd/833s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0026-420-Raichu-Alola.png rename to newsrc/afd/833s.png diff --git a/src/afd/sprites-canonical/front/0261-000-Poochyena.png b/newsrc/afd/8352.png similarity index 100% rename from src/afd/sprites-canonical/front/0261-000-Poochyena.png rename to newsrc/afd/8352.png diff --git a/src/afd/sprites-canonical/back/0261-000-Poochyena.png b/newsrc/afd/8352b.png similarity index 100% rename from src/afd/sprites-canonical/back/0261-000-Poochyena.png rename to newsrc/afd/8352b.png diff --git a/src/afd/sprites-canonical/back-shiny/0261-000-Poochyena.png b/newsrc/afd/8352bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0261-000-Poochyena.png rename to newsrc/afd/8352bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0261-000-Poochyena.png b/newsrc/afd/8352s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0261-000-Poochyena.png rename to newsrc/afd/8352s.png diff --git a/src/afd/sprites-canonical/front/0262-000-Mightyena.png b/newsrc/afd/8384.png similarity index 100% rename from src/afd/sprites-canonical/front/0262-000-Mightyena.png rename to newsrc/afd/8384.png diff --git a/src/afd/sprites-canonical/back/0262-000-Mightyena.png b/newsrc/afd/8384b.png similarity index 100% rename from src/afd/sprites-canonical/back/0262-000-Mightyena.png rename to newsrc/afd/8384b.png diff --git a/src/afd/sprites-canonical/back-shiny/0262-000-Mightyena.png b/newsrc/afd/8384bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0262-000-Mightyena.png rename to newsrc/afd/8384bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0262-000-Mightyena.png b/newsrc/afd/8384s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0262-000-Mightyena.png rename to newsrc/afd/8384s.png diff --git a/src/afd/sprites-canonical/front/0263-000-Zigzagoon.png b/newsrc/afd/8416.png similarity index 100% rename from src/afd/sprites-canonical/front/0263-000-Zigzagoon.png rename to newsrc/afd/8416.png diff --git a/src/afd/sprites-canonical/back/0263-000-Zigzagoon.png b/newsrc/afd/8416b.png similarity index 100% rename from src/afd/sprites-canonical/back/0263-000-Zigzagoon.png rename to newsrc/afd/8416b.png diff --git a/src/afd/sprites-canonical/back-shiny/0263-000-Zigzagoon.png b/newsrc/afd/8416bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0263-000-Zigzagoon.png rename to newsrc/afd/8416bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0263-000-Zigzagoon.png b/newsrc/afd/8416s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0263-000-Zigzagoon.png rename to newsrc/afd/8416s.png diff --git a/src/afd/sprites-canonical/back/0263-420-Zigzagoon-Galar.png b/newsrc/afd/8417.png similarity index 100% rename from src/afd/sprites-canonical/back/0263-420-Zigzagoon-Galar.png rename to newsrc/afd/8417.png diff --git a/src/afd/sprites-canonical/front/0263-420-Zigzagoon-Galar.png b/newsrc/afd/8417b.png similarity index 100% rename from src/afd/sprites-canonical/front/0263-420-Zigzagoon-Galar.png rename to newsrc/afd/8417b.png diff --git a/src/afd/sprites-canonical/back-shiny/0263-420-Zigzagoon-Galar.png b/newsrc/afd/8417bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0263-420-Zigzagoon-Galar.png rename to newsrc/afd/8417bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0263-420-Zigzagoon-Galar.png b/newsrc/afd/8417s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0263-420-Zigzagoon-Galar.png rename to newsrc/afd/8417s.png diff --git a/src/afd/sprites-canonical/front/0264-000-Linoone.png b/newsrc/afd/8448.png similarity index 100% rename from src/afd/sprites-canonical/front/0264-000-Linoone.png rename to newsrc/afd/8448.png diff --git a/src/afd/sprites-canonical/back/0264-000-Linoone.png b/newsrc/afd/8448b.png similarity index 100% rename from src/afd/sprites-canonical/back/0264-000-Linoone.png rename to newsrc/afd/8448b.png diff --git a/src/afd/sprites-canonical/back-shiny/0264-000-Linoone.png b/newsrc/afd/8448bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0264-000-Linoone.png rename to newsrc/afd/8448bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0264-000-Linoone.png b/newsrc/afd/8448s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0264-000-Linoone.png rename to newsrc/afd/8448s.png diff --git a/src/afd/sprites-canonical/back/0264-420-Linoone-Galar.png b/newsrc/afd/8449.png similarity index 100% rename from src/afd/sprites-canonical/back/0264-420-Linoone-Galar.png rename to newsrc/afd/8449.png diff --git a/src/afd/sprites-canonical/front/0264-420-Linoone-Galar.png b/newsrc/afd/8449b.png similarity index 100% rename from src/afd/sprites-canonical/front/0264-420-Linoone-Galar.png rename to newsrc/afd/8449b.png diff --git a/src/afd/sprites-canonical/back-shiny/0264-420-Linoone-Galar.png b/newsrc/afd/8449bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0264-420-Linoone-Galar.png rename to newsrc/afd/8449bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0264-420-Linoone-Galar.png b/newsrc/afd/8449s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0264-420-Linoone-Galar.png rename to newsrc/afd/8449s.png diff --git a/src/afd/sprites-canonical/front/0265-000-Wurmple.png b/newsrc/afd/8480.png similarity index 100% rename from src/afd/sprites-canonical/front/0265-000-Wurmple.png rename to newsrc/afd/8480.png diff --git a/src/afd/sprites-canonical/back/0265-000-Wurmple.png b/newsrc/afd/8480b.png similarity index 100% rename from src/afd/sprites-canonical/back/0265-000-Wurmple.png rename to newsrc/afd/8480b.png diff --git a/src/afd/sprites-canonical/back-shiny/0265-000-Wurmple.png b/newsrc/afd/8480bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0265-000-Wurmple.png rename to newsrc/afd/8480bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0265-000-Wurmple.png b/newsrc/afd/8480s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0265-000-Wurmple.png rename to newsrc/afd/8480s.png diff --git a/src/afd/sprites-canonical/front/0266-000-Silcoon.png b/newsrc/afd/8512.png similarity index 100% rename from src/afd/sprites-canonical/front/0266-000-Silcoon.png rename to newsrc/afd/8512.png diff --git a/src/afd/sprites-canonical/back/0266-000-Silcoon.png b/newsrc/afd/8512b.png similarity index 100% rename from src/afd/sprites-canonical/back/0266-000-Silcoon.png rename to newsrc/afd/8512b.png diff --git a/src/afd/sprites-canonical/back-shiny/0266-000-Silcoon.png b/newsrc/afd/8512bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0266-000-Silcoon.png rename to newsrc/afd/8512bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0266-000-Silcoon.png b/newsrc/afd/8512s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0266-000-Silcoon.png rename to newsrc/afd/8512s.png diff --git a/src/afd/sprites-canonical/front/0267-000-Beautifly.png b/newsrc/afd/8544.png similarity index 100% rename from src/afd/sprites-canonical/front/0267-000-Beautifly.png rename to newsrc/afd/8544.png diff --git a/src/afd/sprites-canonical/back/0267-000-Beautifly.png b/newsrc/afd/8544b.png similarity index 100% rename from src/afd/sprites-canonical/back/0267-000-Beautifly.png rename to newsrc/afd/8544b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0267-000-Beautifly-Female.png b/newsrc/afd/8544bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0267-000-Beautifly-Female.png rename to newsrc/afd/8544bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0267-000-Beautifly-Female.png b/newsrc/afd/8544bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0267-000-Beautifly-Female.png rename to newsrc/afd/8544bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0267-000-Beautifly.png b/newsrc/afd/8544bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0267-000-Beautifly.png rename to newsrc/afd/8544bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0267-000-Beautifly-Female.png b/newsrc/afd/8544f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0267-000-Beautifly-Female.png rename to newsrc/afd/8544f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0267-000-Beautifly-Female.png b/newsrc/afd/8544fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0267-000-Beautifly-Female.png rename to newsrc/afd/8544fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0267-000-Beautifly.png b/newsrc/afd/8544s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0267-000-Beautifly.png rename to newsrc/afd/8544s.png diff --git a/src/afd/sprites-canonical/front/0268-000-Cascoon.png b/newsrc/afd/8576.png similarity index 100% rename from src/afd/sprites-canonical/front/0268-000-Cascoon.png rename to newsrc/afd/8576.png diff --git a/src/afd/sprites-canonical/back/0268-000-Cascoon.png b/newsrc/afd/8576b.png similarity index 100% rename from src/afd/sprites-canonical/back/0268-000-Cascoon.png rename to newsrc/afd/8576b.png diff --git a/src/afd/sprites-canonical/back-shiny/0268-000-Cascoon.png b/newsrc/afd/8576bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0268-000-Cascoon.png rename to newsrc/afd/8576bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0268-000-Cascoon.png b/newsrc/afd/8576s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0268-000-Cascoon.png rename to newsrc/afd/8576s.png diff --git a/src/afd/sprites-canonical/front/0269-000-Dustox.png b/newsrc/afd/8608.png similarity index 100% rename from src/afd/sprites-canonical/front/0269-000-Dustox.png rename to newsrc/afd/8608.png diff --git a/src/afd/sprites-canonical/back/0269-000-Dustox.png b/newsrc/afd/8608b.png similarity index 100% rename from src/afd/sprites-canonical/back/0269-000-Dustox.png rename to newsrc/afd/8608b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0269-000-Dustox-Female.png b/newsrc/afd/8608bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0269-000-Dustox-Female.png rename to newsrc/afd/8608bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0269-000-Dustox-Female.png b/newsrc/afd/8608bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0269-000-Dustox-Female.png rename to newsrc/afd/8608bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0269-000-Dustox.png b/newsrc/afd/8608bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0269-000-Dustox.png rename to newsrc/afd/8608bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0269-000-Dustox-Female.png b/newsrc/afd/8608f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0269-000-Dustox-Female.png rename to newsrc/afd/8608f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0269-000-Dustox-Female.png b/newsrc/afd/8608fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0269-000-Dustox-Female.png rename to newsrc/afd/8608fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0269-000-Dustox.png b/newsrc/afd/8608s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0269-000-Dustox.png rename to newsrc/afd/8608s.png diff --git a/src/afd/sprites-canonical/front/0027-000-Sandshrew.png b/newsrc/afd/864.png similarity index 100% rename from src/afd/sprites-canonical/front/0027-000-Sandshrew.png rename to newsrc/afd/864.png diff --git a/src/afd/sprites-canonical/front/0270-000-Lotad.png b/newsrc/afd/8640.png similarity index 100% rename from src/afd/sprites-canonical/front/0270-000-Lotad.png rename to newsrc/afd/8640.png diff --git a/src/afd/sprites-canonical/back/0270-000-Lotad.png b/newsrc/afd/8640b.png similarity index 100% rename from src/afd/sprites-canonical/back/0270-000-Lotad.png rename to newsrc/afd/8640b.png diff --git a/src/afd/sprites-canonical/back-shiny/0270-000-Lotad.png b/newsrc/afd/8640bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0270-000-Lotad.png rename to newsrc/afd/8640bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0270-000-Lotad.png b/newsrc/afd/8640s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0270-000-Lotad.png rename to newsrc/afd/8640s.png diff --git a/src/afd/sprites-canonical/back/0027-000-Sandshrew.png b/newsrc/afd/864b.png similarity index 100% rename from src/afd/sprites-canonical/back/0027-000-Sandshrew.png rename to newsrc/afd/864b.png diff --git a/src/afd/sprites-canonical/back-shiny/0027-000-Sandshrew.png b/newsrc/afd/864bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0027-000-Sandshrew.png rename to newsrc/afd/864bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0027-000-Sandshrew.png b/newsrc/afd/864s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0027-000-Sandshrew.png rename to newsrc/afd/864s.png diff --git a/src/afd/sprites-canonical/front/0027-420-Sandshrew-Alola.png b/newsrc/afd/865.png similarity index 100% rename from src/afd/sprites-canonical/front/0027-420-Sandshrew-Alola.png rename to newsrc/afd/865.png diff --git a/src/afd/sprites-canonical/back/0027-420-Sandshrew-Alola.png b/newsrc/afd/865b.png similarity index 100% rename from src/afd/sprites-canonical/back/0027-420-Sandshrew-Alola.png rename to newsrc/afd/865b.png diff --git a/src/afd/sprites-canonical/back-shiny/0027-420-Sandshrew-Alola.png b/newsrc/afd/865bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0027-420-Sandshrew-Alola.png rename to newsrc/afd/865bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0027-420-Sandshrew-Alola.png b/newsrc/afd/865s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0027-420-Sandshrew-Alola.png rename to newsrc/afd/865s.png diff --git a/src/afd/sprites-canonical/front/0271-000-Lombre.png b/newsrc/afd/8672.png similarity index 100% rename from src/afd/sprites-canonical/front/0271-000-Lombre.png rename to newsrc/afd/8672.png diff --git a/src/afd/sprites-canonical/back/0271-000-Lombre.png b/newsrc/afd/8672b.png similarity index 100% rename from src/afd/sprites-canonical/back/0271-000-Lombre.png rename to newsrc/afd/8672b.png diff --git a/src/afd/sprites-canonical/back-shiny/0271-000-Lombre.png b/newsrc/afd/8672bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0271-000-Lombre.png rename to newsrc/afd/8672bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0271-000-Lombre.png b/newsrc/afd/8672s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0271-000-Lombre.png rename to newsrc/afd/8672s.png diff --git a/src/afd/sprites-canonical/front/0272-000-Ludicolo.png b/newsrc/afd/8704.png similarity index 100% rename from src/afd/sprites-canonical/front/0272-000-Ludicolo.png rename to newsrc/afd/8704.png diff --git a/src/afd/sprites-canonical/back/0272-000-Ludicolo.png b/newsrc/afd/8704b.png similarity index 100% rename from src/afd/sprites-canonical/back/0272-000-Ludicolo.png rename to newsrc/afd/8704b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0272-000-Ludicolo-Female.png b/newsrc/afd/8704bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0272-000-Ludicolo-Female.png rename to newsrc/afd/8704bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0272-000-Ludicolo-Female.png b/newsrc/afd/8704bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0272-000-Ludicolo-Female.png rename to newsrc/afd/8704bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0272-000-Ludicolo.png b/newsrc/afd/8704bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0272-000-Ludicolo.png rename to newsrc/afd/8704bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0272-000-Ludicolo-Female.png b/newsrc/afd/8704f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0272-000-Ludicolo-Female.png rename to newsrc/afd/8704f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0272-000-Ludicolo-Female.png b/newsrc/afd/8704fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0272-000-Ludicolo-Female.png rename to newsrc/afd/8704fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0272-000-Ludicolo.png b/newsrc/afd/8704s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0272-000-Ludicolo.png rename to newsrc/afd/8704s.png diff --git a/src/afd/sprites-canonical/front/0273-000-Seedot.png b/newsrc/afd/8736.png similarity index 100% rename from src/afd/sprites-canonical/front/0273-000-Seedot.png rename to newsrc/afd/8736.png diff --git a/src/afd/sprites-canonical/back/0273-000-Seedot.png b/newsrc/afd/8736b.png similarity index 100% rename from src/afd/sprites-canonical/back/0273-000-Seedot.png rename to newsrc/afd/8736b.png diff --git a/src/afd/sprites-canonical/back-shiny/0273-000-Seedot.png b/newsrc/afd/8736bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0273-000-Seedot.png rename to newsrc/afd/8736bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0273-000-Seedot.png b/newsrc/afd/8736s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0273-000-Seedot.png rename to newsrc/afd/8736s.png diff --git a/src/afd/sprites-canonical/front/0274-000-Nuzleaf.png b/newsrc/afd/8768.png similarity index 100% rename from src/afd/sprites-canonical/front/0274-000-Nuzleaf.png rename to newsrc/afd/8768.png diff --git a/src/afd/sprites-canonical/back/0274-000-Nuzleaf.png b/newsrc/afd/8768b.png similarity index 100% rename from src/afd/sprites-canonical/back/0274-000-Nuzleaf.png rename to newsrc/afd/8768b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0274-000-Nuzleaf-Female.png b/newsrc/afd/8768bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0274-000-Nuzleaf-Female.png rename to newsrc/afd/8768bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0274-000-Nuzleaf-Female.png b/newsrc/afd/8768bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0274-000-Nuzleaf-Female.png rename to newsrc/afd/8768bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0274-000-Nuzleaf.png b/newsrc/afd/8768bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0274-000-Nuzleaf.png rename to newsrc/afd/8768bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0274-000-Nuzleaf-Female.png b/newsrc/afd/8768f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0274-000-Nuzleaf-Female.png rename to newsrc/afd/8768f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0274-000-Nuzleaf-Female.png b/newsrc/afd/8768fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0274-000-Nuzleaf-Female.png rename to newsrc/afd/8768fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0274-000-Nuzleaf.png b/newsrc/afd/8768s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0274-000-Nuzleaf.png rename to newsrc/afd/8768s.png diff --git a/src/afd/sprites-canonical/front/0275-000-Shiftry.png b/newsrc/afd/8800.png similarity index 100% rename from src/afd/sprites-canonical/front/0275-000-Shiftry.png rename to newsrc/afd/8800.png diff --git a/src/afd/sprites-canonical/back/0275-000-Shiftry.png b/newsrc/afd/8800b.png similarity index 100% rename from src/afd/sprites-canonical/back/0275-000-Shiftry.png rename to newsrc/afd/8800b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0275-000-Shiftry-Female.png b/newsrc/afd/8800bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0275-000-Shiftry-Female.png rename to newsrc/afd/8800bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0275-000-Shiftry-Female.png b/newsrc/afd/8800bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0275-000-Shiftry-Female.png rename to newsrc/afd/8800bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0275-000-Shiftry.png b/newsrc/afd/8800bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0275-000-Shiftry.png rename to newsrc/afd/8800bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0275-000-Shiftry-Female.png b/newsrc/afd/8800f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0275-000-Shiftry-Female.png rename to newsrc/afd/8800f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0275-000-Shiftry-Female.png b/newsrc/afd/8800fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0275-000-Shiftry-Female.png rename to newsrc/afd/8800fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0275-000-Shiftry.png b/newsrc/afd/8800s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0275-000-Shiftry.png rename to newsrc/afd/8800s.png diff --git a/src/afd/sprites-canonical/front/0276-000-Taillow.png b/newsrc/afd/8832.png similarity index 100% rename from src/afd/sprites-canonical/front/0276-000-Taillow.png rename to newsrc/afd/8832.png diff --git a/src/afd/sprites-canonical/back/0276-000-Taillow.png b/newsrc/afd/8832b.png similarity index 100% rename from src/afd/sprites-canonical/back/0276-000-Taillow.png rename to newsrc/afd/8832b.png diff --git a/src/afd/sprites-canonical/back-shiny/0276-000-Taillow.png b/newsrc/afd/8832bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0276-000-Taillow.png rename to newsrc/afd/8832bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0276-000-Taillow.png b/newsrc/afd/8832s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0276-000-Taillow.png rename to newsrc/afd/8832s.png diff --git a/src/afd/sprites-canonical/front/0277-000-Swellow.png b/newsrc/afd/8864.png similarity index 100% rename from src/afd/sprites-canonical/front/0277-000-Swellow.png rename to newsrc/afd/8864.png diff --git a/src/afd/sprites-canonical/back/0277-000-Swellow.png b/newsrc/afd/8864b.png similarity index 100% rename from src/afd/sprites-canonical/back/0277-000-Swellow.png rename to newsrc/afd/8864b.png diff --git a/src/afd/sprites-canonical/back-shiny/0277-000-Swellow.png b/newsrc/afd/8864bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0277-000-Swellow.png rename to newsrc/afd/8864bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0277-000-Swellow.png b/newsrc/afd/8864s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0277-000-Swellow.png rename to newsrc/afd/8864s.png diff --git a/src/afd/sprites-canonical/front/0278-000-Wingull.png b/newsrc/afd/8896.png similarity index 100% rename from src/afd/sprites-canonical/front/0278-000-Wingull.png rename to newsrc/afd/8896.png diff --git a/src/afd/sprites-canonical/back/0278-000-Wingull.png b/newsrc/afd/8896b.png similarity index 100% rename from src/afd/sprites-canonical/back/0278-000-Wingull.png rename to newsrc/afd/8896b.png diff --git a/src/afd/sprites-canonical/back-shiny/0278-000-Wingull.png b/newsrc/afd/8896bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0278-000-Wingull.png rename to newsrc/afd/8896bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0278-000-Wingull.png b/newsrc/afd/8896s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0278-000-Wingull.png rename to newsrc/afd/8896s.png diff --git a/src/afd/sprites-canonical/front/0279-000-Pelipper.png b/newsrc/afd/8928.png similarity index 100% rename from src/afd/sprites-canonical/front/0279-000-Pelipper.png rename to newsrc/afd/8928.png diff --git a/src/afd/sprites-canonical/back/0279-000-Pelipper.png b/newsrc/afd/8928b.png similarity index 100% rename from src/afd/sprites-canonical/back/0279-000-Pelipper.png rename to newsrc/afd/8928b.png diff --git a/src/afd/sprites-canonical/back-shiny/0279-000-Pelipper.png b/newsrc/afd/8928bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0279-000-Pelipper.png rename to newsrc/afd/8928bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0279-000-Pelipper.png b/newsrc/afd/8928s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0279-000-Pelipper.png rename to newsrc/afd/8928s.png diff --git a/src/afd/sprites-canonical/front/0028-000-Sandslash.png b/newsrc/afd/896.png similarity index 100% rename from src/afd/sprites-canonical/front/0028-000-Sandslash.png rename to newsrc/afd/896.png diff --git a/src/afd/sprites-canonical/front/0280-000-Ralts.png b/newsrc/afd/8960.png similarity index 100% rename from src/afd/sprites-canonical/front/0280-000-Ralts.png rename to newsrc/afd/8960.png diff --git a/src/afd/sprites-canonical/back/0280-000-Ralts.png b/newsrc/afd/8960b.png similarity index 100% rename from src/afd/sprites-canonical/back/0280-000-Ralts.png rename to newsrc/afd/8960b.png diff --git a/src/afd/sprites-canonical/back-shiny/0280-000-Ralts.png b/newsrc/afd/8960bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0280-000-Ralts.png rename to newsrc/afd/8960bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0280-000-Ralts.png b/newsrc/afd/8960s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0280-000-Ralts.png rename to newsrc/afd/8960s.png diff --git a/src/afd/sprites-canonical/back/0028-000-Sandslash.png b/newsrc/afd/896b.png similarity index 100% rename from src/afd/sprites-canonical/back/0028-000-Sandslash.png rename to newsrc/afd/896b.png diff --git a/src/afd/sprites-canonical/back-shiny/0028-000-Sandslash.png b/newsrc/afd/896bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0028-000-Sandslash.png rename to newsrc/afd/896bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0028-000-Sandslash.png b/newsrc/afd/896s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0028-000-Sandslash.png rename to newsrc/afd/896s.png diff --git a/src/afd/sprites-canonical/back/0028-420-Sandslash-Alola.png b/newsrc/afd/897.png similarity index 100% rename from src/afd/sprites-canonical/back/0028-420-Sandslash-Alola.png rename to newsrc/afd/897.png diff --git a/src/afd/sprites-canonical/front/0028-420-Sandslash-Alola.png b/newsrc/afd/897b.png similarity index 100% rename from src/afd/sprites-canonical/front/0028-420-Sandslash-Alola.png rename to newsrc/afd/897b.png diff --git a/src/afd/sprites-canonical/back-shiny/0028-420-Sandslash-Alola.png b/newsrc/afd/897bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0028-420-Sandslash-Alola.png rename to newsrc/afd/897bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0028-420-Sandslash-Alola.png b/newsrc/afd/897s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0028-420-Sandslash-Alola.png rename to newsrc/afd/897s.png diff --git a/src/afd/sprites-canonical/front/0281-000-Kirlia.png b/newsrc/afd/8992.png similarity index 100% rename from src/afd/sprites-canonical/front/0281-000-Kirlia.png rename to newsrc/afd/8992.png diff --git a/src/afd/sprites-canonical/back/0281-000-Kirlia.png b/newsrc/afd/8992b.png similarity index 100% rename from src/afd/sprites-canonical/back/0281-000-Kirlia.png rename to newsrc/afd/8992b.png diff --git a/src/afd/sprites-canonical/back-shiny/0281-000-Kirlia.png b/newsrc/afd/8992bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0281-000-Kirlia.png rename to newsrc/afd/8992bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0281-000-Kirlia.png b/newsrc/afd/8992s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0281-000-Kirlia.png rename to newsrc/afd/8992s.png diff --git a/src/afd/sprites-canonical/front/0282-000-Gardevoir.png b/newsrc/afd/9024.png similarity index 100% rename from src/afd/sprites-canonical/front/0282-000-Gardevoir.png rename to newsrc/afd/9024.png diff --git a/src/afd/sprites-canonical/back/0282-000-Gardevoir.png b/newsrc/afd/9024b.png similarity index 100% rename from src/afd/sprites-canonical/back/0282-000-Gardevoir.png rename to newsrc/afd/9024b.png diff --git a/src/afd/sprites-canonical/back-shiny/0282-000-Gardevoir.png b/newsrc/afd/9024bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0282-000-Gardevoir.png rename to newsrc/afd/9024bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0282-000-Gardevoir.png b/newsrc/afd/9024s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0282-000-Gardevoir.png rename to newsrc/afd/9024s.png diff --git a/src/afd/sprites-canonical/front/0282-420-Gardevoir-Mega.png b/newsrc/afd/9025.png similarity index 100% rename from src/afd/sprites-canonical/front/0282-420-Gardevoir-Mega.png rename to newsrc/afd/9025.png diff --git a/src/afd/sprites-canonical/back/0282-420-Gardevoir-Mega.png b/newsrc/afd/9025b.png similarity index 100% rename from src/afd/sprites-canonical/back/0282-420-Gardevoir-Mega.png rename to newsrc/afd/9025b.png diff --git a/src/afd/sprites-canonical/back-shiny/0282-420-Gardevoir-Mega.png b/newsrc/afd/9025bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0282-420-Gardevoir-Mega.png rename to newsrc/afd/9025bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0282-420-Gardevoir-Mega.png b/newsrc/afd/9025s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0282-420-Gardevoir-Mega.png rename to newsrc/afd/9025s.png diff --git a/src/afd/sprites-canonical/front/0283-000-Surskit.png b/newsrc/afd/9056.png similarity index 100% rename from src/afd/sprites-canonical/front/0283-000-Surskit.png rename to newsrc/afd/9056.png diff --git a/src/afd/sprites-canonical/back/0283-000-Surskit.png b/newsrc/afd/9056b.png similarity index 100% rename from src/afd/sprites-canonical/back/0283-000-Surskit.png rename to newsrc/afd/9056b.png diff --git a/src/afd/sprites-canonical/back-shiny/0283-000-Surskit.png b/newsrc/afd/9056bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0283-000-Surskit.png rename to newsrc/afd/9056bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0283-000-Surskit.png b/newsrc/afd/9056s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0283-000-Surskit.png rename to newsrc/afd/9056s.png diff --git a/src/afd/sprites-canonical/front/0284-000-Masquerain.png b/newsrc/afd/9088.png similarity index 100% rename from src/afd/sprites-canonical/front/0284-000-Masquerain.png rename to newsrc/afd/9088.png diff --git a/src/afd/sprites-canonical/back/0284-000-Masquerain.png b/newsrc/afd/9088b.png similarity index 100% rename from src/afd/sprites-canonical/back/0284-000-Masquerain.png rename to newsrc/afd/9088b.png diff --git a/src/afd/sprites-canonical/back-shiny/0284-000-Masquerain.png b/newsrc/afd/9088bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0284-000-Masquerain.png rename to newsrc/afd/9088bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0284-000-Masquerain.png b/newsrc/afd/9088s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0284-000-Masquerain.png rename to newsrc/afd/9088s.png diff --git a/src/afd/sprites-canonical/front/0285-000-Shroomish.png b/newsrc/afd/9120.png similarity index 100% rename from src/afd/sprites-canonical/front/0285-000-Shroomish.png rename to newsrc/afd/9120.png diff --git a/src/afd/sprites-canonical/back/0285-000-Shroomish.png b/newsrc/afd/9120b.png similarity index 100% rename from src/afd/sprites-canonical/back/0285-000-Shroomish.png rename to newsrc/afd/9120b.png diff --git a/src/afd/sprites-canonical/back-shiny/0285-000-Shroomish.png b/newsrc/afd/9120bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0285-000-Shroomish.png rename to newsrc/afd/9120bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0285-000-Shroomish.png b/newsrc/afd/9120s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0285-000-Shroomish.png rename to newsrc/afd/9120s.png diff --git a/src/afd/sprites-canonical/front/0286-000-Breloom.png b/newsrc/afd/9152.png similarity index 100% rename from src/afd/sprites-canonical/front/0286-000-Breloom.png rename to newsrc/afd/9152.png diff --git a/src/afd/sprites-canonical/back/0286-000-Breloom.png b/newsrc/afd/9152b.png similarity index 100% rename from src/afd/sprites-canonical/back/0286-000-Breloom.png rename to newsrc/afd/9152b.png diff --git a/src/afd/sprites-canonical/back-shiny/0286-000-Breloom.png b/newsrc/afd/9152bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0286-000-Breloom.png rename to newsrc/afd/9152bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0286-000-Breloom.png b/newsrc/afd/9152s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0286-000-Breloom.png rename to newsrc/afd/9152s.png diff --git a/src/afd/sprites-canonical/front/0287-000-Slakoth.png b/newsrc/afd/9184.png similarity index 100% rename from src/afd/sprites-canonical/front/0287-000-Slakoth.png rename to newsrc/afd/9184.png diff --git a/src/afd/sprites-canonical/back/0287-000-Slakoth.png b/newsrc/afd/9184b.png similarity index 100% rename from src/afd/sprites-canonical/back/0287-000-Slakoth.png rename to newsrc/afd/9184b.png diff --git a/src/afd/sprites-canonical/back-shiny/0287-000-Slakoth.png b/newsrc/afd/9184bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0287-000-Slakoth.png rename to newsrc/afd/9184bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0287-000-Slakoth.png b/newsrc/afd/9184s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0287-000-Slakoth.png rename to newsrc/afd/9184s.png diff --git a/src/afd/sprites-canonical/front/0288-000-Vigoroth.png b/newsrc/afd/9216.png similarity index 100% rename from src/afd/sprites-canonical/front/0288-000-Vigoroth.png rename to newsrc/afd/9216.png diff --git a/src/afd/sprites-canonical/back/0288-000-Vigoroth.png b/newsrc/afd/9216b.png similarity index 100% rename from src/afd/sprites-canonical/back/0288-000-Vigoroth.png rename to newsrc/afd/9216b.png diff --git a/src/afd/sprites-canonical/back-shiny/0288-000-Vigoroth.png b/newsrc/afd/9216bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0288-000-Vigoroth.png rename to newsrc/afd/9216bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0288-000-Vigoroth.png b/newsrc/afd/9216s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0288-000-Vigoroth.png rename to newsrc/afd/9216s.png diff --git a/src/afd/sprites-canonical/front/0289-000-Slaking.png b/newsrc/afd/9248.png similarity index 100% rename from src/afd/sprites-canonical/front/0289-000-Slaking.png rename to newsrc/afd/9248.png diff --git a/src/afd/sprites-canonical/back/0289-000-Slaking.png b/newsrc/afd/9248b.png similarity index 100% rename from src/afd/sprites-canonical/back/0289-000-Slaking.png rename to newsrc/afd/9248b.png diff --git a/src/afd/sprites-canonical/back-shiny/0289-000-Slaking.png b/newsrc/afd/9248bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0289-000-Slaking.png rename to newsrc/afd/9248bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0289-000-Slaking.png b/newsrc/afd/9248s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0289-000-Slaking.png rename to newsrc/afd/9248s.png diff --git a/src/afd/sprites-canonical/front/0029-000-Nidoran~F.png b/newsrc/afd/928.png similarity index 100% rename from src/afd/sprites-canonical/front/0029-000-Nidoran~F.png rename to newsrc/afd/928.png diff --git a/src/afd/sprites-canonical/front/0290-000-Nincada.png b/newsrc/afd/9280.png similarity index 100% rename from src/afd/sprites-canonical/front/0290-000-Nincada.png rename to newsrc/afd/9280.png diff --git a/src/afd/sprites-canonical/back/0290-000-Nincada.png b/newsrc/afd/9280b.png similarity index 100% rename from src/afd/sprites-canonical/back/0290-000-Nincada.png rename to newsrc/afd/9280b.png diff --git a/src/afd/sprites-canonical/back-shiny/0290-000-Nincada.png b/newsrc/afd/9280bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0290-000-Nincada.png rename to newsrc/afd/9280bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0290-000-Nincada.png b/newsrc/afd/9280s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0290-000-Nincada.png rename to newsrc/afd/9280s.png diff --git a/src/afd/sprites-canonical/back/0029-000-Nidoran~F.png b/newsrc/afd/928b.png similarity index 100% rename from src/afd/sprites-canonical/back/0029-000-Nidoran~F.png rename to newsrc/afd/928b.png diff --git a/src/afd/sprites-canonical/back-shiny/0029-000-Nidoran~F.png b/newsrc/afd/928bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0029-000-Nidoran~F.png rename to newsrc/afd/928bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0029-000-Nidoran~F.png b/newsrc/afd/928s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0029-000-Nidoran~F.png rename to newsrc/afd/928s.png diff --git a/src/afd/sprites-canonical/front/0291-000-Ninjask.png b/newsrc/afd/9312.png similarity index 100% rename from src/afd/sprites-canonical/front/0291-000-Ninjask.png rename to newsrc/afd/9312.png diff --git a/src/afd/sprites-canonical/back/0291-000-Ninjask.png b/newsrc/afd/9312b.png similarity index 100% rename from src/afd/sprites-canonical/back/0291-000-Ninjask.png rename to newsrc/afd/9312b.png diff --git a/src/afd/sprites-canonical/back-shiny/0291-000-Ninjask.png b/newsrc/afd/9312bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0291-000-Ninjask.png rename to newsrc/afd/9312bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0291-000-Ninjask.png b/newsrc/afd/9312s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0291-000-Ninjask.png rename to newsrc/afd/9312s.png diff --git a/src/afd/sprites-canonical/front/0292-000-Shedinja.png b/newsrc/afd/9344.png similarity index 100% rename from src/afd/sprites-canonical/front/0292-000-Shedinja.png rename to newsrc/afd/9344.png diff --git a/src/afd/sprites-canonical/back/0292-000-Shedinja.png b/newsrc/afd/9344b.png similarity index 100% rename from src/afd/sprites-canonical/back/0292-000-Shedinja.png rename to newsrc/afd/9344b.png diff --git a/src/afd/sprites-canonical/back-shiny/0292-000-Shedinja.png b/newsrc/afd/9344bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0292-000-Shedinja.png rename to newsrc/afd/9344bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0292-000-Shedinja.png b/newsrc/afd/9344s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0292-000-Shedinja.png rename to newsrc/afd/9344s.png diff --git a/src/afd/sprites-canonical/front/0293-000-Whismur.png b/newsrc/afd/9376.png similarity index 100% rename from src/afd/sprites-canonical/front/0293-000-Whismur.png rename to newsrc/afd/9376.png diff --git a/src/afd/sprites-canonical/back/0293-000-Whismur.png b/newsrc/afd/9376b.png similarity index 100% rename from src/afd/sprites-canonical/back/0293-000-Whismur.png rename to newsrc/afd/9376b.png diff --git a/src/afd/sprites-canonical/back-shiny/0293-000-Whismur.png b/newsrc/afd/9376bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0293-000-Whismur.png rename to newsrc/afd/9376bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0293-000-Whismur.png b/newsrc/afd/9376s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0293-000-Whismur.png rename to newsrc/afd/9376s.png diff --git a/src/afd/sprites-canonical/front/0294-000-Loudred.png b/newsrc/afd/9408.png similarity index 100% rename from src/afd/sprites-canonical/front/0294-000-Loudred.png rename to newsrc/afd/9408.png diff --git a/src/afd/sprites-canonical/back/0294-000-Loudred.png b/newsrc/afd/9408b.png similarity index 100% rename from src/afd/sprites-canonical/back/0294-000-Loudred.png rename to newsrc/afd/9408b.png diff --git a/src/afd/sprites-canonical/back-shiny/0294-000-Loudred.png b/newsrc/afd/9408bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0294-000-Loudred.png rename to newsrc/afd/9408bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0294-000-Loudred.png b/newsrc/afd/9408s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0294-000-Loudred.png rename to newsrc/afd/9408s.png diff --git a/src/afd/sprites-canonical/front/0295-000-Exploud.png b/newsrc/afd/9440.png similarity index 100% rename from src/afd/sprites-canonical/front/0295-000-Exploud.png rename to newsrc/afd/9440.png diff --git a/src/afd/sprites-canonical/back/0295-000-Exploud.png b/newsrc/afd/9440b.png similarity index 100% rename from src/afd/sprites-canonical/back/0295-000-Exploud.png rename to newsrc/afd/9440b.png diff --git a/src/afd/sprites-canonical/back-shiny/0295-000-Exploud.png b/newsrc/afd/9440bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0295-000-Exploud.png rename to newsrc/afd/9440bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0295-000-Exploud.png b/newsrc/afd/9440s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0295-000-Exploud.png rename to newsrc/afd/9440s.png diff --git a/src/afd/sprites-canonical/front/0296-000-Makuhita.png b/newsrc/afd/9472.png similarity index 100% rename from src/afd/sprites-canonical/front/0296-000-Makuhita.png rename to newsrc/afd/9472.png diff --git a/src/afd/sprites-canonical/back/0296-000-Makuhita.png b/newsrc/afd/9472b.png similarity index 100% rename from src/afd/sprites-canonical/back/0296-000-Makuhita.png rename to newsrc/afd/9472b.png diff --git a/src/afd/sprites-canonical/back-shiny/0296-000-Makuhita.png b/newsrc/afd/9472bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0296-000-Makuhita.png rename to newsrc/afd/9472bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0296-000-Makuhita.png b/newsrc/afd/9472s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0296-000-Makuhita.png rename to newsrc/afd/9472s.png diff --git a/src/afd/sprites-canonical/front/0297-000-Hariyama.png b/newsrc/afd/9504.png similarity index 100% rename from src/afd/sprites-canonical/front/0297-000-Hariyama.png rename to newsrc/afd/9504.png diff --git a/src/afd/sprites-canonical/back/0297-000-Hariyama.png b/newsrc/afd/9504b.png similarity index 100% rename from src/afd/sprites-canonical/back/0297-000-Hariyama.png rename to newsrc/afd/9504b.png diff --git a/src/afd/sprites-canonical/back-shiny/0297-000-Hariyama.png b/newsrc/afd/9504bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0297-000-Hariyama.png rename to newsrc/afd/9504bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0297-000-Hariyama.png b/newsrc/afd/9504s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0297-000-Hariyama.png rename to newsrc/afd/9504s.png diff --git a/src/afd/sprites-canonical/front/0298-000-Azurill.png b/newsrc/afd/9536.png similarity index 100% rename from src/afd/sprites-canonical/front/0298-000-Azurill.png rename to newsrc/afd/9536.png diff --git a/src/afd/sprites-canonical/back/0298-000-Azurill.png b/newsrc/afd/9536b.png similarity index 100% rename from src/afd/sprites-canonical/back/0298-000-Azurill.png rename to newsrc/afd/9536b.png diff --git a/src/afd/sprites-canonical/back-shiny/0298-000-Azurill.png b/newsrc/afd/9536bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0298-000-Azurill.png rename to newsrc/afd/9536bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0298-000-Azurill.png b/newsrc/afd/9536s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0298-000-Azurill.png rename to newsrc/afd/9536s.png diff --git a/src/afd/sprites-canonical/front/0299-000-Nosepass.png b/newsrc/afd/9568.png similarity index 100% rename from src/afd/sprites-canonical/front/0299-000-Nosepass.png rename to newsrc/afd/9568.png diff --git a/src/afd/sprites-canonical/back/0299-000-Nosepass.png b/newsrc/afd/9568b.png similarity index 100% rename from src/afd/sprites-canonical/back/0299-000-Nosepass.png rename to newsrc/afd/9568b.png diff --git a/src/afd/sprites-canonical/back-shiny/0299-000-Nosepass.png b/newsrc/afd/9568bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0299-000-Nosepass.png rename to newsrc/afd/9568bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0299-000-Nosepass.png b/newsrc/afd/9568s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0299-000-Nosepass.png rename to newsrc/afd/9568s.png diff --git a/src/afd/sprites-canonical/front/0003-000-Venusaur.png b/newsrc/afd/96.png similarity index 100% rename from src/afd/sprites-canonical/front/0003-000-Venusaur.png rename to newsrc/afd/96.png diff --git a/src/afd/sprites-canonical/front/0030-000-Nidorina.png b/newsrc/afd/960.png similarity index 100% rename from src/afd/sprites-canonical/front/0030-000-Nidorina.png rename to newsrc/afd/960.png diff --git a/src/afd/sprites-canonical/front/0300-000-Skitty.png b/newsrc/afd/9600.png similarity index 100% rename from src/afd/sprites-canonical/front/0300-000-Skitty.png rename to newsrc/afd/9600.png diff --git a/src/afd/sprites-canonical/back/0300-000-Skitty.png b/newsrc/afd/9600b.png similarity index 100% rename from src/afd/sprites-canonical/back/0300-000-Skitty.png rename to newsrc/afd/9600b.png diff --git a/src/afd/sprites-canonical/back-shiny/0300-000-Skitty.png b/newsrc/afd/9600bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0300-000-Skitty.png rename to newsrc/afd/9600bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0300-000-Skitty.png b/newsrc/afd/9600s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0300-000-Skitty.png rename to newsrc/afd/9600s.png diff --git a/src/afd/sprites-canonical/back/0030-000-Nidorina.png b/newsrc/afd/960b.png similarity index 100% rename from src/afd/sprites-canonical/back/0030-000-Nidorina.png rename to newsrc/afd/960b.png diff --git a/src/afd/sprites-canonical/back-shiny/0030-000-Nidorina.png b/newsrc/afd/960bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0030-000-Nidorina.png rename to newsrc/afd/960bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0030-000-Nidorina.png b/newsrc/afd/960s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0030-000-Nidorina.png rename to newsrc/afd/960s.png diff --git a/src/afd/sprites-canonical/front/0301-000-Delcatty.png b/newsrc/afd/9632.png similarity index 100% rename from src/afd/sprites-canonical/front/0301-000-Delcatty.png rename to newsrc/afd/9632.png diff --git a/src/afd/sprites-canonical/back/0301-000-Delcatty.png b/newsrc/afd/9632b.png similarity index 100% rename from src/afd/sprites-canonical/back/0301-000-Delcatty.png rename to newsrc/afd/9632b.png diff --git a/src/afd/sprites-canonical/back-shiny/0301-000-Delcatty.png b/newsrc/afd/9632bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0301-000-Delcatty.png rename to newsrc/afd/9632bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0301-000-Delcatty.png b/newsrc/afd/9632s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0301-000-Delcatty.png rename to newsrc/afd/9632s.png diff --git a/src/afd/sprites-canonical/front/0302-000-Sableye.png b/newsrc/afd/9664.png similarity index 100% rename from src/afd/sprites-canonical/front/0302-000-Sableye.png rename to newsrc/afd/9664.png diff --git a/src/afd/sprites-canonical/back/0302-000-Sableye.png b/newsrc/afd/9664b.png similarity index 100% rename from src/afd/sprites-canonical/back/0302-000-Sableye.png rename to newsrc/afd/9664b.png diff --git a/src/afd/sprites-canonical/back-shiny/0302-000-Sableye.png b/newsrc/afd/9664bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0302-000-Sableye.png rename to newsrc/afd/9664bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0302-000-Sableye.png b/newsrc/afd/9664s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0302-000-Sableye.png rename to newsrc/afd/9664s.png diff --git a/src/afd/sprites-canonical/front/0302-420-Sableye-Mega.png b/newsrc/afd/9665.png similarity index 100% rename from src/afd/sprites-canonical/front/0302-420-Sableye-Mega.png rename to newsrc/afd/9665.png diff --git a/src/afd/sprites-canonical/back/0302-420-Sableye-Mega.png b/newsrc/afd/9665b.png similarity index 100% rename from src/afd/sprites-canonical/back/0302-420-Sableye-Mega.png rename to newsrc/afd/9665b.png diff --git a/src/afd/sprites-canonical/back-shiny/0302-420-Sableye-Mega.png b/newsrc/afd/9665bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0302-420-Sableye-Mega.png rename to newsrc/afd/9665bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0302-420-Sableye-Mega.png b/newsrc/afd/9665s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0302-420-Sableye-Mega.png rename to newsrc/afd/9665s.png diff --git a/src/afd/sprites-canonical/front/0303-000-Mawile.png b/newsrc/afd/9696.png similarity index 100% rename from src/afd/sprites-canonical/front/0303-000-Mawile.png rename to newsrc/afd/9696.png diff --git a/src/afd/sprites-canonical/back/0303-000-Mawile.png b/newsrc/afd/9696b.png similarity index 100% rename from src/afd/sprites-canonical/back/0303-000-Mawile.png rename to newsrc/afd/9696b.png diff --git a/src/afd/sprites-canonical/back-shiny/0303-000-Mawile.png b/newsrc/afd/9696bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0303-000-Mawile.png rename to newsrc/afd/9696bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0303-000-Mawile.png b/newsrc/afd/9696s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0303-000-Mawile.png rename to newsrc/afd/9696s.png diff --git a/src/afd/sprites-canonical/front/0303-420-Mawile-Mega.png b/newsrc/afd/9697.png similarity index 100% rename from src/afd/sprites-canonical/front/0303-420-Mawile-Mega.png rename to newsrc/afd/9697.png diff --git a/src/afd/sprites-canonical/back/0303-420-Mawile-Mega.png b/newsrc/afd/9697b.png similarity index 100% rename from src/afd/sprites-canonical/back/0303-420-Mawile-Mega.png rename to newsrc/afd/9697b.png diff --git a/src/afd/sprites-canonical/back-shiny/0303-420-Mawile-Mega.png b/newsrc/afd/9697bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0303-420-Mawile-Mega.png rename to newsrc/afd/9697bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0303-420-Mawile-Mega.png b/newsrc/afd/9697s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0303-420-Mawile-Mega.png rename to newsrc/afd/9697s.png diff --git a/src/afd/sprites-canonical/back/0003-000-Venusaur.png b/newsrc/afd/96b.png similarity index 100% rename from src/afd/sprites-canonical/back/0003-000-Venusaur.png rename to newsrc/afd/96b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0003-000-Venusaur-Female.png b/newsrc/afd/96bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0003-000-Venusaur-Female.png rename to newsrc/afd/96bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0003-000-Venusaur-Female.png b/newsrc/afd/96bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0003-000-Venusaur-Female.png rename to newsrc/afd/96bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0003-000-Venusaur.png b/newsrc/afd/96bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0003-000-Venusaur.png rename to newsrc/afd/96bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0003-000-Venusaur-Female.png b/newsrc/afd/96f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0003-000-Venusaur-Female.png rename to newsrc/afd/96f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0003-000-Venusaur-Female.png b/newsrc/afd/96fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0003-000-Venusaur-Female.png rename to newsrc/afd/96fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0003-000-Venusaur.png b/newsrc/afd/96s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0003-000-Venusaur.png rename to newsrc/afd/96s.png diff --git a/src/afd/sprites-canonical/front/0003-420-Venusaur-Mega.png b/newsrc/afd/97.png similarity index 100% rename from src/afd/sprites-canonical/front/0003-420-Venusaur-Mega.png rename to newsrc/afd/97.png diff --git a/src/afd/sprites-canonical/front/0304-000-Aron.png b/newsrc/afd/9728.png similarity index 100% rename from src/afd/sprites-canonical/front/0304-000-Aron.png rename to newsrc/afd/9728.png diff --git a/src/afd/sprites-canonical/back/0304-000-Aron.png b/newsrc/afd/9728b.png similarity index 100% rename from src/afd/sprites-canonical/back/0304-000-Aron.png rename to newsrc/afd/9728b.png diff --git a/src/afd/sprites-canonical/back-shiny/0304-000-Aron.png b/newsrc/afd/9728bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0304-000-Aron.png rename to newsrc/afd/9728bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0304-000-Aron.png b/newsrc/afd/9728s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0304-000-Aron.png rename to newsrc/afd/9728s.png diff --git a/src/afd/sprites-canonical/front/0305-000-Lairon.png b/newsrc/afd/9760.png similarity index 100% rename from src/afd/sprites-canonical/front/0305-000-Lairon.png rename to newsrc/afd/9760.png diff --git a/src/afd/sprites-canonical/back/0305-000-Lairon.png b/newsrc/afd/9760b.png similarity index 100% rename from src/afd/sprites-canonical/back/0305-000-Lairon.png rename to newsrc/afd/9760b.png diff --git a/src/afd/sprites-canonical/back-shiny/0305-000-Lairon.png b/newsrc/afd/9760bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0305-000-Lairon.png rename to newsrc/afd/9760bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0305-000-Lairon.png b/newsrc/afd/9760s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0305-000-Lairon.png rename to newsrc/afd/9760s.png diff --git a/src/afd/sprites-canonical/front/0306-000-Aggron.png b/newsrc/afd/9792.png similarity index 100% rename from src/afd/sprites-canonical/front/0306-000-Aggron.png rename to newsrc/afd/9792.png diff --git a/src/afd/sprites-canonical/back/0306-000-Aggron.png b/newsrc/afd/9792b.png similarity index 100% rename from src/afd/sprites-canonical/back/0306-000-Aggron.png rename to newsrc/afd/9792b.png diff --git a/src/afd/sprites-canonical/back-shiny/0306-000-Aggron.png b/newsrc/afd/9792bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0306-000-Aggron.png rename to newsrc/afd/9792bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0306-000-Aggron.png b/newsrc/afd/9792s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0306-000-Aggron.png rename to newsrc/afd/9792s.png diff --git a/src/afd/sprites-canonical/front/0306-420-Aggron-Mega.png b/newsrc/afd/9793.png similarity index 100% rename from src/afd/sprites-canonical/front/0306-420-Aggron-Mega.png rename to newsrc/afd/9793.png diff --git a/src/afd/sprites-canonical/back/0306-420-Aggron-Mega.png b/newsrc/afd/9793b.png similarity index 100% rename from src/afd/sprites-canonical/back/0306-420-Aggron-Mega.png rename to newsrc/afd/9793b.png diff --git a/src/afd/sprites-canonical/back-shiny/0306-420-Aggron-Mega.png b/newsrc/afd/9793bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0306-420-Aggron-Mega.png rename to newsrc/afd/9793bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0306-420-Aggron-Mega.png b/newsrc/afd/9793s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0306-420-Aggron-Mega.png rename to newsrc/afd/9793s.png diff --git a/src/afd/sprites-canonical/back/0003-420-Venusaur-Mega.png b/newsrc/afd/97b.png similarity index 100% rename from src/afd/sprites-canonical/back/0003-420-Venusaur-Mega.png rename to newsrc/afd/97b.png diff --git a/src/afd/sprites-canonical/back-shiny/0003-420-Venusaur-Mega.png b/newsrc/afd/97bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0003-420-Venusaur-Mega.png rename to newsrc/afd/97bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0003-420-Venusaur-Mega.png b/newsrc/afd/97s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0003-420-Venusaur-Mega.png rename to newsrc/afd/97s.png diff --git a/src/afd/sprites-canonical/front/0307-000-Meditite.png b/newsrc/afd/9824.png similarity index 100% rename from src/afd/sprites-canonical/front/0307-000-Meditite.png rename to newsrc/afd/9824.png diff --git a/src/afd/sprites-canonical/back/0307-000-Meditite.png b/newsrc/afd/9824b.png similarity index 100% rename from src/afd/sprites-canonical/back/0307-000-Meditite.png rename to newsrc/afd/9824b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0307-000-Meditite-Female.png b/newsrc/afd/9824bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0307-000-Meditite-Female.png rename to newsrc/afd/9824bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0307-000-Meditite-Female.png b/newsrc/afd/9824bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0307-000-Meditite-Female.png rename to newsrc/afd/9824bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0307-000-Meditite.png b/newsrc/afd/9824bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0307-000-Meditite.png rename to newsrc/afd/9824bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0307-000-Meditite-Female.png b/newsrc/afd/9824f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0307-000-Meditite-Female.png rename to newsrc/afd/9824f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0307-000-Meditite-Female.png b/newsrc/afd/9824fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0307-000-Meditite-Female.png rename to newsrc/afd/9824fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0307-000-Meditite.png b/newsrc/afd/9824s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0307-000-Meditite.png rename to newsrc/afd/9824s.png diff --git a/src/afd/sprites-canonical/front/0308-000-Medicham.png b/newsrc/afd/9856.png similarity index 100% rename from src/afd/sprites-canonical/front/0308-000-Medicham.png rename to newsrc/afd/9856.png diff --git a/src/afd/sprites-canonical/back/0308-000-Medicham.png b/newsrc/afd/9856b.png similarity index 100% rename from src/afd/sprites-canonical/back/0308-000-Medicham.png rename to newsrc/afd/9856b.png diff --git a/src/afd/sprites-canonical/back-cosmetic/0308-000-Medicham-Female.png b/newsrc/afd/9856bf.png similarity index 100% rename from src/afd/sprites-canonical/back-cosmetic/0308-000-Medicham-Female.png rename to newsrc/afd/9856bf.png diff --git a/src/afd/sprites-canonical/back-shiny-cosmetic/0308-000-Medicham-Female.png b/newsrc/afd/9856bfs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny-cosmetic/0308-000-Medicham-Female.png rename to newsrc/afd/9856bfs.png diff --git a/src/afd/sprites-canonical/back-shiny/0308-000-Medicham.png b/newsrc/afd/9856bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0308-000-Medicham.png rename to newsrc/afd/9856bs.png diff --git a/src/afd/sprites-canonical/front-cosmetic/0308-000-Medicham-Female.png b/newsrc/afd/9856f.png similarity index 100% rename from src/afd/sprites-canonical/front-cosmetic/0308-000-Medicham-Female.png rename to newsrc/afd/9856f.png diff --git a/src/afd/sprites-canonical/front-shiny-cosmetic/0308-000-Medicham-Female.png b/newsrc/afd/9856fs.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny-cosmetic/0308-000-Medicham-Female.png rename to newsrc/afd/9856fs.png diff --git a/src/afd/sprites-canonical/front-shiny/0308-000-Medicham.png b/newsrc/afd/9856s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0308-000-Medicham.png rename to newsrc/afd/9856s.png diff --git a/src/afd/sprites-canonical/front/0308-420-Medicham-Mega.png b/newsrc/afd/9857.png similarity index 100% rename from src/afd/sprites-canonical/front/0308-420-Medicham-Mega.png rename to newsrc/afd/9857.png diff --git a/src/afd/sprites-canonical/back/0308-420-Medicham-Mega.png b/newsrc/afd/9857b.png similarity index 100% rename from src/afd/sprites-canonical/back/0308-420-Medicham-Mega.png rename to newsrc/afd/9857b.png diff --git a/src/afd/sprites-canonical/back-shiny/0308-420-Medicham-Mega.png b/newsrc/afd/9857bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0308-420-Medicham-Mega.png rename to newsrc/afd/9857bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0308-420-Medicham-Mega.png b/newsrc/afd/9857s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0308-420-Medicham-Mega.png rename to newsrc/afd/9857s.png diff --git a/src/afd/sprites-canonical/front/0309-000-Electrike.png b/newsrc/afd/9888.png similarity index 100% rename from src/afd/sprites-canonical/front/0309-000-Electrike.png rename to newsrc/afd/9888.png diff --git a/src/afd/sprites-canonical/back/0309-000-Electrike.png b/newsrc/afd/9888b.png similarity index 100% rename from src/afd/sprites-canonical/back/0309-000-Electrike.png rename to newsrc/afd/9888b.png diff --git a/src/afd/sprites-canonical/back-shiny/0309-000-Electrike.png b/newsrc/afd/9888bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0309-000-Electrike.png rename to newsrc/afd/9888bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0309-000-Electrike.png b/newsrc/afd/9888s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0309-000-Electrike.png rename to newsrc/afd/9888s.png diff --git a/src/afd/sprites-canonical/front/0031-000-Nidoqueen.png b/newsrc/afd/992.png similarity index 100% rename from src/afd/sprites-canonical/front/0031-000-Nidoqueen.png rename to newsrc/afd/992.png diff --git a/src/afd/sprites-canonical/front/0310-000-Manectric.png b/newsrc/afd/9920.png similarity index 100% rename from src/afd/sprites-canonical/front/0310-000-Manectric.png rename to newsrc/afd/9920.png diff --git a/src/afd/sprites-canonical/back/0310-000-Manectric.png b/newsrc/afd/9920b.png similarity index 100% rename from src/afd/sprites-canonical/back/0310-000-Manectric.png rename to newsrc/afd/9920b.png diff --git a/src/afd/sprites-canonical/back-shiny/0310-000-Manectric.png b/newsrc/afd/9920bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0310-000-Manectric.png rename to newsrc/afd/9920bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0310-000-Manectric.png b/newsrc/afd/9920s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0310-000-Manectric.png rename to newsrc/afd/9920s.png diff --git a/src/afd/sprites-canonical/front/0310-420-Manectric-Mega.png b/newsrc/afd/9921.png similarity index 100% rename from src/afd/sprites-canonical/front/0310-420-Manectric-Mega.png rename to newsrc/afd/9921.png diff --git a/src/afd/sprites-canonical/back/0310-420-Manectric-Mega.png b/newsrc/afd/9921b.png similarity index 100% rename from src/afd/sprites-canonical/back/0310-420-Manectric-Mega.png rename to newsrc/afd/9921b.png diff --git a/src/afd/sprites-canonical/back-shiny/0310-420-Manectric-Mega.png b/newsrc/afd/9921bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0310-420-Manectric-Mega.png rename to newsrc/afd/9921bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0310-420-Manectric-Mega.png b/newsrc/afd/9921s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0310-420-Manectric-Mega.png rename to newsrc/afd/9921s.png diff --git a/src/afd/sprites-canonical/back/0031-000-Nidoqueen.png b/newsrc/afd/992b.png similarity index 100% rename from src/afd/sprites-canonical/back/0031-000-Nidoqueen.png rename to newsrc/afd/992b.png diff --git a/src/afd/sprites-canonical/back-shiny/0031-000-Nidoqueen.png b/newsrc/afd/992bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0031-000-Nidoqueen.png rename to newsrc/afd/992bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0031-000-Nidoqueen.png b/newsrc/afd/992s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0031-000-Nidoqueen.png rename to newsrc/afd/992s.png diff --git a/src/afd/sprites-canonical/front/0311-000-Plusle.png b/newsrc/afd/9952.png similarity index 100% rename from src/afd/sprites-canonical/front/0311-000-Plusle.png rename to newsrc/afd/9952.png diff --git a/src/afd/sprites-canonical/back/0311-000-Plusle.png b/newsrc/afd/9952b.png similarity index 100% rename from src/afd/sprites-canonical/back/0311-000-Plusle.png rename to newsrc/afd/9952b.png diff --git a/src/afd/sprites-canonical/back-shiny/0311-000-Plusle.png b/newsrc/afd/9952bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0311-000-Plusle.png rename to newsrc/afd/9952bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0311-000-Plusle.png b/newsrc/afd/9952s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0311-000-Plusle.png rename to newsrc/afd/9952s.png diff --git a/src/afd/sprites-canonical/front/0312-000-Minun.png b/newsrc/afd/9984.png similarity index 100% rename from src/afd/sprites-canonical/front/0312-000-Minun.png rename to newsrc/afd/9984.png diff --git a/src/afd/sprites-canonical/back/0312-000-Minun.png b/newsrc/afd/9984b.png similarity index 100% rename from src/afd/sprites-canonical/back/0312-000-Minun.png rename to newsrc/afd/9984b.png diff --git a/src/afd/sprites-canonical/back-shiny/0312-000-Minun.png b/newsrc/afd/9984bs.png similarity index 100% rename from src/afd/sprites-canonical/back-shiny/0312-000-Minun.png rename to newsrc/afd/9984bs.png diff --git a/src/afd/sprites-canonical/front-shiny/0312-000-Minun.png b/newsrc/afd/9984s.png similarity index 100% rename from src/afd/sprites-canonical/front-shiny/0312-000-Minun.png rename to newsrc/afd/9984s.png