From 3442b09852c846bf1c7d99ce9188599bf15a0757 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 27 Oct 2024 16:15:11 -0300 Subject: [PATCH] Renamed folders and symbols to match species defines (#5581) --- .../competitive_defines/rename_subfolders.py | 21 + .../alcremie/{gigantamax => gmax}/back.png | Bin .../alcremie/{gigantamax => gmax}/front.png | Bin .../alcremie/{gigantamax => gmax}/icon.png | Bin .../alcremie/{gigantamax => gmax}/normal.pal | 0 .../alcremie/{gigantamax => gmax}/shiny.pal | 0 .../appletun/{gigantamax => gmax}/back.png | Bin .../appletun/{gigantamax => gmax}/front.png | Bin .../appletun/{gigantamax => gmax}/icon.png | Bin .../appletun/{gigantamax => gmax}/normal.pal | 0 .../appletun/{gigantamax => gmax}/shiny.pal | 0 .../arcanine/{hisuian => hisui}/back.png | Bin .../arcanine/{hisuian => hisui}/front.png | Bin .../arcanine/{hisuian => hisui}/icon.png | Bin .../arcanine/{hisuian => hisui}/normal.pal | 0 .../arcanine/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../arcanine/{hisuian => hisui}/shiny.pal | 0 .../articuno/{galarian => galar}/back.png | Bin .../articuno/{galarian => galar}/front.png | Bin .../articuno/{galarian => galar}/icon.png | Bin .../articuno/{galarian => galar}/normal.pal | 0 .../{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../articuno/{galarian => galar}/shiny.pal | 0 .../avalugg/{hisuian => hisui}/back.png | Bin .../avalugg/{hisuian => hisui}/front.png | Bin .../avalugg/{hisuian => hisui}/icon.png | Bin .../avalugg/{hisuian => hisui}/normal.pal | 0 .../avalugg/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../avalugg/{hisuian => hisui}/shiny.pal | 0 .../basculegion/{female => f}/back.png | Bin .../basculegion/{female => f}/front.png | Bin .../basculegion/{female => f}/icon.png | Bin .../basculegion/{female => f}/normal.pal | 0 .../basculegion/{female => f}/overworld.png | Bin .../{female => f}/overworld_normal.pal | 0 .../{female => f}/overworld_shiny.pal | 0 .../basculegion/{female => f}/shiny.pal | 0 .../basculin/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../blastoise/{gigantamax => gmax}/back.png | Bin .../blastoise/{gigantamax => gmax}/front.png | Bin .../blastoise/{gigantamax => gmax}/icon.png | Bin .../blastoise/{gigantamax => gmax}/normal.pal | 0 .../blastoise/{gigantamax => gmax}/shiny.pal | 0 .../braviary/{hisuian => hisui}/back.png | Bin .../braviary/{hisuian => hisui}/front.png | Bin .../braviary/{hisuian => hisui}/icon.png | Bin .../braviary/{hisuian => hisui}/normal.pal | 0 .../braviary/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../braviary/{hisuian => hisui}/shiny.pal | 0 .../pokemon/burmy/{plant => }/footprint.png | Bin .../{sandy_cloak => sandy}/anim_front.png | Bin .../burmy/{sandy_cloak => sandy}/back.png | Bin .../burmy/{sandy_cloak => sandy}/icon.png | Bin .../burmy/{sandy_cloak => sandy}/normal.pal | 0 .../{sandy_cloak => sandy}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../burmy/{sandy_cloak => sandy}/shiny.pal | 0 .../{trash_cloak => trash}/anim_front.png | Bin .../burmy/{trash_cloak => trash}/back.png | Bin .../burmy/{trash_cloak => trash}/icon.png | Bin .../burmy/{trash_cloak => trash}/normal.pal | 0 .../{trash_cloak => trash}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../burmy/{trash_cloak => trash}/shiny.pal | 0 .../butterfree/{gigantamax => gmax}/back.png | Bin .../butterfree/{gigantamax => gmax}/front.png | Bin .../butterfree/{gigantamax => gmax}/icon.png | Bin .../{gigantamax => gmax}/normal.pal | 0 .../butterfree/{gigantamax => gmax}/shiny.pal | 0 .../calyrex/{ice_rider => ice}/back.png | Bin .../calyrex/{ice_rider => ice}/front.png | Bin .../calyrex/{ice_rider => ice}/icon.png | Bin .../calyrex/{ice_rider => ice}/normal.pal | 0 .../calyrex/{ice_rider => ice}/overworld.png | Bin .../{ice_rider => ice}/overworld_normal.pal | 0 .../{ice_rider => ice}/overworld_shiny.pal | 0 .../calyrex/{ice_rider => ice}/shiny.pal | 0 .../calyrex/{shadow_rider => shadow}/back.png | Bin .../{shadow_rider => shadow}/front.png | Bin .../calyrex/{shadow_rider => shadow}/icon.png | Bin .../{shadow_rider => shadow}/normal.pal | 0 .../{shadow_rider => shadow}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{shadow_rider => shadow}/shiny.pal | 0 .../centiskorch/{gigantamax => gmax}/back.png | Bin .../{gigantamax => gmax}/front.png | Bin .../centiskorch/{gigantamax => gmax}/icon.png | Bin .../{gigantamax => gmax}/normal.pal | 0 .../{gigantamax => gmax}/shiny.pal | 0 .../charizard/{gigantamax => gmax}/back.png | Bin .../charizard/{gigantamax => gmax}/front.png | Bin .../charizard/{gigantamax => gmax}/icon.png | Bin .../charizard/{gigantamax => gmax}/normal.pal | 0 .../charizard/{gigantamax => gmax}/shiny.pal | 0 .../cinderace/{gigantamax => gmax}/back.png | Bin .../cinderace/{gigantamax => gmax}/front.png | Bin .../cinderace/{gigantamax => gmax}/icon.png | Bin .../cinderace/{gigantamax => gmax}/normal.pal | 0 .../cinderace/{gigantamax => gmax}/shiny.pal | 0 .../coalossal/{gigantamax => gmax}/back.png | Bin .../coalossal/{gigantamax => gmax}/front.png | Bin .../coalossal/{gigantamax => gmax}/icon.png | Bin .../coalossal/{gigantamax => gmax}/normal.pal | 0 .../coalossal/{gigantamax => gmax}/shiny.pal | 0 .../copperajah/{gigantamax => gmax}/back.png | Bin .../copperajah/{gigantamax => gmax}/front.png | Bin .../copperajah/{gigantamax => gmax}/icon.png | Bin .../{gigantamax => gmax}/normal.pal | 0 .../copperajah/{gigantamax => gmax}/shiny.pal | 0 .../corsola/{galarian => galar}/back.png | Bin .../corsola/{galarian => galar}/front.png | Bin .../corsola/{galarian => galar}/icon.png | Bin .../corsola/{galarian => galar}/normal.pal | 0 .../corsola/{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../corsola/{galarian => galar}/shiny.pal | 0 .../corviknight/{gigantamax => gmax}/back.png | Bin .../{gigantamax => gmax}/front.png | Bin .../corviknight/{gigantamax => gmax}/icon.png | Bin .../{gigantamax => gmax}/normal.pal | 0 .../{gigantamax => gmax}/shiny.pal | 0 .../{galarian => galar_standard}/back.png | Bin .../{galarian => galar_standard}/front.png | Bin .../{galarian => galar_standard}/icon.png | Bin .../{galarian => galar_standard}/normal.pal | 0 .../overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{galarian => galar_standard}/shiny.pal | 0 .../{zen_mode/galarian => galar_zen}/back.png | Bin .../galarian => galar_zen}/front.png | Bin .../{zen_mode/galarian => galar_zen}/icon.png | Bin .../galarian => galar_zen}/normal.pal | 0 .../galarian => galar_zen}/shiny.pal | 0 .../{zen_mode => zen}/anim_front.png | Bin .../darmanitan/{zen_mode => zen}/back.png | Bin .../darmanitan/{zen_mode => zen}/icon.png | Bin .../darmanitan/{zen_mode => zen}/normal.pal | 0 .../darmanitan/{zen_mode => zen}/shiny.pal | 0 .../darumaka/{galarian => galar}/back.png | Bin .../darumaka/{galarian => galar}/front.png | Bin .../darumaka/{galarian => galar}/icon.png | Bin .../darumaka/{galarian => galar}/normal.pal | 0 .../{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../darumaka/{galarian => galar}/shiny.pal | 0 .../decidueye/{hisuian => hisui}/back.png | Bin .../decidueye/{hisuian => hisui}/front.png | Bin .../decidueye/{hisuian => hisui}/icon.png | Bin .../decidueye/{hisuian => hisui}/normal.pal | 0 .../{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../decidueye/{hisuian => hisui}/shiny.pal | 0 .../diglett/{alolan => alola}/back.png | Bin .../diglett/{alolan => alola}/front.png | Bin .../diglett/{alolan => alola}/icon.png | Bin .../diglett/{alolan => alola}/normal.pal | 0 .../diglett/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../diglett/{alolan => alola}/shiny.pal | 0 .../drednaw/{gigantamax => gmax}/back.png | Bin .../drednaw/{gigantamax => gmax}/front.png | Bin .../drednaw/{gigantamax => gmax}/icon.png | Bin .../drednaw/{gigantamax => gmax}/normal.pal | 0 .../drednaw/{gigantamax => gmax}/shiny.pal | 0 .../dugtrio/{alolan => alola}/back.png | Bin .../dugtrio/{alolan => alola}/front.png | Bin .../dugtrio/{alolan => alola}/icon.png | Bin .../dugtrio/{alolan => alola}/normal.pal | 0 .../dugtrio/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../dugtrio/{alolan => alola}/shiny.pal | 0 .../duraludon/{gigantamax => gmax}/back.png | Bin .../duraludon/{gigantamax => gmax}/front.png | Bin .../duraludon/{gigantamax => gmax}/icon.png | Bin .../duraludon/{gigantamax => gmax}/normal.pal | 0 .../duraludon/{gigantamax => gmax}/shiny.pal | 0 .../eevee/{gigantamax => gmax}/back.png | Bin .../eevee/{gigantamax => gmax}/front.png | Bin .../eevee/{gigantamax => gmax}/icon.png | Bin .../eevee/{gigantamax => gmax}/normal.pal | 0 .../eevee/{gigantamax => gmax}/shiny.pal | 0 .../electrode/{hisuian => hisui}/back.png | Bin .../electrode/{hisuian => hisui}/front.png | Bin .../electrode/{hisuian => hisui}/icon.png | Bin .../electrode/{hisuian => hisui}/normal.pal | 0 .../{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../electrode/{hisuian => hisui}/shiny.pal | 0 .../{alolan => alola}/anim_front.png | Bin .../exeggutor/{alolan => alola}/back.png | Bin .../exeggutor/{alolan => alola}/icon.png | Bin .../exeggutor/{alolan => alola}/normal.pal | 0 .../exeggutor/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../exeggutor/{alolan => alola}/shiny.pal | 0 .../farfetchd/{galarian => galar}/back.png | Bin .../farfetchd/{galarian => galar}/front.png | Bin .../farfetchd/{galarian => galar}/icon.png | Bin .../farfetchd/{galarian => galar}/normal.pal | 0 .../{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../farfetchd/{galarian => galar}/shiny.pal | 0 .../flabebe/{blue_flower => blue}/icon.png | Bin .../flabebe/{blue_flower => blue}/normal.pal | 0 .../{blue_flower => blue}/overworld.png | Bin .../overworld_normal.pal | 0 .../{blue_flower => blue}/overworld_shiny.pal | 0 .../flabebe/{blue_flower => blue}/shiny.pal | 0 .../{orange_flower => orange}/icon.png | Bin .../{orange_flower => orange}/normal.pal | 0 .../{orange_flower => orange}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{orange_flower => orange}/shiny.pal | 0 .../flabebe/{white_flower => white}/icon.png | Bin .../{white_flower => white}/normal.pal | 0 .../{white_flower => white}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../flabebe/{white_flower => white}/shiny.pal | 0 .../{yellow_flower => yellow}/icon.png | Bin .../{yellow_flower => yellow}/normal.pal | 0 .../{yellow_flower => yellow}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{yellow_flower => yellow}/shiny.pal | 0 .../flapple/{gigantamax => gmax}/back.png | Bin .../flapple/{gigantamax => gmax}/front.png | Bin .../flapple/{gigantamax => gmax}/icon.png | Bin .../flapple/{gigantamax => gmax}/normal.pal | 0 .../flapple/{gigantamax => gmax}/shiny.pal | 0 .../floette/{blue_flower => blue}/icon.png | Bin .../floette/{blue_flower => blue}/normal.pal | 0 .../{blue_flower => blue}/overworld.png | Bin .../overworld_normal.pal | 0 .../{blue_flower => blue}/overworld_shiny.pal | 0 .../floette/{blue_flower => blue}/shiny.pal | 0 .../anim_front.png | Bin .../{eternal_flower => eternal}/back.png | Bin .../{eternal_flower => eternal}/icon.png | Bin .../{eternal_flower => eternal}/normal.pal | 0 .../{eternal_flower => eternal}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{eternal_flower => eternal}/shiny.pal | 0 .../{orange_flower => orange}/icon.png | Bin .../{orange_flower => orange}/normal.pal | 0 .../{orange_flower => orange}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{orange_flower => orange}/shiny.pal | 0 .../floette/{white_flower => white}/icon.png | Bin .../{white_flower => white}/normal.pal | 0 .../{white_flower => white}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../floette/{white_flower => white}/shiny.pal | 0 .../{yellow_flower => yellow}/icon.png | Bin .../{yellow_flower => yellow}/normal.pal | 0 .../{yellow_flower => yellow}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{yellow_flower => yellow}/shiny.pal | 0 .../florges/{blue_flower => blue}/icon.png | Bin .../florges/{blue_flower => blue}/normal.pal | 0 .../{blue_flower => blue}/overworld.png | Bin .../overworld_normal.pal | 0 .../{blue_flower => blue}/overworld_shiny.pal | 0 .../florges/{blue_flower => blue}/shiny.pal | 0 .../{orange_flower => orange}/icon.png | Bin .../{orange_flower => orange}/normal.pal | 0 .../{orange_flower => orange}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{orange_flower => orange}/shiny.pal | 0 .../florges/{white_flower => white}/icon.png | Bin .../{white_flower => white}/normal.pal | 0 .../{white_flower => white}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../florges/{white_flower => white}/shiny.pal | 0 .../{yellow_flower => yellow}/icon.png | Bin .../{yellow_flower => yellow}/normal.pal | 0 .../{yellow_flower => yellow}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{yellow_flower => yellow}/shiny.pal | 0 .../garbodor/{gigantamax => gmax}/back.png | Bin .../garbodor/{gigantamax => gmax}/front.png | Bin .../garbodor/{gigantamax => gmax}/icon.png | Bin .../garbodor/{gigantamax => gmax}/normal.pal | 0 .../garbodor/{gigantamax => gmax}/shiny.pal | 0 .../{east_sea => east}/anim_front.png | Bin .../gastrodon/{east_sea => east}/back.png | Bin .../gastrodon/{east_sea => east}/icon.png | Bin .../gastrodon/{east_sea => east}/normal.pal | 0 .../{east_sea => east}/overworld.png | Bin .../{east_sea => east}/overworld_normal.pal | 0 .../{east_sea => east}/overworld_shiny.pal | 0 .../gastrodon/{east_sea => east}/shiny.pal | 0 .../gengar/{gigantamax => gmax}/back.png | Bin .../gengar/{gigantamax => gmax}/front.png | Bin .../gengar/{gigantamax => gmax}/icon.png | Bin .../gengar/{gigantamax => gmax}/normal.pal | 0 .../gengar/{gigantamax => gmax}/shiny.pal | 0 .../geodude/{alolan => alola}/back.png | Bin .../geodude/{alolan => alola}/front.png | Bin .../geodude/{alolan => alola}/icon.png | Bin .../geodude/{alolan => alola}/normal.pal | 0 .../geodude/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../geodude/{alolan => alola}/shiny.pal | 0 .../pokemon/golem/{alolan => alola}/back.png | Bin .../pokemon/golem/{alolan => alola}/front.png | Bin .../pokemon/golem/{alolan => alola}/icon.png | Bin .../golem/{alolan => alola}/normal.pal | 0 .../golem/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../pokemon/golem/{alolan => alola}/shiny.pal | 0 .../goodra/{hisuian => hisui}/back.png | Bin .../goodra/{hisuian => hisui}/front.png | Bin .../goodra/{hisuian => hisui}/icon.png | Bin .../goodra/{hisuian => hisui}/normal.pal | 0 .../goodra/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../goodra/{hisuian => hisui}/shiny.pal | 0 .../graveler/{alolan => alola}/back.png | Bin .../graveler/{alolan => alola}/front.png | Bin .../graveler/{alolan => alola}/icon.png | Bin .../graveler/{alolan => alola}/normal.pal | 0 .../graveler/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../graveler/{alolan => alola}/shiny.pal | 0 .../pokemon/grimer/{alolan => alola}/back.png | Bin .../grimer/{alolan => alola}/front.png | Bin .../pokemon/grimer/{alolan => alola}/icon.png | Bin .../grimer/{alolan => alola}/normal.pal | 0 .../grimer/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../grimer/{alolan => alola}/shiny.pal | 0 .../grimmsnarl/{gigantamax => gmax}/back.png | Bin .../grimmsnarl/{gigantamax => gmax}/front.png | Bin .../grimmsnarl/{gigantamax => gmax}/icon.png | Bin .../{gigantamax => gmax}/normal.pal | 0 .../grimmsnarl/{gigantamax => gmax}/shiny.pal | 0 .../growlithe/{hisuian => hisui}/back.png | Bin .../growlithe/{hisuian => hisui}/front.png | Bin .../growlithe/{hisuian => hisui}/icon.png | Bin .../growlithe/{hisuian => hisui}/normal.pal | 0 .../{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../growlithe/{hisuian => hisui}/shiny.pal | 0 .../hatterene/{gigantamax => gmax}/back.png | Bin .../hatterene/{gigantamax => gmax}/front.png | Bin .../hatterene/{gigantamax => gmax}/icon.png | Bin .../hatterene/{gigantamax => gmax}/normal.pal | 0 .../hatterene/{gigantamax => gmax}/shiny.pal | 0 .../pokemon/indeedee/{female => f}/back.png | Bin .../pokemon/indeedee/{female => f}/front.png | Bin .../pokemon/indeedee/{female => f}/icon.png | Bin .../pokemon/indeedee/{female => f}/normal.pal | 0 .../indeedee/{female => f}/overworld.png | Bin .../{female => f}/overworld_normal.pal | 0 .../{female => f}/overworld_shiny.pal | 0 .../pokemon/indeedee/{female => f}/shiny.pal | 0 .../inteleon/{gigantamax => gmax}/back.png | Bin .../inteleon/{gigantamax => gmax}/front.png | Bin .../inteleon/{gigantamax => gmax}/icon.png | Bin .../inteleon/{gigantamax => gmax}/normal.pal | 0 .../inteleon/{gigantamax => gmax}/shiny.pal | 0 .../kingler/{gigantamax => gmax}/back.png | Bin .../kingler/{gigantamax => gmax}/front.png | Bin .../kingler/{gigantamax => gmax}/icon.png | Bin .../kingler/{gigantamax => gmax}/normal.pal | 0 .../kingler/{gigantamax => gmax}/shiny.pal | 0 .../lapras/{gigantamax => gmax}/back.png | Bin .../lapras/{gigantamax => gmax}/front.png | Bin .../lapras/{gigantamax => gmax}/icon.png | Bin .../lapras/{gigantamax => gmax}/normal.pal | 0 .../lapras/{gigantamax => gmax}/shiny.pal | 0 .../lilligant/{hisuian => hisui}/back.png | Bin .../lilligant/{hisuian => hisui}/front.png | Bin .../lilligant/{hisuian => hisui}/icon.png | Bin .../lilligant/{hisuian => hisui}/normal.pal | 0 .../{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../lilligant/{hisuian => hisui}/shiny.pal | 0 .../linoone/{galarian => galar}/back.png | Bin .../linoone/{galarian => galar}/front.png | Bin .../linoone/{galarian => galar}/icon.png | Bin .../linoone/{galarian => galar}/normal.pal | 0 .../linoone/{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../linoone/{galarian => galar}/shiny.pal | 0 .../machamp/{gigantamax => gmax}/back.png | Bin .../machamp/{gigantamax => gmax}/front.png | Bin .../machamp/{gigantamax => gmax}/icon.png | Bin .../machamp/{gigantamax => gmax}/normal.pal | 0 .../machamp/{gigantamax => gmax}/shiny.pal | 0 .../marowak/{alolan => alola}/back.png | Bin .../marowak/{alolan => alola}/front.png | Bin .../marowak/{alolan => alola}/icon.png | Bin .../marowak/{alolan => alola}/normal.pal | 0 .../marowak/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../marowak/{alolan => alola}/shiny.pal | 0 .../melmetal/{gigantamax => gmax}/back.png | Bin .../melmetal/{gigantamax => gmax}/front.png | Bin .../melmetal/{gigantamax => gmax}/icon.png | Bin .../melmetal/{gigantamax => gmax}/normal.pal | 0 .../melmetal/{gigantamax => gmax}/shiny.pal | 0 .../meowstic/{female => f}/anim_front.png | Bin .../pokemon/meowstic/{female => f}/back.png | Bin .../pokemon/meowstic/{female => f}/icon.png | Bin .../pokemon/meowstic/{female => f}/normal.pal | 0 .../meowstic/{female => f}/overworld.png | Bin .../{female => f}/overworld_normal.pal | 0 .../{female => f}/overworld_shiny.pal | 0 .../pokemon/meowstic/{female => f}/shiny.pal | 0 .../pokemon/meowth/{alolan => alola}/back.png | Bin .../meowth/{alolan => alola}/front.png | Bin .../pokemon/meowth/{alolan => alola}/icon.png | Bin .../meowth/{alolan => alola}/normal.pal | 0 .../meowth/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../meowth/{alolan => alola}/shiny.pal | 0 .../meowth/{galarian => galar}/back.png | Bin .../meowth/{galarian => galar}/front.png | Bin .../meowth/{galarian => galar}/icon.png | Bin .../meowth/{galarian => galar}/normal.pal | 0 .../meowth/{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../meowth/{galarian => galar}/shiny.pal | 0 .../meowth/{gigantamax => gmax}/back.png | Bin .../meowth/{gigantamax => gmax}/front.png | Bin .../meowth/{gigantamax => gmax}/icon.png | Bin .../meowth/{gigantamax => gmax}/normal.pal | 0 .../meowth/{gigantamax => gmax}/shiny.pal | 0 .../moltres/{galarian => galar}/back.png | Bin .../moltres/{galarian => galar}/front.png | Bin .../moltres/{galarian => galar}/icon.png | Bin .../moltres/{galarian => galar}/normal.pal | 0 .../moltres/{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../moltres/{galarian => galar}/shiny.pal | 0 .../mr_mime/{galarian => galar}/back.png | Bin .../mr_mime/{galarian => galar}/front.png | Bin .../mr_mime/{galarian => galar}/icon.png | Bin .../mr_mime/{galarian => galar}/normal.pal | 0 .../mr_mime/{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../mr_mime/{galarian => galar}/shiny.pal | 0 .../pokemon/muk/{alolan => alola}/back.png | Bin .../pokemon/muk/{alolan => alola}/front.png | Bin .../pokemon/muk/{alolan => alola}/icon.png | Bin .../pokemon/muk/{alolan => alola}/normal.pal | 0 .../muk/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../muk/{alolan => alola}/overworld_shiny.pal | 0 .../pokemon/muk/{alolan => alola}/shiny.pal | 0 .../ninetales/{alolan => alola}/back.png | Bin .../ninetales/{alolan => alola}/front.png | Bin .../ninetales/{alolan => alola}/icon.png | Bin .../ninetales/{alolan => alola}/normal.pal | 0 .../ninetales/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../ninetales/{alolan => alola}/shiny.pal | 0 .../tera => cornerstone_tera}/back.png | Bin .../tera => cornerstone_tera}/front.png | Bin .../tera => cornerstone_tera}/normal.pal | 0 .../tera => cornerstone_tera}/shiny.pal | 0 .../tera => hearthflame_tera}/back.png | Bin .../tera => hearthflame_tera}/front.png | Bin .../tera => hearthflame_tera}/normal.pal | 0 .../tera => hearthflame_tera}/shiny.pal | 0 .../ogerpon/{tera => teal_tera}/back.png | Bin .../ogerpon/{tera => teal_tera}/front.png | Bin .../ogerpon/{tera => teal_tera}/normal.pal | 0 .../ogerpon/{tera => teal_tera}/shiny.pal | 0 .../tera => wellspring_tera}/back.png | Bin .../tera => wellspring_tera}/front.png | Bin .../tera => wellspring_tera}/normal.pal | 0 .../tera => wellspring_tera}/shiny.pal | 0 .../pokemon/oinkologne/{female => f}/back.png | Bin .../oinkologne/{female => f}/front.png | Bin .../pokemon/oinkologne/{female => f}/icon.png | Bin .../oinkologne/{female => f}/normal.pal | 0 .../oinkologne/{female => f}/overworld.png | Bin .../{female => f}/overworld_normal.pal | 0 .../{female => f}/overworld_shiny.pal | 0 .../oinkologne/{female => f}/shiny.pal | 0 .../orbeetle/{gigantamax => gmax}/back.png | Bin .../orbeetle/{gigantamax => gmax}/front.png | Bin .../orbeetle/{gigantamax => gmax}/icon.png | Bin .../orbeetle/{gigantamax => gmax}/normal.pal | 0 .../orbeetle/{gigantamax => gmax}/shiny.pal | 0 .../persian/{alolan => alola}/back.png | Bin .../persian/{alolan => alola}/front.png | Bin .../persian/{alolan => alola}/icon.png | Bin .../persian/{alolan => alola}/normal.pal | 0 .../persian/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../persian/{alolan => alola}/shiny.pal | 0 .../pikachu/{alola_cap => alola}/back.png | Bin .../pikachu/{alola_cap => alola}/front.png | Bin .../pikachu/{alola_cap => alola}/icon.png | Bin .../pikachu/{alola_cap => alola}/normal.pal | 0 .../pikachu/{alola_cap => alola}/shiny.pal | 0 .../pikachu/{gigantamax => gmax}/back.png | Bin .../pikachu/{gigantamax => gmax}/front.png | Bin .../pikachu/{gigantamax => gmax}/icon.png | Bin .../pikachu/{gigantamax => gmax}/normal.pal | 0 .../pikachu/{gigantamax => gmax}/shiny.pal | 0 .../pikachu/{hoenn_cap => hoenn}/back.png | Bin .../pikachu/{hoenn_cap => hoenn}/front.png | Bin .../pikachu/{hoenn_cap => hoenn}/icon.png | Bin .../pikachu/{hoenn_cap => hoenn}/normal.pal | 0 .../pikachu/{hoenn_cap => hoenn}/shiny.pal | 0 .../pikachu/{kalos_cap => kalos}/back.png | Bin .../pikachu/{kalos_cap => kalos}/front.png | Bin .../pikachu/{kalos_cap => kalos}/icon.png | Bin .../pikachu/{kalos_cap => kalos}/normal.pal | 0 .../pikachu/{kalos_cap => kalos}/shiny.pal | 0 .../{original_cap => original}/back.png | Bin .../{original_cap => original}/front.png | Bin .../{original_cap => original}/icon.png | Bin .../{original_cap => original}/normal.pal | 0 .../{original_cap => original}/shiny.pal | 0 .../pikachu/{partner_cap => partner}/back.png | Bin .../{partner_cap => partner}/front.png | Bin graphics/pokemon/pikachu/partner/icon.png | Bin 388 -> 444 bytes .../{partner_cap => partner}/normal.pal | 0 .../{partner_cap => partner}/shiny.pal | 0 graphics/pokemon/pikachu/partner_cap/icon.png | Bin 444 -> 0 bytes .../pokemon/pikachu/{ph_d => phd}/back.png | Bin .../pokemon/pikachu/{ph_d => phd}/front.png | Bin .../pokemon/pikachu/{ph_d => phd}/icon.png | Bin .../pokemon/pikachu/{ph_d => phd}/normal.pal | 0 .../pokemon/pikachu/{ph_d => phd}/shiny.pal | 0 .../pikachu/{sinnoh_cap => sinnoh}/back.png | Bin .../pikachu/{sinnoh_cap => sinnoh}/front.png | Bin .../pikachu/{sinnoh_cap => sinnoh}/icon.png | Bin .../pikachu/{sinnoh_cap => sinnoh}/normal.pal | 0 .../pikachu/{sinnoh_cap => sinnoh}/shiny.pal | 0 graphics/pokemon/pikachu/starter/icon.png | Bin 0 -> 388 bytes .../pikachu/{partner => starter}/iconf.png | Bin .../pikachu/{unova_cap => unova}/back.png | Bin .../pikachu/{unova_cap => unova}/front.png | Bin .../pikachu/{unova_cap => unova}/icon.png | Bin .../pikachu/{unova_cap => unova}/normal.pal | 0 .../pikachu/{unova_cap => unova}/shiny.pal | 0 .../pikachu/{world_cap => world}/back.png | Bin .../pikachu/{world_cap => world}/front.png | Bin .../pikachu/{world_cap => world}/icon.png | Bin .../pikachu/{world_cap => world}/normal.pal | 0 .../pikachu/{world_cap => world}/shiny.pal | 0 .../ponyta/{galarian => galar}/back.png | Bin .../ponyta/{galarian => galar}/front.png | Bin .../ponyta/{galarian => galar}/icon.png | Bin .../ponyta/{galarian => galar}/normal.pal | 0 .../ponyta/{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../ponyta/{galarian => galar}/shiny.pal | 0 .../qwilfish/{hisuian => hisui}/back.png | Bin .../qwilfish/{hisuian => hisui}/front.png | Bin .../qwilfish/{hisuian => hisui}/icon.png | Bin .../qwilfish/{hisuian => hisui}/normal.pal | 0 .../qwilfish/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../qwilfish/{hisuian => hisui}/shiny.pal | 0 .../pokemon/raichu/{alolan => alola}/back.png | Bin .../raichu/{alolan => alola}/front.png | Bin .../pokemon/raichu/{alolan => alola}/icon.png | Bin .../raichu/{alolan => alola}/normal.pal | 0 .../raichu/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../raichu/{alolan => alola}/shiny.pal | 0 .../rapidash/{galarian => galar}/back.png | Bin .../rapidash/{galarian => galar}/front.png | Bin .../rapidash/{galarian => galar}/icon.png | Bin .../rapidash/{galarian => galar}/normal.pal | 0 .../{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../rapidash/{galarian => galar}/shiny.pal | 0 .../raticate/{alolan => alola}/back.png | Bin .../raticate/{alolan => alola}/front.png | Bin .../raticate/{alolan => alola}/icon.png | Bin .../raticate/{alolan => alola}/normal.pal | 0 .../raticate/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../raticate/{alolan => alola}/shiny.pal | 0 .../rattata/{alolan => alola}/back.png | Bin .../rattata/{alolan => alola}/front.png | Bin .../rattata/{alolan => alola}/icon.png | Bin .../rattata/{alolan => alola}/normal.pal | 0 .../rattata/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../rattata/{alolan => alola}/shiny.pal | 0 .../rillaboom/{gigantamax => gmax}/back.png | Bin .../rillaboom/{gigantamax => gmax}/front.png | Bin .../rillaboom/{gigantamax => gmax}/icon.png | Bin .../rillaboom/{gigantamax => gmax}/normal.pal | 0 .../rillaboom/{gigantamax => gmax}/shiny.pal | 0 .../samurott/{hisuian => hisui}/back.png | Bin .../samurott/{hisuian => hisui}/front.png | Bin .../samurott/{hisuian => hisui}/icon.png | Bin .../samurott/{hisuian => hisui}/normal.pal | 0 .../samurott/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../samurott/{hisuian => hisui}/shiny.pal | 0 .../sandaconda/{gigantamax => gmax}/back.png | Bin .../sandaconda/{gigantamax => gmax}/front.png | Bin .../sandaconda/{gigantamax => gmax}/icon.png | Bin .../{gigantamax => gmax}/normal.pal | 0 .../sandaconda/{gigantamax => gmax}/shiny.pal | 0 .../sandshrew/{alolan => alola}/back.png | Bin .../sandshrew/{alolan => alola}/front.png | Bin .../sandshrew/{alolan => alola}/icon.png | Bin .../sandshrew/{alolan => alola}/normal.pal | 0 .../sandshrew/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../sandshrew/{alolan => alola}/shiny.pal | 0 .../sandslash/{alolan => alola}/back.png | Bin .../sandslash/{alolan => alola}/front.png | Bin .../sandslash/{alolan => alola}/icon.png | Bin .../sandslash/{alolan => alola}/normal.pal | 0 .../sandslash/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../sandslash/{alolan => alola}/shiny.pal | 0 .../shellos/{east_sea => east}/anim_front.png | Bin .../shellos/{east_sea => east}/back.png | Bin .../shellos/{east_sea => east}/icon.png | Bin .../shellos/{east_sea => east}/normal.pal | 0 .../shellos/{east_sea => east}/overworld.png | Bin .../{east_sea => east}/overworld_normal.pal | 0 .../{east_sea => east}/overworld_shiny.pal | 0 .../shellos/{east_sea => east}/shiny.pal | 0 .../sliggoo/{hisuian => hisui}/back.png | Bin .../sliggoo/{hisuian => hisui}/front.png | Bin .../sliggoo/{hisuian => hisui}/icon.png | Bin .../sliggoo/{hisuian => hisui}/normal.pal | 0 .../sliggoo/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../sliggoo/{hisuian => hisui}/shiny.pal | 0 .../slowbro/{galarian => galar}/back.png | Bin .../slowbro/{galarian => galar}/front.png | Bin .../slowbro/{galarian => galar}/icon.png | Bin .../slowbro/{galarian => galar}/normal.pal | 0 .../slowbro/{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../slowbro/{galarian => galar}/shiny.pal | 0 .../slowking/{galarian => galar}/back.png | Bin .../slowking/{galarian => galar}/front.png | Bin .../slowking/{galarian => galar}/icon.png | Bin .../slowking/{galarian => galar}/normal.pal | 0 .../{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../slowking/{galarian => galar}/shiny.pal | 0 .../slowpoke/{galarian => galar}/back.png | Bin .../slowpoke/{galarian => galar}/front.png | Bin .../slowpoke/{galarian => galar}/icon.png | Bin .../slowpoke/{galarian => galar}/normal.pal | 0 .../{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../slowpoke/{galarian => galar}/shiny.pal | 0 .../sneasel/{hisuian => hisui}/back.png | Bin .../sneasel/{hisuian => hisui}/backf.png | Bin .../sneasel/{hisuian => hisui}/front.png | Bin .../sneasel/{hisuian => hisui}/frontf.png | Bin .../sneasel/{hisuian => hisui}/icon.png | Bin .../sneasel/{hisuian => hisui}/normal.pal | 0 .../sneasel/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../sneasel/{hisuian => hisui}/overworldf.png | Bin .../sneasel/{hisuian => hisui}/shiny.pal | 0 .../snorlax/{gigantamax => gmax}/back.png | Bin .../snorlax/{gigantamax => gmax}/front.png | Bin .../snorlax/{gigantamax => gmax}/icon.png | Bin .../snorlax/{gigantamax => gmax}/normal.pal | 0 .../snorlax/{gigantamax => gmax}/shiny.pal | 0 .../{blue_plumage => blue}/icon.png | Bin .../{blue_plumage => blue}/normal.pal | 0 .../{blue_plumage => blue}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{blue_plumage => blue}/shiny.pal | 0 .../{white_plumage => white}/icon.png | Bin .../{white_plumage => white}/normal.pal | 0 .../{white_plumage => white}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{white_plumage => white}/shiny.pal | 0 .../{yellow_plumage => yellow}/icon.png | Bin .../{yellow_plumage => yellow}/normal.pal | 0 .../{yellow_plumage => yellow}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{yellow_plumage => yellow}/shiny.pal | 0 .../stunfisk/{galarian => galar}/back.png | Bin .../stunfisk/{galarian => galar}/front.png | Bin .../stunfisk/{galarian => galar}/icon.png | Bin .../stunfisk/{galarian => galar}/normal.pal | 0 .../{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../stunfisk/{galarian => galar}/shiny.pal | 0 .../back.png | Bin .../front.png | Bin .../icon.png | Bin .../normal.pal | 0 .../overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../shiny.pal | 0 .../back.png | Bin .../front.png | Bin .../icon.png | Bin .../normal.pal | 0 .../overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../shiny.pal | 0 .../back.png | Bin .../front.png | Bin .../icon.png | Bin .../normal.pal | 0 .../overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../shiny.pal | 0 .../toxtricity/{gigantamax => gmax}/back.png | Bin .../toxtricity/{gigantamax => gmax}/front.png | Bin .../toxtricity/{gigantamax => gmax}/icon.png | Bin .../{gigantamax => gmax}/normal.pal | 0 .../toxtricity/{gigantamax => gmax}/shiny.pal | 0 .../typhlosion/{hisuian => hisui}/back.png | Bin .../typhlosion/{hisuian => hisui}/front.png | Bin .../typhlosion/{hisuian => hisui}/icon.png | Bin .../typhlosion/{hisuian => hisui}/normal.pal | 0 .../{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../typhlosion/{hisuian => hisui}/shiny.pal | 0 .../back.png | Bin .../front.png | Bin .../icon.png | Bin .../overworld.png | Bin .../{question_mark => question}/back.png | Bin .../{question_mark => question}/front.png | Bin .../{question_mark => question}/icon.png | Bin .../{question_mark => question}/overworld.png | Bin .../back.png | Bin .../front.png | Bin .../normal.pal | 0 .../shiny.pal | 0 .../back.png | Bin .../front.png | Bin .../icon.png | Bin .../normal.pal | 0 .../shiny.pal | 0 .../back.png | Bin .../front.png | Bin .../icon.png | Bin .../normal.pal | 0 .../shiny.pal | 0 .../venusaur/{gigantamax => gmax}/back.png | Bin .../venusaur/{gigantamax => gmax}/front.png | Bin .../venusaur/{gigantamax => gmax}/icon.png | Bin .../venusaur/{gigantamax => gmax}/normal.pal | 0 .../venusaur/{gigantamax => gmax}/shiny.pal | 0 .../voltorb/{hisuian => hisui}/back.png | Bin .../voltorb/{hisuian => hisui}/front.png | Bin .../voltorb/{hisuian => hisui}/icon.png | Bin .../voltorb/{hisuian => hisui}/normal.pal | 0 .../voltorb/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../voltorb/{hisuian => hisui}/shiny.pal | 0 .../pokemon/vulpix/{alolan => alola}/back.png | Bin .../vulpix/{alolan => alola}/front.png | Bin .../pokemon/vulpix/{alolan => alola}/icon.png | Bin .../vulpix/{alolan => alola}/normal.pal | 0 .../vulpix/{alolan => alola}/overworld.png | Bin .../{alolan => alola}/overworld_normal.pal | 0 .../{alolan => alola}/overworld_shiny.pal | 0 .../vulpix/{alolan => alola}/shiny.pal | 0 .../weezing/{galarian => galar}/back.png | Bin .../weezing/{galarian => galar}/front.png | Bin .../weezing/{galarian => galar}/icon.png | Bin .../weezing/{galarian => galar}/normal.pal | 0 .../weezing/{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../weezing/{galarian => galar}/shiny.pal | 0 .../{wooper_paldean => paldea}/back.png | Bin .../{wooper_paldean => paldea}/front.png | Bin .../{wooper_paldean => paldea}/icon.png | Bin .../{wooper_paldean => paldea}/normal.pal | 0 .../{wooper_paldean => paldea}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../{wooper_paldean => paldea}/shiny.pal | 0 .../wormadam/{plant => }/footprint.png | Bin .../{sandy_cloak => sandy}/anim_front.png | Bin .../wormadam/{sandy_cloak => sandy}/back.png | Bin .../wormadam/{sandy_cloak => sandy}/icon.png | Bin .../{sandy_cloak => sandy}/normal.pal | 0 .../{sandy_cloak => sandy}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../wormadam/{sandy_cloak => sandy}/shiny.pal | 0 .../{trash_cloak => trash}/anim_front.png | Bin .../wormadam/{trash_cloak => trash}/back.png | Bin .../wormadam/{trash_cloak => trash}/icon.png | Bin .../{trash_cloak => trash}/normal.pal | 0 .../{trash_cloak => trash}/overworld.png | Bin .../overworld_normal.pal | 0 .../overworld_shiny.pal | 0 .../wormadam/{trash_cloak => trash}/shiny.pal | 0 .../yamask/{galarian => galar}/back.png | Bin .../yamask/{galarian => galar}/front.png | Bin .../yamask/{galarian => galar}/icon.png | Bin .../yamask/{galarian => galar}/normal.pal | 0 .../yamask/{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../yamask/{galarian => galar}/shiny.pal | 0 .../zapdos/{galarian => galar}/back.png | Bin .../zapdos/{galarian => galar}/front.png | Bin .../zapdos/{galarian => galar}/icon.png | Bin .../zapdos/{galarian => galar}/normal.pal | 0 .../zapdos/{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../zapdos/{galarian => galar}/shiny.pal | 0 .../zigzagoon/{galarian => galar}/back.png | Bin .../zigzagoon/{galarian => galar}/front.png | Bin .../zigzagoon/{galarian => galar}/icon.png | Bin .../zigzagoon/{galarian => galar}/normal.pal | 0 .../{galarian => galar}/overworld.png | Bin .../{galarian => galar}/overworld_normal.pal | 0 .../{galarian => galar}/overworld_shiny.pal | 0 .../zigzagoon/{galarian => galar}/shiny.pal | 0 .../zoroark/{hisuian => hisui}/back.png | Bin .../zoroark/{hisuian => hisui}/front.png | Bin .../zoroark/{hisuian => hisui}/icon.png | Bin .../zoroark/{hisuian => hisui}/normal.pal | 0 .../zoroark/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../zoroark/{hisuian => hisui}/shiny.pal | 0 .../pokemon/zorua/{hisuian => hisui}/back.png | Bin .../zorua/{hisuian => hisui}/front.png | Bin .../pokemon/zorua/{hisuian => hisui}/icon.png | Bin .../zorua/{hisuian => hisui}/normal.pal | 0 .../zorua/{hisuian => hisui}/overworld.png | Bin .../{hisuian => hisui}/overworld_normal.pal | 0 .../{hisuian => hisui}/overworld_shiny.pal | 0 .../zorua/{hisuian => hisui}/shiny.pal | 0 include/constants/cries.h | 18 +- include/constants/species.h | 2 +- sound/cry_tables.inc | 72 +- sound/direct_sound_data.inc | 56 +- ...{calyrex_ice_rider.aif => calyrex_ice.aif} | Bin ...ex_shadow_rider.aif => calyrex_shadow.aif} | Bin ...eternal_flower.aif => floette_eternal.aif} | Bin ...d_family_of_four.aif => maushold_four.aif} | Bin ...family_of_three.aif => maushold_three.aif} | Bin ...oinkologne_female.aif => oinkologne_f.aif} | Bin .../{oinkologne_male.aif => oinkologne_m.aif} | Bin ...owpoke_galarian.aif => slowpoke_galar.aif} | Bin ...ike_style.aif => urshifu_rapid_strike.aif} | Bin ...ke_style.aif => urshifu_single_strike.aif} | Bin spritesheet_rules.mk | 176 +- src/battle_z_move.c | 2 +- src/data/graphics/pokemon.h | 2394 ++++++++--------- .../object_event_pic_tables_followers.h | 628 ++--- src/data/pokemon/egg_moves.h | 44 +- src/data/pokemon/form_change_tables.h | 2 +- src/data/pokemon/form_species_tables.h | 2 +- src/data/pokemon/level_up_learnsets/gen_1.h | 140 +- src/data/pokemon/level_up_learnsets/gen_2.h | 140 +- src/data/pokemon/level_up_learnsets/gen_3.h | 140 +- src/data/pokemon/level_up_learnsets/gen_4.h | 140 +- src/data/pokemon/level_up_learnsets/gen_5.h | 140 +- src/data/pokemon/level_up_learnsets/gen_6.h | 140 +- src/data/pokemon/level_up_learnsets/gen_7.h | 140 +- src/data/pokemon/level_up_learnsets/gen_8.h | 140 +- src/data/pokemon/level_up_learnsets/gen_9.h | 140 +- src/data/pokemon/pokedex_orders.h | 198 +- .../pokemon/species_info/gen_1_families.h | 1144 ++++---- .../pokemon/species_info/gen_2_families.h | 176 +- .../pokemon/species_info/gen_3_families.h | 46 +- .../pokemon/species_info/gen_4_families.h | 104 +- .../pokemon/species_info/gen_5_families.h | 298 +- .../pokemon/species_info/gen_6_families.h | 156 +- .../pokemon/species_info/gen_7_families.h | 50 +- .../pokemon/species_info/gen_8_families.h | 460 ++-- .../pokemon/species_info/gen_9_families.h | 148 +- .../pokemon/species_info/shared_dex_text.h | 4 +- src/data/pokemon/teachable_learnsets.h | 136 +- src/data/pokemon_graphics/front_pic_anims.h | 396 +-- src/pokemon_jump.c | 44 +- test/battle/gimmick/zmove.c | 2 +- .../porymoves_files/b2w2.json | 4 +- .../porymoves_files/bdsp.json | 4 +- .../learnset_helpers/porymoves_files/bw.json | 4 +- .../learnset_helpers/porymoves_files/dp.json | 4 +- .../porymoves_files/hgss.json | 4 +- .../learnset_helpers/porymoves_files/la.json | 126 +- .../porymoves_files/lgpe.json | 36 +- .../porymoves_files/oras.json | 10 +- .../learnset_helpers/porymoves_files/pt.json | 4 +- .../learnset_helpers/porymoves_files/sm.json | 46 +- .../learnset_helpers/porymoves_files/sv.json | 138 +- .../porymoves_files/swsh.json | 76 +- .../porymoves_files/usum.json | 46 +- .../learnset_helpers/porymoves_files/xy.json | 10 +- 968 files changed, 4286 insertions(+), 4265 deletions(-) create mode 100644 dev_scripts/competitive_defines/rename_subfolders.py rename graphics/pokemon/alcremie/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/alcremie/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/alcremie/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/alcremie/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/alcremie/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/appletun/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/appletun/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/appletun/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/appletun/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/appletun/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/arcanine/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/arcanine/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/arcanine/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/arcanine/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/arcanine/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/arcanine/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/arcanine/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/arcanine/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/articuno/{galarian => galar}/back.png (100%) rename graphics/pokemon/articuno/{galarian => galar}/front.png (100%) rename graphics/pokemon/articuno/{galarian => galar}/icon.png (100%) rename graphics/pokemon/articuno/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/articuno/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/articuno/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/articuno/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/articuno/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/avalugg/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/avalugg/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/avalugg/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/avalugg/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/avalugg/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/avalugg/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/avalugg/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/avalugg/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/basculegion/{female => f}/back.png (100%) rename graphics/pokemon/basculegion/{female => f}/front.png (100%) rename graphics/pokemon/basculegion/{female => f}/icon.png (100%) rename graphics/pokemon/basculegion/{female => f}/normal.pal (100%) rename graphics/pokemon/basculegion/{female => f}/overworld.png (100%) rename graphics/pokemon/basculegion/{female => f}/overworld_normal.pal (100%) rename graphics/pokemon/basculegion/{female => f}/overworld_shiny.pal (100%) rename graphics/pokemon/basculegion/{female => f}/shiny.pal (100%) rename graphics/pokemon/basculin/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/basculin/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/blastoise/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/blastoise/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/blastoise/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/blastoise/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/blastoise/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/braviary/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/braviary/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/braviary/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/braviary/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/braviary/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/braviary/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/braviary/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/braviary/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/burmy/{plant => }/footprint.png (100%) rename graphics/pokemon/burmy/{sandy_cloak => sandy}/anim_front.png (100%) rename graphics/pokemon/burmy/{sandy_cloak => sandy}/back.png (100%) rename graphics/pokemon/burmy/{sandy_cloak => sandy}/icon.png (100%) rename graphics/pokemon/burmy/{sandy_cloak => sandy}/normal.pal (100%) rename graphics/pokemon/burmy/{sandy_cloak => sandy}/overworld.png (100%) rename graphics/pokemon/burmy/{sandy_cloak => sandy}/overworld_normal.pal (100%) rename graphics/pokemon/burmy/{sandy_cloak => sandy}/overworld_shiny.pal (100%) rename graphics/pokemon/burmy/{sandy_cloak => sandy}/shiny.pal (100%) rename graphics/pokemon/burmy/{trash_cloak => trash}/anim_front.png (100%) rename graphics/pokemon/burmy/{trash_cloak => trash}/back.png (100%) rename graphics/pokemon/burmy/{trash_cloak => trash}/icon.png (100%) rename graphics/pokemon/burmy/{trash_cloak => trash}/normal.pal (100%) rename graphics/pokemon/burmy/{trash_cloak => trash}/overworld.png (100%) rename graphics/pokemon/burmy/{trash_cloak => trash}/overworld_normal.pal (100%) rename graphics/pokemon/burmy/{trash_cloak => trash}/overworld_shiny.pal (100%) rename graphics/pokemon/burmy/{trash_cloak => trash}/shiny.pal (100%) rename graphics/pokemon/butterfree/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/butterfree/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/butterfree/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/butterfree/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/butterfree/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/calyrex/{ice_rider => ice}/back.png (100%) rename graphics/pokemon/calyrex/{ice_rider => ice}/front.png (100%) rename graphics/pokemon/calyrex/{ice_rider => ice}/icon.png (100%) rename graphics/pokemon/calyrex/{ice_rider => ice}/normal.pal (100%) rename graphics/pokemon/calyrex/{ice_rider => ice}/overworld.png (100%) rename graphics/pokemon/calyrex/{ice_rider => ice}/overworld_normal.pal (100%) rename graphics/pokemon/calyrex/{ice_rider => ice}/overworld_shiny.pal (100%) rename graphics/pokemon/calyrex/{ice_rider => ice}/shiny.pal (100%) rename graphics/pokemon/calyrex/{shadow_rider => shadow}/back.png (100%) rename graphics/pokemon/calyrex/{shadow_rider => shadow}/front.png (100%) rename graphics/pokemon/calyrex/{shadow_rider => shadow}/icon.png (100%) rename graphics/pokemon/calyrex/{shadow_rider => shadow}/normal.pal (100%) rename graphics/pokemon/calyrex/{shadow_rider => shadow}/overworld.png (100%) rename graphics/pokemon/calyrex/{shadow_rider => shadow}/overworld_normal.pal (100%) rename graphics/pokemon/calyrex/{shadow_rider => shadow}/overworld_shiny.pal (100%) rename graphics/pokemon/calyrex/{shadow_rider => shadow}/shiny.pal (100%) rename graphics/pokemon/centiskorch/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/centiskorch/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/centiskorch/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/centiskorch/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/centiskorch/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/charizard/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/charizard/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/charizard/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/charizard/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/charizard/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/cinderace/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/cinderace/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/cinderace/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/cinderace/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/cinderace/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/coalossal/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/coalossal/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/coalossal/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/coalossal/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/coalossal/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/copperajah/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/copperajah/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/copperajah/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/copperajah/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/copperajah/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/corsola/{galarian => galar}/back.png (100%) rename graphics/pokemon/corsola/{galarian => galar}/front.png (100%) rename graphics/pokemon/corsola/{galarian => galar}/icon.png (100%) rename graphics/pokemon/corsola/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/corsola/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/corsola/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/corsola/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/corsola/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/corviknight/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/corviknight/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/corviknight/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/corviknight/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/corviknight/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/darmanitan/{galarian => galar_standard}/back.png (100%) rename graphics/pokemon/darmanitan/{galarian => galar_standard}/front.png (100%) rename graphics/pokemon/darmanitan/{galarian => galar_standard}/icon.png (100%) rename graphics/pokemon/darmanitan/{galarian => galar_standard}/normal.pal (100%) rename graphics/pokemon/darmanitan/{galarian => galar_standard}/overworld.png (100%) rename graphics/pokemon/darmanitan/{galarian => galar_standard}/overworld_normal.pal (100%) rename graphics/pokemon/darmanitan/{galarian => galar_standard}/overworld_shiny.pal (100%) rename graphics/pokemon/darmanitan/{galarian => galar_standard}/shiny.pal (100%) rename graphics/pokemon/darmanitan/{zen_mode/galarian => galar_zen}/back.png (100%) rename graphics/pokemon/darmanitan/{zen_mode/galarian => galar_zen}/front.png (100%) rename graphics/pokemon/darmanitan/{zen_mode/galarian => galar_zen}/icon.png (100%) rename graphics/pokemon/darmanitan/{zen_mode/galarian => galar_zen}/normal.pal (100%) rename graphics/pokemon/darmanitan/{zen_mode/galarian => galar_zen}/shiny.pal (100%) rename graphics/pokemon/darmanitan/{zen_mode => zen}/anim_front.png (100%) rename graphics/pokemon/darmanitan/{zen_mode => zen}/back.png (100%) rename graphics/pokemon/darmanitan/{zen_mode => zen}/icon.png (100%) rename graphics/pokemon/darmanitan/{zen_mode => zen}/normal.pal (100%) rename graphics/pokemon/darmanitan/{zen_mode => zen}/shiny.pal (100%) rename graphics/pokemon/darumaka/{galarian => galar}/back.png (100%) rename graphics/pokemon/darumaka/{galarian => galar}/front.png (100%) rename graphics/pokemon/darumaka/{galarian => galar}/icon.png (100%) rename graphics/pokemon/darumaka/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/darumaka/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/darumaka/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/darumaka/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/darumaka/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/decidueye/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/decidueye/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/decidueye/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/decidueye/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/decidueye/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/decidueye/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/decidueye/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/decidueye/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/diglett/{alolan => alola}/back.png (100%) rename graphics/pokemon/diglett/{alolan => alola}/front.png (100%) rename graphics/pokemon/diglett/{alolan => alola}/icon.png (100%) rename graphics/pokemon/diglett/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/diglett/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/diglett/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/diglett/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/diglett/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/drednaw/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/drednaw/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/drednaw/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/drednaw/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/drednaw/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/dugtrio/{alolan => alola}/back.png (100%) rename graphics/pokemon/dugtrio/{alolan => alola}/front.png (100%) rename graphics/pokemon/dugtrio/{alolan => alola}/icon.png (100%) rename graphics/pokemon/dugtrio/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/dugtrio/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/dugtrio/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/dugtrio/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/dugtrio/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/duraludon/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/duraludon/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/duraludon/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/duraludon/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/duraludon/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/eevee/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/eevee/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/eevee/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/eevee/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/eevee/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/electrode/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/electrode/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/electrode/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/electrode/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/electrode/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/electrode/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/electrode/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/electrode/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/exeggutor/{alolan => alola}/anim_front.png (100%) rename graphics/pokemon/exeggutor/{alolan => alola}/back.png (100%) rename graphics/pokemon/exeggutor/{alolan => alola}/icon.png (100%) rename graphics/pokemon/exeggutor/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/exeggutor/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/exeggutor/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/exeggutor/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/exeggutor/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/farfetchd/{galarian => galar}/back.png (100%) rename graphics/pokemon/farfetchd/{galarian => galar}/front.png (100%) rename graphics/pokemon/farfetchd/{galarian => galar}/icon.png (100%) rename graphics/pokemon/farfetchd/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/farfetchd/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/farfetchd/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/farfetchd/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/farfetchd/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/flabebe/{blue_flower => blue}/icon.png (100%) rename graphics/pokemon/flabebe/{blue_flower => blue}/normal.pal (100%) rename graphics/pokemon/flabebe/{blue_flower => blue}/overworld.png (100%) rename graphics/pokemon/flabebe/{blue_flower => blue}/overworld_normal.pal (100%) rename graphics/pokemon/flabebe/{blue_flower => blue}/overworld_shiny.pal (100%) rename graphics/pokemon/flabebe/{blue_flower => blue}/shiny.pal (100%) rename graphics/pokemon/flabebe/{orange_flower => orange}/icon.png (100%) rename graphics/pokemon/flabebe/{orange_flower => orange}/normal.pal (100%) rename graphics/pokemon/flabebe/{orange_flower => orange}/overworld.png (100%) rename graphics/pokemon/flabebe/{orange_flower => orange}/overworld_normal.pal (100%) rename graphics/pokemon/flabebe/{orange_flower => orange}/overworld_shiny.pal (100%) rename graphics/pokemon/flabebe/{orange_flower => orange}/shiny.pal (100%) rename graphics/pokemon/flabebe/{white_flower => white}/icon.png (100%) rename graphics/pokemon/flabebe/{white_flower => white}/normal.pal (100%) rename graphics/pokemon/flabebe/{white_flower => white}/overworld.png (100%) rename graphics/pokemon/flabebe/{white_flower => white}/overworld_normal.pal (100%) rename graphics/pokemon/flabebe/{white_flower => white}/overworld_shiny.pal (100%) rename graphics/pokemon/flabebe/{white_flower => white}/shiny.pal (100%) rename graphics/pokemon/flabebe/{yellow_flower => yellow}/icon.png (100%) rename graphics/pokemon/flabebe/{yellow_flower => yellow}/normal.pal (100%) rename graphics/pokemon/flabebe/{yellow_flower => yellow}/overworld.png (100%) rename graphics/pokemon/flabebe/{yellow_flower => yellow}/overworld_normal.pal (100%) rename graphics/pokemon/flabebe/{yellow_flower => yellow}/overworld_shiny.pal (100%) rename graphics/pokemon/flabebe/{yellow_flower => yellow}/shiny.pal (100%) rename graphics/pokemon/flapple/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/flapple/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/flapple/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/flapple/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/flapple/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/floette/{blue_flower => blue}/icon.png (100%) rename graphics/pokemon/floette/{blue_flower => blue}/normal.pal (100%) rename graphics/pokemon/floette/{blue_flower => blue}/overworld.png (100%) rename graphics/pokemon/floette/{blue_flower => blue}/overworld_normal.pal (100%) rename graphics/pokemon/floette/{blue_flower => blue}/overworld_shiny.pal (100%) rename graphics/pokemon/floette/{blue_flower => blue}/shiny.pal (100%) rename graphics/pokemon/floette/{eternal_flower => eternal}/anim_front.png (100%) rename graphics/pokemon/floette/{eternal_flower => eternal}/back.png (100%) rename graphics/pokemon/floette/{eternal_flower => eternal}/icon.png (100%) rename graphics/pokemon/floette/{eternal_flower => eternal}/normal.pal (100%) rename graphics/pokemon/floette/{eternal_flower => eternal}/overworld.png (100%) rename graphics/pokemon/floette/{eternal_flower => eternal}/overworld_normal.pal (100%) rename graphics/pokemon/floette/{eternal_flower => eternal}/overworld_shiny.pal (100%) rename graphics/pokemon/floette/{eternal_flower => eternal}/shiny.pal (100%) rename graphics/pokemon/floette/{orange_flower => orange}/icon.png (100%) rename graphics/pokemon/floette/{orange_flower => orange}/normal.pal (100%) rename graphics/pokemon/floette/{orange_flower => orange}/overworld.png (100%) rename graphics/pokemon/floette/{orange_flower => orange}/overworld_normal.pal (100%) rename graphics/pokemon/floette/{orange_flower => orange}/overworld_shiny.pal (100%) rename graphics/pokemon/floette/{orange_flower => orange}/shiny.pal (100%) rename graphics/pokemon/floette/{white_flower => white}/icon.png (100%) rename graphics/pokemon/floette/{white_flower => white}/normal.pal (100%) rename graphics/pokemon/floette/{white_flower => white}/overworld.png (100%) rename graphics/pokemon/floette/{white_flower => white}/overworld_normal.pal (100%) rename graphics/pokemon/floette/{white_flower => white}/overworld_shiny.pal (100%) rename graphics/pokemon/floette/{white_flower => white}/shiny.pal (100%) rename graphics/pokemon/floette/{yellow_flower => yellow}/icon.png (100%) rename graphics/pokemon/floette/{yellow_flower => yellow}/normal.pal (100%) rename graphics/pokemon/floette/{yellow_flower => yellow}/overworld.png (100%) rename graphics/pokemon/floette/{yellow_flower => yellow}/overworld_normal.pal (100%) rename graphics/pokemon/floette/{yellow_flower => yellow}/overworld_shiny.pal (100%) rename graphics/pokemon/floette/{yellow_flower => yellow}/shiny.pal (100%) rename graphics/pokemon/florges/{blue_flower => blue}/icon.png (100%) rename graphics/pokemon/florges/{blue_flower => blue}/normal.pal (100%) rename graphics/pokemon/florges/{blue_flower => blue}/overworld.png (100%) rename graphics/pokemon/florges/{blue_flower => blue}/overworld_normal.pal (100%) rename graphics/pokemon/florges/{blue_flower => blue}/overworld_shiny.pal (100%) rename graphics/pokemon/florges/{blue_flower => blue}/shiny.pal (100%) rename graphics/pokemon/florges/{orange_flower => orange}/icon.png (100%) rename graphics/pokemon/florges/{orange_flower => orange}/normal.pal (100%) rename graphics/pokemon/florges/{orange_flower => orange}/overworld.png (100%) rename graphics/pokemon/florges/{orange_flower => orange}/overworld_normal.pal (100%) rename graphics/pokemon/florges/{orange_flower => orange}/overworld_shiny.pal (100%) rename graphics/pokemon/florges/{orange_flower => orange}/shiny.pal (100%) rename graphics/pokemon/florges/{white_flower => white}/icon.png (100%) rename graphics/pokemon/florges/{white_flower => white}/normal.pal (100%) rename graphics/pokemon/florges/{white_flower => white}/overworld.png (100%) rename graphics/pokemon/florges/{white_flower => white}/overworld_normal.pal (100%) rename graphics/pokemon/florges/{white_flower => white}/overworld_shiny.pal (100%) rename graphics/pokemon/florges/{white_flower => white}/shiny.pal (100%) rename graphics/pokemon/florges/{yellow_flower => yellow}/icon.png (100%) rename graphics/pokemon/florges/{yellow_flower => yellow}/normal.pal (100%) rename graphics/pokemon/florges/{yellow_flower => yellow}/overworld.png (100%) rename graphics/pokemon/florges/{yellow_flower => yellow}/overworld_normal.pal (100%) rename graphics/pokemon/florges/{yellow_flower => yellow}/overworld_shiny.pal (100%) rename graphics/pokemon/florges/{yellow_flower => yellow}/shiny.pal (100%) rename graphics/pokemon/garbodor/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/garbodor/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/garbodor/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/garbodor/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/garbodor/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/gastrodon/{east_sea => east}/anim_front.png (100%) rename graphics/pokemon/gastrodon/{east_sea => east}/back.png (100%) rename graphics/pokemon/gastrodon/{east_sea => east}/icon.png (100%) rename graphics/pokemon/gastrodon/{east_sea => east}/normal.pal (100%) rename graphics/pokemon/gastrodon/{east_sea => east}/overworld.png (100%) rename graphics/pokemon/gastrodon/{east_sea => east}/overworld_normal.pal (100%) rename graphics/pokemon/gastrodon/{east_sea => east}/overworld_shiny.pal (100%) rename graphics/pokemon/gastrodon/{east_sea => east}/shiny.pal (100%) rename graphics/pokemon/gengar/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/gengar/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/gengar/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/gengar/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/gengar/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/geodude/{alolan => alola}/back.png (100%) rename graphics/pokemon/geodude/{alolan => alola}/front.png (100%) rename graphics/pokemon/geodude/{alolan => alola}/icon.png (100%) rename graphics/pokemon/geodude/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/geodude/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/geodude/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/geodude/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/geodude/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/golem/{alolan => alola}/back.png (100%) rename graphics/pokemon/golem/{alolan => alola}/front.png (100%) rename graphics/pokemon/golem/{alolan => alola}/icon.png (100%) rename graphics/pokemon/golem/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/golem/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/golem/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/golem/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/golem/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/goodra/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/goodra/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/goodra/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/goodra/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/goodra/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/goodra/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/goodra/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/goodra/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/graveler/{alolan => alola}/back.png (100%) rename graphics/pokemon/graveler/{alolan => alola}/front.png (100%) rename graphics/pokemon/graveler/{alolan => alola}/icon.png (100%) rename graphics/pokemon/graveler/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/graveler/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/graveler/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/graveler/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/graveler/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/grimer/{alolan => alola}/back.png (100%) rename graphics/pokemon/grimer/{alolan => alola}/front.png (100%) rename graphics/pokemon/grimer/{alolan => alola}/icon.png (100%) rename graphics/pokemon/grimer/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/grimer/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/grimer/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/grimer/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/grimer/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/grimmsnarl/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/grimmsnarl/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/grimmsnarl/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/grimmsnarl/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/grimmsnarl/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/growlithe/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/growlithe/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/growlithe/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/growlithe/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/growlithe/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/growlithe/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/growlithe/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/growlithe/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/hatterene/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/hatterene/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/hatterene/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/hatterene/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/hatterene/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/indeedee/{female => f}/back.png (100%) rename graphics/pokemon/indeedee/{female => f}/front.png (100%) rename graphics/pokemon/indeedee/{female => f}/icon.png (100%) rename graphics/pokemon/indeedee/{female => f}/normal.pal (100%) rename graphics/pokemon/indeedee/{female => f}/overworld.png (100%) rename graphics/pokemon/indeedee/{female => f}/overworld_normal.pal (100%) rename graphics/pokemon/indeedee/{female => f}/overworld_shiny.pal (100%) rename graphics/pokemon/indeedee/{female => f}/shiny.pal (100%) rename graphics/pokemon/inteleon/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/inteleon/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/inteleon/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/inteleon/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/inteleon/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/kingler/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/kingler/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/kingler/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/kingler/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/kingler/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/lapras/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/lapras/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/lapras/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/lapras/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/lapras/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/lilligant/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/lilligant/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/lilligant/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/lilligant/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/lilligant/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/lilligant/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/lilligant/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/lilligant/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/linoone/{galarian => galar}/back.png (100%) rename graphics/pokemon/linoone/{galarian => galar}/front.png (100%) rename graphics/pokemon/linoone/{galarian => galar}/icon.png (100%) rename graphics/pokemon/linoone/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/linoone/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/linoone/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/linoone/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/linoone/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/machamp/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/machamp/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/machamp/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/machamp/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/machamp/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/marowak/{alolan => alola}/back.png (100%) rename graphics/pokemon/marowak/{alolan => alola}/front.png (100%) rename graphics/pokemon/marowak/{alolan => alola}/icon.png (100%) rename graphics/pokemon/marowak/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/marowak/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/marowak/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/marowak/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/marowak/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/melmetal/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/melmetal/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/melmetal/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/melmetal/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/melmetal/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/meowstic/{female => f}/anim_front.png (100%) rename graphics/pokemon/meowstic/{female => f}/back.png (100%) rename graphics/pokemon/meowstic/{female => f}/icon.png (100%) rename graphics/pokemon/meowstic/{female => f}/normal.pal (100%) rename graphics/pokemon/meowstic/{female => f}/overworld.png (100%) rename graphics/pokemon/meowstic/{female => f}/overworld_normal.pal (100%) rename graphics/pokemon/meowstic/{female => f}/overworld_shiny.pal (100%) rename graphics/pokemon/meowstic/{female => f}/shiny.pal (100%) rename graphics/pokemon/meowth/{alolan => alola}/back.png (100%) rename graphics/pokemon/meowth/{alolan => alola}/front.png (100%) rename graphics/pokemon/meowth/{alolan => alola}/icon.png (100%) rename graphics/pokemon/meowth/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/meowth/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/meowth/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/meowth/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/meowth/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/meowth/{galarian => galar}/back.png (100%) rename graphics/pokemon/meowth/{galarian => galar}/front.png (100%) rename graphics/pokemon/meowth/{galarian => galar}/icon.png (100%) rename graphics/pokemon/meowth/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/meowth/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/meowth/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/meowth/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/meowth/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/meowth/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/meowth/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/meowth/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/meowth/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/meowth/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/moltres/{galarian => galar}/back.png (100%) rename graphics/pokemon/moltres/{galarian => galar}/front.png (100%) rename graphics/pokemon/moltres/{galarian => galar}/icon.png (100%) rename graphics/pokemon/moltres/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/moltres/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/moltres/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/moltres/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/moltres/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/mr_mime/{galarian => galar}/back.png (100%) rename graphics/pokemon/mr_mime/{galarian => galar}/front.png (100%) rename graphics/pokemon/mr_mime/{galarian => galar}/icon.png (100%) rename graphics/pokemon/mr_mime/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/mr_mime/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/mr_mime/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/mr_mime/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/mr_mime/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/muk/{alolan => alola}/back.png (100%) rename graphics/pokemon/muk/{alolan => alola}/front.png (100%) rename graphics/pokemon/muk/{alolan => alola}/icon.png (100%) rename graphics/pokemon/muk/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/muk/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/muk/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/muk/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/muk/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/ninetales/{alolan => alola}/back.png (100%) rename graphics/pokemon/ninetales/{alolan => alola}/front.png (100%) rename graphics/pokemon/ninetales/{alolan => alola}/icon.png (100%) rename graphics/pokemon/ninetales/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/ninetales/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/ninetales/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/ninetales/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/ninetales/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/ogerpon/{cornerstone/tera => cornerstone_tera}/back.png (100%) rename graphics/pokemon/ogerpon/{cornerstone/tera => cornerstone_tera}/front.png (100%) rename graphics/pokemon/ogerpon/{cornerstone/tera => cornerstone_tera}/normal.pal (100%) rename graphics/pokemon/ogerpon/{cornerstone/tera => cornerstone_tera}/shiny.pal (100%) rename graphics/pokemon/ogerpon/{hearthflame/tera => hearthflame_tera}/back.png (100%) rename graphics/pokemon/ogerpon/{hearthflame/tera => hearthflame_tera}/front.png (100%) rename graphics/pokemon/ogerpon/{hearthflame/tera => hearthflame_tera}/normal.pal (100%) rename graphics/pokemon/ogerpon/{hearthflame/tera => hearthflame_tera}/shiny.pal (100%) rename graphics/pokemon/ogerpon/{tera => teal_tera}/back.png (100%) rename graphics/pokemon/ogerpon/{tera => teal_tera}/front.png (100%) rename graphics/pokemon/ogerpon/{tera => teal_tera}/normal.pal (100%) rename graphics/pokemon/ogerpon/{tera => teal_tera}/shiny.pal (100%) rename graphics/pokemon/ogerpon/{wellspring/tera => wellspring_tera}/back.png (100%) rename graphics/pokemon/ogerpon/{wellspring/tera => wellspring_tera}/front.png (100%) rename graphics/pokemon/ogerpon/{wellspring/tera => wellspring_tera}/normal.pal (100%) rename graphics/pokemon/ogerpon/{wellspring/tera => wellspring_tera}/shiny.pal (100%) rename graphics/pokemon/oinkologne/{female => f}/back.png (100%) rename graphics/pokemon/oinkologne/{female => f}/front.png (100%) rename graphics/pokemon/oinkologne/{female => f}/icon.png (100%) rename graphics/pokemon/oinkologne/{female => f}/normal.pal (100%) rename graphics/pokemon/oinkologne/{female => f}/overworld.png (100%) rename graphics/pokemon/oinkologne/{female => f}/overworld_normal.pal (100%) rename graphics/pokemon/oinkologne/{female => f}/overworld_shiny.pal (100%) rename graphics/pokemon/oinkologne/{female => f}/shiny.pal (100%) rename graphics/pokemon/orbeetle/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/orbeetle/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/orbeetle/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/orbeetle/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/orbeetle/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/persian/{alolan => alola}/back.png (100%) rename graphics/pokemon/persian/{alolan => alola}/front.png (100%) rename graphics/pokemon/persian/{alolan => alola}/icon.png (100%) rename graphics/pokemon/persian/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/persian/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/persian/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/persian/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/persian/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/pikachu/{alola_cap => alola}/back.png (100%) rename graphics/pokemon/pikachu/{alola_cap => alola}/front.png (100%) rename graphics/pokemon/pikachu/{alola_cap => alola}/icon.png (100%) rename graphics/pokemon/pikachu/{alola_cap => alola}/normal.pal (100%) rename graphics/pokemon/pikachu/{alola_cap => alola}/shiny.pal (100%) rename graphics/pokemon/pikachu/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/pikachu/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/pikachu/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/pikachu/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/pikachu/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/pikachu/{hoenn_cap => hoenn}/back.png (100%) rename graphics/pokemon/pikachu/{hoenn_cap => hoenn}/front.png (100%) rename graphics/pokemon/pikachu/{hoenn_cap => hoenn}/icon.png (100%) rename graphics/pokemon/pikachu/{hoenn_cap => hoenn}/normal.pal (100%) rename graphics/pokemon/pikachu/{hoenn_cap => hoenn}/shiny.pal (100%) rename graphics/pokemon/pikachu/{kalos_cap => kalos}/back.png (100%) rename graphics/pokemon/pikachu/{kalos_cap => kalos}/front.png (100%) rename graphics/pokemon/pikachu/{kalos_cap => kalos}/icon.png (100%) rename graphics/pokemon/pikachu/{kalos_cap => kalos}/normal.pal (100%) rename graphics/pokemon/pikachu/{kalos_cap => kalos}/shiny.pal (100%) rename graphics/pokemon/pikachu/{original_cap => original}/back.png (100%) rename graphics/pokemon/pikachu/{original_cap => original}/front.png (100%) rename graphics/pokemon/pikachu/{original_cap => original}/icon.png (100%) rename graphics/pokemon/pikachu/{original_cap => original}/normal.pal (100%) rename graphics/pokemon/pikachu/{original_cap => original}/shiny.pal (100%) rename graphics/pokemon/pikachu/{partner_cap => partner}/back.png (100%) rename graphics/pokemon/pikachu/{partner_cap => partner}/front.png (100%) rename graphics/pokemon/pikachu/{partner_cap => partner}/normal.pal (100%) rename graphics/pokemon/pikachu/{partner_cap => partner}/shiny.pal (100%) delete mode 100644 graphics/pokemon/pikachu/partner_cap/icon.png rename graphics/pokemon/pikachu/{ph_d => phd}/back.png (100%) rename graphics/pokemon/pikachu/{ph_d => phd}/front.png (100%) rename graphics/pokemon/pikachu/{ph_d => phd}/icon.png (100%) rename graphics/pokemon/pikachu/{ph_d => phd}/normal.pal (100%) rename graphics/pokemon/pikachu/{ph_d => phd}/shiny.pal (100%) rename graphics/pokemon/pikachu/{sinnoh_cap => sinnoh}/back.png (100%) rename graphics/pokemon/pikachu/{sinnoh_cap => sinnoh}/front.png (100%) rename graphics/pokemon/pikachu/{sinnoh_cap => sinnoh}/icon.png (100%) rename graphics/pokemon/pikachu/{sinnoh_cap => sinnoh}/normal.pal (100%) rename graphics/pokemon/pikachu/{sinnoh_cap => sinnoh}/shiny.pal (100%) create mode 100644 graphics/pokemon/pikachu/starter/icon.png rename graphics/pokemon/pikachu/{partner => starter}/iconf.png (100%) rename graphics/pokemon/pikachu/{unova_cap => unova}/back.png (100%) rename graphics/pokemon/pikachu/{unova_cap => unova}/front.png (100%) rename graphics/pokemon/pikachu/{unova_cap => unova}/icon.png (100%) rename graphics/pokemon/pikachu/{unova_cap => unova}/normal.pal (100%) rename graphics/pokemon/pikachu/{unova_cap => unova}/shiny.pal (100%) rename graphics/pokemon/pikachu/{world_cap => world}/back.png (100%) rename graphics/pokemon/pikachu/{world_cap => world}/front.png (100%) rename graphics/pokemon/pikachu/{world_cap => world}/icon.png (100%) rename graphics/pokemon/pikachu/{world_cap => world}/normal.pal (100%) rename graphics/pokemon/pikachu/{world_cap => world}/shiny.pal (100%) rename graphics/pokemon/ponyta/{galarian => galar}/back.png (100%) rename graphics/pokemon/ponyta/{galarian => galar}/front.png (100%) rename graphics/pokemon/ponyta/{galarian => galar}/icon.png (100%) rename graphics/pokemon/ponyta/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/ponyta/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/ponyta/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/ponyta/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/ponyta/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/qwilfish/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/qwilfish/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/qwilfish/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/qwilfish/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/qwilfish/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/qwilfish/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/qwilfish/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/qwilfish/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/raichu/{alolan => alola}/back.png (100%) rename graphics/pokemon/raichu/{alolan => alola}/front.png (100%) rename graphics/pokemon/raichu/{alolan => alola}/icon.png (100%) rename graphics/pokemon/raichu/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/raichu/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/raichu/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/raichu/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/raichu/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/rapidash/{galarian => galar}/back.png (100%) rename graphics/pokemon/rapidash/{galarian => galar}/front.png (100%) rename graphics/pokemon/rapidash/{galarian => galar}/icon.png (100%) rename graphics/pokemon/rapidash/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/rapidash/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/rapidash/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/rapidash/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/rapidash/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/raticate/{alolan => alola}/back.png (100%) rename graphics/pokemon/raticate/{alolan => alola}/front.png (100%) rename graphics/pokemon/raticate/{alolan => alola}/icon.png (100%) rename graphics/pokemon/raticate/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/raticate/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/raticate/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/raticate/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/raticate/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/rattata/{alolan => alola}/back.png (100%) rename graphics/pokemon/rattata/{alolan => alola}/front.png (100%) rename graphics/pokemon/rattata/{alolan => alola}/icon.png (100%) rename graphics/pokemon/rattata/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/rattata/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/rattata/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/rattata/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/rattata/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/rillaboom/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/rillaboom/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/rillaboom/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/rillaboom/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/rillaboom/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/samurott/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/samurott/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/samurott/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/samurott/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/samurott/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/samurott/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/samurott/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/samurott/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/sandaconda/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/sandaconda/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/sandaconda/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/sandaconda/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/sandaconda/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/sandshrew/{alolan => alola}/back.png (100%) rename graphics/pokemon/sandshrew/{alolan => alola}/front.png (100%) rename graphics/pokemon/sandshrew/{alolan => alola}/icon.png (100%) rename graphics/pokemon/sandshrew/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/sandshrew/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/sandshrew/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/sandshrew/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/sandshrew/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/sandslash/{alolan => alola}/back.png (100%) rename graphics/pokemon/sandslash/{alolan => alola}/front.png (100%) rename graphics/pokemon/sandslash/{alolan => alola}/icon.png (100%) rename graphics/pokemon/sandslash/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/sandslash/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/sandslash/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/sandslash/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/sandslash/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/shellos/{east_sea => east}/anim_front.png (100%) rename graphics/pokemon/shellos/{east_sea => east}/back.png (100%) rename graphics/pokemon/shellos/{east_sea => east}/icon.png (100%) rename graphics/pokemon/shellos/{east_sea => east}/normal.pal (100%) rename graphics/pokemon/shellos/{east_sea => east}/overworld.png (100%) rename graphics/pokemon/shellos/{east_sea => east}/overworld_normal.pal (100%) rename graphics/pokemon/shellos/{east_sea => east}/overworld_shiny.pal (100%) rename graphics/pokemon/shellos/{east_sea => east}/shiny.pal (100%) rename graphics/pokemon/sliggoo/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/sliggoo/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/sliggoo/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/sliggoo/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/sliggoo/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/sliggoo/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/sliggoo/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/sliggoo/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/slowbro/{galarian => galar}/back.png (100%) rename graphics/pokemon/slowbro/{galarian => galar}/front.png (100%) rename graphics/pokemon/slowbro/{galarian => galar}/icon.png (100%) rename graphics/pokemon/slowbro/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/slowbro/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/slowbro/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/slowbro/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/slowbro/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/slowking/{galarian => galar}/back.png (100%) rename graphics/pokemon/slowking/{galarian => galar}/front.png (100%) rename graphics/pokemon/slowking/{galarian => galar}/icon.png (100%) rename graphics/pokemon/slowking/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/slowking/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/slowking/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/slowking/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/slowking/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/slowpoke/{galarian => galar}/back.png (100%) rename graphics/pokemon/slowpoke/{galarian => galar}/front.png (100%) rename graphics/pokemon/slowpoke/{galarian => galar}/icon.png (100%) rename graphics/pokemon/slowpoke/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/slowpoke/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/slowpoke/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/slowpoke/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/slowpoke/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/backf.png (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/frontf.png (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/overworldf.png (100%) rename graphics/pokemon/sneasel/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/snorlax/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/snorlax/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/snorlax/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/snorlax/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/snorlax/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/squawkabilly/{blue_plumage => blue}/icon.png (100%) rename graphics/pokemon/squawkabilly/{blue_plumage => blue}/normal.pal (100%) rename graphics/pokemon/squawkabilly/{blue_plumage => blue}/overworld.png (100%) rename graphics/pokemon/squawkabilly/{blue_plumage => blue}/overworld_normal.pal (100%) rename graphics/pokemon/squawkabilly/{blue_plumage => blue}/overworld_shiny.pal (100%) rename graphics/pokemon/squawkabilly/{blue_plumage => blue}/shiny.pal (100%) rename graphics/pokemon/squawkabilly/{white_plumage => white}/icon.png (100%) rename graphics/pokemon/squawkabilly/{white_plumage => white}/normal.pal (100%) rename graphics/pokemon/squawkabilly/{white_plumage => white}/overworld.png (100%) rename graphics/pokemon/squawkabilly/{white_plumage => white}/overworld_normal.pal (100%) rename graphics/pokemon/squawkabilly/{white_plumage => white}/overworld_shiny.pal (100%) rename graphics/pokemon/squawkabilly/{white_plumage => white}/shiny.pal (100%) rename graphics/pokemon/squawkabilly/{yellow_plumage => yellow}/icon.png (100%) rename graphics/pokemon/squawkabilly/{yellow_plumage => yellow}/normal.pal (100%) rename graphics/pokemon/squawkabilly/{yellow_plumage => yellow}/overworld.png (100%) rename graphics/pokemon/squawkabilly/{yellow_plumage => yellow}/overworld_normal.pal (100%) rename graphics/pokemon/squawkabilly/{yellow_plumage => yellow}/overworld_shiny.pal (100%) rename graphics/pokemon/squawkabilly/{yellow_plumage => yellow}/shiny.pal (100%) rename graphics/pokemon/stunfisk/{galarian => galar}/back.png (100%) rename graphics/pokemon/stunfisk/{galarian => galar}/front.png (100%) rename graphics/pokemon/stunfisk/{galarian => galar}/icon.png (100%) rename graphics/pokemon/stunfisk/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/stunfisk/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/stunfisk/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/stunfisk/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/stunfisk/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/tauros/{paldean_aqua_breed => paldea_aqua}/back.png (100%) rename graphics/pokemon/tauros/{paldean_aqua_breed => paldea_aqua}/front.png (100%) rename graphics/pokemon/tauros/{paldean_aqua_breed => paldea_aqua}/icon.png (100%) rename graphics/pokemon/tauros/{paldean_aqua_breed => paldea_aqua}/normal.pal (100%) rename graphics/pokemon/tauros/{paldean_aqua_breed => paldea_aqua}/overworld.png (100%) rename graphics/pokemon/tauros/{paldean_aqua_breed => paldea_aqua}/overworld_normal.pal (100%) rename graphics/pokemon/tauros/{paldean_aqua_breed => paldea_aqua}/overworld_shiny.pal (100%) rename graphics/pokemon/tauros/{paldean_aqua_breed => paldea_aqua}/shiny.pal (100%) rename graphics/pokemon/tauros/{paldean_blaze_breed => paldea_blaze}/back.png (100%) rename graphics/pokemon/tauros/{paldean_blaze_breed => paldea_blaze}/front.png (100%) rename graphics/pokemon/tauros/{paldean_blaze_breed => paldea_blaze}/icon.png (100%) rename graphics/pokemon/tauros/{paldean_blaze_breed => paldea_blaze}/normal.pal (100%) rename graphics/pokemon/tauros/{paldean_blaze_breed => paldea_blaze}/overworld.png (100%) rename graphics/pokemon/tauros/{paldean_blaze_breed => paldea_blaze}/overworld_normal.pal (100%) rename graphics/pokemon/tauros/{paldean_blaze_breed => paldea_blaze}/overworld_shiny.pal (100%) rename graphics/pokemon/tauros/{paldean_blaze_breed => paldea_blaze}/shiny.pal (100%) rename graphics/pokemon/tauros/{paldean_combat_breed => paldea_combat}/back.png (100%) rename graphics/pokemon/tauros/{paldean_combat_breed => paldea_combat}/front.png (100%) rename graphics/pokemon/tauros/{paldean_combat_breed => paldea_combat}/icon.png (100%) rename graphics/pokemon/tauros/{paldean_combat_breed => paldea_combat}/normal.pal (100%) rename graphics/pokemon/tauros/{paldean_combat_breed => paldea_combat}/overworld.png (100%) rename graphics/pokemon/tauros/{paldean_combat_breed => paldea_combat}/overworld_normal.pal (100%) rename graphics/pokemon/tauros/{paldean_combat_breed => paldea_combat}/overworld_shiny.pal (100%) rename graphics/pokemon/tauros/{paldean_combat_breed => paldea_combat}/shiny.pal (100%) rename graphics/pokemon/toxtricity/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/toxtricity/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/toxtricity/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/toxtricity/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/toxtricity/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/typhlosion/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/typhlosion/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/typhlosion/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/typhlosion/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/typhlosion/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/typhlosion/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/typhlosion/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/typhlosion/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/unown/{exclamation_mark => exclamation}/back.png (100%) rename graphics/pokemon/unown/{exclamation_mark => exclamation}/front.png (100%) rename graphics/pokemon/unown/{exclamation_mark => exclamation}/icon.png (100%) rename graphics/pokemon/unown/{exclamation_mark => exclamation}/overworld.png (100%) rename graphics/pokemon/unown/{question_mark => question}/back.png (100%) rename graphics/pokemon/unown/{question_mark => question}/front.png (100%) rename graphics/pokemon/unown/{question_mark => question}/icon.png (100%) rename graphics/pokemon/unown/{question_mark => question}/overworld.png (100%) rename graphics/pokemon/urshifu/{rapid_strike_style => rapid_strike}/back.png (100%) rename graphics/pokemon/urshifu/{rapid_strike_style => rapid_strike}/front.png (100%) rename graphics/pokemon/urshifu/{rapid_strike_style => rapid_strike}/normal.pal (100%) rename graphics/pokemon/urshifu/{rapid_strike_style => rapid_strike}/shiny.pal (100%) rename graphics/pokemon/urshifu/{rapid_strike_style_gigantamax => rapid_strike_gmax}/back.png (100%) rename graphics/pokemon/urshifu/{rapid_strike_style_gigantamax => rapid_strike_gmax}/front.png (100%) rename graphics/pokemon/urshifu/{rapid_strike_style_gigantamax => rapid_strike_gmax}/icon.png (100%) rename graphics/pokemon/urshifu/{rapid_strike_style_gigantamax => rapid_strike_gmax}/normal.pal (100%) rename graphics/pokemon/urshifu/{rapid_strike_style_gigantamax => rapid_strike_gmax}/shiny.pal (100%) rename graphics/pokemon/urshifu/{single_strike_style_gigantamax => single_strike_gmax}/back.png (100%) rename graphics/pokemon/urshifu/{single_strike_style_gigantamax => single_strike_gmax}/front.png (100%) rename graphics/pokemon/urshifu/{single_strike_style_gigantamax => single_strike_gmax}/icon.png (100%) rename graphics/pokemon/urshifu/{single_strike_style_gigantamax => single_strike_gmax}/normal.pal (100%) rename graphics/pokemon/urshifu/{single_strike_style_gigantamax => single_strike_gmax}/shiny.pal (100%) rename graphics/pokemon/venusaur/{gigantamax => gmax}/back.png (100%) rename graphics/pokemon/venusaur/{gigantamax => gmax}/front.png (100%) rename graphics/pokemon/venusaur/{gigantamax => gmax}/icon.png (100%) rename graphics/pokemon/venusaur/{gigantamax => gmax}/normal.pal (100%) rename graphics/pokemon/venusaur/{gigantamax => gmax}/shiny.pal (100%) rename graphics/pokemon/voltorb/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/voltorb/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/voltorb/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/voltorb/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/voltorb/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/voltorb/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/voltorb/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/voltorb/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/vulpix/{alolan => alola}/back.png (100%) rename graphics/pokemon/vulpix/{alolan => alola}/front.png (100%) rename graphics/pokemon/vulpix/{alolan => alola}/icon.png (100%) rename graphics/pokemon/vulpix/{alolan => alola}/normal.pal (100%) rename graphics/pokemon/vulpix/{alolan => alola}/overworld.png (100%) rename graphics/pokemon/vulpix/{alolan => alola}/overworld_normal.pal (100%) rename graphics/pokemon/vulpix/{alolan => alola}/overworld_shiny.pal (100%) rename graphics/pokemon/vulpix/{alolan => alola}/shiny.pal (100%) rename graphics/pokemon/weezing/{galarian => galar}/back.png (100%) rename graphics/pokemon/weezing/{galarian => galar}/front.png (100%) rename graphics/pokemon/weezing/{galarian => galar}/icon.png (100%) rename graphics/pokemon/weezing/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/weezing/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/weezing/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/weezing/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/weezing/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/wooper/{wooper_paldean => paldea}/back.png (100%) rename graphics/pokemon/wooper/{wooper_paldean => paldea}/front.png (100%) rename graphics/pokemon/wooper/{wooper_paldean => paldea}/icon.png (100%) rename graphics/pokemon/wooper/{wooper_paldean => paldea}/normal.pal (100%) rename graphics/pokemon/wooper/{wooper_paldean => paldea}/overworld.png (100%) rename graphics/pokemon/wooper/{wooper_paldean => paldea}/overworld_normal.pal (100%) rename graphics/pokemon/wooper/{wooper_paldean => paldea}/overworld_shiny.pal (100%) rename graphics/pokemon/wooper/{wooper_paldean => paldea}/shiny.pal (100%) rename graphics/pokemon/wormadam/{plant => }/footprint.png (100%) rename graphics/pokemon/wormadam/{sandy_cloak => sandy}/anim_front.png (100%) rename graphics/pokemon/wormadam/{sandy_cloak => sandy}/back.png (100%) rename graphics/pokemon/wormadam/{sandy_cloak => sandy}/icon.png (100%) rename graphics/pokemon/wormadam/{sandy_cloak => sandy}/normal.pal (100%) rename graphics/pokemon/wormadam/{sandy_cloak => sandy}/overworld.png (100%) rename graphics/pokemon/wormadam/{sandy_cloak => sandy}/overworld_normal.pal (100%) rename graphics/pokemon/wormadam/{sandy_cloak => sandy}/overworld_shiny.pal (100%) rename graphics/pokemon/wormadam/{sandy_cloak => sandy}/shiny.pal (100%) rename graphics/pokemon/wormadam/{trash_cloak => trash}/anim_front.png (100%) rename graphics/pokemon/wormadam/{trash_cloak => trash}/back.png (100%) rename graphics/pokemon/wormadam/{trash_cloak => trash}/icon.png (100%) rename graphics/pokemon/wormadam/{trash_cloak => trash}/normal.pal (100%) rename graphics/pokemon/wormadam/{trash_cloak => trash}/overworld.png (100%) rename graphics/pokemon/wormadam/{trash_cloak => trash}/overworld_normal.pal (100%) rename graphics/pokemon/wormadam/{trash_cloak => trash}/overworld_shiny.pal (100%) rename graphics/pokemon/wormadam/{trash_cloak => trash}/shiny.pal (100%) rename graphics/pokemon/yamask/{galarian => galar}/back.png (100%) rename graphics/pokemon/yamask/{galarian => galar}/front.png (100%) rename graphics/pokemon/yamask/{galarian => galar}/icon.png (100%) rename graphics/pokemon/yamask/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/yamask/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/yamask/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/yamask/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/yamask/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/zapdos/{galarian => galar}/back.png (100%) rename graphics/pokemon/zapdos/{galarian => galar}/front.png (100%) rename graphics/pokemon/zapdos/{galarian => galar}/icon.png (100%) rename graphics/pokemon/zapdos/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/zapdos/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/zapdos/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/zapdos/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/zapdos/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/zigzagoon/{galarian => galar}/back.png (100%) rename graphics/pokemon/zigzagoon/{galarian => galar}/front.png (100%) rename graphics/pokemon/zigzagoon/{galarian => galar}/icon.png (100%) rename graphics/pokemon/zigzagoon/{galarian => galar}/normal.pal (100%) rename graphics/pokemon/zigzagoon/{galarian => galar}/overworld.png (100%) rename graphics/pokemon/zigzagoon/{galarian => galar}/overworld_normal.pal (100%) rename graphics/pokemon/zigzagoon/{galarian => galar}/overworld_shiny.pal (100%) rename graphics/pokemon/zigzagoon/{galarian => galar}/shiny.pal (100%) rename graphics/pokemon/zoroark/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/zoroark/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/zoroark/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/zoroark/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/zoroark/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/zoroark/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/zoroark/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/zoroark/{hisuian => hisui}/shiny.pal (100%) rename graphics/pokemon/zorua/{hisuian => hisui}/back.png (100%) rename graphics/pokemon/zorua/{hisuian => hisui}/front.png (100%) rename graphics/pokemon/zorua/{hisuian => hisui}/icon.png (100%) rename graphics/pokemon/zorua/{hisuian => hisui}/normal.pal (100%) rename graphics/pokemon/zorua/{hisuian => hisui}/overworld.png (100%) rename graphics/pokemon/zorua/{hisuian => hisui}/overworld_normal.pal (100%) rename graphics/pokemon/zorua/{hisuian => hisui}/overworld_shiny.pal (100%) rename graphics/pokemon/zorua/{hisuian => hisui}/shiny.pal (100%) rename sound/direct_sound_samples/cries/{calyrex_ice_rider.aif => calyrex_ice.aif} (100%) rename sound/direct_sound_samples/cries/{calyrex_shadow_rider.aif => calyrex_shadow.aif} (100%) rename sound/direct_sound_samples/cries/{floette_eternal_flower.aif => floette_eternal.aif} (100%) rename sound/direct_sound_samples/cries/{maushold_family_of_four.aif => maushold_four.aif} (100%) rename sound/direct_sound_samples/cries/{maushold_family_of_three.aif => maushold_three.aif} (100%) rename sound/direct_sound_samples/cries/{oinkologne_female.aif => oinkologne_f.aif} (100%) rename sound/direct_sound_samples/cries/{oinkologne_male.aif => oinkologne_m.aif} (100%) rename sound/direct_sound_samples/cries/{slowpoke_galarian.aif => slowpoke_galar.aif} (100%) rename sound/direct_sound_samples/cries/{urshifu_rapid_strike_style.aif => urshifu_rapid_strike.aif} (100%) rename sound/direct_sound_samples/cries/{urshifu_single_strike_style.aif => urshifu_single_strike.aif} (100%) diff --git a/dev_scripts/competitive_defines/rename_subfolders.py b/dev_scripts/competitive_defines/rename_subfolders.py new file mode 100644 index 0000000000..5b818b5f7d --- /dev/null +++ b/dev_scripts/competitive_defines/rename_subfolders.py @@ -0,0 +1,21 @@ +import glob +import re +import json +import os +import subprocess + +def rename_subdirs(rootDir, old, new): + for root, dirs, files in os.walk(rootDir): + for name in files: + originalName = os.path.join(root, name) + if root.endswith(old) and os.path.isfile(originalName): + newName = originalName.replace(old + '/', new + '/') + print(originalName + " -> " + newName) + if (not os.path.isdir(root.replace(old, '') + new)): + os.mkdir(root.replace(old, '') + new) + os.rename(originalName, newName) + +rename_subdirs("graphics/pokemon", '/alolan', "/alola") +rename_subdirs("graphics/pokemon", '/galarian', "/galar") +rename_subdirs("graphics/pokemon", '/hisuian', "/hisui") +rename_subdirs("graphics/pokemon", '/gigantamax', "/gmax") diff --git a/graphics/pokemon/alcremie/gigantamax/back.png b/graphics/pokemon/alcremie/gmax/back.png similarity index 100% rename from graphics/pokemon/alcremie/gigantamax/back.png rename to graphics/pokemon/alcremie/gmax/back.png diff --git a/graphics/pokemon/alcremie/gigantamax/front.png b/graphics/pokemon/alcremie/gmax/front.png similarity index 100% rename from graphics/pokemon/alcremie/gigantamax/front.png rename to graphics/pokemon/alcremie/gmax/front.png diff --git a/graphics/pokemon/alcremie/gigantamax/icon.png b/graphics/pokemon/alcremie/gmax/icon.png similarity index 100% rename from graphics/pokemon/alcremie/gigantamax/icon.png rename to graphics/pokemon/alcremie/gmax/icon.png diff --git a/graphics/pokemon/alcremie/gigantamax/normal.pal b/graphics/pokemon/alcremie/gmax/normal.pal similarity index 100% rename from graphics/pokemon/alcremie/gigantamax/normal.pal rename to graphics/pokemon/alcremie/gmax/normal.pal diff --git a/graphics/pokemon/alcremie/gigantamax/shiny.pal b/graphics/pokemon/alcremie/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/gigantamax/shiny.pal rename to graphics/pokemon/alcremie/gmax/shiny.pal diff --git a/graphics/pokemon/appletun/gigantamax/back.png b/graphics/pokemon/appletun/gmax/back.png similarity index 100% rename from graphics/pokemon/appletun/gigantamax/back.png rename to graphics/pokemon/appletun/gmax/back.png diff --git a/graphics/pokemon/appletun/gigantamax/front.png b/graphics/pokemon/appletun/gmax/front.png similarity index 100% rename from graphics/pokemon/appletun/gigantamax/front.png rename to graphics/pokemon/appletun/gmax/front.png diff --git a/graphics/pokemon/appletun/gigantamax/icon.png b/graphics/pokemon/appletun/gmax/icon.png similarity index 100% rename from graphics/pokemon/appletun/gigantamax/icon.png rename to graphics/pokemon/appletun/gmax/icon.png diff --git a/graphics/pokemon/appletun/gigantamax/normal.pal b/graphics/pokemon/appletun/gmax/normal.pal similarity index 100% rename from graphics/pokemon/appletun/gigantamax/normal.pal rename to graphics/pokemon/appletun/gmax/normal.pal diff --git a/graphics/pokemon/appletun/gigantamax/shiny.pal b/graphics/pokemon/appletun/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/appletun/gigantamax/shiny.pal rename to graphics/pokemon/appletun/gmax/shiny.pal diff --git a/graphics/pokemon/arcanine/hisuian/back.png b/graphics/pokemon/arcanine/hisui/back.png similarity index 100% rename from graphics/pokemon/arcanine/hisuian/back.png rename to graphics/pokemon/arcanine/hisui/back.png diff --git a/graphics/pokemon/arcanine/hisuian/front.png b/graphics/pokemon/arcanine/hisui/front.png similarity index 100% rename from graphics/pokemon/arcanine/hisuian/front.png rename to graphics/pokemon/arcanine/hisui/front.png diff --git a/graphics/pokemon/arcanine/hisuian/icon.png b/graphics/pokemon/arcanine/hisui/icon.png similarity index 100% rename from graphics/pokemon/arcanine/hisuian/icon.png rename to graphics/pokemon/arcanine/hisui/icon.png diff --git a/graphics/pokemon/arcanine/hisuian/normal.pal b/graphics/pokemon/arcanine/hisui/normal.pal similarity index 100% rename from graphics/pokemon/arcanine/hisuian/normal.pal rename to graphics/pokemon/arcanine/hisui/normal.pal diff --git a/graphics/pokemon/arcanine/hisuian/overworld.png b/graphics/pokemon/arcanine/hisui/overworld.png similarity index 100% rename from graphics/pokemon/arcanine/hisuian/overworld.png rename to graphics/pokemon/arcanine/hisui/overworld.png diff --git a/graphics/pokemon/arcanine/hisuian/overworld_normal.pal b/graphics/pokemon/arcanine/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arcanine/hisuian/overworld_normal.pal rename to graphics/pokemon/arcanine/hisui/overworld_normal.pal diff --git a/graphics/pokemon/arcanine/hisuian/overworld_shiny.pal b/graphics/pokemon/arcanine/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arcanine/hisuian/overworld_shiny.pal rename to graphics/pokemon/arcanine/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/arcanine/hisuian/shiny.pal b/graphics/pokemon/arcanine/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/arcanine/hisuian/shiny.pal rename to graphics/pokemon/arcanine/hisui/shiny.pal diff --git a/graphics/pokemon/articuno/galarian/back.png b/graphics/pokemon/articuno/galar/back.png similarity index 100% rename from graphics/pokemon/articuno/galarian/back.png rename to graphics/pokemon/articuno/galar/back.png diff --git a/graphics/pokemon/articuno/galarian/front.png b/graphics/pokemon/articuno/galar/front.png similarity index 100% rename from graphics/pokemon/articuno/galarian/front.png rename to graphics/pokemon/articuno/galar/front.png diff --git a/graphics/pokemon/articuno/galarian/icon.png b/graphics/pokemon/articuno/galar/icon.png similarity index 100% rename from graphics/pokemon/articuno/galarian/icon.png rename to graphics/pokemon/articuno/galar/icon.png diff --git a/graphics/pokemon/articuno/galarian/normal.pal b/graphics/pokemon/articuno/galar/normal.pal similarity index 100% rename from graphics/pokemon/articuno/galarian/normal.pal rename to graphics/pokemon/articuno/galar/normal.pal diff --git a/graphics/pokemon/articuno/galarian/overworld.png b/graphics/pokemon/articuno/galar/overworld.png similarity index 100% rename from graphics/pokemon/articuno/galarian/overworld.png rename to graphics/pokemon/articuno/galar/overworld.png diff --git a/graphics/pokemon/articuno/galarian/overworld_normal.pal b/graphics/pokemon/articuno/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/articuno/galarian/overworld_normal.pal rename to graphics/pokemon/articuno/galar/overworld_normal.pal diff --git a/graphics/pokemon/articuno/galarian/overworld_shiny.pal b/graphics/pokemon/articuno/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/articuno/galarian/overworld_shiny.pal rename to graphics/pokemon/articuno/galar/overworld_shiny.pal diff --git a/graphics/pokemon/articuno/galarian/shiny.pal b/graphics/pokemon/articuno/galar/shiny.pal similarity index 100% rename from graphics/pokemon/articuno/galarian/shiny.pal rename to graphics/pokemon/articuno/galar/shiny.pal diff --git a/graphics/pokemon/avalugg/hisuian/back.png b/graphics/pokemon/avalugg/hisui/back.png similarity index 100% rename from graphics/pokemon/avalugg/hisuian/back.png rename to graphics/pokemon/avalugg/hisui/back.png diff --git a/graphics/pokemon/avalugg/hisuian/front.png b/graphics/pokemon/avalugg/hisui/front.png similarity index 100% rename from graphics/pokemon/avalugg/hisuian/front.png rename to graphics/pokemon/avalugg/hisui/front.png diff --git a/graphics/pokemon/avalugg/hisuian/icon.png b/graphics/pokemon/avalugg/hisui/icon.png similarity index 100% rename from graphics/pokemon/avalugg/hisuian/icon.png rename to graphics/pokemon/avalugg/hisui/icon.png diff --git a/graphics/pokemon/avalugg/hisuian/normal.pal b/graphics/pokemon/avalugg/hisui/normal.pal similarity index 100% rename from graphics/pokemon/avalugg/hisuian/normal.pal rename to graphics/pokemon/avalugg/hisui/normal.pal diff --git a/graphics/pokemon/avalugg/hisuian/overworld.png b/graphics/pokemon/avalugg/hisui/overworld.png similarity index 100% rename from graphics/pokemon/avalugg/hisuian/overworld.png rename to graphics/pokemon/avalugg/hisui/overworld.png diff --git a/graphics/pokemon/avalugg/hisuian/overworld_normal.pal b/graphics/pokemon/avalugg/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/avalugg/hisuian/overworld_normal.pal rename to graphics/pokemon/avalugg/hisui/overworld_normal.pal diff --git a/graphics/pokemon/avalugg/hisuian/overworld_shiny.pal b/graphics/pokemon/avalugg/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/avalugg/hisuian/overworld_shiny.pal rename to graphics/pokemon/avalugg/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/avalugg/hisuian/shiny.pal b/graphics/pokemon/avalugg/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/avalugg/hisuian/shiny.pal rename to graphics/pokemon/avalugg/hisui/shiny.pal diff --git a/graphics/pokemon/basculegion/female/back.png b/graphics/pokemon/basculegion/f/back.png similarity index 100% rename from graphics/pokemon/basculegion/female/back.png rename to graphics/pokemon/basculegion/f/back.png diff --git a/graphics/pokemon/basculegion/female/front.png b/graphics/pokemon/basculegion/f/front.png similarity index 100% rename from graphics/pokemon/basculegion/female/front.png rename to graphics/pokemon/basculegion/f/front.png diff --git a/graphics/pokemon/basculegion/female/icon.png b/graphics/pokemon/basculegion/f/icon.png similarity index 100% rename from graphics/pokemon/basculegion/female/icon.png rename to graphics/pokemon/basculegion/f/icon.png diff --git a/graphics/pokemon/basculegion/female/normal.pal b/graphics/pokemon/basculegion/f/normal.pal similarity index 100% rename from graphics/pokemon/basculegion/female/normal.pal rename to graphics/pokemon/basculegion/f/normal.pal diff --git a/graphics/pokemon/basculegion/female/overworld.png b/graphics/pokemon/basculegion/f/overworld.png similarity index 100% rename from graphics/pokemon/basculegion/female/overworld.png rename to graphics/pokemon/basculegion/f/overworld.png diff --git a/graphics/pokemon/basculegion/female/overworld_normal.pal b/graphics/pokemon/basculegion/f/overworld_normal.pal similarity index 100% rename from graphics/pokemon/basculegion/female/overworld_normal.pal rename to graphics/pokemon/basculegion/f/overworld_normal.pal diff --git a/graphics/pokemon/basculegion/female/overworld_shiny.pal b/graphics/pokemon/basculegion/f/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/basculegion/female/overworld_shiny.pal rename to graphics/pokemon/basculegion/f/overworld_shiny.pal diff --git a/graphics/pokemon/basculegion/female/shiny.pal b/graphics/pokemon/basculegion/f/shiny.pal similarity index 100% rename from graphics/pokemon/basculegion/female/shiny.pal rename to graphics/pokemon/basculegion/f/shiny.pal diff --git a/graphics/pokemon/basculin/hisuian/overworld.png b/graphics/pokemon/basculin/hisui/overworld.png similarity index 100% rename from graphics/pokemon/basculin/hisuian/overworld.png rename to graphics/pokemon/basculin/hisui/overworld.png diff --git a/graphics/pokemon/basculin/hisuian/overworld_normal.pal b/graphics/pokemon/basculin/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/basculin/hisuian/overworld_normal.pal rename to graphics/pokemon/basculin/hisui/overworld_normal.pal diff --git a/graphics/pokemon/blastoise/gigantamax/back.png b/graphics/pokemon/blastoise/gmax/back.png similarity index 100% rename from graphics/pokemon/blastoise/gigantamax/back.png rename to graphics/pokemon/blastoise/gmax/back.png diff --git a/graphics/pokemon/blastoise/gigantamax/front.png b/graphics/pokemon/blastoise/gmax/front.png similarity index 100% rename from graphics/pokemon/blastoise/gigantamax/front.png rename to graphics/pokemon/blastoise/gmax/front.png diff --git a/graphics/pokemon/blastoise/gigantamax/icon.png b/graphics/pokemon/blastoise/gmax/icon.png similarity index 100% rename from graphics/pokemon/blastoise/gigantamax/icon.png rename to graphics/pokemon/blastoise/gmax/icon.png diff --git a/graphics/pokemon/blastoise/gigantamax/normal.pal b/graphics/pokemon/blastoise/gmax/normal.pal similarity index 100% rename from graphics/pokemon/blastoise/gigantamax/normal.pal rename to graphics/pokemon/blastoise/gmax/normal.pal diff --git a/graphics/pokemon/blastoise/gigantamax/shiny.pal b/graphics/pokemon/blastoise/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/blastoise/gigantamax/shiny.pal rename to graphics/pokemon/blastoise/gmax/shiny.pal diff --git a/graphics/pokemon/braviary/hisuian/back.png b/graphics/pokemon/braviary/hisui/back.png similarity index 100% rename from graphics/pokemon/braviary/hisuian/back.png rename to graphics/pokemon/braviary/hisui/back.png diff --git a/graphics/pokemon/braviary/hisuian/front.png b/graphics/pokemon/braviary/hisui/front.png similarity index 100% rename from graphics/pokemon/braviary/hisuian/front.png rename to graphics/pokemon/braviary/hisui/front.png diff --git a/graphics/pokemon/braviary/hisuian/icon.png b/graphics/pokemon/braviary/hisui/icon.png similarity index 100% rename from graphics/pokemon/braviary/hisuian/icon.png rename to graphics/pokemon/braviary/hisui/icon.png diff --git a/graphics/pokemon/braviary/hisuian/normal.pal b/graphics/pokemon/braviary/hisui/normal.pal similarity index 100% rename from graphics/pokemon/braviary/hisuian/normal.pal rename to graphics/pokemon/braviary/hisui/normal.pal diff --git a/graphics/pokemon/braviary/hisuian/overworld.png b/graphics/pokemon/braviary/hisui/overworld.png similarity index 100% rename from graphics/pokemon/braviary/hisuian/overworld.png rename to graphics/pokemon/braviary/hisui/overworld.png diff --git a/graphics/pokemon/braviary/hisuian/overworld_normal.pal b/graphics/pokemon/braviary/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/braviary/hisuian/overworld_normal.pal rename to graphics/pokemon/braviary/hisui/overworld_normal.pal diff --git a/graphics/pokemon/braviary/hisuian/overworld_shiny.pal b/graphics/pokemon/braviary/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/braviary/hisuian/overworld_shiny.pal rename to graphics/pokemon/braviary/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/braviary/hisuian/shiny.pal b/graphics/pokemon/braviary/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/braviary/hisuian/shiny.pal rename to graphics/pokemon/braviary/hisui/shiny.pal diff --git a/graphics/pokemon/burmy/plant/footprint.png b/graphics/pokemon/burmy/footprint.png similarity index 100% rename from graphics/pokemon/burmy/plant/footprint.png rename to graphics/pokemon/burmy/footprint.png diff --git a/graphics/pokemon/burmy/sandy_cloak/anim_front.png b/graphics/pokemon/burmy/sandy/anim_front.png similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/anim_front.png rename to graphics/pokemon/burmy/sandy/anim_front.png diff --git a/graphics/pokemon/burmy/sandy_cloak/back.png b/graphics/pokemon/burmy/sandy/back.png similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/back.png rename to graphics/pokemon/burmy/sandy/back.png diff --git a/graphics/pokemon/burmy/sandy_cloak/icon.png b/graphics/pokemon/burmy/sandy/icon.png similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/icon.png rename to graphics/pokemon/burmy/sandy/icon.png diff --git a/graphics/pokemon/burmy/sandy_cloak/normal.pal b/graphics/pokemon/burmy/sandy/normal.pal similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/normal.pal rename to graphics/pokemon/burmy/sandy/normal.pal diff --git a/graphics/pokemon/burmy/sandy_cloak/overworld.png b/graphics/pokemon/burmy/sandy/overworld.png similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/overworld.png rename to graphics/pokemon/burmy/sandy/overworld.png diff --git a/graphics/pokemon/burmy/sandy_cloak/overworld_normal.pal b/graphics/pokemon/burmy/sandy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/overworld_normal.pal rename to graphics/pokemon/burmy/sandy/overworld_normal.pal diff --git a/graphics/pokemon/burmy/sandy_cloak/overworld_shiny.pal b/graphics/pokemon/burmy/sandy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/overworld_shiny.pal rename to graphics/pokemon/burmy/sandy/overworld_shiny.pal diff --git a/graphics/pokemon/burmy/sandy_cloak/shiny.pal b/graphics/pokemon/burmy/sandy/shiny.pal similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/shiny.pal rename to graphics/pokemon/burmy/sandy/shiny.pal diff --git a/graphics/pokemon/burmy/trash_cloak/anim_front.png b/graphics/pokemon/burmy/trash/anim_front.png similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/anim_front.png rename to graphics/pokemon/burmy/trash/anim_front.png diff --git a/graphics/pokemon/burmy/trash_cloak/back.png b/graphics/pokemon/burmy/trash/back.png similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/back.png rename to graphics/pokemon/burmy/trash/back.png diff --git a/graphics/pokemon/burmy/trash_cloak/icon.png b/graphics/pokemon/burmy/trash/icon.png similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/icon.png rename to graphics/pokemon/burmy/trash/icon.png diff --git a/graphics/pokemon/burmy/trash_cloak/normal.pal b/graphics/pokemon/burmy/trash/normal.pal similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/normal.pal rename to graphics/pokemon/burmy/trash/normal.pal diff --git a/graphics/pokemon/burmy/trash_cloak/overworld.png b/graphics/pokemon/burmy/trash/overworld.png similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/overworld.png rename to graphics/pokemon/burmy/trash/overworld.png diff --git a/graphics/pokemon/burmy/trash_cloak/overworld_normal.pal b/graphics/pokemon/burmy/trash/overworld_normal.pal similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/overworld_normal.pal rename to graphics/pokemon/burmy/trash/overworld_normal.pal diff --git a/graphics/pokemon/burmy/trash_cloak/overworld_shiny.pal b/graphics/pokemon/burmy/trash/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/overworld_shiny.pal rename to graphics/pokemon/burmy/trash/overworld_shiny.pal diff --git a/graphics/pokemon/burmy/trash_cloak/shiny.pal b/graphics/pokemon/burmy/trash/shiny.pal similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/shiny.pal rename to graphics/pokemon/burmy/trash/shiny.pal diff --git a/graphics/pokemon/butterfree/gigantamax/back.png b/graphics/pokemon/butterfree/gmax/back.png similarity index 100% rename from graphics/pokemon/butterfree/gigantamax/back.png rename to graphics/pokemon/butterfree/gmax/back.png diff --git a/graphics/pokemon/butterfree/gigantamax/front.png b/graphics/pokemon/butterfree/gmax/front.png similarity index 100% rename from graphics/pokemon/butterfree/gigantamax/front.png rename to graphics/pokemon/butterfree/gmax/front.png diff --git a/graphics/pokemon/butterfree/gigantamax/icon.png b/graphics/pokemon/butterfree/gmax/icon.png similarity index 100% rename from graphics/pokemon/butterfree/gigantamax/icon.png rename to graphics/pokemon/butterfree/gmax/icon.png diff --git a/graphics/pokemon/butterfree/gigantamax/normal.pal b/graphics/pokemon/butterfree/gmax/normal.pal similarity index 100% rename from graphics/pokemon/butterfree/gigantamax/normal.pal rename to graphics/pokemon/butterfree/gmax/normal.pal diff --git a/graphics/pokemon/butterfree/gigantamax/shiny.pal b/graphics/pokemon/butterfree/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/butterfree/gigantamax/shiny.pal rename to graphics/pokemon/butterfree/gmax/shiny.pal diff --git a/graphics/pokemon/calyrex/ice_rider/back.png b/graphics/pokemon/calyrex/ice/back.png similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/back.png rename to graphics/pokemon/calyrex/ice/back.png diff --git a/graphics/pokemon/calyrex/ice_rider/front.png b/graphics/pokemon/calyrex/ice/front.png similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/front.png rename to graphics/pokemon/calyrex/ice/front.png diff --git a/graphics/pokemon/calyrex/ice_rider/icon.png b/graphics/pokemon/calyrex/ice/icon.png similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/icon.png rename to graphics/pokemon/calyrex/ice/icon.png diff --git a/graphics/pokemon/calyrex/ice_rider/normal.pal b/graphics/pokemon/calyrex/ice/normal.pal similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/normal.pal rename to graphics/pokemon/calyrex/ice/normal.pal diff --git a/graphics/pokemon/calyrex/ice_rider/overworld.png b/graphics/pokemon/calyrex/ice/overworld.png similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/overworld.png rename to graphics/pokemon/calyrex/ice/overworld.png diff --git a/graphics/pokemon/calyrex/ice_rider/overworld_normal.pal b/graphics/pokemon/calyrex/ice/overworld_normal.pal similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/overworld_normal.pal rename to graphics/pokemon/calyrex/ice/overworld_normal.pal diff --git a/graphics/pokemon/calyrex/ice_rider/overworld_shiny.pal b/graphics/pokemon/calyrex/ice/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/overworld_shiny.pal rename to graphics/pokemon/calyrex/ice/overworld_shiny.pal diff --git a/graphics/pokemon/calyrex/ice_rider/shiny.pal b/graphics/pokemon/calyrex/ice/shiny.pal similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/shiny.pal rename to graphics/pokemon/calyrex/ice/shiny.pal diff --git a/graphics/pokemon/calyrex/shadow_rider/back.png b/graphics/pokemon/calyrex/shadow/back.png similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/back.png rename to graphics/pokemon/calyrex/shadow/back.png diff --git a/graphics/pokemon/calyrex/shadow_rider/front.png b/graphics/pokemon/calyrex/shadow/front.png similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/front.png rename to graphics/pokemon/calyrex/shadow/front.png diff --git a/graphics/pokemon/calyrex/shadow_rider/icon.png b/graphics/pokemon/calyrex/shadow/icon.png similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/icon.png rename to graphics/pokemon/calyrex/shadow/icon.png diff --git a/graphics/pokemon/calyrex/shadow_rider/normal.pal b/graphics/pokemon/calyrex/shadow/normal.pal similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/normal.pal rename to graphics/pokemon/calyrex/shadow/normal.pal diff --git a/graphics/pokemon/calyrex/shadow_rider/overworld.png b/graphics/pokemon/calyrex/shadow/overworld.png similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/overworld.png rename to graphics/pokemon/calyrex/shadow/overworld.png diff --git a/graphics/pokemon/calyrex/shadow_rider/overworld_normal.pal b/graphics/pokemon/calyrex/shadow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/overworld_normal.pal rename to graphics/pokemon/calyrex/shadow/overworld_normal.pal diff --git a/graphics/pokemon/calyrex/shadow_rider/overworld_shiny.pal b/graphics/pokemon/calyrex/shadow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/overworld_shiny.pal rename to graphics/pokemon/calyrex/shadow/overworld_shiny.pal diff --git a/graphics/pokemon/calyrex/shadow_rider/shiny.pal b/graphics/pokemon/calyrex/shadow/shiny.pal similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/shiny.pal rename to graphics/pokemon/calyrex/shadow/shiny.pal diff --git a/graphics/pokemon/centiskorch/gigantamax/back.png b/graphics/pokemon/centiskorch/gmax/back.png similarity index 100% rename from graphics/pokemon/centiskorch/gigantamax/back.png rename to graphics/pokemon/centiskorch/gmax/back.png diff --git a/graphics/pokemon/centiskorch/gigantamax/front.png b/graphics/pokemon/centiskorch/gmax/front.png similarity index 100% rename from graphics/pokemon/centiskorch/gigantamax/front.png rename to graphics/pokemon/centiskorch/gmax/front.png diff --git a/graphics/pokemon/centiskorch/gigantamax/icon.png b/graphics/pokemon/centiskorch/gmax/icon.png similarity index 100% rename from graphics/pokemon/centiskorch/gigantamax/icon.png rename to graphics/pokemon/centiskorch/gmax/icon.png diff --git a/graphics/pokemon/centiskorch/gigantamax/normal.pal b/graphics/pokemon/centiskorch/gmax/normal.pal similarity index 100% rename from graphics/pokemon/centiskorch/gigantamax/normal.pal rename to graphics/pokemon/centiskorch/gmax/normal.pal diff --git a/graphics/pokemon/centiskorch/gigantamax/shiny.pal b/graphics/pokemon/centiskorch/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/centiskorch/gigantamax/shiny.pal rename to graphics/pokemon/centiskorch/gmax/shiny.pal diff --git a/graphics/pokemon/charizard/gigantamax/back.png b/graphics/pokemon/charizard/gmax/back.png similarity index 100% rename from graphics/pokemon/charizard/gigantamax/back.png rename to graphics/pokemon/charizard/gmax/back.png diff --git a/graphics/pokemon/charizard/gigantamax/front.png b/graphics/pokemon/charizard/gmax/front.png similarity index 100% rename from graphics/pokemon/charizard/gigantamax/front.png rename to graphics/pokemon/charizard/gmax/front.png diff --git a/graphics/pokemon/charizard/gigantamax/icon.png b/graphics/pokemon/charizard/gmax/icon.png similarity index 100% rename from graphics/pokemon/charizard/gigantamax/icon.png rename to graphics/pokemon/charizard/gmax/icon.png diff --git a/graphics/pokemon/charizard/gigantamax/normal.pal b/graphics/pokemon/charizard/gmax/normal.pal similarity index 100% rename from graphics/pokemon/charizard/gigantamax/normal.pal rename to graphics/pokemon/charizard/gmax/normal.pal diff --git a/graphics/pokemon/charizard/gigantamax/shiny.pal b/graphics/pokemon/charizard/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/charizard/gigantamax/shiny.pal rename to graphics/pokemon/charizard/gmax/shiny.pal diff --git a/graphics/pokemon/cinderace/gigantamax/back.png b/graphics/pokemon/cinderace/gmax/back.png similarity index 100% rename from graphics/pokemon/cinderace/gigantamax/back.png rename to graphics/pokemon/cinderace/gmax/back.png diff --git a/graphics/pokemon/cinderace/gigantamax/front.png b/graphics/pokemon/cinderace/gmax/front.png similarity index 100% rename from graphics/pokemon/cinderace/gigantamax/front.png rename to graphics/pokemon/cinderace/gmax/front.png diff --git a/graphics/pokemon/cinderace/gigantamax/icon.png b/graphics/pokemon/cinderace/gmax/icon.png similarity index 100% rename from graphics/pokemon/cinderace/gigantamax/icon.png rename to graphics/pokemon/cinderace/gmax/icon.png diff --git a/graphics/pokemon/cinderace/gigantamax/normal.pal b/graphics/pokemon/cinderace/gmax/normal.pal similarity index 100% rename from graphics/pokemon/cinderace/gigantamax/normal.pal rename to graphics/pokemon/cinderace/gmax/normal.pal diff --git a/graphics/pokemon/cinderace/gigantamax/shiny.pal b/graphics/pokemon/cinderace/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/cinderace/gigantamax/shiny.pal rename to graphics/pokemon/cinderace/gmax/shiny.pal diff --git a/graphics/pokemon/coalossal/gigantamax/back.png b/graphics/pokemon/coalossal/gmax/back.png similarity index 100% rename from graphics/pokemon/coalossal/gigantamax/back.png rename to graphics/pokemon/coalossal/gmax/back.png diff --git a/graphics/pokemon/coalossal/gigantamax/front.png b/graphics/pokemon/coalossal/gmax/front.png similarity index 100% rename from graphics/pokemon/coalossal/gigantamax/front.png rename to graphics/pokemon/coalossal/gmax/front.png diff --git a/graphics/pokemon/coalossal/gigantamax/icon.png b/graphics/pokemon/coalossal/gmax/icon.png similarity index 100% rename from graphics/pokemon/coalossal/gigantamax/icon.png rename to graphics/pokemon/coalossal/gmax/icon.png diff --git a/graphics/pokemon/coalossal/gigantamax/normal.pal b/graphics/pokemon/coalossal/gmax/normal.pal similarity index 100% rename from graphics/pokemon/coalossal/gigantamax/normal.pal rename to graphics/pokemon/coalossal/gmax/normal.pal diff --git a/graphics/pokemon/coalossal/gigantamax/shiny.pal b/graphics/pokemon/coalossal/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/coalossal/gigantamax/shiny.pal rename to graphics/pokemon/coalossal/gmax/shiny.pal diff --git a/graphics/pokemon/copperajah/gigantamax/back.png b/graphics/pokemon/copperajah/gmax/back.png similarity index 100% rename from graphics/pokemon/copperajah/gigantamax/back.png rename to graphics/pokemon/copperajah/gmax/back.png diff --git a/graphics/pokemon/copperajah/gigantamax/front.png b/graphics/pokemon/copperajah/gmax/front.png similarity index 100% rename from graphics/pokemon/copperajah/gigantamax/front.png rename to graphics/pokemon/copperajah/gmax/front.png diff --git a/graphics/pokemon/copperajah/gigantamax/icon.png b/graphics/pokemon/copperajah/gmax/icon.png similarity index 100% rename from graphics/pokemon/copperajah/gigantamax/icon.png rename to graphics/pokemon/copperajah/gmax/icon.png diff --git a/graphics/pokemon/copperajah/gigantamax/normal.pal b/graphics/pokemon/copperajah/gmax/normal.pal similarity index 100% rename from graphics/pokemon/copperajah/gigantamax/normal.pal rename to graphics/pokemon/copperajah/gmax/normal.pal diff --git a/graphics/pokemon/copperajah/gigantamax/shiny.pal b/graphics/pokemon/copperajah/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/copperajah/gigantamax/shiny.pal rename to graphics/pokemon/copperajah/gmax/shiny.pal diff --git a/graphics/pokemon/corsola/galarian/back.png b/graphics/pokemon/corsola/galar/back.png similarity index 100% rename from graphics/pokemon/corsola/galarian/back.png rename to graphics/pokemon/corsola/galar/back.png diff --git a/graphics/pokemon/corsola/galarian/front.png b/graphics/pokemon/corsola/galar/front.png similarity index 100% rename from graphics/pokemon/corsola/galarian/front.png rename to graphics/pokemon/corsola/galar/front.png diff --git a/graphics/pokemon/corsola/galarian/icon.png b/graphics/pokemon/corsola/galar/icon.png similarity index 100% rename from graphics/pokemon/corsola/galarian/icon.png rename to graphics/pokemon/corsola/galar/icon.png diff --git a/graphics/pokemon/corsola/galarian/normal.pal b/graphics/pokemon/corsola/galar/normal.pal similarity index 100% rename from graphics/pokemon/corsola/galarian/normal.pal rename to graphics/pokemon/corsola/galar/normal.pal diff --git a/graphics/pokemon/corsola/galarian/overworld.png b/graphics/pokemon/corsola/galar/overworld.png similarity index 100% rename from graphics/pokemon/corsola/galarian/overworld.png rename to graphics/pokemon/corsola/galar/overworld.png diff --git a/graphics/pokemon/corsola/galarian/overworld_normal.pal b/graphics/pokemon/corsola/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/corsola/galarian/overworld_normal.pal rename to graphics/pokemon/corsola/galar/overworld_normal.pal diff --git a/graphics/pokemon/corsola/galarian/overworld_shiny.pal b/graphics/pokemon/corsola/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/corsola/galarian/overworld_shiny.pal rename to graphics/pokemon/corsola/galar/overworld_shiny.pal diff --git a/graphics/pokemon/corsola/galarian/shiny.pal b/graphics/pokemon/corsola/galar/shiny.pal similarity index 100% rename from graphics/pokemon/corsola/galarian/shiny.pal rename to graphics/pokemon/corsola/galar/shiny.pal diff --git a/graphics/pokemon/corviknight/gigantamax/back.png b/graphics/pokemon/corviknight/gmax/back.png similarity index 100% rename from graphics/pokemon/corviknight/gigantamax/back.png rename to graphics/pokemon/corviknight/gmax/back.png diff --git a/graphics/pokemon/corviknight/gigantamax/front.png b/graphics/pokemon/corviknight/gmax/front.png similarity index 100% rename from graphics/pokemon/corviknight/gigantamax/front.png rename to graphics/pokemon/corviknight/gmax/front.png diff --git a/graphics/pokemon/corviknight/gigantamax/icon.png b/graphics/pokemon/corviknight/gmax/icon.png similarity index 100% rename from graphics/pokemon/corviknight/gigantamax/icon.png rename to graphics/pokemon/corviknight/gmax/icon.png diff --git a/graphics/pokemon/corviknight/gigantamax/normal.pal b/graphics/pokemon/corviknight/gmax/normal.pal similarity index 100% rename from graphics/pokemon/corviknight/gigantamax/normal.pal rename to graphics/pokemon/corviknight/gmax/normal.pal diff --git a/graphics/pokemon/corviknight/gigantamax/shiny.pal b/graphics/pokemon/corviknight/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/corviknight/gigantamax/shiny.pal rename to graphics/pokemon/corviknight/gmax/shiny.pal diff --git a/graphics/pokemon/darmanitan/galarian/back.png b/graphics/pokemon/darmanitan/galar_standard/back.png similarity index 100% rename from graphics/pokemon/darmanitan/galarian/back.png rename to graphics/pokemon/darmanitan/galar_standard/back.png diff --git a/graphics/pokemon/darmanitan/galarian/front.png b/graphics/pokemon/darmanitan/galar_standard/front.png similarity index 100% rename from graphics/pokemon/darmanitan/galarian/front.png rename to graphics/pokemon/darmanitan/galar_standard/front.png diff --git a/graphics/pokemon/darmanitan/galarian/icon.png b/graphics/pokemon/darmanitan/galar_standard/icon.png similarity index 100% rename from graphics/pokemon/darmanitan/galarian/icon.png rename to graphics/pokemon/darmanitan/galar_standard/icon.png diff --git a/graphics/pokemon/darmanitan/galarian/normal.pal b/graphics/pokemon/darmanitan/galar_standard/normal.pal similarity index 100% rename from graphics/pokemon/darmanitan/galarian/normal.pal rename to graphics/pokemon/darmanitan/galar_standard/normal.pal diff --git a/graphics/pokemon/darmanitan/galarian/overworld.png b/graphics/pokemon/darmanitan/galar_standard/overworld.png similarity index 100% rename from graphics/pokemon/darmanitan/galarian/overworld.png rename to graphics/pokemon/darmanitan/galar_standard/overworld.png diff --git a/graphics/pokemon/darmanitan/galarian/overworld_normal.pal b/graphics/pokemon/darmanitan/galar_standard/overworld_normal.pal similarity index 100% rename from graphics/pokemon/darmanitan/galarian/overworld_normal.pal rename to graphics/pokemon/darmanitan/galar_standard/overworld_normal.pal diff --git a/graphics/pokemon/darmanitan/galarian/overworld_shiny.pal b/graphics/pokemon/darmanitan/galar_standard/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/darmanitan/galarian/overworld_shiny.pal rename to graphics/pokemon/darmanitan/galar_standard/overworld_shiny.pal diff --git a/graphics/pokemon/darmanitan/galarian/shiny.pal b/graphics/pokemon/darmanitan/galar_standard/shiny.pal similarity index 100% rename from graphics/pokemon/darmanitan/galarian/shiny.pal rename to graphics/pokemon/darmanitan/galar_standard/shiny.pal diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/back.png b/graphics/pokemon/darmanitan/galar_zen/back.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/galarian/back.png rename to graphics/pokemon/darmanitan/galar_zen/back.png diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/front.png b/graphics/pokemon/darmanitan/galar_zen/front.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/galarian/front.png rename to graphics/pokemon/darmanitan/galar_zen/front.png diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/icon.png b/graphics/pokemon/darmanitan/galar_zen/icon.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/galarian/icon.png rename to graphics/pokemon/darmanitan/galar_zen/icon.png diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/normal.pal b/graphics/pokemon/darmanitan/galar_zen/normal.pal similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/galarian/normal.pal rename to graphics/pokemon/darmanitan/galar_zen/normal.pal diff --git a/graphics/pokemon/darmanitan/zen_mode/galarian/shiny.pal b/graphics/pokemon/darmanitan/galar_zen/shiny.pal similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/galarian/shiny.pal rename to graphics/pokemon/darmanitan/galar_zen/shiny.pal diff --git a/graphics/pokemon/darmanitan/zen_mode/anim_front.png b/graphics/pokemon/darmanitan/zen/anim_front.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/anim_front.png rename to graphics/pokemon/darmanitan/zen/anim_front.png diff --git a/graphics/pokemon/darmanitan/zen_mode/back.png b/graphics/pokemon/darmanitan/zen/back.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/back.png rename to graphics/pokemon/darmanitan/zen/back.png diff --git a/graphics/pokemon/darmanitan/zen_mode/icon.png b/graphics/pokemon/darmanitan/zen/icon.png similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/icon.png rename to graphics/pokemon/darmanitan/zen/icon.png diff --git a/graphics/pokemon/darmanitan/zen_mode/normal.pal b/graphics/pokemon/darmanitan/zen/normal.pal similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/normal.pal rename to graphics/pokemon/darmanitan/zen/normal.pal diff --git a/graphics/pokemon/darmanitan/zen_mode/shiny.pal b/graphics/pokemon/darmanitan/zen/shiny.pal similarity index 100% rename from graphics/pokemon/darmanitan/zen_mode/shiny.pal rename to graphics/pokemon/darmanitan/zen/shiny.pal diff --git a/graphics/pokemon/darumaka/galarian/back.png b/graphics/pokemon/darumaka/galar/back.png similarity index 100% rename from graphics/pokemon/darumaka/galarian/back.png rename to graphics/pokemon/darumaka/galar/back.png diff --git a/graphics/pokemon/darumaka/galarian/front.png b/graphics/pokemon/darumaka/galar/front.png similarity index 100% rename from graphics/pokemon/darumaka/galarian/front.png rename to graphics/pokemon/darumaka/galar/front.png diff --git a/graphics/pokemon/darumaka/galarian/icon.png b/graphics/pokemon/darumaka/galar/icon.png similarity index 100% rename from graphics/pokemon/darumaka/galarian/icon.png rename to graphics/pokemon/darumaka/galar/icon.png diff --git a/graphics/pokemon/darumaka/galarian/normal.pal b/graphics/pokemon/darumaka/galar/normal.pal similarity index 100% rename from graphics/pokemon/darumaka/galarian/normal.pal rename to graphics/pokemon/darumaka/galar/normal.pal diff --git a/graphics/pokemon/darumaka/galarian/overworld.png b/graphics/pokemon/darumaka/galar/overworld.png similarity index 100% rename from graphics/pokemon/darumaka/galarian/overworld.png rename to graphics/pokemon/darumaka/galar/overworld.png diff --git a/graphics/pokemon/darumaka/galarian/overworld_normal.pal b/graphics/pokemon/darumaka/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/darumaka/galarian/overworld_normal.pal rename to graphics/pokemon/darumaka/galar/overworld_normal.pal diff --git a/graphics/pokemon/darumaka/galarian/overworld_shiny.pal b/graphics/pokemon/darumaka/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/darumaka/galarian/overworld_shiny.pal rename to graphics/pokemon/darumaka/galar/overworld_shiny.pal diff --git a/graphics/pokemon/darumaka/galarian/shiny.pal b/graphics/pokemon/darumaka/galar/shiny.pal similarity index 100% rename from graphics/pokemon/darumaka/galarian/shiny.pal rename to graphics/pokemon/darumaka/galar/shiny.pal diff --git a/graphics/pokemon/decidueye/hisuian/back.png b/graphics/pokemon/decidueye/hisui/back.png similarity index 100% rename from graphics/pokemon/decidueye/hisuian/back.png rename to graphics/pokemon/decidueye/hisui/back.png diff --git a/graphics/pokemon/decidueye/hisuian/front.png b/graphics/pokemon/decidueye/hisui/front.png similarity index 100% rename from graphics/pokemon/decidueye/hisuian/front.png rename to graphics/pokemon/decidueye/hisui/front.png diff --git a/graphics/pokemon/decidueye/hisuian/icon.png b/graphics/pokemon/decidueye/hisui/icon.png similarity index 100% rename from graphics/pokemon/decidueye/hisuian/icon.png rename to graphics/pokemon/decidueye/hisui/icon.png diff --git a/graphics/pokemon/decidueye/hisuian/normal.pal b/graphics/pokemon/decidueye/hisui/normal.pal similarity index 100% rename from graphics/pokemon/decidueye/hisuian/normal.pal rename to graphics/pokemon/decidueye/hisui/normal.pal diff --git a/graphics/pokemon/decidueye/hisuian/overworld.png b/graphics/pokemon/decidueye/hisui/overworld.png similarity index 100% rename from graphics/pokemon/decidueye/hisuian/overworld.png rename to graphics/pokemon/decidueye/hisui/overworld.png diff --git a/graphics/pokemon/decidueye/hisuian/overworld_normal.pal b/graphics/pokemon/decidueye/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/decidueye/hisuian/overworld_normal.pal rename to graphics/pokemon/decidueye/hisui/overworld_normal.pal diff --git a/graphics/pokemon/decidueye/hisuian/overworld_shiny.pal b/graphics/pokemon/decidueye/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/decidueye/hisuian/overworld_shiny.pal rename to graphics/pokemon/decidueye/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/decidueye/hisuian/shiny.pal b/graphics/pokemon/decidueye/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/decidueye/hisuian/shiny.pal rename to graphics/pokemon/decidueye/hisui/shiny.pal diff --git a/graphics/pokemon/diglett/alolan/back.png b/graphics/pokemon/diglett/alola/back.png similarity index 100% rename from graphics/pokemon/diglett/alolan/back.png rename to graphics/pokemon/diglett/alola/back.png diff --git a/graphics/pokemon/diglett/alolan/front.png b/graphics/pokemon/diglett/alola/front.png similarity index 100% rename from graphics/pokemon/diglett/alolan/front.png rename to graphics/pokemon/diglett/alola/front.png diff --git a/graphics/pokemon/diglett/alolan/icon.png b/graphics/pokemon/diglett/alola/icon.png similarity index 100% rename from graphics/pokemon/diglett/alolan/icon.png rename to graphics/pokemon/diglett/alola/icon.png diff --git a/graphics/pokemon/diglett/alolan/normal.pal b/graphics/pokemon/diglett/alola/normal.pal similarity index 100% rename from graphics/pokemon/diglett/alolan/normal.pal rename to graphics/pokemon/diglett/alola/normal.pal diff --git a/graphics/pokemon/diglett/alolan/overworld.png b/graphics/pokemon/diglett/alola/overworld.png similarity index 100% rename from graphics/pokemon/diglett/alolan/overworld.png rename to graphics/pokemon/diglett/alola/overworld.png diff --git a/graphics/pokemon/diglett/alolan/overworld_normal.pal b/graphics/pokemon/diglett/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/diglett/alolan/overworld_normal.pal rename to graphics/pokemon/diglett/alola/overworld_normal.pal diff --git a/graphics/pokemon/diglett/alolan/overworld_shiny.pal b/graphics/pokemon/diglett/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/diglett/alolan/overworld_shiny.pal rename to graphics/pokemon/diglett/alola/overworld_shiny.pal diff --git a/graphics/pokemon/diglett/alolan/shiny.pal b/graphics/pokemon/diglett/alola/shiny.pal similarity index 100% rename from graphics/pokemon/diglett/alolan/shiny.pal rename to graphics/pokemon/diglett/alola/shiny.pal diff --git a/graphics/pokemon/drednaw/gigantamax/back.png b/graphics/pokemon/drednaw/gmax/back.png similarity index 100% rename from graphics/pokemon/drednaw/gigantamax/back.png rename to graphics/pokemon/drednaw/gmax/back.png diff --git a/graphics/pokemon/drednaw/gigantamax/front.png b/graphics/pokemon/drednaw/gmax/front.png similarity index 100% rename from graphics/pokemon/drednaw/gigantamax/front.png rename to graphics/pokemon/drednaw/gmax/front.png diff --git a/graphics/pokemon/drednaw/gigantamax/icon.png b/graphics/pokemon/drednaw/gmax/icon.png similarity index 100% rename from graphics/pokemon/drednaw/gigantamax/icon.png rename to graphics/pokemon/drednaw/gmax/icon.png diff --git a/graphics/pokemon/drednaw/gigantamax/normal.pal b/graphics/pokemon/drednaw/gmax/normal.pal similarity index 100% rename from graphics/pokemon/drednaw/gigantamax/normal.pal rename to graphics/pokemon/drednaw/gmax/normal.pal diff --git a/graphics/pokemon/drednaw/gigantamax/shiny.pal b/graphics/pokemon/drednaw/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/drednaw/gigantamax/shiny.pal rename to graphics/pokemon/drednaw/gmax/shiny.pal diff --git a/graphics/pokemon/dugtrio/alolan/back.png b/graphics/pokemon/dugtrio/alola/back.png similarity index 100% rename from graphics/pokemon/dugtrio/alolan/back.png rename to graphics/pokemon/dugtrio/alola/back.png diff --git a/graphics/pokemon/dugtrio/alolan/front.png b/graphics/pokemon/dugtrio/alola/front.png similarity index 100% rename from graphics/pokemon/dugtrio/alolan/front.png rename to graphics/pokemon/dugtrio/alola/front.png diff --git a/graphics/pokemon/dugtrio/alolan/icon.png b/graphics/pokemon/dugtrio/alola/icon.png similarity index 100% rename from graphics/pokemon/dugtrio/alolan/icon.png rename to graphics/pokemon/dugtrio/alola/icon.png diff --git a/graphics/pokemon/dugtrio/alolan/normal.pal b/graphics/pokemon/dugtrio/alola/normal.pal similarity index 100% rename from graphics/pokemon/dugtrio/alolan/normal.pal rename to graphics/pokemon/dugtrio/alola/normal.pal diff --git a/graphics/pokemon/dugtrio/alolan/overworld.png b/graphics/pokemon/dugtrio/alola/overworld.png similarity index 100% rename from graphics/pokemon/dugtrio/alolan/overworld.png rename to graphics/pokemon/dugtrio/alola/overworld.png diff --git a/graphics/pokemon/dugtrio/alolan/overworld_normal.pal b/graphics/pokemon/dugtrio/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dugtrio/alolan/overworld_normal.pal rename to graphics/pokemon/dugtrio/alola/overworld_normal.pal diff --git a/graphics/pokemon/dugtrio/alolan/overworld_shiny.pal b/graphics/pokemon/dugtrio/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dugtrio/alolan/overworld_shiny.pal rename to graphics/pokemon/dugtrio/alola/overworld_shiny.pal diff --git a/graphics/pokemon/dugtrio/alolan/shiny.pal b/graphics/pokemon/dugtrio/alola/shiny.pal similarity index 100% rename from graphics/pokemon/dugtrio/alolan/shiny.pal rename to graphics/pokemon/dugtrio/alola/shiny.pal diff --git a/graphics/pokemon/duraludon/gigantamax/back.png b/graphics/pokemon/duraludon/gmax/back.png similarity index 100% rename from graphics/pokemon/duraludon/gigantamax/back.png rename to graphics/pokemon/duraludon/gmax/back.png diff --git a/graphics/pokemon/duraludon/gigantamax/front.png b/graphics/pokemon/duraludon/gmax/front.png similarity index 100% rename from graphics/pokemon/duraludon/gigantamax/front.png rename to graphics/pokemon/duraludon/gmax/front.png diff --git a/graphics/pokemon/duraludon/gigantamax/icon.png b/graphics/pokemon/duraludon/gmax/icon.png similarity index 100% rename from graphics/pokemon/duraludon/gigantamax/icon.png rename to graphics/pokemon/duraludon/gmax/icon.png diff --git a/graphics/pokemon/duraludon/gigantamax/normal.pal b/graphics/pokemon/duraludon/gmax/normal.pal similarity index 100% rename from graphics/pokemon/duraludon/gigantamax/normal.pal rename to graphics/pokemon/duraludon/gmax/normal.pal diff --git a/graphics/pokemon/duraludon/gigantamax/shiny.pal b/graphics/pokemon/duraludon/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/duraludon/gigantamax/shiny.pal rename to graphics/pokemon/duraludon/gmax/shiny.pal diff --git a/graphics/pokemon/eevee/gigantamax/back.png b/graphics/pokemon/eevee/gmax/back.png similarity index 100% rename from graphics/pokemon/eevee/gigantamax/back.png rename to graphics/pokemon/eevee/gmax/back.png diff --git a/graphics/pokemon/eevee/gigantamax/front.png b/graphics/pokemon/eevee/gmax/front.png similarity index 100% rename from graphics/pokemon/eevee/gigantamax/front.png rename to graphics/pokemon/eevee/gmax/front.png diff --git a/graphics/pokemon/eevee/gigantamax/icon.png b/graphics/pokemon/eevee/gmax/icon.png similarity index 100% rename from graphics/pokemon/eevee/gigantamax/icon.png rename to graphics/pokemon/eevee/gmax/icon.png diff --git a/graphics/pokemon/eevee/gigantamax/normal.pal b/graphics/pokemon/eevee/gmax/normal.pal similarity index 100% rename from graphics/pokemon/eevee/gigantamax/normal.pal rename to graphics/pokemon/eevee/gmax/normal.pal diff --git a/graphics/pokemon/eevee/gigantamax/shiny.pal b/graphics/pokemon/eevee/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/eevee/gigantamax/shiny.pal rename to graphics/pokemon/eevee/gmax/shiny.pal diff --git a/graphics/pokemon/electrode/hisuian/back.png b/graphics/pokemon/electrode/hisui/back.png similarity index 100% rename from graphics/pokemon/electrode/hisuian/back.png rename to graphics/pokemon/electrode/hisui/back.png diff --git a/graphics/pokemon/electrode/hisuian/front.png b/graphics/pokemon/electrode/hisui/front.png similarity index 100% rename from graphics/pokemon/electrode/hisuian/front.png rename to graphics/pokemon/electrode/hisui/front.png diff --git a/graphics/pokemon/electrode/hisuian/icon.png b/graphics/pokemon/electrode/hisui/icon.png similarity index 100% rename from graphics/pokemon/electrode/hisuian/icon.png rename to graphics/pokemon/electrode/hisui/icon.png diff --git a/graphics/pokemon/electrode/hisuian/normal.pal b/graphics/pokemon/electrode/hisui/normal.pal similarity index 100% rename from graphics/pokemon/electrode/hisuian/normal.pal rename to graphics/pokemon/electrode/hisui/normal.pal diff --git a/graphics/pokemon/electrode/hisuian/overworld.png b/graphics/pokemon/electrode/hisui/overworld.png similarity index 100% rename from graphics/pokemon/electrode/hisuian/overworld.png rename to graphics/pokemon/electrode/hisui/overworld.png diff --git a/graphics/pokemon/electrode/hisuian/overworld_normal.pal b/graphics/pokemon/electrode/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/electrode/hisuian/overworld_normal.pal rename to graphics/pokemon/electrode/hisui/overworld_normal.pal diff --git a/graphics/pokemon/electrode/hisuian/overworld_shiny.pal b/graphics/pokemon/electrode/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/electrode/hisuian/overworld_shiny.pal rename to graphics/pokemon/electrode/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/electrode/hisuian/shiny.pal b/graphics/pokemon/electrode/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/electrode/hisuian/shiny.pal rename to graphics/pokemon/electrode/hisui/shiny.pal diff --git a/graphics/pokemon/exeggutor/alolan/anim_front.png b/graphics/pokemon/exeggutor/alola/anim_front.png similarity index 100% rename from graphics/pokemon/exeggutor/alolan/anim_front.png rename to graphics/pokemon/exeggutor/alola/anim_front.png diff --git a/graphics/pokemon/exeggutor/alolan/back.png b/graphics/pokemon/exeggutor/alola/back.png similarity index 100% rename from graphics/pokemon/exeggutor/alolan/back.png rename to graphics/pokemon/exeggutor/alola/back.png diff --git a/graphics/pokemon/exeggutor/alolan/icon.png b/graphics/pokemon/exeggutor/alola/icon.png similarity index 100% rename from graphics/pokemon/exeggutor/alolan/icon.png rename to graphics/pokemon/exeggutor/alola/icon.png diff --git a/graphics/pokemon/exeggutor/alolan/normal.pal b/graphics/pokemon/exeggutor/alola/normal.pal similarity index 100% rename from graphics/pokemon/exeggutor/alolan/normal.pal rename to graphics/pokemon/exeggutor/alola/normal.pal diff --git a/graphics/pokemon/exeggutor/alolan/overworld.png b/graphics/pokemon/exeggutor/alola/overworld.png similarity index 100% rename from graphics/pokemon/exeggutor/alolan/overworld.png rename to graphics/pokemon/exeggutor/alola/overworld.png diff --git a/graphics/pokemon/exeggutor/alolan/overworld_normal.pal b/graphics/pokemon/exeggutor/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/exeggutor/alolan/overworld_normal.pal rename to graphics/pokemon/exeggutor/alola/overworld_normal.pal diff --git a/graphics/pokemon/exeggutor/alolan/overworld_shiny.pal b/graphics/pokemon/exeggutor/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/exeggutor/alolan/overworld_shiny.pal rename to graphics/pokemon/exeggutor/alola/overworld_shiny.pal diff --git a/graphics/pokemon/exeggutor/alolan/shiny.pal b/graphics/pokemon/exeggutor/alola/shiny.pal similarity index 100% rename from graphics/pokemon/exeggutor/alolan/shiny.pal rename to graphics/pokemon/exeggutor/alola/shiny.pal diff --git a/graphics/pokemon/farfetchd/galarian/back.png b/graphics/pokemon/farfetchd/galar/back.png similarity index 100% rename from graphics/pokemon/farfetchd/galarian/back.png rename to graphics/pokemon/farfetchd/galar/back.png diff --git a/graphics/pokemon/farfetchd/galarian/front.png b/graphics/pokemon/farfetchd/galar/front.png similarity index 100% rename from graphics/pokemon/farfetchd/galarian/front.png rename to graphics/pokemon/farfetchd/galar/front.png diff --git a/graphics/pokemon/farfetchd/galarian/icon.png b/graphics/pokemon/farfetchd/galar/icon.png similarity index 100% rename from graphics/pokemon/farfetchd/galarian/icon.png rename to graphics/pokemon/farfetchd/galar/icon.png diff --git a/graphics/pokemon/farfetchd/galarian/normal.pal b/graphics/pokemon/farfetchd/galar/normal.pal similarity index 100% rename from graphics/pokemon/farfetchd/galarian/normal.pal rename to graphics/pokemon/farfetchd/galar/normal.pal diff --git a/graphics/pokemon/farfetchd/galarian/overworld.png b/graphics/pokemon/farfetchd/galar/overworld.png similarity index 100% rename from graphics/pokemon/farfetchd/galarian/overworld.png rename to graphics/pokemon/farfetchd/galar/overworld.png diff --git a/graphics/pokemon/farfetchd/galarian/overworld_normal.pal b/graphics/pokemon/farfetchd/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/farfetchd/galarian/overworld_normal.pal rename to graphics/pokemon/farfetchd/galar/overworld_normal.pal diff --git a/graphics/pokemon/farfetchd/galarian/overworld_shiny.pal b/graphics/pokemon/farfetchd/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/farfetchd/galarian/overworld_shiny.pal rename to graphics/pokemon/farfetchd/galar/overworld_shiny.pal diff --git a/graphics/pokemon/farfetchd/galarian/shiny.pal b/graphics/pokemon/farfetchd/galar/shiny.pal similarity index 100% rename from graphics/pokemon/farfetchd/galarian/shiny.pal rename to graphics/pokemon/farfetchd/galar/shiny.pal diff --git a/graphics/pokemon/flabebe/blue_flower/icon.png b/graphics/pokemon/flabebe/blue/icon.png similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/icon.png rename to graphics/pokemon/flabebe/blue/icon.png diff --git a/graphics/pokemon/flabebe/blue_flower/normal.pal b/graphics/pokemon/flabebe/blue/normal.pal similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/normal.pal rename to graphics/pokemon/flabebe/blue/normal.pal diff --git a/graphics/pokemon/flabebe/blue_flower/overworld.png b/graphics/pokemon/flabebe/blue/overworld.png similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/overworld.png rename to graphics/pokemon/flabebe/blue/overworld.png diff --git a/graphics/pokemon/flabebe/blue_flower/overworld_normal.pal b/graphics/pokemon/flabebe/blue/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/overworld_normal.pal rename to graphics/pokemon/flabebe/blue/overworld_normal.pal diff --git a/graphics/pokemon/flabebe/blue_flower/overworld_shiny.pal b/graphics/pokemon/flabebe/blue/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/overworld_shiny.pal rename to graphics/pokemon/flabebe/blue/overworld_shiny.pal diff --git a/graphics/pokemon/flabebe/blue_flower/shiny.pal b/graphics/pokemon/flabebe/blue/shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/shiny.pal rename to graphics/pokemon/flabebe/blue/shiny.pal diff --git a/graphics/pokemon/flabebe/orange_flower/icon.png b/graphics/pokemon/flabebe/orange/icon.png similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/icon.png rename to graphics/pokemon/flabebe/orange/icon.png diff --git a/graphics/pokemon/flabebe/orange_flower/normal.pal b/graphics/pokemon/flabebe/orange/normal.pal similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/normal.pal rename to graphics/pokemon/flabebe/orange/normal.pal diff --git a/graphics/pokemon/flabebe/orange_flower/overworld.png b/graphics/pokemon/flabebe/orange/overworld.png similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/overworld.png rename to graphics/pokemon/flabebe/orange/overworld.png diff --git a/graphics/pokemon/flabebe/orange_flower/overworld_normal.pal b/graphics/pokemon/flabebe/orange/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/overworld_normal.pal rename to graphics/pokemon/flabebe/orange/overworld_normal.pal diff --git a/graphics/pokemon/flabebe/orange_flower/overworld_shiny.pal b/graphics/pokemon/flabebe/orange/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/overworld_shiny.pal rename to graphics/pokemon/flabebe/orange/overworld_shiny.pal diff --git a/graphics/pokemon/flabebe/orange_flower/shiny.pal b/graphics/pokemon/flabebe/orange/shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/shiny.pal rename to graphics/pokemon/flabebe/orange/shiny.pal diff --git a/graphics/pokemon/flabebe/white_flower/icon.png b/graphics/pokemon/flabebe/white/icon.png similarity index 100% rename from graphics/pokemon/flabebe/white_flower/icon.png rename to graphics/pokemon/flabebe/white/icon.png diff --git a/graphics/pokemon/flabebe/white_flower/normal.pal b/graphics/pokemon/flabebe/white/normal.pal similarity index 100% rename from graphics/pokemon/flabebe/white_flower/normal.pal rename to graphics/pokemon/flabebe/white/normal.pal diff --git a/graphics/pokemon/flabebe/white_flower/overworld.png b/graphics/pokemon/flabebe/white/overworld.png similarity index 100% rename from graphics/pokemon/flabebe/white_flower/overworld.png rename to graphics/pokemon/flabebe/white/overworld.png diff --git a/graphics/pokemon/flabebe/white_flower/overworld_normal.pal b/graphics/pokemon/flabebe/white/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flabebe/white_flower/overworld_normal.pal rename to graphics/pokemon/flabebe/white/overworld_normal.pal diff --git a/graphics/pokemon/flabebe/white_flower/overworld_shiny.pal b/graphics/pokemon/flabebe/white/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/white_flower/overworld_shiny.pal rename to graphics/pokemon/flabebe/white/overworld_shiny.pal diff --git a/graphics/pokemon/flabebe/white_flower/shiny.pal b/graphics/pokemon/flabebe/white/shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/white_flower/shiny.pal rename to graphics/pokemon/flabebe/white/shiny.pal diff --git a/graphics/pokemon/flabebe/yellow_flower/icon.png b/graphics/pokemon/flabebe/yellow/icon.png similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/icon.png rename to graphics/pokemon/flabebe/yellow/icon.png diff --git a/graphics/pokemon/flabebe/yellow_flower/normal.pal b/graphics/pokemon/flabebe/yellow/normal.pal similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/normal.pal rename to graphics/pokemon/flabebe/yellow/normal.pal diff --git a/graphics/pokemon/flabebe/yellow_flower/overworld.png b/graphics/pokemon/flabebe/yellow/overworld.png similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/overworld.png rename to graphics/pokemon/flabebe/yellow/overworld.png diff --git a/graphics/pokemon/flabebe/yellow_flower/overworld_normal.pal b/graphics/pokemon/flabebe/yellow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/overworld_normal.pal rename to graphics/pokemon/flabebe/yellow/overworld_normal.pal diff --git a/graphics/pokemon/flabebe/yellow_flower/overworld_shiny.pal b/graphics/pokemon/flabebe/yellow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/overworld_shiny.pal rename to graphics/pokemon/flabebe/yellow/overworld_shiny.pal diff --git a/graphics/pokemon/flabebe/yellow_flower/shiny.pal b/graphics/pokemon/flabebe/yellow/shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/shiny.pal rename to graphics/pokemon/flabebe/yellow/shiny.pal diff --git a/graphics/pokemon/flapple/gigantamax/back.png b/graphics/pokemon/flapple/gmax/back.png similarity index 100% rename from graphics/pokemon/flapple/gigantamax/back.png rename to graphics/pokemon/flapple/gmax/back.png diff --git a/graphics/pokemon/flapple/gigantamax/front.png b/graphics/pokemon/flapple/gmax/front.png similarity index 100% rename from graphics/pokemon/flapple/gigantamax/front.png rename to graphics/pokemon/flapple/gmax/front.png diff --git a/graphics/pokemon/flapple/gigantamax/icon.png b/graphics/pokemon/flapple/gmax/icon.png similarity index 100% rename from graphics/pokemon/flapple/gigantamax/icon.png rename to graphics/pokemon/flapple/gmax/icon.png diff --git a/graphics/pokemon/flapple/gigantamax/normal.pal b/graphics/pokemon/flapple/gmax/normal.pal similarity index 100% rename from graphics/pokemon/flapple/gigantamax/normal.pal rename to graphics/pokemon/flapple/gmax/normal.pal diff --git a/graphics/pokemon/flapple/gigantamax/shiny.pal b/graphics/pokemon/flapple/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/flapple/gigantamax/shiny.pal rename to graphics/pokemon/flapple/gmax/shiny.pal diff --git a/graphics/pokemon/floette/blue_flower/icon.png b/graphics/pokemon/floette/blue/icon.png similarity index 100% rename from graphics/pokemon/floette/blue_flower/icon.png rename to graphics/pokemon/floette/blue/icon.png diff --git a/graphics/pokemon/floette/blue_flower/normal.pal b/graphics/pokemon/floette/blue/normal.pal similarity index 100% rename from graphics/pokemon/floette/blue_flower/normal.pal rename to graphics/pokemon/floette/blue/normal.pal diff --git a/graphics/pokemon/floette/blue_flower/overworld.png b/graphics/pokemon/floette/blue/overworld.png similarity index 100% rename from graphics/pokemon/floette/blue_flower/overworld.png rename to graphics/pokemon/floette/blue/overworld.png diff --git a/graphics/pokemon/floette/blue_flower/overworld_normal.pal b/graphics/pokemon/floette/blue/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/blue_flower/overworld_normal.pal rename to graphics/pokemon/floette/blue/overworld_normal.pal diff --git a/graphics/pokemon/floette/blue_flower/overworld_shiny.pal b/graphics/pokemon/floette/blue/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/blue_flower/overworld_shiny.pal rename to graphics/pokemon/floette/blue/overworld_shiny.pal diff --git a/graphics/pokemon/floette/blue_flower/shiny.pal b/graphics/pokemon/floette/blue/shiny.pal similarity index 100% rename from graphics/pokemon/floette/blue_flower/shiny.pal rename to graphics/pokemon/floette/blue/shiny.pal diff --git a/graphics/pokemon/floette/eternal_flower/anim_front.png b/graphics/pokemon/floette/eternal/anim_front.png similarity index 100% rename from graphics/pokemon/floette/eternal_flower/anim_front.png rename to graphics/pokemon/floette/eternal/anim_front.png diff --git a/graphics/pokemon/floette/eternal_flower/back.png b/graphics/pokemon/floette/eternal/back.png similarity index 100% rename from graphics/pokemon/floette/eternal_flower/back.png rename to graphics/pokemon/floette/eternal/back.png diff --git a/graphics/pokemon/floette/eternal_flower/icon.png b/graphics/pokemon/floette/eternal/icon.png similarity index 100% rename from graphics/pokemon/floette/eternal_flower/icon.png rename to graphics/pokemon/floette/eternal/icon.png diff --git a/graphics/pokemon/floette/eternal_flower/normal.pal b/graphics/pokemon/floette/eternal/normal.pal similarity index 100% rename from graphics/pokemon/floette/eternal_flower/normal.pal rename to graphics/pokemon/floette/eternal/normal.pal diff --git a/graphics/pokemon/floette/eternal_flower/overworld.png b/graphics/pokemon/floette/eternal/overworld.png similarity index 100% rename from graphics/pokemon/floette/eternal_flower/overworld.png rename to graphics/pokemon/floette/eternal/overworld.png diff --git a/graphics/pokemon/floette/eternal_flower/overworld_normal.pal b/graphics/pokemon/floette/eternal/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/eternal_flower/overworld_normal.pal rename to graphics/pokemon/floette/eternal/overworld_normal.pal diff --git a/graphics/pokemon/floette/eternal_flower/overworld_shiny.pal b/graphics/pokemon/floette/eternal/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/eternal_flower/overworld_shiny.pal rename to graphics/pokemon/floette/eternal/overworld_shiny.pal diff --git a/graphics/pokemon/floette/eternal_flower/shiny.pal b/graphics/pokemon/floette/eternal/shiny.pal similarity index 100% rename from graphics/pokemon/floette/eternal_flower/shiny.pal rename to graphics/pokemon/floette/eternal/shiny.pal diff --git a/graphics/pokemon/floette/orange_flower/icon.png b/graphics/pokemon/floette/orange/icon.png similarity index 100% rename from graphics/pokemon/floette/orange_flower/icon.png rename to graphics/pokemon/floette/orange/icon.png diff --git a/graphics/pokemon/floette/orange_flower/normal.pal b/graphics/pokemon/floette/orange/normal.pal similarity index 100% rename from graphics/pokemon/floette/orange_flower/normal.pal rename to graphics/pokemon/floette/orange/normal.pal diff --git a/graphics/pokemon/floette/orange_flower/overworld.png b/graphics/pokemon/floette/orange/overworld.png similarity index 100% rename from graphics/pokemon/floette/orange_flower/overworld.png rename to graphics/pokemon/floette/orange/overworld.png diff --git a/graphics/pokemon/floette/orange_flower/overworld_normal.pal b/graphics/pokemon/floette/orange/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/orange_flower/overworld_normal.pal rename to graphics/pokemon/floette/orange/overworld_normal.pal diff --git a/graphics/pokemon/floette/orange_flower/overworld_shiny.pal b/graphics/pokemon/floette/orange/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/orange_flower/overworld_shiny.pal rename to graphics/pokemon/floette/orange/overworld_shiny.pal diff --git a/graphics/pokemon/floette/orange_flower/shiny.pal b/graphics/pokemon/floette/orange/shiny.pal similarity index 100% rename from graphics/pokemon/floette/orange_flower/shiny.pal rename to graphics/pokemon/floette/orange/shiny.pal diff --git a/graphics/pokemon/floette/white_flower/icon.png b/graphics/pokemon/floette/white/icon.png similarity index 100% rename from graphics/pokemon/floette/white_flower/icon.png rename to graphics/pokemon/floette/white/icon.png diff --git a/graphics/pokemon/floette/white_flower/normal.pal b/graphics/pokemon/floette/white/normal.pal similarity index 100% rename from graphics/pokemon/floette/white_flower/normal.pal rename to graphics/pokemon/floette/white/normal.pal diff --git a/graphics/pokemon/floette/white_flower/overworld.png b/graphics/pokemon/floette/white/overworld.png similarity index 100% rename from graphics/pokemon/floette/white_flower/overworld.png rename to graphics/pokemon/floette/white/overworld.png diff --git a/graphics/pokemon/floette/white_flower/overworld_normal.pal b/graphics/pokemon/floette/white/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/white_flower/overworld_normal.pal rename to graphics/pokemon/floette/white/overworld_normal.pal diff --git a/graphics/pokemon/floette/white_flower/overworld_shiny.pal b/graphics/pokemon/floette/white/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/white_flower/overworld_shiny.pal rename to graphics/pokemon/floette/white/overworld_shiny.pal diff --git a/graphics/pokemon/floette/white_flower/shiny.pal b/graphics/pokemon/floette/white/shiny.pal similarity index 100% rename from graphics/pokemon/floette/white_flower/shiny.pal rename to graphics/pokemon/floette/white/shiny.pal diff --git a/graphics/pokemon/floette/yellow_flower/icon.png b/graphics/pokemon/floette/yellow/icon.png similarity index 100% rename from graphics/pokemon/floette/yellow_flower/icon.png rename to graphics/pokemon/floette/yellow/icon.png diff --git a/graphics/pokemon/floette/yellow_flower/normal.pal b/graphics/pokemon/floette/yellow/normal.pal similarity index 100% rename from graphics/pokemon/floette/yellow_flower/normal.pal rename to graphics/pokemon/floette/yellow/normal.pal diff --git a/graphics/pokemon/floette/yellow_flower/overworld.png b/graphics/pokemon/floette/yellow/overworld.png similarity index 100% rename from graphics/pokemon/floette/yellow_flower/overworld.png rename to graphics/pokemon/floette/yellow/overworld.png diff --git a/graphics/pokemon/floette/yellow_flower/overworld_normal.pal b/graphics/pokemon/floette/yellow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/yellow_flower/overworld_normal.pal rename to graphics/pokemon/floette/yellow/overworld_normal.pal diff --git a/graphics/pokemon/floette/yellow_flower/overworld_shiny.pal b/graphics/pokemon/floette/yellow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/yellow_flower/overworld_shiny.pal rename to graphics/pokemon/floette/yellow/overworld_shiny.pal diff --git a/graphics/pokemon/floette/yellow_flower/shiny.pal b/graphics/pokemon/floette/yellow/shiny.pal similarity index 100% rename from graphics/pokemon/floette/yellow_flower/shiny.pal rename to graphics/pokemon/floette/yellow/shiny.pal diff --git a/graphics/pokemon/florges/blue_flower/icon.png b/graphics/pokemon/florges/blue/icon.png similarity index 100% rename from graphics/pokemon/florges/blue_flower/icon.png rename to graphics/pokemon/florges/blue/icon.png diff --git a/graphics/pokemon/florges/blue_flower/normal.pal b/graphics/pokemon/florges/blue/normal.pal similarity index 100% rename from graphics/pokemon/florges/blue_flower/normal.pal rename to graphics/pokemon/florges/blue/normal.pal diff --git a/graphics/pokemon/florges/blue_flower/overworld.png b/graphics/pokemon/florges/blue/overworld.png similarity index 100% rename from graphics/pokemon/florges/blue_flower/overworld.png rename to graphics/pokemon/florges/blue/overworld.png diff --git a/graphics/pokemon/florges/blue_flower/overworld_normal.pal b/graphics/pokemon/florges/blue/overworld_normal.pal similarity index 100% rename from graphics/pokemon/florges/blue_flower/overworld_normal.pal rename to graphics/pokemon/florges/blue/overworld_normal.pal diff --git a/graphics/pokemon/florges/blue_flower/overworld_shiny.pal b/graphics/pokemon/florges/blue/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/florges/blue_flower/overworld_shiny.pal rename to graphics/pokemon/florges/blue/overworld_shiny.pal diff --git a/graphics/pokemon/florges/blue_flower/shiny.pal b/graphics/pokemon/florges/blue/shiny.pal similarity index 100% rename from graphics/pokemon/florges/blue_flower/shiny.pal rename to graphics/pokemon/florges/blue/shiny.pal diff --git a/graphics/pokemon/florges/orange_flower/icon.png b/graphics/pokemon/florges/orange/icon.png similarity index 100% rename from graphics/pokemon/florges/orange_flower/icon.png rename to graphics/pokemon/florges/orange/icon.png diff --git a/graphics/pokemon/florges/orange_flower/normal.pal b/graphics/pokemon/florges/orange/normal.pal similarity index 100% rename from graphics/pokemon/florges/orange_flower/normal.pal rename to graphics/pokemon/florges/orange/normal.pal diff --git a/graphics/pokemon/florges/orange_flower/overworld.png b/graphics/pokemon/florges/orange/overworld.png similarity index 100% rename from graphics/pokemon/florges/orange_flower/overworld.png rename to graphics/pokemon/florges/orange/overworld.png diff --git a/graphics/pokemon/florges/orange_flower/overworld_normal.pal b/graphics/pokemon/florges/orange/overworld_normal.pal similarity index 100% rename from graphics/pokemon/florges/orange_flower/overworld_normal.pal rename to graphics/pokemon/florges/orange/overworld_normal.pal diff --git a/graphics/pokemon/florges/orange_flower/overworld_shiny.pal b/graphics/pokemon/florges/orange/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/florges/orange_flower/overworld_shiny.pal rename to graphics/pokemon/florges/orange/overworld_shiny.pal diff --git a/graphics/pokemon/florges/orange_flower/shiny.pal b/graphics/pokemon/florges/orange/shiny.pal similarity index 100% rename from graphics/pokemon/florges/orange_flower/shiny.pal rename to graphics/pokemon/florges/orange/shiny.pal diff --git a/graphics/pokemon/florges/white_flower/icon.png b/graphics/pokemon/florges/white/icon.png similarity index 100% rename from graphics/pokemon/florges/white_flower/icon.png rename to graphics/pokemon/florges/white/icon.png diff --git a/graphics/pokemon/florges/white_flower/normal.pal b/graphics/pokemon/florges/white/normal.pal similarity index 100% rename from graphics/pokemon/florges/white_flower/normal.pal rename to graphics/pokemon/florges/white/normal.pal diff --git a/graphics/pokemon/florges/white_flower/overworld.png b/graphics/pokemon/florges/white/overworld.png similarity index 100% rename from graphics/pokemon/florges/white_flower/overworld.png rename to graphics/pokemon/florges/white/overworld.png diff --git a/graphics/pokemon/florges/white_flower/overworld_normal.pal b/graphics/pokemon/florges/white/overworld_normal.pal similarity index 100% rename from graphics/pokemon/florges/white_flower/overworld_normal.pal rename to graphics/pokemon/florges/white/overworld_normal.pal diff --git a/graphics/pokemon/florges/white_flower/overworld_shiny.pal b/graphics/pokemon/florges/white/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/florges/white_flower/overworld_shiny.pal rename to graphics/pokemon/florges/white/overworld_shiny.pal diff --git a/graphics/pokemon/florges/white_flower/shiny.pal b/graphics/pokemon/florges/white/shiny.pal similarity index 100% rename from graphics/pokemon/florges/white_flower/shiny.pal rename to graphics/pokemon/florges/white/shiny.pal diff --git a/graphics/pokemon/florges/yellow_flower/icon.png b/graphics/pokemon/florges/yellow/icon.png similarity index 100% rename from graphics/pokemon/florges/yellow_flower/icon.png rename to graphics/pokemon/florges/yellow/icon.png diff --git a/graphics/pokemon/florges/yellow_flower/normal.pal b/graphics/pokemon/florges/yellow/normal.pal similarity index 100% rename from graphics/pokemon/florges/yellow_flower/normal.pal rename to graphics/pokemon/florges/yellow/normal.pal diff --git a/graphics/pokemon/florges/yellow_flower/overworld.png b/graphics/pokemon/florges/yellow/overworld.png similarity index 100% rename from graphics/pokemon/florges/yellow_flower/overworld.png rename to graphics/pokemon/florges/yellow/overworld.png diff --git a/graphics/pokemon/florges/yellow_flower/overworld_normal.pal b/graphics/pokemon/florges/yellow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/florges/yellow_flower/overworld_normal.pal rename to graphics/pokemon/florges/yellow/overworld_normal.pal diff --git a/graphics/pokemon/florges/yellow_flower/overworld_shiny.pal b/graphics/pokemon/florges/yellow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/florges/yellow_flower/overworld_shiny.pal rename to graphics/pokemon/florges/yellow/overworld_shiny.pal diff --git a/graphics/pokemon/florges/yellow_flower/shiny.pal b/graphics/pokemon/florges/yellow/shiny.pal similarity index 100% rename from graphics/pokemon/florges/yellow_flower/shiny.pal rename to graphics/pokemon/florges/yellow/shiny.pal diff --git a/graphics/pokemon/garbodor/gigantamax/back.png b/graphics/pokemon/garbodor/gmax/back.png similarity index 100% rename from graphics/pokemon/garbodor/gigantamax/back.png rename to graphics/pokemon/garbodor/gmax/back.png diff --git a/graphics/pokemon/garbodor/gigantamax/front.png b/graphics/pokemon/garbodor/gmax/front.png similarity index 100% rename from graphics/pokemon/garbodor/gigantamax/front.png rename to graphics/pokemon/garbodor/gmax/front.png diff --git a/graphics/pokemon/garbodor/gigantamax/icon.png b/graphics/pokemon/garbodor/gmax/icon.png similarity index 100% rename from graphics/pokemon/garbodor/gigantamax/icon.png rename to graphics/pokemon/garbodor/gmax/icon.png diff --git a/graphics/pokemon/garbodor/gigantamax/normal.pal b/graphics/pokemon/garbodor/gmax/normal.pal similarity index 100% rename from graphics/pokemon/garbodor/gigantamax/normal.pal rename to graphics/pokemon/garbodor/gmax/normal.pal diff --git a/graphics/pokemon/garbodor/gigantamax/shiny.pal b/graphics/pokemon/garbodor/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/garbodor/gigantamax/shiny.pal rename to graphics/pokemon/garbodor/gmax/shiny.pal diff --git a/graphics/pokemon/gastrodon/east_sea/anim_front.png b/graphics/pokemon/gastrodon/east/anim_front.png similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/anim_front.png rename to graphics/pokemon/gastrodon/east/anim_front.png diff --git a/graphics/pokemon/gastrodon/east_sea/back.png b/graphics/pokemon/gastrodon/east/back.png similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/back.png rename to graphics/pokemon/gastrodon/east/back.png diff --git a/graphics/pokemon/gastrodon/east_sea/icon.png b/graphics/pokemon/gastrodon/east/icon.png similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/icon.png rename to graphics/pokemon/gastrodon/east/icon.png diff --git a/graphics/pokemon/gastrodon/east_sea/normal.pal b/graphics/pokemon/gastrodon/east/normal.pal similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/normal.pal rename to graphics/pokemon/gastrodon/east/normal.pal diff --git a/graphics/pokemon/gastrodon/east_sea/overworld.png b/graphics/pokemon/gastrodon/east/overworld.png similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/overworld.png rename to graphics/pokemon/gastrodon/east/overworld.png diff --git a/graphics/pokemon/gastrodon/east_sea/overworld_normal.pal b/graphics/pokemon/gastrodon/east/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/overworld_normal.pal rename to graphics/pokemon/gastrodon/east/overworld_normal.pal diff --git a/graphics/pokemon/gastrodon/east_sea/overworld_shiny.pal b/graphics/pokemon/gastrodon/east/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/overworld_shiny.pal rename to graphics/pokemon/gastrodon/east/overworld_shiny.pal diff --git a/graphics/pokemon/gastrodon/east_sea/shiny.pal b/graphics/pokemon/gastrodon/east/shiny.pal similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/shiny.pal rename to graphics/pokemon/gastrodon/east/shiny.pal diff --git a/graphics/pokemon/gengar/gigantamax/back.png b/graphics/pokemon/gengar/gmax/back.png similarity index 100% rename from graphics/pokemon/gengar/gigantamax/back.png rename to graphics/pokemon/gengar/gmax/back.png diff --git a/graphics/pokemon/gengar/gigantamax/front.png b/graphics/pokemon/gengar/gmax/front.png similarity index 100% rename from graphics/pokemon/gengar/gigantamax/front.png rename to graphics/pokemon/gengar/gmax/front.png diff --git a/graphics/pokemon/gengar/gigantamax/icon.png b/graphics/pokemon/gengar/gmax/icon.png similarity index 100% rename from graphics/pokemon/gengar/gigantamax/icon.png rename to graphics/pokemon/gengar/gmax/icon.png diff --git a/graphics/pokemon/gengar/gigantamax/normal.pal b/graphics/pokemon/gengar/gmax/normal.pal similarity index 100% rename from graphics/pokemon/gengar/gigantamax/normal.pal rename to graphics/pokemon/gengar/gmax/normal.pal diff --git a/graphics/pokemon/gengar/gigantamax/shiny.pal b/graphics/pokemon/gengar/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/gengar/gigantamax/shiny.pal rename to graphics/pokemon/gengar/gmax/shiny.pal diff --git a/graphics/pokemon/geodude/alolan/back.png b/graphics/pokemon/geodude/alola/back.png similarity index 100% rename from graphics/pokemon/geodude/alolan/back.png rename to graphics/pokemon/geodude/alola/back.png diff --git a/graphics/pokemon/geodude/alolan/front.png b/graphics/pokemon/geodude/alola/front.png similarity index 100% rename from graphics/pokemon/geodude/alolan/front.png rename to graphics/pokemon/geodude/alola/front.png diff --git a/graphics/pokemon/geodude/alolan/icon.png b/graphics/pokemon/geodude/alola/icon.png similarity index 100% rename from graphics/pokemon/geodude/alolan/icon.png rename to graphics/pokemon/geodude/alola/icon.png diff --git a/graphics/pokemon/geodude/alolan/normal.pal b/graphics/pokemon/geodude/alola/normal.pal similarity index 100% rename from graphics/pokemon/geodude/alolan/normal.pal rename to graphics/pokemon/geodude/alola/normal.pal diff --git a/graphics/pokemon/geodude/alolan/overworld.png b/graphics/pokemon/geodude/alola/overworld.png similarity index 100% rename from graphics/pokemon/geodude/alolan/overworld.png rename to graphics/pokemon/geodude/alola/overworld.png diff --git a/graphics/pokemon/geodude/alolan/overworld_normal.pal b/graphics/pokemon/geodude/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/geodude/alolan/overworld_normal.pal rename to graphics/pokemon/geodude/alola/overworld_normal.pal diff --git a/graphics/pokemon/geodude/alolan/overworld_shiny.pal b/graphics/pokemon/geodude/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/geodude/alolan/overworld_shiny.pal rename to graphics/pokemon/geodude/alola/overworld_shiny.pal diff --git a/graphics/pokemon/geodude/alolan/shiny.pal b/graphics/pokemon/geodude/alola/shiny.pal similarity index 100% rename from graphics/pokemon/geodude/alolan/shiny.pal rename to graphics/pokemon/geodude/alola/shiny.pal diff --git a/graphics/pokemon/golem/alolan/back.png b/graphics/pokemon/golem/alola/back.png similarity index 100% rename from graphics/pokemon/golem/alolan/back.png rename to graphics/pokemon/golem/alola/back.png diff --git a/graphics/pokemon/golem/alolan/front.png b/graphics/pokemon/golem/alola/front.png similarity index 100% rename from graphics/pokemon/golem/alolan/front.png rename to graphics/pokemon/golem/alola/front.png diff --git a/graphics/pokemon/golem/alolan/icon.png b/graphics/pokemon/golem/alola/icon.png similarity index 100% rename from graphics/pokemon/golem/alolan/icon.png rename to graphics/pokemon/golem/alola/icon.png diff --git a/graphics/pokemon/golem/alolan/normal.pal b/graphics/pokemon/golem/alola/normal.pal similarity index 100% rename from graphics/pokemon/golem/alolan/normal.pal rename to graphics/pokemon/golem/alola/normal.pal diff --git a/graphics/pokemon/golem/alolan/overworld.png b/graphics/pokemon/golem/alola/overworld.png similarity index 100% rename from graphics/pokemon/golem/alolan/overworld.png rename to graphics/pokemon/golem/alola/overworld.png diff --git a/graphics/pokemon/golem/alolan/overworld_normal.pal b/graphics/pokemon/golem/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/golem/alolan/overworld_normal.pal rename to graphics/pokemon/golem/alola/overworld_normal.pal diff --git a/graphics/pokemon/golem/alolan/overworld_shiny.pal b/graphics/pokemon/golem/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/golem/alolan/overworld_shiny.pal rename to graphics/pokemon/golem/alola/overworld_shiny.pal diff --git a/graphics/pokemon/golem/alolan/shiny.pal b/graphics/pokemon/golem/alola/shiny.pal similarity index 100% rename from graphics/pokemon/golem/alolan/shiny.pal rename to graphics/pokemon/golem/alola/shiny.pal diff --git a/graphics/pokemon/goodra/hisuian/back.png b/graphics/pokemon/goodra/hisui/back.png similarity index 100% rename from graphics/pokemon/goodra/hisuian/back.png rename to graphics/pokemon/goodra/hisui/back.png diff --git a/graphics/pokemon/goodra/hisuian/front.png b/graphics/pokemon/goodra/hisui/front.png similarity index 100% rename from graphics/pokemon/goodra/hisuian/front.png rename to graphics/pokemon/goodra/hisui/front.png diff --git a/graphics/pokemon/goodra/hisuian/icon.png b/graphics/pokemon/goodra/hisui/icon.png similarity index 100% rename from graphics/pokemon/goodra/hisuian/icon.png rename to graphics/pokemon/goodra/hisui/icon.png diff --git a/graphics/pokemon/goodra/hisuian/normal.pal b/graphics/pokemon/goodra/hisui/normal.pal similarity index 100% rename from graphics/pokemon/goodra/hisuian/normal.pal rename to graphics/pokemon/goodra/hisui/normal.pal diff --git a/graphics/pokemon/goodra/hisuian/overworld.png b/graphics/pokemon/goodra/hisui/overworld.png similarity index 100% rename from graphics/pokemon/goodra/hisuian/overworld.png rename to graphics/pokemon/goodra/hisui/overworld.png diff --git a/graphics/pokemon/goodra/hisuian/overworld_normal.pal b/graphics/pokemon/goodra/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/goodra/hisuian/overworld_normal.pal rename to graphics/pokemon/goodra/hisui/overworld_normal.pal diff --git a/graphics/pokemon/goodra/hisuian/overworld_shiny.pal b/graphics/pokemon/goodra/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/goodra/hisuian/overworld_shiny.pal rename to graphics/pokemon/goodra/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/goodra/hisuian/shiny.pal b/graphics/pokemon/goodra/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/goodra/hisuian/shiny.pal rename to graphics/pokemon/goodra/hisui/shiny.pal diff --git a/graphics/pokemon/graveler/alolan/back.png b/graphics/pokemon/graveler/alola/back.png similarity index 100% rename from graphics/pokemon/graveler/alolan/back.png rename to graphics/pokemon/graveler/alola/back.png diff --git a/graphics/pokemon/graveler/alolan/front.png b/graphics/pokemon/graveler/alola/front.png similarity index 100% rename from graphics/pokemon/graveler/alolan/front.png rename to graphics/pokemon/graveler/alola/front.png diff --git a/graphics/pokemon/graveler/alolan/icon.png b/graphics/pokemon/graveler/alola/icon.png similarity index 100% rename from graphics/pokemon/graveler/alolan/icon.png rename to graphics/pokemon/graveler/alola/icon.png diff --git a/graphics/pokemon/graveler/alolan/normal.pal b/graphics/pokemon/graveler/alola/normal.pal similarity index 100% rename from graphics/pokemon/graveler/alolan/normal.pal rename to graphics/pokemon/graveler/alola/normal.pal diff --git a/graphics/pokemon/graveler/alolan/overworld.png b/graphics/pokemon/graveler/alola/overworld.png similarity index 100% rename from graphics/pokemon/graveler/alolan/overworld.png rename to graphics/pokemon/graveler/alola/overworld.png diff --git a/graphics/pokemon/graveler/alolan/overworld_normal.pal b/graphics/pokemon/graveler/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/graveler/alolan/overworld_normal.pal rename to graphics/pokemon/graveler/alola/overworld_normal.pal diff --git a/graphics/pokemon/graveler/alolan/overworld_shiny.pal b/graphics/pokemon/graveler/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/graveler/alolan/overworld_shiny.pal rename to graphics/pokemon/graveler/alola/overworld_shiny.pal diff --git a/graphics/pokemon/graveler/alolan/shiny.pal b/graphics/pokemon/graveler/alola/shiny.pal similarity index 100% rename from graphics/pokemon/graveler/alolan/shiny.pal rename to graphics/pokemon/graveler/alola/shiny.pal diff --git a/graphics/pokemon/grimer/alolan/back.png b/graphics/pokemon/grimer/alola/back.png similarity index 100% rename from graphics/pokemon/grimer/alolan/back.png rename to graphics/pokemon/grimer/alola/back.png diff --git a/graphics/pokemon/grimer/alolan/front.png b/graphics/pokemon/grimer/alola/front.png similarity index 100% rename from graphics/pokemon/grimer/alolan/front.png rename to graphics/pokemon/grimer/alola/front.png diff --git a/graphics/pokemon/grimer/alolan/icon.png b/graphics/pokemon/grimer/alola/icon.png similarity index 100% rename from graphics/pokemon/grimer/alolan/icon.png rename to graphics/pokemon/grimer/alola/icon.png diff --git a/graphics/pokemon/grimer/alolan/normal.pal b/graphics/pokemon/grimer/alola/normal.pal similarity index 100% rename from graphics/pokemon/grimer/alolan/normal.pal rename to graphics/pokemon/grimer/alola/normal.pal diff --git a/graphics/pokemon/grimer/alolan/overworld.png b/graphics/pokemon/grimer/alola/overworld.png similarity index 100% rename from graphics/pokemon/grimer/alolan/overworld.png rename to graphics/pokemon/grimer/alola/overworld.png diff --git a/graphics/pokemon/grimer/alolan/overworld_normal.pal b/graphics/pokemon/grimer/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/grimer/alolan/overworld_normal.pal rename to graphics/pokemon/grimer/alola/overworld_normal.pal diff --git a/graphics/pokemon/grimer/alolan/overworld_shiny.pal b/graphics/pokemon/grimer/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/grimer/alolan/overworld_shiny.pal rename to graphics/pokemon/grimer/alola/overworld_shiny.pal diff --git a/graphics/pokemon/grimer/alolan/shiny.pal b/graphics/pokemon/grimer/alola/shiny.pal similarity index 100% rename from graphics/pokemon/grimer/alolan/shiny.pal rename to graphics/pokemon/grimer/alola/shiny.pal diff --git a/graphics/pokemon/grimmsnarl/gigantamax/back.png b/graphics/pokemon/grimmsnarl/gmax/back.png similarity index 100% rename from graphics/pokemon/grimmsnarl/gigantamax/back.png rename to graphics/pokemon/grimmsnarl/gmax/back.png diff --git a/graphics/pokemon/grimmsnarl/gigantamax/front.png b/graphics/pokemon/grimmsnarl/gmax/front.png similarity index 100% rename from graphics/pokemon/grimmsnarl/gigantamax/front.png rename to graphics/pokemon/grimmsnarl/gmax/front.png diff --git a/graphics/pokemon/grimmsnarl/gigantamax/icon.png b/graphics/pokemon/grimmsnarl/gmax/icon.png similarity index 100% rename from graphics/pokemon/grimmsnarl/gigantamax/icon.png rename to graphics/pokemon/grimmsnarl/gmax/icon.png diff --git a/graphics/pokemon/grimmsnarl/gigantamax/normal.pal b/graphics/pokemon/grimmsnarl/gmax/normal.pal similarity index 100% rename from graphics/pokemon/grimmsnarl/gigantamax/normal.pal rename to graphics/pokemon/grimmsnarl/gmax/normal.pal diff --git a/graphics/pokemon/grimmsnarl/gigantamax/shiny.pal b/graphics/pokemon/grimmsnarl/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/grimmsnarl/gigantamax/shiny.pal rename to graphics/pokemon/grimmsnarl/gmax/shiny.pal diff --git a/graphics/pokemon/growlithe/hisuian/back.png b/graphics/pokemon/growlithe/hisui/back.png similarity index 100% rename from graphics/pokemon/growlithe/hisuian/back.png rename to graphics/pokemon/growlithe/hisui/back.png diff --git a/graphics/pokemon/growlithe/hisuian/front.png b/graphics/pokemon/growlithe/hisui/front.png similarity index 100% rename from graphics/pokemon/growlithe/hisuian/front.png rename to graphics/pokemon/growlithe/hisui/front.png diff --git a/graphics/pokemon/growlithe/hisuian/icon.png b/graphics/pokemon/growlithe/hisui/icon.png similarity index 100% rename from graphics/pokemon/growlithe/hisuian/icon.png rename to graphics/pokemon/growlithe/hisui/icon.png diff --git a/graphics/pokemon/growlithe/hisuian/normal.pal b/graphics/pokemon/growlithe/hisui/normal.pal similarity index 100% rename from graphics/pokemon/growlithe/hisuian/normal.pal rename to graphics/pokemon/growlithe/hisui/normal.pal diff --git a/graphics/pokemon/growlithe/hisuian/overworld.png b/graphics/pokemon/growlithe/hisui/overworld.png similarity index 100% rename from graphics/pokemon/growlithe/hisuian/overworld.png rename to graphics/pokemon/growlithe/hisui/overworld.png diff --git a/graphics/pokemon/growlithe/hisuian/overworld_normal.pal b/graphics/pokemon/growlithe/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/growlithe/hisuian/overworld_normal.pal rename to graphics/pokemon/growlithe/hisui/overworld_normal.pal diff --git a/graphics/pokemon/growlithe/hisuian/overworld_shiny.pal b/graphics/pokemon/growlithe/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/growlithe/hisuian/overworld_shiny.pal rename to graphics/pokemon/growlithe/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/growlithe/hisuian/shiny.pal b/graphics/pokemon/growlithe/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/growlithe/hisuian/shiny.pal rename to graphics/pokemon/growlithe/hisui/shiny.pal diff --git a/graphics/pokemon/hatterene/gigantamax/back.png b/graphics/pokemon/hatterene/gmax/back.png similarity index 100% rename from graphics/pokemon/hatterene/gigantamax/back.png rename to graphics/pokemon/hatterene/gmax/back.png diff --git a/graphics/pokemon/hatterene/gigantamax/front.png b/graphics/pokemon/hatterene/gmax/front.png similarity index 100% rename from graphics/pokemon/hatterene/gigantamax/front.png rename to graphics/pokemon/hatterene/gmax/front.png diff --git a/graphics/pokemon/hatterene/gigantamax/icon.png b/graphics/pokemon/hatterene/gmax/icon.png similarity index 100% rename from graphics/pokemon/hatterene/gigantamax/icon.png rename to graphics/pokemon/hatterene/gmax/icon.png diff --git a/graphics/pokemon/hatterene/gigantamax/normal.pal b/graphics/pokemon/hatterene/gmax/normal.pal similarity index 100% rename from graphics/pokemon/hatterene/gigantamax/normal.pal rename to graphics/pokemon/hatterene/gmax/normal.pal diff --git a/graphics/pokemon/hatterene/gigantamax/shiny.pal b/graphics/pokemon/hatterene/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/hatterene/gigantamax/shiny.pal rename to graphics/pokemon/hatterene/gmax/shiny.pal diff --git a/graphics/pokemon/indeedee/female/back.png b/graphics/pokemon/indeedee/f/back.png similarity index 100% rename from graphics/pokemon/indeedee/female/back.png rename to graphics/pokemon/indeedee/f/back.png diff --git a/graphics/pokemon/indeedee/female/front.png b/graphics/pokemon/indeedee/f/front.png similarity index 100% rename from graphics/pokemon/indeedee/female/front.png rename to graphics/pokemon/indeedee/f/front.png diff --git a/graphics/pokemon/indeedee/female/icon.png b/graphics/pokemon/indeedee/f/icon.png similarity index 100% rename from graphics/pokemon/indeedee/female/icon.png rename to graphics/pokemon/indeedee/f/icon.png diff --git a/graphics/pokemon/indeedee/female/normal.pal b/graphics/pokemon/indeedee/f/normal.pal similarity index 100% rename from graphics/pokemon/indeedee/female/normal.pal rename to graphics/pokemon/indeedee/f/normal.pal diff --git a/graphics/pokemon/indeedee/female/overworld.png b/graphics/pokemon/indeedee/f/overworld.png similarity index 100% rename from graphics/pokemon/indeedee/female/overworld.png rename to graphics/pokemon/indeedee/f/overworld.png diff --git a/graphics/pokemon/indeedee/female/overworld_normal.pal b/graphics/pokemon/indeedee/f/overworld_normal.pal similarity index 100% rename from graphics/pokemon/indeedee/female/overworld_normal.pal rename to graphics/pokemon/indeedee/f/overworld_normal.pal diff --git a/graphics/pokemon/indeedee/female/overworld_shiny.pal b/graphics/pokemon/indeedee/f/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/indeedee/female/overworld_shiny.pal rename to graphics/pokemon/indeedee/f/overworld_shiny.pal diff --git a/graphics/pokemon/indeedee/female/shiny.pal b/graphics/pokemon/indeedee/f/shiny.pal similarity index 100% rename from graphics/pokemon/indeedee/female/shiny.pal rename to graphics/pokemon/indeedee/f/shiny.pal diff --git a/graphics/pokemon/inteleon/gigantamax/back.png b/graphics/pokemon/inteleon/gmax/back.png similarity index 100% rename from graphics/pokemon/inteleon/gigantamax/back.png rename to graphics/pokemon/inteleon/gmax/back.png diff --git a/graphics/pokemon/inteleon/gigantamax/front.png b/graphics/pokemon/inteleon/gmax/front.png similarity index 100% rename from graphics/pokemon/inteleon/gigantamax/front.png rename to graphics/pokemon/inteleon/gmax/front.png diff --git a/graphics/pokemon/inteleon/gigantamax/icon.png b/graphics/pokemon/inteleon/gmax/icon.png similarity index 100% rename from graphics/pokemon/inteleon/gigantamax/icon.png rename to graphics/pokemon/inteleon/gmax/icon.png diff --git a/graphics/pokemon/inteleon/gigantamax/normal.pal b/graphics/pokemon/inteleon/gmax/normal.pal similarity index 100% rename from graphics/pokemon/inteleon/gigantamax/normal.pal rename to graphics/pokemon/inteleon/gmax/normal.pal diff --git a/graphics/pokemon/inteleon/gigantamax/shiny.pal b/graphics/pokemon/inteleon/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/inteleon/gigantamax/shiny.pal rename to graphics/pokemon/inteleon/gmax/shiny.pal diff --git a/graphics/pokemon/kingler/gigantamax/back.png b/graphics/pokemon/kingler/gmax/back.png similarity index 100% rename from graphics/pokemon/kingler/gigantamax/back.png rename to graphics/pokemon/kingler/gmax/back.png diff --git a/graphics/pokemon/kingler/gigantamax/front.png b/graphics/pokemon/kingler/gmax/front.png similarity index 100% rename from graphics/pokemon/kingler/gigantamax/front.png rename to graphics/pokemon/kingler/gmax/front.png diff --git a/graphics/pokemon/kingler/gigantamax/icon.png b/graphics/pokemon/kingler/gmax/icon.png similarity index 100% rename from graphics/pokemon/kingler/gigantamax/icon.png rename to graphics/pokemon/kingler/gmax/icon.png diff --git a/graphics/pokemon/kingler/gigantamax/normal.pal b/graphics/pokemon/kingler/gmax/normal.pal similarity index 100% rename from graphics/pokemon/kingler/gigantamax/normal.pal rename to graphics/pokemon/kingler/gmax/normal.pal diff --git a/graphics/pokemon/kingler/gigantamax/shiny.pal b/graphics/pokemon/kingler/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/kingler/gigantamax/shiny.pal rename to graphics/pokemon/kingler/gmax/shiny.pal diff --git a/graphics/pokemon/lapras/gigantamax/back.png b/graphics/pokemon/lapras/gmax/back.png similarity index 100% rename from graphics/pokemon/lapras/gigantamax/back.png rename to graphics/pokemon/lapras/gmax/back.png diff --git a/graphics/pokemon/lapras/gigantamax/front.png b/graphics/pokemon/lapras/gmax/front.png similarity index 100% rename from graphics/pokemon/lapras/gigantamax/front.png rename to graphics/pokemon/lapras/gmax/front.png diff --git a/graphics/pokemon/lapras/gigantamax/icon.png b/graphics/pokemon/lapras/gmax/icon.png similarity index 100% rename from graphics/pokemon/lapras/gigantamax/icon.png rename to graphics/pokemon/lapras/gmax/icon.png diff --git a/graphics/pokemon/lapras/gigantamax/normal.pal b/graphics/pokemon/lapras/gmax/normal.pal similarity index 100% rename from graphics/pokemon/lapras/gigantamax/normal.pal rename to graphics/pokemon/lapras/gmax/normal.pal diff --git a/graphics/pokemon/lapras/gigantamax/shiny.pal b/graphics/pokemon/lapras/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/lapras/gigantamax/shiny.pal rename to graphics/pokemon/lapras/gmax/shiny.pal diff --git a/graphics/pokemon/lilligant/hisuian/back.png b/graphics/pokemon/lilligant/hisui/back.png similarity index 100% rename from graphics/pokemon/lilligant/hisuian/back.png rename to graphics/pokemon/lilligant/hisui/back.png diff --git a/graphics/pokemon/lilligant/hisuian/front.png b/graphics/pokemon/lilligant/hisui/front.png similarity index 100% rename from graphics/pokemon/lilligant/hisuian/front.png rename to graphics/pokemon/lilligant/hisui/front.png diff --git a/graphics/pokemon/lilligant/hisuian/icon.png b/graphics/pokemon/lilligant/hisui/icon.png similarity index 100% rename from graphics/pokemon/lilligant/hisuian/icon.png rename to graphics/pokemon/lilligant/hisui/icon.png diff --git a/graphics/pokemon/lilligant/hisuian/normal.pal b/graphics/pokemon/lilligant/hisui/normal.pal similarity index 100% rename from graphics/pokemon/lilligant/hisuian/normal.pal rename to graphics/pokemon/lilligant/hisui/normal.pal diff --git a/graphics/pokemon/lilligant/hisuian/overworld.png b/graphics/pokemon/lilligant/hisui/overworld.png similarity index 100% rename from graphics/pokemon/lilligant/hisuian/overworld.png rename to graphics/pokemon/lilligant/hisui/overworld.png diff --git a/graphics/pokemon/lilligant/hisuian/overworld_normal.pal b/graphics/pokemon/lilligant/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lilligant/hisuian/overworld_normal.pal rename to graphics/pokemon/lilligant/hisui/overworld_normal.pal diff --git a/graphics/pokemon/lilligant/hisuian/overworld_shiny.pal b/graphics/pokemon/lilligant/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lilligant/hisuian/overworld_shiny.pal rename to graphics/pokemon/lilligant/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/lilligant/hisuian/shiny.pal b/graphics/pokemon/lilligant/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/lilligant/hisuian/shiny.pal rename to graphics/pokemon/lilligant/hisui/shiny.pal diff --git a/graphics/pokemon/linoone/galarian/back.png b/graphics/pokemon/linoone/galar/back.png similarity index 100% rename from graphics/pokemon/linoone/galarian/back.png rename to graphics/pokemon/linoone/galar/back.png diff --git a/graphics/pokemon/linoone/galarian/front.png b/graphics/pokemon/linoone/galar/front.png similarity index 100% rename from graphics/pokemon/linoone/galarian/front.png rename to graphics/pokemon/linoone/galar/front.png diff --git a/graphics/pokemon/linoone/galarian/icon.png b/graphics/pokemon/linoone/galar/icon.png similarity index 100% rename from graphics/pokemon/linoone/galarian/icon.png rename to graphics/pokemon/linoone/galar/icon.png diff --git a/graphics/pokemon/linoone/galarian/normal.pal b/graphics/pokemon/linoone/galar/normal.pal similarity index 100% rename from graphics/pokemon/linoone/galarian/normal.pal rename to graphics/pokemon/linoone/galar/normal.pal diff --git a/graphics/pokemon/linoone/galarian/overworld.png b/graphics/pokemon/linoone/galar/overworld.png similarity index 100% rename from graphics/pokemon/linoone/galarian/overworld.png rename to graphics/pokemon/linoone/galar/overworld.png diff --git a/graphics/pokemon/linoone/galarian/overworld_normal.pal b/graphics/pokemon/linoone/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/linoone/galarian/overworld_normal.pal rename to graphics/pokemon/linoone/galar/overworld_normal.pal diff --git a/graphics/pokemon/linoone/galarian/overworld_shiny.pal b/graphics/pokemon/linoone/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/linoone/galarian/overworld_shiny.pal rename to graphics/pokemon/linoone/galar/overworld_shiny.pal diff --git a/graphics/pokemon/linoone/galarian/shiny.pal b/graphics/pokemon/linoone/galar/shiny.pal similarity index 100% rename from graphics/pokemon/linoone/galarian/shiny.pal rename to graphics/pokemon/linoone/galar/shiny.pal diff --git a/graphics/pokemon/machamp/gigantamax/back.png b/graphics/pokemon/machamp/gmax/back.png similarity index 100% rename from graphics/pokemon/machamp/gigantamax/back.png rename to graphics/pokemon/machamp/gmax/back.png diff --git a/graphics/pokemon/machamp/gigantamax/front.png b/graphics/pokemon/machamp/gmax/front.png similarity index 100% rename from graphics/pokemon/machamp/gigantamax/front.png rename to graphics/pokemon/machamp/gmax/front.png diff --git a/graphics/pokemon/machamp/gigantamax/icon.png b/graphics/pokemon/machamp/gmax/icon.png similarity index 100% rename from graphics/pokemon/machamp/gigantamax/icon.png rename to graphics/pokemon/machamp/gmax/icon.png diff --git a/graphics/pokemon/machamp/gigantamax/normal.pal b/graphics/pokemon/machamp/gmax/normal.pal similarity index 100% rename from graphics/pokemon/machamp/gigantamax/normal.pal rename to graphics/pokemon/machamp/gmax/normal.pal diff --git a/graphics/pokemon/machamp/gigantamax/shiny.pal b/graphics/pokemon/machamp/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/machamp/gigantamax/shiny.pal rename to graphics/pokemon/machamp/gmax/shiny.pal diff --git a/graphics/pokemon/marowak/alolan/back.png b/graphics/pokemon/marowak/alola/back.png similarity index 100% rename from graphics/pokemon/marowak/alolan/back.png rename to graphics/pokemon/marowak/alola/back.png diff --git a/graphics/pokemon/marowak/alolan/front.png b/graphics/pokemon/marowak/alola/front.png similarity index 100% rename from graphics/pokemon/marowak/alolan/front.png rename to graphics/pokemon/marowak/alola/front.png diff --git a/graphics/pokemon/marowak/alolan/icon.png b/graphics/pokemon/marowak/alola/icon.png similarity index 100% rename from graphics/pokemon/marowak/alolan/icon.png rename to graphics/pokemon/marowak/alola/icon.png diff --git a/graphics/pokemon/marowak/alolan/normal.pal b/graphics/pokemon/marowak/alola/normal.pal similarity index 100% rename from graphics/pokemon/marowak/alolan/normal.pal rename to graphics/pokemon/marowak/alola/normal.pal diff --git a/graphics/pokemon/marowak/alolan/overworld.png b/graphics/pokemon/marowak/alola/overworld.png similarity index 100% rename from graphics/pokemon/marowak/alolan/overworld.png rename to graphics/pokemon/marowak/alola/overworld.png diff --git a/graphics/pokemon/marowak/alolan/overworld_normal.pal b/graphics/pokemon/marowak/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/marowak/alolan/overworld_normal.pal rename to graphics/pokemon/marowak/alola/overworld_normal.pal diff --git a/graphics/pokemon/marowak/alolan/overworld_shiny.pal b/graphics/pokemon/marowak/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/marowak/alolan/overworld_shiny.pal rename to graphics/pokemon/marowak/alola/overworld_shiny.pal diff --git a/graphics/pokemon/marowak/alolan/shiny.pal b/graphics/pokemon/marowak/alola/shiny.pal similarity index 100% rename from graphics/pokemon/marowak/alolan/shiny.pal rename to graphics/pokemon/marowak/alola/shiny.pal diff --git a/graphics/pokemon/melmetal/gigantamax/back.png b/graphics/pokemon/melmetal/gmax/back.png similarity index 100% rename from graphics/pokemon/melmetal/gigantamax/back.png rename to graphics/pokemon/melmetal/gmax/back.png diff --git a/graphics/pokemon/melmetal/gigantamax/front.png b/graphics/pokemon/melmetal/gmax/front.png similarity index 100% rename from graphics/pokemon/melmetal/gigantamax/front.png rename to graphics/pokemon/melmetal/gmax/front.png diff --git a/graphics/pokemon/melmetal/gigantamax/icon.png b/graphics/pokemon/melmetal/gmax/icon.png similarity index 100% rename from graphics/pokemon/melmetal/gigantamax/icon.png rename to graphics/pokemon/melmetal/gmax/icon.png diff --git a/graphics/pokemon/melmetal/gigantamax/normal.pal b/graphics/pokemon/melmetal/gmax/normal.pal similarity index 100% rename from graphics/pokemon/melmetal/gigantamax/normal.pal rename to graphics/pokemon/melmetal/gmax/normal.pal diff --git a/graphics/pokemon/melmetal/gigantamax/shiny.pal b/graphics/pokemon/melmetal/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/melmetal/gigantamax/shiny.pal rename to graphics/pokemon/melmetal/gmax/shiny.pal diff --git a/graphics/pokemon/meowstic/female/anim_front.png b/graphics/pokemon/meowstic/f/anim_front.png similarity index 100% rename from graphics/pokemon/meowstic/female/anim_front.png rename to graphics/pokemon/meowstic/f/anim_front.png diff --git a/graphics/pokemon/meowstic/female/back.png b/graphics/pokemon/meowstic/f/back.png similarity index 100% rename from graphics/pokemon/meowstic/female/back.png rename to graphics/pokemon/meowstic/f/back.png diff --git a/graphics/pokemon/meowstic/female/icon.png b/graphics/pokemon/meowstic/f/icon.png similarity index 100% rename from graphics/pokemon/meowstic/female/icon.png rename to graphics/pokemon/meowstic/f/icon.png diff --git a/graphics/pokemon/meowstic/female/normal.pal b/graphics/pokemon/meowstic/f/normal.pal similarity index 100% rename from graphics/pokemon/meowstic/female/normal.pal rename to graphics/pokemon/meowstic/f/normal.pal diff --git a/graphics/pokemon/meowstic/female/overworld.png b/graphics/pokemon/meowstic/f/overworld.png similarity index 100% rename from graphics/pokemon/meowstic/female/overworld.png rename to graphics/pokemon/meowstic/f/overworld.png diff --git a/graphics/pokemon/meowstic/female/overworld_normal.pal b/graphics/pokemon/meowstic/f/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meowstic/female/overworld_normal.pal rename to graphics/pokemon/meowstic/f/overworld_normal.pal diff --git a/graphics/pokemon/meowstic/female/overworld_shiny.pal b/graphics/pokemon/meowstic/f/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meowstic/female/overworld_shiny.pal rename to graphics/pokemon/meowstic/f/overworld_shiny.pal diff --git a/graphics/pokemon/meowstic/female/shiny.pal b/graphics/pokemon/meowstic/f/shiny.pal similarity index 100% rename from graphics/pokemon/meowstic/female/shiny.pal rename to graphics/pokemon/meowstic/f/shiny.pal diff --git a/graphics/pokemon/meowth/alolan/back.png b/graphics/pokemon/meowth/alola/back.png similarity index 100% rename from graphics/pokemon/meowth/alolan/back.png rename to graphics/pokemon/meowth/alola/back.png diff --git a/graphics/pokemon/meowth/alolan/front.png b/graphics/pokemon/meowth/alola/front.png similarity index 100% rename from graphics/pokemon/meowth/alolan/front.png rename to graphics/pokemon/meowth/alola/front.png diff --git a/graphics/pokemon/meowth/alolan/icon.png b/graphics/pokemon/meowth/alola/icon.png similarity index 100% rename from graphics/pokemon/meowth/alolan/icon.png rename to graphics/pokemon/meowth/alola/icon.png diff --git a/graphics/pokemon/meowth/alolan/normal.pal b/graphics/pokemon/meowth/alola/normal.pal similarity index 100% rename from graphics/pokemon/meowth/alolan/normal.pal rename to graphics/pokemon/meowth/alola/normal.pal diff --git a/graphics/pokemon/meowth/alolan/overworld.png b/graphics/pokemon/meowth/alola/overworld.png similarity index 100% rename from graphics/pokemon/meowth/alolan/overworld.png rename to graphics/pokemon/meowth/alola/overworld.png diff --git a/graphics/pokemon/meowth/alolan/overworld_normal.pal b/graphics/pokemon/meowth/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meowth/alolan/overworld_normal.pal rename to graphics/pokemon/meowth/alola/overworld_normal.pal diff --git a/graphics/pokemon/meowth/alolan/overworld_shiny.pal b/graphics/pokemon/meowth/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meowth/alolan/overworld_shiny.pal rename to graphics/pokemon/meowth/alola/overworld_shiny.pal diff --git a/graphics/pokemon/meowth/alolan/shiny.pal b/graphics/pokemon/meowth/alola/shiny.pal similarity index 100% rename from graphics/pokemon/meowth/alolan/shiny.pal rename to graphics/pokemon/meowth/alola/shiny.pal diff --git a/graphics/pokemon/meowth/galarian/back.png b/graphics/pokemon/meowth/galar/back.png similarity index 100% rename from graphics/pokemon/meowth/galarian/back.png rename to graphics/pokemon/meowth/galar/back.png diff --git a/graphics/pokemon/meowth/galarian/front.png b/graphics/pokemon/meowth/galar/front.png similarity index 100% rename from graphics/pokemon/meowth/galarian/front.png rename to graphics/pokemon/meowth/galar/front.png diff --git a/graphics/pokemon/meowth/galarian/icon.png b/graphics/pokemon/meowth/galar/icon.png similarity index 100% rename from graphics/pokemon/meowth/galarian/icon.png rename to graphics/pokemon/meowth/galar/icon.png diff --git a/graphics/pokemon/meowth/galarian/normal.pal b/graphics/pokemon/meowth/galar/normal.pal similarity index 100% rename from graphics/pokemon/meowth/galarian/normal.pal rename to graphics/pokemon/meowth/galar/normal.pal diff --git a/graphics/pokemon/meowth/galarian/overworld.png b/graphics/pokemon/meowth/galar/overworld.png similarity index 100% rename from graphics/pokemon/meowth/galarian/overworld.png rename to graphics/pokemon/meowth/galar/overworld.png diff --git a/graphics/pokemon/meowth/galarian/overworld_normal.pal b/graphics/pokemon/meowth/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meowth/galarian/overworld_normal.pal rename to graphics/pokemon/meowth/galar/overworld_normal.pal diff --git a/graphics/pokemon/meowth/galarian/overworld_shiny.pal b/graphics/pokemon/meowth/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meowth/galarian/overworld_shiny.pal rename to graphics/pokemon/meowth/galar/overworld_shiny.pal diff --git a/graphics/pokemon/meowth/galarian/shiny.pal b/graphics/pokemon/meowth/galar/shiny.pal similarity index 100% rename from graphics/pokemon/meowth/galarian/shiny.pal rename to graphics/pokemon/meowth/galar/shiny.pal diff --git a/graphics/pokemon/meowth/gigantamax/back.png b/graphics/pokemon/meowth/gmax/back.png similarity index 100% rename from graphics/pokemon/meowth/gigantamax/back.png rename to graphics/pokemon/meowth/gmax/back.png diff --git a/graphics/pokemon/meowth/gigantamax/front.png b/graphics/pokemon/meowth/gmax/front.png similarity index 100% rename from graphics/pokemon/meowth/gigantamax/front.png rename to graphics/pokemon/meowth/gmax/front.png diff --git a/graphics/pokemon/meowth/gigantamax/icon.png b/graphics/pokemon/meowth/gmax/icon.png similarity index 100% rename from graphics/pokemon/meowth/gigantamax/icon.png rename to graphics/pokemon/meowth/gmax/icon.png diff --git a/graphics/pokemon/meowth/gigantamax/normal.pal b/graphics/pokemon/meowth/gmax/normal.pal similarity index 100% rename from graphics/pokemon/meowth/gigantamax/normal.pal rename to graphics/pokemon/meowth/gmax/normal.pal diff --git a/graphics/pokemon/meowth/gigantamax/shiny.pal b/graphics/pokemon/meowth/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/meowth/gigantamax/shiny.pal rename to graphics/pokemon/meowth/gmax/shiny.pal diff --git a/graphics/pokemon/moltres/galarian/back.png b/graphics/pokemon/moltres/galar/back.png similarity index 100% rename from graphics/pokemon/moltres/galarian/back.png rename to graphics/pokemon/moltres/galar/back.png diff --git a/graphics/pokemon/moltres/galarian/front.png b/graphics/pokemon/moltres/galar/front.png similarity index 100% rename from graphics/pokemon/moltres/galarian/front.png rename to graphics/pokemon/moltres/galar/front.png diff --git a/graphics/pokemon/moltres/galarian/icon.png b/graphics/pokemon/moltres/galar/icon.png similarity index 100% rename from graphics/pokemon/moltres/galarian/icon.png rename to graphics/pokemon/moltres/galar/icon.png diff --git a/graphics/pokemon/moltres/galarian/normal.pal b/graphics/pokemon/moltres/galar/normal.pal similarity index 100% rename from graphics/pokemon/moltres/galarian/normal.pal rename to graphics/pokemon/moltres/galar/normal.pal diff --git a/graphics/pokemon/moltres/galarian/overworld.png b/graphics/pokemon/moltres/galar/overworld.png similarity index 100% rename from graphics/pokemon/moltres/galarian/overworld.png rename to graphics/pokemon/moltres/galar/overworld.png diff --git a/graphics/pokemon/moltres/galarian/overworld_normal.pal b/graphics/pokemon/moltres/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/moltres/galarian/overworld_normal.pal rename to graphics/pokemon/moltres/galar/overworld_normal.pal diff --git a/graphics/pokemon/moltres/galarian/overworld_shiny.pal b/graphics/pokemon/moltres/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/moltres/galarian/overworld_shiny.pal rename to graphics/pokemon/moltres/galar/overworld_shiny.pal diff --git a/graphics/pokemon/moltres/galarian/shiny.pal b/graphics/pokemon/moltres/galar/shiny.pal similarity index 100% rename from graphics/pokemon/moltres/galarian/shiny.pal rename to graphics/pokemon/moltres/galar/shiny.pal diff --git a/graphics/pokemon/mr_mime/galarian/back.png b/graphics/pokemon/mr_mime/galar/back.png similarity index 100% rename from graphics/pokemon/mr_mime/galarian/back.png rename to graphics/pokemon/mr_mime/galar/back.png diff --git a/graphics/pokemon/mr_mime/galarian/front.png b/graphics/pokemon/mr_mime/galar/front.png similarity index 100% rename from graphics/pokemon/mr_mime/galarian/front.png rename to graphics/pokemon/mr_mime/galar/front.png diff --git a/graphics/pokemon/mr_mime/galarian/icon.png b/graphics/pokemon/mr_mime/galar/icon.png similarity index 100% rename from graphics/pokemon/mr_mime/galarian/icon.png rename to graphics/pokemon/mr_mime/galar/icon.png diff --git a/graphics/pokemon/mr_mime/galarian/normal.pal b/graphics/pokemon/mr_mime/galar/normal.pal similarity index 100% rename from graphics/pokemon/mr_mime/galarian/normal.pal rename to graphics/pokemon/mr_mime/galar/normal.pal diff --git a/graphics/pokemon/mr_mime/galarian/overworld.png b/graphics/pokemon/mr_mime/galar/overworld.png similarity index 100% rename from graphics/pokemon/mr_mime/galarian/overworld.png rename to graphics/pokemon/mr_mime/galar/overworld.png diff --git a/graphics/pokemon/mr_mime/galarian/overworld_normal.pal b/graphics/pokemon/mr_mime/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mr_mime/galarian/overworld_normal.pal rename to graphics/pokemon/mr_mime/galar/overworld_normal.pal diff --git a/graphics/pokemon/mr_mime/galarian/overworld_shiny.pal b/graphics/pokemon/mr_mime/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mr_mime/galarian/overworld_shiny.pal rename to graphics/pokemon/mr_mime/galar/overworld_shiny.pal diff --git a/graphics/pokemon/mr_mime/galarian/shiny.pal b/graphics/pokemon/mr_mime/galar/shiny.pal similarity index 100% rename from graphics/pokemon/mr_mime/galarian/shiny.pal rename to graphics/pokemon/mr_mime/galar/shiny.pal diff --git a/graphics/pokemon/muk/alolan/back.png b/graphics/pokemon/muk/alola/back.png similarity index 100% rename from graphics/pokemon/muk/alolan/back.png rename to graphics/pokemon/muk/alola/back.png diff --git a/graphics/pokemon/muk/alolan/front.png b/graphics/pokemon/muk/alola/front.png similarity index 100% rename from graphics/pokemon/muk/alolan/front.png rename to graphics/pokemon/muk/alola/front.png diff --git a/graphics/pokemon/muk/alolan/icon.png b/graphics/pokemon/muk/alola/icon.png similarity index 100% rename from graphics/pokemon/muk/alolan/icon.png rename to graphics/pokemon/muk/alola/icon.png diff --git a/graphics/pokemon/muk/alolan/normal.pal b/graphics/pokemon/muk/alola/normal.pal similarity index 100% rename from graphics/pokemon/muk/alolan/normal.pal rename to graphics/pokemon/muk/alola/normal.pal diff --git a/graphics/pokemon/muk/alolan/overworld.png b/graphics/pokemon/muk/alola/overworld.png similarity index 100% rename from graphics/pokemon/muk/alolan/overworld.png rename to graphics/pokemon/muk/alola/overworld.png diff --git a/graphics/pokemon/muk/alolan/overworld_normal.pal b/graphics/pokemon/muk/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/muk/alolan/overworld_normal.pal rename to graphics/pokemon/muk/alola/overworld_normal.pal diff --git a/graphics/pokemon/muk/alolan/overworld_shiny.pal b/graphics/pokemon/muk/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/muk/alolan/overworld_shiny.pal rename to graphics/pokemon/muk/alola/overworld_shiny.pal diff --git a/graphics/pokemon/muk/alolan/shiny.pal b/graphics/pokemon/muk/alola/shiny.pal similarity index 100% rename from graphics/pokemon/muk/alolan/shiny.pal rename to graphics/pokemon/muk/alola/shiny.pal diff --git a/graphics/pokemon/ninetales/alolan/back.png b/graphics/pokemon/ninetales/alola/back.png similarity index 100% rename from graphics/pokemon/ninetales/alolan/back.png rename to graphics/pokemon/ninetales/alola/back.png diff --git a/graphics/pokemon/ninetales/alolan/front.png b/graphics/pokemon/ninetales/alola/front.png similarity index 100% rename from graphics/pokemon/ninetales/alolan/front.png rename to graphics/pokemon/ninetales/alola/front.png diff --git a/graphics/pokemon/ninetales/alolan/icon.png b/graphics/pokemon/ninetales/alola/icon.png similarity index 100% rename from graphics/pokemon/ninetales/alolan/icon.png rename to graphics/pokemon/ninetales/alola/icon.png diff --git a/graphics/pokemon/ninetales/alolan/normal.pal b/graphics/pokemon/ninetales/alola/normal.pal similarity index 100% rename from graphics/pokemon/ninetales/alolan/normal.pal rename to graphics/pokemon/ninetales/alola/normal.pal diff --git a/graphics/pokemon/ninetales/alolan/overworld.png b/graphics/pokemon/ninetales/alola/overworld.png similarity index 100% rename from graphics/pokemon/ninetales/alolan/overworld.png rename to graphics/pokemon/ninetales/alola/overworld.png diff --git a/graphics/pokemon/ninetales/alolan/overworld_normal.pal b/graphics/pokemon/ninetales/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ninetales/alolan/overworld_normal.pal rename to graphics/pokemon/ninetales/alola/overworld_normal.pal diff --git a/graphics/pokemon/ninetales/alolan/overworld_shiny.pal b/graphics/pokemon/ninetales/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ninetales/alolan/overworld_shiny.pal rename to graphics/pokemon/ninetales/alola/overworld_shiny.pal diff --git a/graphics/pokemon/ninetales/alolan/shiny.pal b/graphics/pokemon/ninetales/alola/shiny.pal similarity index 100% rename from graphics/pokemon/ninetales/alolan/shiny.pal rename to graphics/pokemon/ninetales/alola/shiny.pal diff --git a/graphics/pokemon/ogerpon/cornerstone/tera/back.png b/graphics/pokemon/ogerpon/cornerstone_tera/back.png similarity index 100% rename from graphics/pokemon/ogerpon/cornerstone/tera/back.png rename to graphics/pokemon/ogerpon/cornerstone_tera/back.png diff --git a/graphics/pokemon/ogerpon/cornerstone/tera/front.png b/graphics/pokemon/ogerpon/cornerstone_tera/front.png similarity index 100% rename from graphics/pokemon/ogerpon/cornerstone/tera/front.png rename to graphics/pokemon/ogerpon/cornerstone_tera/front.png diff --git a/graphics/pokemon/ogerpon/cornerstone/tera/normal.pal b/graphics/pokemon/ogerpon/cornerstone_tera/normal.pal similarity index 100% rename from graphics/pokemon/ogerpon/cornerstone/tera/normal.pal rename to graphics/pokemon/ogerpon/cornerstone_tera/normal.pal diff --git a/graphics/pokemon/ogerpon/cornerstone/tera/shiny.pal b/graphics/pokemon/ogerpon/cornerstone_tera/shiny.pal similarity index 100% rename from graphics/pokemon/ogerpon/cornerstone/tera/shiny.pal rename to graphics/pokemon/ogerpon/cornerstone_tera/shiny.pal diff --git a/graphics/pokemon/ogerpon/hearthflame/tera/back.png b/graphics/pokemon/ogerpon/hearthflame_tera/back.png similarity index 100% rename from graphics/pokemon/ogerpon/hearthflame/tera/back.png rename to graphics/pokemon/ogerpon/hearthflame_tera/back.png diff --git a/graphics/pokemon/ogerpon/hearthflame/tera/front.png b/graphics/pokemon/ogerpon/hearthflame_tera/front.png similarity index 100% rename from graphics/pokemon/ogerpon/hearthflame/tera/front.png rename to graphics/pokemon/ogerpon/hearthflame_tera/front.png diff --git a/graphics/pokemon/ogerpon/hearthflame/tera/normal.pal b/graphics/pokemon/ogerpon/hearthflame_tera/normal.pal similarity index 100% rename from graphics/pokemon/ogerpon/hearthflame/tera/normal.pal rename to graphics/pokemon/ogerpon/hearthflame_tera/normal.pal diff --git a/graphics/pokemon/ogerpon/hearthflame/tera/shiny.pal b/graphics/pokemon/ogerpon/hearthflame_tera/shiny.pal similarity index 100% rename from graphics/pokemon/ogerpon/hearthflame/tera/shiny.pal rename to graphics/pokemon/ogerpon/hearthflame_tera/shiny.pal diff --git a/graphics/pokemon/ogerpon/tera/back.png b/graphics/pokemon/ogerpon/teal_tera/back.png similarity index 100% rename from graphics/pokemon/ogerpon/tera/back.png rename to graphics/pokemon/ogerpon/teal_tera/back.png diff --git a/graphics/pokemon/ogerpon/tera/front.png b/graphics/pokemon/ogerpon/teal_tera/front.png similarity index 100% rename from graphics/pokemon/ogerpon/tera/front.png rename to graphics/pokemon/ogerpon/teal_tera/front.png diff --git a/graphics/pokemon/ogerpon/tera/normal.pal b/graphics/pokemon/ogerpon/teal_tera/normal.pal similarity index 100% rename from graphics/pokemon/ogerpon/tera/normal.pal rename to graphics/pokemon/ogerpon/teal_tera/normal.pal diff --git a/graphics/pokemon/ogerpon/tera/shiny.pal b/graphics/pokemon/ogerpon/teal_tera/shiny.pal similarity index 100% rename from graphics/pokemon/ogerpon/tera/shiny.pal rename to graphics/pokemon/ogerpon/teal_tera/shiny.pal diff --git a/graphics/pokemon/ogerpon/wellspring/tera/back.png b/graphics/pokemon/ogerpon/wellspring_tera/back.png similarity index 100% rename from graphics/pokemon/ogerpon/wellspring/tera/back.png rename to graphics/pokemon/ogerpon/wellspring_tera/back.png diff --git a/graphics/pokemon/ogerpon/wellspring/tera/front.png b/graphics/pokemon/ogerpon/wellspring_tera/front.png similarity index 100% rename from graphics/pokemon/ogerpon/wellspring/tera/front.png rename to graphics/pokemon/ogerpon/wellspring_tera/front.png diff --git a/graphics/pokemon/ogerpon/wellspring/tera/normal.pal b/graphics/pokemon/ogerpon/wellspring_tera/normal.pal similarity index 100% rename from graphics/pokemon/ogerpon/wellspring/tera/normal.pal rename to graphics/pokemon/ogerpon/wellspring_tera/normal.pal diff --git a/graphics/pokemon/ogerpon/wellspring/tera/shiny.pal b/graphics/pokemon/ogerpon/wellspring_tera/shiny.pal similarity index 100% rename from graphics/pokemon/ogerpon/wellspring/tera/shiny.pal rename to graphics/pokemon/ogerpon/wellspring_tera/shiny.pal diff --git a/graphics/pokemon/oinkologne/female/back.png b/graphics/pokemon/oinkologne/f/back.png similarity index 100% rename from graphics/pokemon/oinkologne/female/back.png rename to graphics/pokemon/oinkologne/f/back.png diff --git a/graphics/pokemon/oinkologne/female/front.png b/graphics/pokemon/oinkologne/f/front.png similarity index 100% rename from graphics/pokemon/oinkologne/female/front.png rename to graphics/pokemon/oinkologne/f/front.png diff --git a/graphics/pokemon/oinkologne/female/icon.png b/graphics/pokemon/oinkologne/f/icon.png similarity index 100% rename from graphics/pokemon/oinkologne/female/icon.png rename to graphics/pokemon/oinkologne/f/icon.png diff --git a/graphics/pokemon/oinkologne/female/normal.pal b/graphics/pokemon/oinkologne/f/normal.pal similarity index 100% rename from graphics/pokemon/oinkologne/female/normal.pal rename to graphics/pokemon/oinkologne/f/normal.pal diff --git a/graphics/pokemon/oinkologne/female/overworld.png b/graphics/pokemon/oinkologne/f/overworld.png similarity index 100% rename from graphics/pokemon/oinkologne/female/overworld.png rename to graphics/pokemon/oinkologne/f/overworld.png diff --git a/graphics/pokemon/oinkologne/female/overworld_normal.pal b/graphics/pokemon/oinkologne/f/overworld_normal.pal similarity index 100% rename from graphics/pokemon/oinkologne/female/overworld_normal.pal rename to graphics/pokemon/oinkologne/f/overworld_normal.pal diff --git a/graphics/pokemon/oinkologne/female/overworld_shiny.pal b/graphics/pokemon/oinkologne/f/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/oinkologne/female/overworld_shiny.pal rename to graphics/pokemon/oinkologne/f/overworld_shiny.pal diff --git a/graphics/pokemon/oinkologne/female/shiny.pal b/graphics/pokemon/oinkologne/f/shiny.pal similarity index 100% rename from graphics/pokemon/oinkologne/female/shiny.pal rename to graphics/pokemon/oinkologne/f/shiny.pal diff --git a/graphics/pokemon/orbeetle/gigantamax/back.png b/graphics/pokemon/orbeetle/gmax/back.png similarity index 100% rename from graphics/pokemon/orbeetle/gigantamax/back.png rename to graphics/pokemon/orbeetle/gmax/back.png diff --git a/graphics/pokemon/orbeetle/gigantamax/front.png b/graphics/pokemon/orbeetle/gmax/front.png similarity index 100% rename from graphics/pokemon/orbeetle/gigantamax/front.png rename to graphics/pokemon/orbeetle/gmax/front.png diff --git a/graphics/pokemon/orbeetle/gigantamax/icon.png b/graphics/pokemon/orbeetle/gmax/icon.png similarity index 100% rename from graphics/pokemon/orbeetle/gigantamax/icon.png rename to graphics/pokemon/orbeetle/gmax/icon.png diff --git a/graphics/pokemon/orbeetle/gigantamax/normal.pal b/graphics/pokemon/orbeetle/gmax/normal.pal similarity index 100% rename from graphics/pokemon/orbeetle/gigantamax/normal.pal rename to graphics/pokemon/orbeetle/gmax/normal.pal diff --git a/graphics/pokemon/orbeetle/gigantamax/shiny.pal b/graphics/pokemon/orbeetle/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/orbeetle/gigantamax/shiny.pal rename to graphics/pokemon/orbeetle/gmax/shiny.pal diff --git a/graphics/pokemon/persian/alolan/back.png b/graphics/pokemon/persian/alola/back.png similarity index 100% rename from graphics/pokemon/persian/alolan/back.png rename to graphics/pokemon/persian/alola/back.png diff --git a/graphics/pokemon/persian/alolan/front.png b/graphics/pokemon/persian/alola/front.png similarity index 100% rename from graphics/pokemon/persian/alolan/front.png rename to graphics/pokemon/persian/alola/front.png diff --git a/graphics/pokemon/persian/alolan/icon.png b/graphics/pokemon/persian/alola/icon.png similarity index 100% rename from graphics/pokemon/persian/alolan/icon.png rename to graphics/pokemon/persian/alola/icon.png diff --git a/graphics/pokemon/persian/alolan/normal.pal b/graphics/pokemon/persian/alola/normal.pal similarity index 100% rename from graphics/pokemon/persian/alolan/normal.pal rename to graphics/pokemon/persian/alola/normal.pal diff --git a/graphics/pokemon/persian/alolan/overworld.png b/graphics/pokemon/persian/alola/overworld.png similarity index 100% rename from graphics/pokemon/persian/alolan/overworld.png rename to graphics/pokemon/persian/alola/overworld.png diff --git a/graphics/pokemon/persian/alolan/overworld_normal.pal b/graphics/pokemon/persian/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/persian/alolan/overworld_normal.pal rename to graphics/pokemon/persian/alola/overworld_normal.pal diff --git a/graphics/pokemon/persian/alolan/overworld_shiny.pal b/graphics/pokemon/persian/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/persian/alolan/overworld_shiny.pal rename to graphics/pokemon/persian/alola/overworld_shiny.pal diff --git a/graphics/pokemon/persian/alolan/shiny.pal b/graphics/pokemon/persian/alola/shiny.pal similarity index 100% rename from graphics/pokemon/persian/alolan/shiny.pal rename to graphics/pokemon/persian/alola/shiny.pal diff --git a/graphics/pokemon/pikachu/alola_cap/back.png b/graphics/pokemon/pikachu/alola/back.png similarity index 100% rename from graphics/pokemon/pikachu/alola_cap/back.png rename to graphics/pokemon/pikachu/alola/back.png diff --git a/graphics/pokemon/pikachu/alola_cap/front.png b/graphics/pokemon/pikachu/alola/front.png similarity index 100% rename from graphics/pokemon/pikachu/alola_cap/front.png rename to graphics/pokemon/pikachu/alola/front.png diff --git a/graphics/pokemon/pikachu/alola_cap/icon.png b/graphics/pokemon/pikachu/alola/icon.png similarity index 100% rename from graphics/pokemon/pikachu/alola_cap/icon.png rename to graphics/pokemon/pikachu/alola/icon.png diff --git a/graphics/pokemon/pikachu/alola_cap/normal.pal b/graphics/pokemon/pikachu/alola/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/alola_cap/normal.pal rename to graphics/pokemon/pikachu/alola/normal.pal diff --git a/graphics/pokemon/pikachu/alola_cap/shiny.pal b/graphics/pokemon/pikachu/alola/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/alola_cap/shiny.pal rename to graphics/pokemon/pikachu/alola/shiny.pal diff --git a/graphics/pokemon/pikachu/gigantamax/back.png b/graphics/pokemon/pikachu/gmax/back.png similarity index 100% rename from graphics/pokemon/pikachu/gigantamax/back.png rename to graphics/pokemon/pikachu/gmax/back.png diff --git a/graphics/pokemon/pikachu/gigantamax/front.png b/graphics/pokemon/pikachu/gmax/front.png similarity index 100% rename from graphics/pokemon/pikachu/gigantamax/front.png rename to graphics/pokemon/pikachu/gmax/front.png diff --git a/graphics/pokemon/pikachu/gigantamax/icon.png b/graphics/pokemon/pikachu/gmax/icon.png similarity index 100% rename from graphics/pokemon/pikachu/gigantamax/icon.png rename to graphics/pokemon/pikachu/gmax/icon.png diff --git a/graphics/pokemon/pikachu/gigantamax/normal.pal b/graphics/pokemon/pikachu/gmax/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/gigantamax/normal.pal rename to graphics/pokemon/pikachu/gmax/normal.pal diff --git a/graphics/pokemon/pikachu/gigantamax/shiny.pal b/graphics/pokemon/pikachu/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/gigantamax/shiny.pal rename to graphics/pokemon/pikachu/gmax/shiny.pal diff --git a/graphics/pokemon/pikachu/hoenn_cap/back.png b/graphics/pokemon/pikachu/hoenn/back.png similarity index 100% rename from graphics/pokemon/pikachu/hoenn_cap/back.png rename to graphics/pokemon/pikachu/hoenn/back.png diff --git a/graphics/pokemon/pikachu/hoenn_cap/front.png b/graphics/pokemon/pikachu/hoenn/front.png similarity index 100% rename from graphics/pokemon/pikachu/hoenn_cap/front.png rename to graphics/pokemon/pikachu/hoenn/front.png diff --git a/graphics/pokemon/pikachu/hoenn_cap/icon.png b/graphics/pokemon/pikachu/hoenn/icon.png similarity index 100% rename from graphics/pokemon/pikachu/hoenn_cap/icon.png rename to graphics/pokemon/pikachu/hoenn/icon.png diff --git a/graphics/pokemon/pikachu/hoenn_cap/normal.pal b/graphics/pokemon/pikachu/hoenn/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/hoenn_cap/normal.pal rename to graphics/pokemon/pikachu/hoenn/normal.pal diff --git a/graphics/pokemon/pikachu/hoenn_cap/shiny.pal b/graphics/pokemon/pikachu/hoenn/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/hoenn_cap/shiny.pal rename to graphics/pokemon/pikachu/hoenn/shiny.pal diff --git a/graphics/pokemon/pikachu/kalos_cap/back.png b/graphics/pokemon/pikachu/kalos/back.png similarity index 100% rename from graphics/pokemon/pikachu/kalos_cap/back.png rename to graphics/pokemon/pikachu/kalos/back.png diff --git a/graphics/pokemon/pikachu/kalos_cap/front.png b/graphics/pokemon/pikachu/kalos/front.png similarity index 100% rename from graphics/pokemon/pikachu/kalos_cap/front.png rename to graphics/pokemon/pikachu/kalos/front.png diff --git a/graphics/pokemon/pikachu/kalos_cap/icon.png b/graphics/pokemon/pikachu/kalos/icon.png similarity index 100% rename from graphics/pokemon/pikachu/kalos_cap/icon.png rename to graphics/pokemon/pikachu/kalos/icon.png diff --git a/graphics/pokemon/pikachu/kalos_cap/normal.pal b/graphics/pokemon/pikachu/kalos/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/kalos_cap/normal.pal rename to graphics/pokemon/pikachu/kalos/normal.pal diff --git a/graphics/pokemon/pikachu/kalos_cap/shiny.pal b/graphics/pokemon/pikachu/kalos/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/kalos_cap/shiny.pal rename to graphics/pokemon/pikachu/kalos/shiny.pal diff --git a/graphics/pokemon/pikachu/original_cap/back.png b/graphics/pokemon/pikachu/original/back.png similarity index 100% rename from graphics/pokemon/pikachu/original_cap/back.png rename to graphics/pokemon/pikachu/original/back.png diff --git a/graphics/pokemon/pikachu/original_cap/front.png b/graphics/pokemon/pikachu/original/front.png similarity index 100% rename from graphics/pokemon/pikachu/original_cap/front.png rename to graphics/pokemon/pikachu/original/front.png diff --git a/graphics/pokemon/pikachu/original_cap/icon.png b/graphics/pokemon/pikachu/original/icon.png similarity index 100% rename from graphics/pokemon/pikachu/original_cap/icon.png rename to graphics/pokemon/pikachu/original/icon.png diff --git a/graphics/pokemon/pikachu/original_cap/normal.pal b/graphics/pokemon/pikachu/original/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/original_cap/normal.pal rename to graphics/pokemon/pikachu/original/normal.pal diff --git a/graphics/pokemon/pikachu/original_cap/shiny.pal b/graphics/pokemon/pikachu/original/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/original_cap/shiny.pal rename to graphics/pokemon/pikachu/original/shiny.pal diff --git a/graphics/pokemon/pikachu/partner_cap/back.png b/graphics/pokemon/pikachu/partner/back.png similarity index 100% rename from graphics/pokemon/pikachu/partner_cap/back.png rename to graphics/pokemon/pikachu/partner/back.png diff --git a/graphics/pokemon/pikachu/partner_cap/front.png b/graphics/pokemon/pikachu/partner/front.png similarity index 100% rename from graphics/pokemon/pikachu/partner_cap/front.png rename to graphics/pokemon/pikachu/partner/front.png diff --git a/graphics/pokemon/pikachu/partner/icon.png b/graphics/pokemon/pikachu/partner/icon.png index 891f0d1b3e870760b696c9a5b4cb5ba286147e4d..09ae0c691aa0b47cc20b7324d87dbb68b53f1dda 100644 GIT binary patch delta 430 zcmV;f0a5;h1H1!}7=Hu<0001qplF={001yhOjJc;oP&ddbG^O2|NsBJq(S!fDb->@ z_LM1$d;ele&F*uY|Foo}#s6xooMK{HK|w)TsgPs<000SaNLh0L04^f{04^f|c%?sf z00007bV*G`2j>O{4GsiEG&V;700AFKL_t(I%iWT(PQx$|hJXDA_YfVJ5K>Rdh8S?x zX35W(OgLM*(UEs-XBLQ86VW7FV_X!+iFYK#Ezy1Y9r@0m5P!OC8}*yJ6(QapUawzI zFGsEpuIaN0oS72`D3?>@!l&e=6}_AQy}xY|Wv!Ick)i(Jq%KV31Im@rrSSn_Rc%sa zot*D7>ihvE&3_5er5J&>n*jk&&nUx@uDOC;7G|*$8fX>+c01_&b1`q18u!=b0whqZ zfbCJPmqt3;qA=p07TKu(+OEl&Z?1aG!jOCXAA`Iw#LSfgvoLhJ=V~v4Fyrl!)jkMA z$}lT!j1LUXm)c-#ybd%d(;&A&7&3V5VS_M~qtxytgC{UOpb!aDBN9dzu`n7dVSd|> YZy(2?6>g_8IsgCw07*qoM6N<$g3A275dZ)H delta 373 zcmV-*0gC>-1B3&R7=H)@0000?P=%ZT0004VQb$4nuFf3k0000mP)t-sVw{6}dwadT zwEzGAb92q4toF2nTJFV*#jGjz_9^yaQj~km#iY%>DV$55?Qk}i(rCv<7kSdw34VYe*CnO_SxV5K0NE1d2y=$M_ zjl?0$P@`Uo9Z(xFQqMY2?C3wm#|V1wuv1Kzkf3^Ly|?C$F~&Kdd6|KuelS#j9p?dO zhwAL7^`-u8HN6D1^O}x{`UH8;=puvZ1dk=i5U**H}vwU~~O`{m0 T84N)W00000NkvXXu0mjfVU($* diff --git a/graphics/pokemon/pikachu/partner_cap/normal.pal b/graphics/pokemon/pikachu/partner/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/partner_cap/normal.pal rename to graphics/pokemon/pikachu/partner/normal.pal diff --git a/graphics/pokemon/pikachu/partner_cap/shiny.pal b/graphics/pokemon/pikachu/partner/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/partner_cap/shiny.pal rename to graphics/pokemon/pikachu/partner/shiny.pal diff --git a/graphics/pokemon/pikachu/partner_cap/icon.png b/graphics/pokemon/pikachu/partner_cap/icon.png deleted file mode 100644 index 09ae0c691aa0b47cc20b7324d87dbb68b53f1dda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 444 zcmV;t0Ymi+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm001r{001r{0eGc9b^rhX2XskIMF-~w2MrDcL^L)>0003WNklRdh8S?xX35W(OgLM*(UEs-XBLQ86VW7FV_X!+iFYK#Ezy1Y9r@0m z5P!OC8}*yJ6(QapUawzIFGsEpuIaN0oS72`D3?>@!l&e=6}_AQy}xY|Wv!Ick)i(J zq%KV31Im@rrSSn_Rc%saot*D7>ihvE%?Z(^7=gB%0Rd0XD8rGixq@95X0Z|)Xchx@ zJLvp#F>jX|_t)hDBv7n??NP3mMmpM}FyfyU*{J{8uF08iu6oSEkbC?egS;@r%#{PP zFm$@-YA=E?6U m2~#5yMi;R#8Y^Lb+mCM_$DkE%r!qPK0000Px#Fi=cXMPi(TdwYAmy|n-T|8sNAq^$O|gIeyzi^Z%d_Vy|EVp5cQ&Bdh6y(yex zVp>5#LFq)aUjP6B0!c(cR7i>Kl-&x$FbIVUfkboRdH=Van*M873WLFzklmcKQ%&nP zO+Qz_jV=!iSr~{givUw}fGS)T5hjWb2x%~whaL55?Qk}i(rCv<7kSdw34VYe* zCnO_SxV5K0NE1d2y=$M_jl?0$P@`Uo9Z(xFQqMY2?C3wm#|V1wuv1Kzkf3^Ly|?C$ zF~&Kdd6|KuelS#j9p?dOhwA= GEN_6); ASSUME(gMovesInfo[MOVE_10_000_000_VOLT_THUNDERBOLT].criticalHitStage == 2); - PLAYER(SPECIES_PIKACHU_PARTNER_CAP) { Item(ITEM_PIKASHUNIUM_Z); } + PLAYER(SPECIES_PIKACHU_PARTNER) { Item(ITEM_PIKASHUNIUM_Z); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_THUNDERBOLT, gimmick: GIMMICK_Z_MOVE); } diff --git a/tools/learnset_helpers/porymoves_files/b2w2.json b/tools/learnset_helpers/porymoves_files/b2w2.json index 809671a6fc..976b125c6c 100644 --- a/tools/learnset_helpers/porymoves_files/b2w2.json +++ b/tools/learnset_helpers/porymoves_files/b2w2.json @@ -80324,7 +80324,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 1, @@ -80426,7 +80426,7 @@ "MOVE_UPROAR" ] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 1, diff --git a/tools/learnset_helpers/porymoves_files/bdsp.json b/tools/learnset_helpers/porymoves_files/bdsp.json index 0109e99ed8..8e4ac589d3 100644 --- a/tools/learnset_helpers/porymoves_files/bdsp.json +++ b/tools/learnset_helpers/porymoves_files/bdsp.json @@ -55908,7 +55908,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 0, @@ -56023,7 +56023,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 0, diff --git a/tools/learnset_helpers/porymoves_files/bw.json b/tools/learnset_helpers/porymoves_files/bw.json index 7be5d6eb6f..7728235c5f 100644 --- a/tools/learnset_helpers/porymoves_files/bw.json +++ b/tools/learnset_helpers/porymoves_files/bw.json @@ -72003,7 +72003,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 1, @@ -72094,7 +72094,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 1, diff --git a/tools/learnset_helpers/porymoves_files/dp.json b/tools/learnset_helpers/porymoves_files/dp.json index d39759df4f..666a6dda58 100644 --- a/tools/learnset_helpers/porymoves_files/dp.json +++ b/tools/learnset_helpers/porymoves_files/dp.json @@ -53246,7 +53246,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 1, @@ -53335,7 +53335,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 1, diff --git a/tools/learnset_helpers/porymoves_files/hgss.json b/tools/learnset_helpers/porymoves_files/hgss.json index 2bd6e7d926..b0241c96f4 100644 --- a/tools/learnset_helpers/porymoves_files/hgss.json +++ b/tools/learnset_helpers/porymoves_files/hgss.json @@ -59645,7 +59645,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 1, @@ -59749,7 +59749,7 @@ "MOVE_UPROAR" ] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 1, diff --git a/tools/learnset_helpers/porymoves_files/la.json b/tools/learnset_helpers/porymoves_files/la.json index cfd51dc2f4..599596a902 100644 --- a/tools/learnset_helpers/porymoves_files/la.json +++ b/tools/learnset_helpers/porymoves_files/la.json @@ -14495,7 +14495,7 @@ "EggMoves": [], "TutorMoves": [] }, - "MEOWSTIC_MALE": { + "MEOWSTIC_M": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], @@ -16049,7 +16049,7 @@ "EggMoves": [], "TutorMoves": [] }, - "INDEEDEE_MALE": { + "INDEEDEE_M": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], @@ -16161,7 +16161,7 @@ "EggMoves": [], "TutorMoves": [] }, - "URSHIFU_SINGLE_STRIKE_STYLE": { + "URSHIFU_SINGLE_STRIKE": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], @@ -16630,21 +16630,21 @@ "MOVE_ZEN_HEADBUTT" ] }, - "RATTATA_ALOLAN": { + "RATTATA_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "RATICATE_ALOLAN": { + "RATICATE_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "RAICHU_ALOLAN": { + "RAICHU_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -16699,21 +16699,21 @@ "MOVE_WILD_CHARGE" ] }, - "SANDSHREW_ALOLAN": { + "SANDSHREW_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "SANDSLASH_ALOLAN": { + "SANDSLASH_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "VULPIX_ALOLAN": { + "VULPIX_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -16765,7 +16765,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "NINETALES_ALOLAN": { + "NINETALES_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -16820,35 +16820,35 @@ "MOVE_ZEN_HEADBUTT" ] }, - "DIGLETT_ALOLAN": { + "DIGLETT_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "DUGTRIO_ALOLAN": { + "DUGTRIO_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "MEOWTH_ALOLAN": { + "MEOWTH_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "PERSIAN_ALOLAN": { + "PERSIAN_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "GEODUDE_ALOLAN": { + "GEODUDE_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -16903,7 +16903,7 @@ "MOVE_THUNDER_PUNCH" ] }, - "GRAVELER_ALOLAN": { + "GRAVELER_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -16958,7 +16958,7 @@ "MOVE_THUNDER_PUNCH" ] }, - "GOLEM_ALOLAN": { + "GOLEM_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -17020,42 +17020,42 @@ "MOVE_THUNDER_PUNCH" ] }, - "GRIMER_ALOLAN": { + "GRIMER_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "MUK_ALOLAN": { + "MUK_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "EXEGGUTOR_ALOLAN": { + "EXEGGUTOR_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "MAROWAK_ALOLAN": { + "MAROWAK_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "MEOWTH_GALARIAN": { + "MEOWTH_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "PONYTA_GALARIAN": { + "PONYTA_GALAR": { "LevelMoves": [ { "Level": 1, @@ -17103,7 +17103,7 @@ "MOVE_WILD_CHARGE" ] }, - "RAPIDASH_GALARIAN": { + "RAPIDASH_GALAR": { "LevelMoves": [ { "Level": 1, @@ -17155,105 +17155,105 @@ "MOVE_WILD_CHARGE" ] }, - "SLOWPOKE_GALARIAN": { + "SLOWPOKE_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "SLOWBRO_GALARIAN": { + "SLOWBRO_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "FARFETCHD_GALARIAN": { + "FARFETCHD_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "WEEZING_GALARIAN": { + "WEEZING_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "ARTICUNO_GALARIAN": { + "ARTICUNO_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "ZAPDOS_GALARIAN": { + "ZAPDOS_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "MOLTRES_GALARIAN": { + "MOLTRES_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "SLOWKING_GALARIAN": { + "SLOWKING_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "CORSOLA_GALARIAN": { + "CORSOLA_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "ZIGZAGOON_GALARIAN": { + "ZIGZAGOON_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "LINOONE_GALARIAN": { + "LINOONE_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "DARUMAKA_GALARIAN": { + "DARUMAKA_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "DARMANITAN_GALARIAN": { + "DARMANITAN_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "YAMASK_GALARIAN": { + "YAMASK_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "STUNFISK_GALARIAN": { + "STUNFISK_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], @@ -17281,7 +17281,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 1, @@ -17326,7 +17326,7 @@ "MOVE_STEALTH_ROCK" ] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 1, @@ -17661,14 +17661,14 @@ "EggMoves": [], "TutorMoves": [] }, - "FLOETTE_ETERNAL_FLOWER": { + "FLOETTE_ETERNAL": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "MEOWSTIC_FEMALE": { + "MEOWSTIC_F": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], @@ -17703,35 +17703,35 @@ "EggMoves": [], "TutorMoves": [] }, - "INDEEDEE_FEMALE": { + "INDEEDEE_F": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "URSHIFU_RAPID_STRIKE_STYLE": { + "URSHIFU_RAPID_STRIKE": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "CALYREX_ICE_RIDER": { + "CALYREX_ICE": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "CALYREX_SHADOW_RIDER": { + "CALYREX_SHADOW": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "GROWLITHE_HISUIAN": { + "GROWLITHE_HISUI": { "LevelMoves": [ { "Level": 1, @@ -17784,7 +17784,7 @@ "MOVE_WILD_CHARGE" ] }, - "ARCANINE_HISUIAN": { + "ARCANINE_HISUI": { "LevelMoves": [ { "Level": 1, @@ -17847,7 +17847,7 @@ "MOVE_WILD_CHARGE" ] }, - "VOLTORB_HISUIAN": { + "VOLTORB_HISUI": { "LevelMoves": [ { "Level": 1, @@ -17896,7 +17896,7 @@ "MOVE_WILD_CHARGE" ] }, - "ELECTRODE_HISUIAN": { + "ELECTRODE_HISUI": { "LevelMoves": [ { "Level": 1, @@ -17951,7 +17951,7 @@ "MOVE_WILD_CHARGE" ] }, - "TYPHLOSION_HISUIAN": { + "TYPHLOSION_HISUI": { "LevelMoves": [ { "Level": 0, @@ -18019,7 +18019,7 @@ "MOVE_WILD_CHARGE" ] }, - "QWILFISH_HISUIAN": { + "QWILFISH_HISUI": { "LevelMoves": [ { "Level": 1, @@ -18080,7 +18080,7 @@ "MOVE_WATER_PULSE" ] }, - "SNEASEL_HISUIAN": { + "SNEASEL_HISUI": { "LevelMoves": [ { "Level": 1, @@ -18132,7 +18132,7 @@ "MOVE_X_SCISSOR" ] }, - "SAMUROTT_HISUIAN": { + "SAMUROTT_HISUI": { "LevelMoves": [ { "Level": 0, @@ -18198,7 +18198,7 @@ "MOVE_X_SCISSOR" ] }, - "LILLIGANT_HISUIAN": { + "LILLIGANT_HISUI": { "LevelMoves": [ { "Level": 0, @@ -18318,7 +18318,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "ZORUA_HISUIAN": { + "ZORUA_HISUI": { "LevelMoves": [ { "Level": 1, @@ -18364,7 +18364,7 @@ "MOVE_SWIFT" ] }, - "ZOROARK_HISUIAN": { + "ZOROARK_HISUI": { "LevelMoves": [ { "Level": 1, @@ -18423,7 +18423,7 @@ "MOVE_SWIFT" ] }, - "BRAVIARY_HISUIAN": { + "BRAVIARY_HISUI": { "LevelMoves": [ { "Level": 1, @@ -18487,7 +18487,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "SLIGGOO_HISUIAN": { + "SLIGGOO_HISUI": { "LevelMoves": [ { "Level": 1, @@ -18539,7 +18539,7 @@ "MOVE_WATER_PULSE" ] }, - "GOODRA_HISUIAN": { + "GOODRA_HISUI": { "LevelMoves": [ { "Level": 1, @@ -18598,7 +18598,7 @@ "MOVE_WATER_PULSE" ] }, - "AVALUGG_HISUIAN": { + "AVALUGG_HISUI": { "LevelMoves": [ { "Level": 0, @@ -18669,7 +18669,7 @@ "MOVE_WATER_PULSE" ] }, - "DECIDUEYE_HISUIAN": { + "DECIDUEYE_HISUI": { "LevelMoves": [ { "Level": 0, diff --git a/tools/learnset_helpers/porymoves_files/lgpe.json b/tools/learnset_helpers/porymoves_files/lgpe.json index 9cb68528bc..f94ef03c94 100644 --- a/tools/learnset_helpers/porymoves_files/lgpe.json +++ b/tools/learnset_helpers/porymoves_files/lgpe.json @@ -11337,7 +11337,7 @@ "EggMoves": [], "TutorMoves": [] }, - "RATTATA_ALOLAN": { + "RATTATA_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -11401,7 +11401,7 @@ "EggMoves": [], "TutorMoves": [] }, - "RATICATE_ALOLAN": { + "RATICATE_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -11491,7 +11491,7 @@ "EggMoves": [], "TutorMoves": [] }, - "RAICHU_ALOLAN": { + "RAICHU_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -11554,7 +11554,7 @@ "EggMoves": [], "TutorMoves": [] }, - "SANDSHREW_ALOLAN": { + "SANDSHREW_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -11625,7 +11625,7 @@ "EggMoves": [], "TutorMoves": [] }, - "SANDSLASH_ALOLAN": { + "SANDSLASH_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -11674,7 +11674,7 @@ "EggMoves": [], "TutorMoves": [] }, - "VULPIX_ALOLAN": { + "VULPIX_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -11737,7 +11737,7 @@ "EggMoves": [], "TutorMoves": [] }, - "NINETALES_ALOLAN": { + "NINETALES_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -11787,7 +11787,7 @@ "EggMoves": [], "TutorMoves": [] }, - "DIGLETT_ALOLAN": { + "DIGLETT_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -11848,7 +11848,7 @@ "EggMoves": [], "TutorMoves": [] }, - "DUGTRIO_ALOLAN": { + "DUGTRIO_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -11935,7 +11935,7 @@ "EggMoves": [], "TutorMoves": [] }, - "MEOWTH_ALOLAN": { + "MEOWTH_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -12017,7 +12017,7 @@ "EggMoves": [], "TutorMoves": [] }, - "PERSIAN_ALOLAN": { + "PERSIAN_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -12116,7 +12116,7 @@ "EggMoves": [], "TutorMoves": [] }, - "GEODUDE_ALOLAN": { + "GEODUDE_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -12194,7 +12194,7 @@ "EggMoves": [], "TutorMoves": [] }, - "GRAVELER_ALOLAN": { + "GRAVELER_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -12280,7 +12280,7 @@ "EggMoves": [], "TutorMoves": [] }, - "GOLEM_ALOLAN": { + "GOLEM_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -12371,7 +12371,7 @@ "EggMoves": [], "TutorMoves": [] }, - "GRIMER_ALOLAN": { + "GRIMER_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -12440,7 +12440,7 @@ "EggMoves": [], "TutorMoves": [] }, - "MUK_ALOLAN": { + "MUK_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -12529,7 +12529,7 @@ "EggMoves": [], "TutorMoves": [] }, - "EXEGGUTOR_ALOLAN": { + "EXEGGUTOR_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -12594,7 +12594,7 @@ "EggMoves": [], "TutorMoves": [] }, - "MAROWAK_ALOLAN": { + "MAROWAK_ALOLA": { "LevelMoves": [ { "Level": 0, diff --git a/tools/learnset_helpers/porymoves_files/oras.json b/tools/learnset_helpers/porymoves_files/oras.json index e61d499654..11a737628e 100644 --- a/tools/learnset_helpers/porymoves_files/oras.json +++ b/tools/learnset_helpers/porymoves_files/oras.json @@ -88631,7 +88631,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "MEOWSTIC_MALE": { + "MEOWSTIC_M": { "LevelMoves": [ { "Level": 1, @@ -94735,7 +94735,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 1, @@ -94840,7 +94840,7 @@ "MOVE_UPROAR" ] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 1, @@ -95859,7 +95859,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "FLOETTE_ETERNAL_FLOWER": { + "FLOETTE_ETERNAL": { "LevelMoves": [ { "Level": 1, @@ -95967,7 +95967,7 @@ "MOVE_WORRY_SEED" ] }, - "MEOWSTIC_FEMALE": { + "MEOWSTIC_F": { "LevelMoves": [ { "Level": 1, diff --git a/tools/learnset_helpers/porymoves_files/pt.json b/tools/learnset_helpers/porymoves_files/pt.json index f230c7ead2..e969777fa6 100644 --- a/tools/learnset_helpers/porymoves_files/pt.json +++ b/tools/learnset_helpers/porymoves_files/pt.json @@ -58146,7 +58146,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 1, @@ -58248,7 +58248,7 @@ "MOVE_UPROAR" ] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 1, diff --git a/tools/learnset_helpers/porymoves_files/sm.json b/tools/learnset_helpers/porymoves_files/sm.json index c1fd671b7e..65255a69fa 100644 --- a/tools/learnset_helpers/porymoves_files/sm.json +++ b/tools/learnset_helpers/porymoves_files/sm.json @@ -79371,7 +79371,7 @@ ], "TutorMoves": [] }, - "MEOWSTIC_MALE": { + "MEOWSTIC_M": { "LevelMoves": [ { "Level": 1, @@ -93399,7 +93399,7 @@ "EggMoves": [], "TutorMoves": [] }, - "RATTATA_ALOLAN": { + "RATTATA_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -93502,7 +93502,7 @@ ], "TutorMoves": [] }, - "RATICATE_ALOLAN": { + "RATICATE_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -93632,7 +93632,7 @@ ], "TutorMoves": [] }, - "RAICHU_ALOLAN": { + "RAICHU_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -93741,7 +93741,7 @@ ], "TutorMoves": [] }, - "SANDSHREW_ALOLAN": { + "SANDSHREW_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -93864,7 +93864,7 @@ ], "TutorMoves": [] }, - "SANDSLASH_ALOLAN": { + "SANDSLASH_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -93968,7 +93968,7 @@ ], "TutorMoves": [] }, - "VULPIX_ALOLAN": { + "VULPIX_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -94097,7 +94097,7 @@ ], "TutorMoves": [] }, - "NINETALES_ALOLAN": { + "NINETALES_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -94200,7 +94200,7 @@ ], "TutorMoves": [] }, - "DIGLETT_ALOLAN": { + "DIGLETT_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -94304,7 +94304,7 @@ ], "TutorMoves": [] }, - "DUGTRIO_ALOLAN": { + "DUGTRIO_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -94436,7 +94436,7 @@ ], "TutorMoves": [] }, - "MEOWTH_ALOLAN": { + "MEOWTH_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -94555,7 +94555,7 @@ ], "TutorMoves": [] }, - "PERSIAN_ALOLAN": { + "PERSIAN_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -94708,7 +94708,7 @@ ], "TutorMoves": [] }, - "GEODUDE_ALOLAN": { + "GEODUDE_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -94827,7 +94827,7 @@ ], "TutorMoves": [] }, - "GRAVELER_ALOLAN": { + "GRAVELER_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -94954,7 +94954,7 @@ ], "TutorMoves": [] }, - "GOLEM_ALOLAN": { + "GOLEM_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -95097,7 +95097,7 @@ ], "TutorMoves": [] }, - "GRIMER_ALOLAN": { + "GRIMER_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -95221,7 +95221,7 @@ ], "TutorMoves": [] }, - "MUK_ALOLAN": { + "MUK_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -95366,7 +95366,7 @@ ], "TutorMoves": [] }, - "EXEGGUTOR_ALOLAN": { + "EXEGGUTOR_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -95484,7 +95484,7 @@ "MOVE_DRACO_METEOR" ] }, - "MAROWAK_ALOLAN": { + "MAROWAK_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -95978,7 +95978,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 0, @@ -96093,7 +96093,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 0, @@ -97019,7 +97019,7 @@ "MOVE_DRACO_METEOR" ] }, - "FLOETTE_ETERNAL_FLOWER": { + "FLOETTE_ETERNAL": { "LevelMoves": [ { "Level": 1, @@ -97117,7 +97117,7 @@ ], "TutorMoves": [] }, - "MEOWSTIC_FEMALE": { + "MEOWSTIC_F": { "LevelMoves": [ { "Level": 1, diff --git a/tools/learnset_helpers/porymoves_files/sv.json b/tools/learnset_helpers/porymoves_files/sv.json index 035fc16998..04bc72f9e6 100644 --- a/tools/learnset_helpers/porymoves_files/sv.json +++ b/tools/learnset_helpers/porymoves_files/sv.json @@ -58132,7 +58132,7 @@ ], "TutorMoves": [] }, - "MEOWSTIC_MALE": { + "MEOWSTIC_M": { "LevelMoves": [ { "Level": 1, @@ -72171,7 +72171,7 @@ ], "TutorMoves": [] }, - "INDEEDEE_MALE": { + "INDEEDEE_M": { "LevelMoves": [ { "Level": 1, @@ -73494,7 +73494,7 @@ "EggMoves": [], "TutorMoves": [] }, - "URSHIFU_SINGLE_STRIKE_STYLE": { + "URSHIFU_SINGLE_STRIKE": { "LevelMoves": [ { "Level": 0, @@ -89091,21 +89091,21 @@ "EggMoves": [], "TutorMoves": [] }, - "RATTATA_ALOLAN": { + "RATTATA_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "RATICATE_ALOLAN": { + "RATICATE_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "RAICHU_ALOLAN": { + "RAICHU_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -89263,7 +89263,7 @@ ], "TutorMoves": [] }, - "SANDSHREW_ALOLAN": { + "SANDSHREW_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -89398,7 +89398,7 @@ ], "TutorMoves": [] }, - "SANDSLASH_ALOLAN": { + "SANDSLASH_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -89568,7 +89568,7 @@ ], "TutorMoves": [] }, - "VULPIX_ALOLAN": { + "VULPIX_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -89687,7 +89687,7 @@ ], "TutorMoves": [] }, - "NINETALES_ALOLAN": { + "NINETALES_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -89833,7 +89833,7 @@ ], "TutorMoves": [] }, - "DIGLETT_ALOLAN": { + "DIGLETT_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -89944,7 +89944,7 @@ ], "TutorMoves": [] }, - "DUGTRIO_ALOLAN": { + "DUGTRIO_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -90075,7 +90075,7 @@ ], "TutorMoves": [] }, - "MEOWTH_ALOLAN": { + "MEOWTH_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -90192,7 +90192,7 @@ ], "TutorMoves": [] }, - "PERSIAN_ALOLAN": { + "PERSIAN_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -90327,7 +90327,7 @@ ], "TutorMoves": [] }, - "GEODUDE_ALOLAN": { + "GEODUDE_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -90453,7 +90453,7 @@ ], "TutorMoves": [] }, - "GRAVELER_ALOLAN": { + "GRAVELER_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -90585,7 +90585,7 @@ ], "TutorMoves": [] }, - "GOLEM_ALOLAN": { + "GOLEM_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -90723,7 +90723,7 @@ ], "TutorMoves": [] }, - "GRIMER_ALOLAN": { + "GRIMER_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -90862,7 +90862,7 @@ ], "TutorMoves": [] }, - "MUK_ALOLAN": { + "MUK_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -91005,7 +91005,7 @@ ], "TutorMoves": [] }, - "EXEGGUTOR_ALOLAN": { + "EXEGGUTOR_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -91150,14 +91150,14 @@ "EggMoves": [], "TutorMoves": [] }, - "MAROWAK_ALOLAN": { + "MAROWAK_ALOLA": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "MEOWTH_GALARIAN": { + "MEOWTH_GALAR": { "LevelMoves": [ { "Level": 1, @@ -91279,21 +91279,21 @@ ], "TutorMoves": [] }, - "PONYTA_GALARIAN": { + "PONYTA_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "RAPIDASH_GALARIAN": { + "RAPIDASH_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "SLOWPOKE_GALARIAN": { + "SLOWPOKE_GALAR": { "LevelMoves": [ { "Level": 1, @@ -91427,7 +91427,7 @@ ], "TutorMoves": [] }, - "SLOWBRO_GALARIAN": { + "SLOWBRO_GALAR": { "LevelMoves": [ { "Level": 0, @@ -91596,14 +91596,14 @@ ], "TutorMoves": [] }, - "FARFETCHD_GALARIAN": { + "FARFETCHD_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "WEEZING_GALARIAN": { + "WEEZING_GALAR": { "LevelMoves": [ { "Level": 0, @@ -91750,7 +91750,7 @@ ], "TutorMoves": [] }, - "ARTICUNO_GALARIAN": { + "ARTICUNO_GALAR": { "LevelMoves": [ { "Level": 1, @@ -91860,7 +91860,7 @@ "EggMoves": [], "TutorMoves": [] }, - "ZAPDOS_GALARIAN": { + "ZAPDOS_GALAR": { "LevelMoves": [ { "Level": 1, @@ -91973,7 +91973,7 @@ "EggMoves": [], "TutorMoves": [] }, - "MOLTRES_GALARIAN": { + "MOLTRES_GALAR": { "LevelMoves": [ { "Level": 1, @@ -92085,7 +92085,7 @@ "EggMoves": [], "TutorMoves": [] }, - "SLOWKING_GALARIAN": { + "SLOWKING_GALAR": { "LevelMoves": [ { "Level": 0, @@ -92280,56 +92280,56 @@ ], "TutorMoves": [] }, - "CORSOLA_GALARIAN": { + "CORSOLA_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "ZIGZAGOON_GALARIAN": { + "ZIGZAGOON_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "LINOONE_GALARIAN": { + "LINOONE_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "DARUMAKA_GALARIAN": { + "DARUMAKA_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "DARMANITAN_GALARIAN": { + "DARMANITAN_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "YAMASK_GALARIAN": { + "YAMASK_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "STUNFISK_GALARIAN": { + "STUNFISK_GALAR": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "GROWLITHE_HISUIAN": { + "GROWLITHE_HISUI": { "LevelMoves": [ { "Level": 1, @@ -92448,7 +92448,7 @@ ], "TutorMoves": [] }, - "ARCANINE_HISUIAN": { + "ARCANINE_HISUI": { "LevelMoves": [ { "Level": 0, @@ -92594,7 +92594,7 @@ ], "TutorMoves": [] }, - "VOLTORB_HISUIAN": { + "VOLTORB_HISUI": { "LevelMoves": [ { "Level": 1, @@ -92711,7 +92711,7 @@ ], "TutorMoves": [] }, - "ELECTRODE_HISUIAN": { + "ELECTRODE_HISUI": { "LevelMoves": [ { "Level": 0, @@ -92837,7 +92837,7 @@ ], "TutorMoves": [] }, - "TYPHLOSION_HISUIAN": { + "TYPHLOSION_HISUI": { "LevelMoves": [ { "Level": 0, @@ -92982,7 +92982,7 @@ ], "TutorMoves": [] }, - "QWILFISH_HISUIAN": { + "QWILFISH_HISUI": { "LevelMoves": [ { "Level": 1, @@ -93118,7 +93118,7 @@ ], "TutorMoves": [] }, - "SNEASEL_HISUIAN": { + "SNEASEL_HISUI": { "LevelMoves": [ { "Level": 1, @@ -93237,7 +93237,7 @@ ], "TutorMoves": [] }, - "SAMUROTT_HISUIAN": { + "SAMUROTT_HISUI": { "LevelMoves": [ { "Level": 0, @@ -93379,7 +93379,7 @@ ], "TutorMoves": [] }, - "LILLIGANT_HISUIAN": { + "LILLIGANT_HISUI": { "LevelMoves": [ { "Level": 0, @@ -93642,7 +93642,7 @@ ], "TutorMoves": [] }, - "ZORUA_HISUIAN": { + "ZORUA_HISUI": { "LevelMoves": [ { "Level": 1, @@ -93754,7 +93754,7 @@ ], "TutorMoves": [] }, - "ZOROARK_HISUIAN": { + "ZOROARK_HISUI": { "LevelMoves": [ { "Level": 0, @@ -93894,7 +93894,7 @@ ], "TutorMoves": [] }, - "BRAVIARY_HISUIAN": { + "BRAVIARY_HISUI": { "LevelMoves": [ { "Level": 0, @@ -94030,7 +94030,7 @@ ], "TutorMoves": [] }, - "SLIGGOO_HISUIAN": { + "SLIGGOO_HISUI": { "LevelMoves": [ { "Level": 0, @@ -94135,7 +94135,7 @@ ], "TutorMoves": [] }, - "GOODRA_HISUIAN": { + "GOODRA_HISUI": { "LevelMoves": [ { "Level": 0, @@ -94280,7 +94280,7 @@ ], "TutorMoves": [] }, - "AVALUGG_HISUIAN": { + "AVALUGG_HISUI": { "LevelMoves": [ { "Level": 0, @@ -94416,7 +94416,7 @@ ], "TutorMoves": [] }, - "DECIDUEYE_HISUIAN": { + "DECIDUEYE_HISUI": { "LevelMoves": [ { "Level": 0, @@ -94555,7 +94555,7 @@ ], "TutorMoves": [] }, - "TAUROS_PALDEAN_COMBAT_BREED": { + "TAUROS_PALDEA_COMBAT": { "LevelMoves": [ { "Level": 1, @@ -94664,7 +94664,7 @@ ], "TutorMoves": [] }, - "TAUROS_PALDEAN_BLAZE_BREED": { + "TAUROS_PALDEA_BLAZE": { "LevelMoves": [ { "Level": 1, @@ -94779,7 +94779,7 @@ ], "TutorMoves": [] }, - "TAUROS_PALDEAN_AQUA_BREED": { + "TAUROS_PALDEA_AQUA": { "LevelMoves": [ { "Level": 1, @@ -94891,7 +94891,7 @@ ], "TutorMoves": [] }, - "WOOPER_PALDEAN": { + "WOOPER_PALDEA": { "LevelMoves": [ { "Level": 1, @@ -95417,14 +95417,14 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [], "PreEvoMoves": [], "TMMoves": [], @@ -96274,7 +96274,7 @@ "EggMoves": [], "TutorMoves": [] }, - "FLOETTE_ETERNAL_FLOWER": { + "FLOETTE_ETERNAL": { "LevelMoves": [ { "Level": 1, @@ -96381,7 +96381,7 @@ ], "TutorMoves": [] }, - "MEOWSTIC_FEMALE": { + "MEOWSTIC_F": { "LevelMoves": [ { "Level": 1, @@ -97091,7 +97091,7 @@ ], "TutorMoves": [] }, - "INDEEDEE_FEMALE": { + "INDEEDEE_F": { "LevelMoves": [ { "Level": 1, @@ -97190,7 +97190,7 @@ ], "TutorMoves": [] }, - "URSHIFU_RAPID_STRIKE_STYLE": { + "URSHIFU_RAPID_STRIKE": { "LevelMoves": [ { "Level": 0, @@ -97318,7 +97318,7 @@ "EggMoves": [], "TutorMoves": [] }, - "CALYREX_ICE_RIDER": { + "CALYREX_ICE": { "LevelMoves": [ { "Level": 1, @@ -97525,7 +97525,7 @@ "EggMoves": [], "TutorMoves": [] }, - "CALYREX_SHADOW_RIDER": { + "CALYREX_SHADOW": { "LevelMoves": [ { "Level": 1, @@ -97873,7 +97873,7 @@ ], "TutorMoves": [] }, - "OINKOLOGNE_MALE": { + "OINKOLOGNE_M": { "LevelMoves": [ { "Level": 1, @@ -97941,7 +97941,7 @@ "EggMoves": [], "TutorMoves": [] }, - "OINKOLOGNE_FEMALE": { + "OINKOLOGNE_F": { "LevelMoves": [ { "Level": 1, diff --git a/tools/learnset_helpers/porymoves_files/swsh.json b/tools/learnset_helpers/porymoves_files/swsh.json index 7d344777f0..cf32f3d552 100644 --- a/tools/learnset_helpers/porymoves_files/swsh.json +++ b/tools/learnset_helpers/porymoves_files/swsh.json @@ -54679,7 +54679,7 @@ "MOVE_EXPANDING_FORCE" ] }, - "MEOWSTIC_MALE": { + "MEOWSTIC_M": { "LevelMoves": [ { "Level": 1, @@ -75050,7 +75050,7 @@ ], "TutorMoves": [] }, - "INDEEDEE_MALE": { + "INDEEDEE_M": { "LevelMoves": [ { "Level": 1, @@ -76790,7 +76790,7 @@ "MOVE_COACHING" ] }, - "URSHIFU_SINGLE_STRIKE_STYLE": { + "URSHIFU_SINGLE_STRIKE": { "LevelMoves": [ { "Level": 0, @@ -77588,7 +77588,7 @@ "MOVE_EXPANDING_FORCE" ] }, - "RAICHU_ALOLAN": { + "RAICHU_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -77747,7 +77747,7 @@ ], "TutorMoves": [] }, - "SANDSHREW_ALOLAN": { + "SANDSHREW_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -77873,7 +77873,7 @@ "MOVE_STEEL_BEAM" ] }, - "SANDSLASH_ALOLAN": { + "SANDSLASH_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -78022,7 +78022,7 @@ "MOVE_STEEL_BEAM" ] }, - "VULPIX_ALOLAN": { + "VULPIX_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -78135,7 +78135,7 @@ ], "TutorMoves": [] }, - "NINETALES_ALOLAN": { + "NINETALES_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -78272,7 +78272,7 @@ ], "TutorMoves": [] }, - "DIGLETT_ALOLAN": { + "DIGLETT_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -78376,7 +78376,7 @@ "MOVE_STEEL_BEAM" ] }, - "DUGTRIO_ALOLAN": { + "DUGTRIO_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -78503,7 +78503,7 @@ "MOVE_STEEL_BEAM" ] }, - "MEOWTH_ALOLAN": { + "MEOWTH_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -78611,7 +78611,7 @@ ], "TutorMoves": [] }, - "PERSIAN_ALOLAN": { + "PERSIAN_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -78741,7 +78741,7 @@ ], "TutorMoves": [] }, - "EXEGGUTOR_ALOLAN": { + "EXEGGUTOR_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -78885,7 +78885,7 @@ "MOVE_DRACO_METEOR" ] }, - "MAROWAK_ALOLAN": { + "MAROWAK_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -79045,7 +79045,7 @@ ], "TutorMoves": [] }, - "MEOWTH_GALARIAN": { + "MEOWTH_GALAR": { "LevelMoves": [ { "Level": 1, @@ -79158,7 +79158,7 @@ "MOVE_LASH_OUT" ] }, - "PONYTA_GALARIAN": { + "PONYTA_GALAR": { "LevelMoves": [ { "Level": 1, @@ -79256,7 +79256,7 @@ "MOVE_EXPANDING_FORCE" ] }, - "RAPIDASH_GALARIAN": { + "RAPIDASH_GALAR": { "LevelMoves": [ { "Level": 0, @@ -79385,7 +79385,7 @@ "MOVE_EXPANDING_FORCE" ] }, - "SLOWPOKE_GALARIAN": { + "SLOWPOKE_GALAR": { "LevelMoves": [ { "Level": 1, @@ -79522,7 +79522,7 @@ "MOVE_EXPANDING_FORCE" ] }, - "SLOWBRO_GALARIAN": { + "SLOWBRO_GALAR": { "LevelMoves": [ { "Level": 0, @@ -79690,7 +79690,7 @@ "MOVE_EXPANDING_FORCE" ] }, - "FARFETCHD_GALARIAN": { + "FARFETCHD_GALAR": { "LevelMoves": [ { "Level": 1, @@ -79801,7 +79801,7 @@ "MOVE_DUAL_WINGBEAT" ] }, - "WEEZING_GALARIAN": { + "WEEZING_GALAR": { "LevelMoves": [ { "Level": 0, @@ -79958,7 +79958,7 @@ "MOVE_MISTY_EXPLOSION" ] }, - "MR_MIME_GALARIAN": { + "MR_MIME_GALAR": { "LevelMoves": [ { "Level": 1, @@ -80147,7 +80147,7 @@ "MOVE_TRIPLE_AXEL" ] }, - "ARTICUNO_GALARIAN": { + "ARTICUNO_GALAR": { "LevelMoves": [ { "Level": 1, @@ -80258,7 +80258,7 @@ "MOVE_EXPANDING_FORCE" ] }, - "ZAPDOS_GALARIAN": { + "ZAPDOS_GALAR": { "LevelMoves": [ { "Level": 1, @@ -80373,7 +80373,7 @@ "MOVE_COACHING" ] }, - "MOLTRES_GALARIAN": { + "MOLTRES_GALAR": { "LevelMoves": [ { "Level": 1, @@ -80480,7 +80480,7 @@ "MOVE_LASH_OUT" ] }, - "SLOWKING_GALARIAN": { + "SLOWKING_GALAR": { "LevelMoves": [ { "Level": 0, @@ -80657,7 +80657,7 @@ "MOVE_EXPANDING_FORCE" ] }, - "CORSOLA_GALARIAN": { + "CORSOLA_GALAR": { "LevelMoves": [ { "Level": 1, @@ -80776,7 +80776,7 @@ "MOVE_METEOR_BEAM" ] }, - "ZIGZAGOON_GALARIAN": { + "ZIGZAGOON_GALAR": { "LevelMoves": [ { "Level": 1, @@ -80890,7 +80890,7 @@ "MOVE_LASH_OUT" ] }, - "LINOONE_GALARIAN": { + "LINOONE_GALAR": { "LevelMoves": [ { "Level": 0, @@ -81030,7 +81030,7 @@ "MOVE_LASH_OUT" ] }, - "DARUMAKA_GALARIAN": { + "DARUMAKA_GALAR": { "LevelMoves": [ { "Level": 1, @@ -81147,7 +81147,7 @@ ], "TutorMoves": [] }, - "DARMANITAN_GALARIAN": { + "DARMANITAN_GALAR": { "LevelMoves": [ { "Level": 0, @@ -81289,7 +81289,7 @@ "MOVE_LASH_OUT" ] }, - "YAMASK_GALARIAN": { + "YAMASK_GALAR": { "LevelMoves": [ { "Level": 1, @@ -81403,7 +81403,7 @@ "MOVE_POLTERGEIST" ] }, - "STUNFISK_GALARIAN": { + "STUNFISK_GALAR": { "LevelMoves": [ { "Level": 1, @@ -82254,7 +82254,7 @@ "MOVE_SCALE_SHOT" ] }, - "MEOWSTIC_FEMALE": { + "MEOWSTIC_F": { "LevelMoves": [ { "Level": 1, @@ -82839,7 +82839,7 @@ "MOVE_RISING_VOLTAGE" ] }, - "INDEEDEE_FEMALE": { + "INDEEDEE_F": { "LevelMoves": [ { "Level": 1, @@ -82945,7 +82945,7 @@ "MOVE_EXPANDING_FORCE" ] }, - "URSHIFU_RAPID_STRIKE_STYLE": { + "URSHIFU_RAPID_STRIKE": { "LevelMoves": [ { "Level": 0, @@ -83081,7 +83081,7 @@ "MOVE_COACHING" ] }, - "CALYREX_ICE_RIDER": { + "CALYREX_ICE": { "LevelMoves": [ { "Level": 1, @@ -83292,7 +83292,7 @@ "MOVE_LASH_OUT" ] }, - "CALYREX_SHADOW_RIDER": { + "CALYREX_SHADOW": { "LevelMoves": [ { "Level": 1, diff --git a/tools/learnset_helpers/porymoves_files/usum.json b/tools/learnset_helpers/porymoves_files/usum.json index a659a4261c..ed4cfb69e0 100644 --- a/tools/learnset_helpers/porymoves_files/usum.json +++ b/tools/learnset_helpers/porymoves_files/usum.json @@ -88196,7 +88196,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "MEOWSTIC_MALE": { + "MEOWSTIC_M": { "LevelMoves": [ { "Level": 1, @@ -104427,7 +104427,7 @@ "MOVE_THUNDER_PUNCH" ] }, - "RATTATA_ALOLAN": { + "RATTATA_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -104542,7 +104542,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "RATICATE_ALOLAN": { + "RATICATE_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -104687,7 +104687,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "RAICHU_ALOLAN": { + "RAICHU_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -104815,7 +104815,7 @@ "MOVE_THUNDER_PUNCH" ] }, - "SANDSHREW_ALOLAN": { + "SANDSHREW_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -104953,7 +104953,7 @@ "MOVE_THROAT_CHOP" ] }, - "SANDSLASH_ALOLAN": { + "SANDSLASH_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -105073,7 +105073,7 @@ "MOVE_THROAT_CHOP" ] }, - "VULPIX_ALOLAN": { + "VULPIX_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -105214,7 +105214,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "NINETALES_ALOLAN": { + "NINETALES_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -105331,7 +105331,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "DIGLETT_ALOLAN": { + "DIGLETT_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -105442,7 +105442,7 @@ "MOVE_STOMPING_TANTRUM" ] }, - "DUGTRIO_ALOLAN": { + "DUGTRIO_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -105581,7 +105581,7 @@ "MOVE_STOMPING_TANTRUM" ] }, - "MEOWTH_ALOLAN": { + "MEOWTH_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -105717,7 +105717,7 @@ "MOVE_WATER_PULSE" ] }, - "PERSIAN_ALOLAN": { + "PERSIAN_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -105887,7 +105887,7 @@ "MOVE_WATER_PULSE" ] }, - "GEODUDE_ALOLAN": { + "GEODUDE_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -106018,7 +106018,7 @@ "MOVE_THUNDER_PUNCH" ] }, - "GRAVELER_ALOLAN": { + "GRAVELER_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -106160,7 +106160,7 @@ "MOVE_THUNDER_PUNCH" ] }, - "GOLEM_ALOLAN": { + "GOLEM_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -106319,7 +106319,7 @@ "MOVE_THUNDER_PUNCH" ] }, - "GRIMER_ALOLAN": { + "GRIMER_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -106456,7 +106456,7 @@ "MOVE_THUNDER_PUNCH" ] }, - "MUK_ALOLAN": { + "MUK_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -106617,7 +106617,7 @@ "MOVE_THUNDER_PUNCH" ] }, - "EXEGGUTOR_ALOLAN": { + "EXEGGUTOR_ALOLA": { "LevelMoves": [ { "Level": 0, @@ -106754,7 +106754,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "MAROWAK_ALOLAN": { + "MAROWAK_ALOLA": { "LevelMoves": [ { "Level": 1, @@ -107351,7 +107351,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 0, @@ -107478,7 +107478,7 @@ "MOVE_UPROAR" ] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 0, @@ -108522,7 +108522,7 @@ "MOVE_ZEN_HEADBUTT" ] }, - "FLOETTE_ETERNAL_FLOWER": { + "FLOETTE_ETERNAL": { "LevelMoves": [ { "Level": 1, @@ -108634,7 +108634,7 @@ "MOVE_WORRY_SEED" ] }, - "MEOWSTIC_FEMALE": { + "MEOWSTIC_F": { "LevelMoves": [ { "Level": 1, diff --git a/tools/learnset_helpers/porymoves_files/xy.json b/tools/learnset_helpers/porymoves_files/xy.json index 5494457f75..8be594e6d7 100644 --- a/tools/learnset_helpers/porymoves_files/xy.json +++ b/tools/learnset_helpers/porymoves_files/xy.json @@ -79310,7 +79310,7 @@ ], "TutorMoves": [] }, - "MEOWSTIC_MALE": { + "MEOWSTIC_M": { "LevelMoves": [ { "Level": 1, @@ -84805,7 +84805,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_SANDY_CLOAK": { + "WORMADAM_SANDY": { "LevelMoves": [ { "Level": 1, @@ -84899,7 +84899,7 @@ "EggMoves": [], "TutorMoves": [] }, - "WORMADAM_TRASH_CLOAK": { + "WORMADAM_TRASH": { "LevelMoves": [ { "Level": 1, @@ -85811,7 +85811,7 @@ "MOVE_DRACO_METEOR" ] }, - "FLOETTE_ETERNAL_FLOWER": { + "FLOETTE_ETERNAL": { "LevelMoves": [ { "Level": 1, @@ -85906,7 +85906,7 @@ ], "TutorMoves": [] }, - "MEOWSTIC_FEMALE": { + "MEOWSTIC_F": { "LevelMoves": [ { "Level": 1,