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 891f0d1b3e..09ae0c691a 100644 Binary files a/graphics/pokemon/pikachu/partner/icon.png and b/graphics/pokemon/pikachu/partner/icon.png differ 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 09ae0c691a..0000000000 Binary files a/graphics/pokemon/pikachu/partner_cap/icon.png and /dev/null differ diff --git a/graphics/pokemon/pikachu/ph_d/back.png b/graphics/pokemon/pikachu/phd/back.png similarity index 100% rename from graphics/pokemon/pikachu/ph_d/back.png rename to graphics/pokemon/pikachu/phd/back.png diff --git a/graphics/pokemon/pikachu/ph_d/front.png b/graphics/pokemon/pikachu/phd/front.png similarity index 100% rename from graphics/pokemon/pikachu/ph_d/front.png rename to graphics/pokemon/pikachu/phd/front.png diff --git a/graphics/pokemon/pikachu/ph_d/icon.png b/graphics/pokemon/pikachu/phd/icon.png similarity index 100% rename from graphics/pokemon/pikachu/ph_d/icon.png rename to graphics/pokemon/pikachu/phd/icon.png diff --git a/graphics/pokemon/pikachu/ph_d/normal.pal b/graphics/pokemon/pikachu/phd/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/ph_d/normal.pal rename to graphics/pokemon/pikachu/phd/normal.pal diff --git a/graphics/pokemon/pikachu/ph_d/shiny.pal b/graphics/pokemon/pikachu/phd/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/ph_d/shiny.pal rename to graphics/pokemon/pikachu/phd/shiny.pal diff --git a/graphics/pokemon/pikachu/sinnoh_cap/back.png b/graphics/pokemon/pikachu/sinnoh/back.png similarity index 100% rename from graphics/pokemon/pikachu/sinnoh_cap/back.png rename to graphics/pokemon/pikachu/sinnoh/back.png diff --git a/graphics/pokemon/pikachu/sinnoh_cap/front.png b/graphics/pokemon/pikachu/sinnoh/front.png similarity index 100% rename from graphics/pokemon/pikachu/sinnoh_cap/front.png rename to graphics/pokemon/pikachu/sinnoh/front.png diff --git a/graphics/pokemon/pikachu/sinnoh_cap/icon.png b/graphics/pokemon/pikachu/sinnoh/icon.png similarity index 100% rename from graphics/pokemon/pikachu/sinnoh_cap/icon.png rename to graphics/pokemon/pikachu/sinnoh/icon.png diff --git a/graphics/pokemon/pikachu/sinnoh_cap/normal.pal b/graphics/pokemon/pikachu/sinnoh/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/sinnoh_cap/normal.pal rename to graphics/pokemon/pikachu/sinnoh/normal.pal diff --git a/graphics/pokemon/pikachu/sinnoh_cap/shiny.pal b/graphics/pokemon/pikachu/sinnoh/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/sinnoh_cap/shiny.pal rename to graphics/pokemon/pikachu/sinnoh/shiny.pal diff --git a/graphics/pokemon/pikachu/starter/icon.png b/graphics/pokemon/pikachu/starter/icon.png new file mode 100644 index 0000000000..891f0d1b3e Binary files /dev/null and b/graphics/pokemon/pikachu/starter/icon.png differ diff --git a/graphics/pokemon/pikachu/partner/iconf.png b/graphics/pokemon/pikachu/starter/iconf.png similarity index 100% rename from graphics/pokemon/pikachu/partner/iconf.png rename to graphics/pokemon/pikachu/starter/iconf.png diff --git a/graphics/pokemon/pikachu/unova_cap/back.png b/graphics/pokemon/pikachu/unova/back.png similarity index 100% rename from graphics/pokemon/pikachu/unova_cap/back.png rename to graphics/pokemon/pikachu/unova/back.png diff --git a/graphics/pokemon/pikachu/unova_cap/front.png b/graphics/pokemon/pikachu/unova/front.png similarity index 100% rename from graphics/pokemon/pikachu/unova_cap/front.png rename to graphics/pokemon/pikachu/unova/front.png diff --git a/graphics/pokemon/pikachu/unova_cap/icon.png b/graphics/pokemon/pikachu/unova/icon.png similarity index 100% rename from graphics/pokemon/pikachu/unova_cap/icon.png rename to graphics/pokemon/pikachu/unova/icon.png diff --git a/graphics/pokemon/pikachu/unova_cap/normal.pal b/graphics/pokemon/pikachu/unova/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/unova_cap/normal.pal rename to graphics/pokemon/pikachu/unova/normal.pal diff --git a/graphics/pokemon/pikachu/unova_cap/shiny.pal b/graphics/pokemon/pikachu/unova/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/unova_cap/shiny.pal rename to graphics/pokemon/pikachu/unova/shiny.pal diff --git a/graphics/pokemon/pikachu/world_cap/back.png b/graphics/pokemon/pikachu/world/back.png similarity index 100% rename from graphics/pokemon/pikachu/world_cap/back.png rename to graphics/pokemon/pikachu/world/back.png diff --git a/graphics/pokemon/pikachu/world_cap/front.png b/graphics/pokemon/pikachu/world/front.png similarity index 100% rename from graphics/pokemon/pikachu/world_cap/front.png rename to graphics/pokemon/pikachu/world/front.png diff --git a/graphics/pokemon/pikachu/world_cap/icon.png b/graphics/pokemon/pikachu/world/icon.png similarity index 100% rename from graphics/pokemon/pikachu/world_cap/icon.png rename to graphics/pokemon/pikachu/world/icon.png diff --git a/graphics/pokemon/pikachu/world_cap/normal.pal b/graphics/pokemon/pikachu/world/normal.pal similarity index 100% rename from graphics/pokemon/pikachu/world_cap/normal.pal rename to graphics/pokemon/pikachu/world/normal.pal diff --git a/graphics/pokemon/pikachu/world_cap/shiny.pal b/graphics/pokemon/pikachu/world/shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/world_cap/shiny.pal rename to graphics/pokemon/pikachu/world/shiny.pal diff --git a/graphics/pokemon/ponyta/galarian/back.png b/graphics/pokemon/ponyta/galar/back.png similarity index 100% rename from graphics/pokemon/ponyta/galarian/back.png rename to graphics/pokemon/ponyta/galar/back.png diff --git a/graphics/pokemon/ponyta/galarian/front.png b/graphics/pokemon/ponyta/galar/front.png similarity index 100% rename from graphics/pokemon/ponyta/galarian/front.png rename to graphics/pokemon/ponyta/galar/front.png diff --git a/graphics/pokemon/ponyta/galarian/icon.png b/graphics/pokemon/ponyta/galar/icon.png similarity index 100% rename from graphics/pokemon/ponyta/galarian/icon.png rename to graphics/pokemon/ponyta/galar/icon.png diff --git a/graphics/pokemon/ponyta/galarian/normal.pal b/graphics/pokemon/ponyta/galar/normal.pal similarity index 100% rename from graphics/pokemon/ponyta/galarian/normal.pal rename to graphics/pokemon/ponyta/galar/normal.pal diff --git a/graphics/pokemon/ponyta/galarian/overworld.png b/graphics/pokemon/ponyta/galar/overworld.png similarity index 100% rename from graphics/pokemon/ponyta/galarian/overworld.png rename to graphics/pokemon/ponyta/galar/overworld.png diff --git a/graphics/pokemon/ponyta/galarian/overworld_normal.pal b/graphics/pokemon/ponyta/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ponyta/galarian/overworld_normal.pal rename to graphics/pokemon/ponyta/galar/overworld_normal.pal diff --git a/graphics/pokemon/ponyta/galarian/overworld_shiny.pal b/graphics/pokemon/ponyta/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ponyta/galarian/overworld_shiny.pal rename to graphics/pokemon/ponyta/galar/overworld_shiny.pal diff --git a/graphics/pokemon/ponyta/galarian/shiny.pal b/graphics/pokemon/ponyta/galar/shiny.pal similarity index 100% rename from graphics/pokemon/ponyta/galarian/shiny.pal rename to graphics/pokemon/ponyta/galar/shiny.pal diff --git a/graphics/pokemon/qwilfish/hisuian/back.png b/graphics/pokemon/qwilfish/hisui/back.png similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/back.png rename to graphics/pokemon/qwilfish/hisui/back.png diff --git a/graphics/pokemon/qwilfish/hisuian/front.png b/graphics/pokemon/qwilfish/hisui/front.png similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/front.png rename to graphics/pokemon/qwilfish/hisui/front.png diff --git a/graphics/pokemon/qwilfish/hisuian/icon.png b/graphics/pokemon/qwilfish/hisui/icon.png similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/icon.png rename to graphics/pokemon/qwilfish/hisui/icon.png diff --git a/graphics/pokemon/qwilfish/hisuian/normal.pal b/graphics/pokemon/qwilfish/hisui/normal.pal similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/normal.pal rename to graphics/pokemon/qwilfish/hisui/normal.pal diff --git a/graphics/pokemon/qwilfish/hisuian/overworld.png b/graphics/pokemon/qwilfish/hisui/overworld.png similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/overworld.png rename to graphics/pokemon/qwilfish/hisui/overworld.png diff --git a/graphics/pokemon/qwilfish/hisuian/overworld_normal.pal b/graphics/pokemon/qwilfish/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/overworld_normal.pal rename to graphics/pokemon/qwilfish/hisui/overworld_normal.pal diff --git a/graphics/pokemon/qwilfish/hisuian/overworld_shiny.pal b/graphics/pokemon/qwilfish/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/overworld_shiny.pal rename to graphics/pokemon/qwilfish/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/qwilfish/hisuian/shiny.pal b/graphics/pokemon/qwilfish/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/shiny.pal rename to graphics/pokemon/qwilfish/hisui/shiny.pal diff --git a/graphics/pokemon/raichu/alolan/back.png b/graphics/pokemon/raichu/alola/back.png similarity index 100% rename from graphics/pokemon/raichu/alolan/back.png rename to graphics/pokemon/raichu/alola/back.png diff --git a/graphics/pokemon/raichu/alolan/front.png b/graphics/pokemon/raichu/alola/front.png similarity index 100% rename from graphics/pokemon/raichu/alolan/front.png rename to graphics/pokemon/raichu/alola/front.png diff --git a/graphics/pokemon/raichu/alolan/icon.png b/graphics/pokemon/raichu/alola/icon.png similarity index 100% rename from graphics/pokemon/raichu/alolan/icon.png rename to graphics/pokemon/raichu/alola/icon.png diff --git a/graphics/pokemon/raichu/alolan/normal.pal b/graphics/pokemon/raichu/alola/normal.pal similarity index 100% rename from graphics/pokemon/raichu/alolan/normal.pal rename to graphics/pokemon/raichu/alola/normal.pal diff --git a/graphics/pokemon/raichu/alolan/overworld.png b/graphics/pokemon/raichu/alola/overworld.png similarity index 100% rename from graphics/pokemon/raichu/alolan/overworld.png rename to graphics/pokemon/raichu/alola/overworld.png diff --git a/graphics/pokemon/raichu/alolan/overworld_normal.pal b/graphics/pokemon/raichu/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/raichu/alolan/overworld_normal.pal rename to graphics/pokemon/raichu/alola/overworld_normal.pal diff --git a/graphics/pokemon/raichu/alolan/overworld_shiny.pal b/graphics/pokemon/raichu/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/raichu/alolan/overworld_shiny.pal rename to graphics/pokemon/raichu/alola/overworld_shiny.pal diff --git a/graphics/pokemon/raichu/alolan/shiny.pal b/graphics/pokemon/raichu/alola/shiny.pal similarity index 100% rename from graphics/pokemon/raichu/alolan/shiny.pal rename to graphics/pokemon/raichu/alola/shiny.pal diff --git a/graphics/pokemon/rapidash/galarian/back.png b/graphics/pokemon/rapidash/galar/back.png similarity index 100% rename from graphics/pokemon/rapidash/galarian/back.png rename to graphics/pokemon/rapidash/galar/back.png diff --git a/graphics/pokemon/rapidash/galarian/front.png b/graphics/pokemon/rapidash/galar/front.png similarity index 100% rename from graphics/pokemon/rapidash/galarian/front.png rename to graphics/pokemon/rapidash/galar/front.png diff --git a/graphics/pokemon/rapidash/galarian/icon.png b/graphics/pokemon/rapidash/galar/icon.png similarity index 100% rename from graphics/pokemon/rapidash/galarian/icon.png rename to graphics/pokemon/rapidash/galar/icon.png diff --git a/graphics/pokemon/rapidash/galarian/normal.pal b/graphics/pokemon/rapidash/galar/normal.pal similarity index 100% rename from graphics/pokemon/rapidash/galarian/normal.pal rename to graphics/pokemon/rapidash/galar/normal.pal diff --git a/graphics/pokemon/rapidash/galarian/overworld.png b/graphics/pokemon/rapidash/galar/overworld.png similarity index 100% rename from graphics/pokemon/rapidash/galarian/overworld.png rename to graphics/pokemon/rapidash/galar/overworld.png diff --git a/graphics/pokemon/rapidash/galarian/overworld_normal.pal b/graphics/pokemon/rapidash/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rapidash/galarian/overworld_normal.pal rename to graphics/pokemon/rapidash/galar/overworld_normal.pal diff --git a/graphics/pokemon/rapidash/galarian/overworld_shiny.pal b/graphics/pokemon/rapidash/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rapidash/galarian/overworld_shiny.pal rename to graphics/pokemon/rapidash/galar/overworld_shiny.pal diff --git a/graphics/pokemon/rapidash/galarian/shiny.pal b/graphics/pokemon/rapidash/galar/shiny.pal similarity index 100% rename from graphics/pokemon/rapidash/galarian/shiny.pal rename to graphics/pokemon/rapidash/galar/shiny.pal diff --git a/graphics/pokemon/raticate/alolan/back.png b/graphics/pokemon/raticate/alola/back.png similarity index 100% rename from graphics/pokemon/raticate/alolan/back.png rename to graphics/pokemon/raticate/alola/back.png diff --git a/graphics/pokemon/raticate/alolan/front.png b/graphics/pokemon/raticate/alola/front.png similarity index 100% rename from graphics/pokemon/raticate/alolan/front.png rename to graphics/pokemon/raticate/alola/front.png diff --git a/graphics/pokemon/raticate/alolan/icon.png b/graphics/pokemon/raticate/alola/icon.png similarity index 100% rename from graphics/pokemon/raticate/alolan/icon.png rename to graphics/pokemon/raticate/alola/icon.png diff --git a/graphics/pokemon/raticate/alolan/normal.pal b/graphics/pokemon/raticate/alola/normal.pal similarity index 100% rename from graphics/pokemon/raticate/alolan/normal.pal rename to graphics/pokemon/raticate/alola/normal.pal diff --git a/graphics/pokemon/raticate/alolan/overworld.png b/graphics/pokemon/raticate/alola/overworld.png similarity index 100% rename from graphics/pokemon/raticate/alolan/overworld.png rename to graphics/pokemon/raticate/alola/overworld.png diff --git a/graphics/pokemon/raticate/alolan/overworld_normal.pal b/graphics/pokemon/raticate/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/raticate/alolan/overworld_normal.pal rename to graphics/pokemon/raticate/alola/overworld_normal.pal diff --git a/graphics/pokemon/raticate/alolan/overworld_shiny.pal b/graphics/pokemon/raticate/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/raticate/alolan/overworld_shiny.pal rename to graphics/pokemon/raticate/alola/overworld_shiny.pal diff --git a/graphics/pokemon/raticate/alolan/shiny.pal b/graphics/pokemon/raticate/alola/shiny.pal similarity index 100% rename from graphics/pokemon/raticate/alolan/shiny.pal rename to graphics/pokemon/raticate/alola/shiny.pal diff --git a/graphics/pokemon/rattata/alolan/back.png b/graphics/pokemon/rattata/alola/back.png similarity index 100% rename from graphics/pokemon/rattata/alolan/back.png rename to graphics/pokemon/rattata/alola/back.png diff --git a/graphics/pokemon/rattata/alolan/front.png b/graphics/pokemon/rattata/alola/front.png similarity index 100% rename from graphics/pokemon/rattata/alolan/front.png rename to graphics/pokemon/rattata/alola/front.png diff --git a/graphics/pokemon/rattata/alolan/icon.png b/graphics/pokemon/rattata/alola/icon.png similarity index 100% rename from graphics/pokemon/rattata/alolan/icon.png rename to graphics/pokemon/rattata/alola/icon.png diff --git a/graphics/pokemon/rattata/alolan/normal.pal b/graphics/pokemon/rattata/alola/normal.pal similarity index 100% rename from graphics/pokemon/rattata/alolan/normal.pal rename to graphics/pokemon/rattata/alola/normal.pal diff --git a/graphics/pokemon/rattata/alolan/overworld.png b/graphics/pokemon/rattata/alola/overworld.png similarity index 100% rename from graphics/pokemon/rattata/alolan/overworld.png rename to graphics/pokemon/rattata/alola/overworld.png diff --git a/graphics/pokemon/rattata/alolan/overworld_normal.pal b/graphics/pokemon/rattata/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rattata/alolan/overworld_normal.pal rename to graphics/pokemon/rattata/alola/overworld_normal.pal diff --git a/graphics/pokemon/rattata/alolan/overworld_shiny.pal b/graphics/pokemon/rattata/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rattata/alolan/overworld_shiny.pal rename to graphics/pokemon/rattata/alola/overworld_shiny.pal diff --git a/graphics/pokemon/rattata/alolan/shiny.pal b/graphics/pokemon/rattata/alola/shiny.pal similarity index 100% rename from graphics/pokemon/rattata/alolan/shiny.pal rename to graphics/pokemon/rattata/alola/shiny.pal diff --git a/graphics/pokemon/rillaboom/gigantamax/back.png b/graphics/pokemon/rillaboom/gmax/back.png similarity index 100% rename from graphics/pokemon/rillaboom/gigantamax/back.png rename to graphics/pokemon/rillaboom/gmax/back.png diff --git a/graphics/pokemon/rillaboom/gigantamax/front.png b/graphics/pokemon/rillaboom/gmax/front.png similarity index 100% rename from graphics/pokemon/rillaboom/gigantamax/front.png rename to graphics/pokemon/rillaboom/gmax/front.png diff --git a/graphics/pokemon/rillaboom/gigantamax/icon.png b/graphics/pokemon/rillaboom/gmax/icon.png similarity index 100% rename from graphics/pokemon/rillaboom/gigantamax/icon.png rename to graphics/pokemon/rillaboom/gmax/icon.png diff --git a/graphics/pokemon/rillaboom/gigantamax/normal.pal b/graphics/pokemon/rillaboom/gmax/normal.pal similarity index 100% rename from graphics/pokemon/rillaboom/gigantamax/normal.pal rename to graphics/pokemon/rillaboom/gmax/normal.pal diff --git a/graphics/pokemon/rillaboom/gigantamax/shiny.pal b/graphics/pokemon/rillaboom/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/rillaboom/gigantamax/shiny.pal rename to graphics/pokemon/rillaboom/gmax/shiny.pal diff --git a/graphics/pokemon/samurott/hisuian/back.png b/graphics/pokemon/samurott/hisui/back.png similarity index 100% rename from graphics/pokemon/samurott/hisuian/back.png rename to graphics/pokemon/samurott/hisui/back.png diff --git a/graphics/pokemon/samurott/hisuian/front.png b/graphics/pokemon/samurott/hisui/front.png similarity index 100% rename from graphics/pokemon/samurott/hisuian/front.png rename to graphics/pokemon/samurott/hisui/front.png diff --git a/graphics/pokemon/samurott/hisuian/icon.png b/graphics/pokemon/samurott/hisui/icon.png similarity index 100% rename from graphics/pokemon/samurott/hisuian/icon.png rename to graphics/pokemon/samurott/hisui/icon.png diff --git a/graphics/pokemon/samurott/hisuian/normal.pal b/graphics/pokemon/samurott/hisui/normal.pal similarity index 100% rename from graphics/pokemon/samurott/hisuian/normal.pal rename to graphics/pokemon/samurott/hisui/normal.pal diff --git a/graphics/pokemon/samurott/hisuian/overworld.png b/graphics/pokemon/samurott/hisui/overworld.png similarity index 100% rename from graphics/pokemon/samurott/hisuian/overworld.png rename to graphics/pokemon/samurott/hisui/overworld.png diff --git a/graphics/pokemon/samurott/hisuian/overworld_normal.pal b/graphics/pokemon/samurott/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/samurott/hisuian/overworld_normal.pal rename to graphics/pokemon/samurott/hisui/overworld_normal.pal diff --git a/graphics/pokemon/samurott/hisuian/overworld_shiny.pal b/graphics/pokemon/samurott/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/samurott/hisuian/overworld_shiny.pal rename to graphics/pokemon/samurott/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/samurott/hisuian/shiny.pal b/graphics/pokemon/samurott/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/samurott/hisuian/shiny.pal rename to graphics/pokemon/samurott/hisui/shiny.pal diff --git a/graphics/pokemon/sandaconda/gigantamax/back.png b/graphics/pokemon/sandaconda/gmax/back.png similarity index 100% rename from graphics/pokemon/sandaconda/gigantamax/back.png rename to graphics/pokemon/sandaconda/gmax/back.png diff --git a/graphics/pokemon/sandaconda/gigantamax/front.png b/graphics/pokemon/sandaconda/gmax/front.png similarity index 100% rename from graphics/pokemon/sandaconda/gigantamax/front.png rename to graphics/pokemon/sandaconda/gmax/front.png diff --git a/graphics/pokemon/sandaconda/gigantamax/icon.png b/graphics/pokemon/sandaconda/gmax/icon.png similarity index 100% rename from graphics/pokemon/sandaconda/gigantamax/icon.png rename to graphics/pokemon/sandaconda/gmax/icon.png diff --git a/graphics/pokemon/sandaconda/gigantamax/normal.pal b/graphics/pokemon/sandaconda/gmax/normal.pal similarity index 100% rename from graphics/pokemon/sandaconda/gigantamax/normal.pal rename to graphics/pokemon/sandaconda/gmax/normal.pal diff --git a/graphics/pokemon/sandaconda/gigantamax/shiny.pal b/graphics/pokemon/sandaconda/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/sandaconda/gigantamax/shiny.pal rename to graphics/pokemon/sandaconda/gmax/shiny.pal diff --git a/graphics/pokemon/sandshrew/alolan/back.png b/graphics/pokemon/sandshrew/alola/back.png similarity index 100% rename from graphics/pokemon/sandshrew/alolan/back.png rename to graphics/pokemon/sandshrew/alola/back.png diff --git a/graphics/pokemon/sandshrew/alolan/front.png b/graphics/pokemon/sandshrew/alola/front.png similarity index 100% rename from graphics/pokemon/sandshrew/alolan/front.png rename to graphics/pokemon/sandshrew/alola/front.png diff --git a/graphics/pokemon/sandshrew/alolan/icon.png b/graphics/pokemon/sandshrew/alola/icon.png similarity index 100% rename from graphics/pokemon/sandshrew/alolan/icon.png rename to graphics/pokemon/sandshrew/alola/icon.png diff --git a/graphics/pokemon/sandshrew/alolan/normal.pal b/graphics/pokemon/sandshrew/alola/normal.pal similarity index 100% rename from graphics/pokemon/sandshrew/alolan/normal.pal rename to graphics/pokemon/sandshrew/alola/normal.pal diff --git a/graphics/pokemon/sandshrew/alolan/overworld.png b/graphics/pokemon/sandshrew/alola/overworld.png similarity index 100% rename from graphics/pokemon/sandshrew/alolan/overworld.png rename to graphics/pokemon/sandshrew/alola/overworld.png diff --git a/graphics/pokemon/sandshrew/alolan/overworld_normal.pal b/graphics/pokemon/sandshrew/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sandshrew/alolan/overworld_normal.pal rename to graphics/pokemon/sandshrew/alola/overworld_normal.pal diff --git a/graphics/pokemon/sandshrew/alolan/overworld_shiny.pal b/graphics/pokemon/sandshrew/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sandshrew/alolan/overworld_shiny.pal rename to graphics/pokemon/sandshrew/alola/overworld_shiny.pal diff --git a/graphics/pokemon/sandshrew/alolan/shiny.pal b/graphics/pokemon/sandshrew/alola/shiny.pal similarity index 100% rename from graphics/pokemon/sandshrew/alolan/shiny.pal rename to graphics/pokemon/sandshrew/alola/shiny.pal diff --git a/graphics/pokemon/sandslash/alolan/back.png b/graphics/pokemon/sandslash/alola/back.png similarity index 100% rename from graphics/pokemon/sandslash/alolan/back.png rename to graphics/pokemon/sandslash/alola/back.png diff --git a/graphics/pokemon/sandslash/alolan/front.png b/graphics/pokemon/sandslash/alola/front.png similarity index 100% rename from graphics/pokemon/sandslash/alolan/front.png rename to graphics/pokemon/sandslash/alola/front.png diff --git a/graphics/pokemon/sandslash/alolan/icon.png b/graphics/pokemon/sandslash/alola/icon.png similarity index 100% rename from graphics/pokemon/sandslash/alolan/icon.png rename to graphics/pokemon/sandslash/alola/icon.png diff --git a/graphics/pokemon/sandslash/alolan/normal.pal b/graphics/pokemon/sandslash/alola/normal.pal similarity index 100% rename from graphics/pokemon/sandslash/alolan/normal.pal rename to graphics/pokemon/sandslash/alola/normal.pal diff --git a/graphics/pokemon/sandslash/alolan/overworld.png b/graphics/pokemon/sandslash/alola/overworld.png similarity index 100% rename from graphics/pokemon/sandslash/alolan/overworld.png rename to graphics/pokemon/sandslash/alola/overworld.png diff --git a/graphics/pokemon/sandslash/alolan/overworld_normal.pal b/graphics/pokemon/sandslash/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sandslash/alolan/overworld_normal.pal rename to graphics/pokemon/sandslash/alola/overworld_normal.pal diff --git a/graphics/pokemon/sandslash/alolan/overworld_shiny.pal b/graphics/pokemon/sandslash/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sandslash/alolan/overworld_shiny.pal rename to graphics/pokemon/sandslash/alola/overworld_shiny.pal diff --git a/graphics/pokemon/sandslash/alolan/shiny.pal b/graphics/pokemon/sandslash/alola/shiny.pal similarity index 100% rename from graphics/pokemon/sandslash/alolan/shiny.pal rename to graphics/pokemon/sandslash/alola/shiny.pal diff --git a/graphics/pokemon/shellos/east_sea/anim_front.png b/graphics/pokemon/shellos/east/anim_front.png similarity index 100% rename from graphics/pokemon/shellos/east_sea/anim_front.png rename to graphics/pokemon/shellos/east/anim_front.png diff --git a/graphics/pokemon/shellos/east_sea/back.png b/graphics/pokemon/shellos/east/back.png similarity index 100% rename from graphics/pokemon/shellos/east_sea/back.png rename to graphics/pokemon/shellos/east/back.png diff --git a/graphics/pokemon/shellos/east_sea/icon.png b/graphics/pokemon/shellos/east/icon.png similarity index 100% rename from graphics/pokemon/shellos/east_sea/icon.png rename to graphics/pokemon/shellos/east/icon.png diff --git a/graphics/pokemon/shellos/east_sea/normal.pal b/graphics/pokemon/shellos/east/normal.pal similarity index 100% rename from graphics/pokemon/shellos/east_sea/normal.pal rename to graphics/pokemon/shellos/east/normal.pal diff --git a/graphics/pokemon/shellos/east_sea/overworld.png b/graphics/pokemon/shellos/east/overworld.png similarity index 100% rename from graphics/pokemon/shellos/east_sea/overworld.png rename to graphics/pokemon/shellos/east/overworld.png diff --git a/graphics/pokemon/shellos/east_sea/overworld_normal.pal b/graphics/pokemon/shellos/east/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shellos/east_sea/overworld_normal.pal rename to graphics/pokemon/shellos/east/overworld_normal.pal diff --git a/graphics/pokemon/shellos/east_sea/overworld_shiny.pal b/graphics/pokemon/shellos/east/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shellos/east_sea/overworld_shiny.pal rename to graphics/pokemon/shellos/east/overworld_shiny.pal diff --git a/graphics/pokemon/shellos/east_sea/shiny.pal b/graphics/pokemon/shellos/east/shiny.pal similarity index 100% rename from graphics/pokemon/shellos/east_sea/shiny.pal rename to graphics/pokemon/shellos/east/shiny.pal diff --git a/graphics/pokemon/sliggoo/hisuian/back.png b/graphics/pokemon/sliggoo/hisui/back.png similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/back.png rename to graphics/pokemon/sliggoo/hisui/back.png diff --git a/graphics/pokemon/sliggoo/hisuian/front.png b/graphics/pokemon/sliggoo/hisui/front.png similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/front.png rename to graphics/pokemon/sliggoo/hisui/front.png diff --git a/graphics/pokemon/sliggoo/hisuian/icon.png b/graphics/pokemon/sliggoo/hisui/icon.png similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/icon.png rename to graphics/pokemon/sliggoo/hisui/icon.png diff --git a/graphics/pokemon/sliggoo/hisuian/normal.pal b/graphics/pokemon/sliggoo/hisui/normal.pal similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/normal.pal rename to graphics/pokemon/sliggoo/hisui/normal.pal diff --git a/graphics/pokemon/sliggoo/hisuian/overworld.png b/graphics/pokemon/sliggoo/hisui/overworld.png similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/overworld.png rename to graphics/pokemon/sliggoo/hisui/overworld.png diff --git a/graphics/pokemon/sliggoo/hisuian/overworld_normal.pal b/graphics/pokemon/sliggoo/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/overworld_normal.pal rename to graphics/pokemon/sliggoo/hisui/overworld_normal.pal diff --git a/graphics/pokemon/sliggoo/hisuian/overworld_shiny.pal b/graphics/pokemon/sliggoo/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/overworld_shiny.pal rename to graphics/pokemon/sliggoo/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/sliggoo/hisuian/shiny.pal b/graphics/pokemon/sliggoo/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/shiny.pal rename to graphics/pokemon/sliggoo/hisui/shiny.pal diff --git a/graphics/pokemon/slowbro/galarian/back.png b/graphics/pokemon/slowbro/galar/back.png similarity index 100% rename from graphics/pokemon/slowbro/galarian/back.png rename to graphics/pokemon/slowbro/galar/back.png diff --git a/graphics/pokemon/slowbro/galarian/front.png b/graphics/pokemon/slowbro/galar/front.png similarity index 100% rename from graphics/pokemon/slowbro/galarian/front.png rename to graphics/pokemon/slowbro/galar/front.png diff --git a/graphics/pokemon/slowbro/galarian/icon.png b/graphics/pokemon/slowbro/galar/icon.png similarity index 100% rename from graphics/pokemon/slowbro/galarian/icon.png rename to graphics/pokemon/slowbro/galar/icon.png diff --git a/graphics/pokemon/slowbro/galarian/normal.pal b/graphics/pokemon/slowbro/galar/normal.pal similarity index 100% rename from graphics/pokemon/slowbro/galarian/normal.pal rename to graphics/pokemon/slowbro/galar/normal.pal diff --git a/graphics/pokemon/slowbro/galarian/overworld.png b/graphics/pokemon/slowbro/galar/overworld.png similarity index 100% rename from graphics/pokemon/slowbro/galarian/overworld.png rename to graphics/pokemon/slowbro/galar/overworld.png diff --git a/graphics/pokemon/slowbro/galarian/overworld_normal.pal b/graphics/pokemon/slowbro/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slowbro/galarian/overworld_normal.pal rename to graphics/pokemon/slowbro/galar/overworld_normal.pal diff --git a/graphics/pokemon/slowbro/galarian/overworld_shiny.pal b/graphics/pokemon/slowbro/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slowbro/galarian/overworld_shiny.pal rename to graphics/pokemon/slowbro/galar/overworld_shiny.pal diff --git a/graphics/pokemon/slowbro/galarian/shiny.pal b/graphics/pokemon/slowbro/galar/shiny.pal similarity index 100% rename from graphics/pokemon/slowbro/galarian/shiny.pal rename to graphics/pokemon/slowbro/galar/shiny.pal diff --git a/graphics/pokemon/slowking/galarian/back.png b/graphics/pokemon/slowking/galar/back.png similarity index 100% rename from graphics/pokemon/slowking/galarian/back.png rename to graphics/pokemon/slowking/galar/back.png diff --git a/graphics/pokemon/slowking/galarian/front.png b/graphics/pokemon/slowking/galar/front.png similarity index 100% rename from graphics/pokemon/slowking/galarian/front.png rename to graphics/pokemon/slowking/galar/front.png diff --git a/graphics/pokemon/slowking/galarian/icon.png b/graphics/pokemon/slowking/galar/icon.png similarity index 100% rename from graphics/pokemon/slowking/galarian/icon.png rename to graphics/pokemon/slowking/galar/icon.png diff --git a/graphics/pokemon/slowking/galarian/normal.pal b/graphics/pokemon/slowking/galar/normal.pal similarity index 100% rename from graphics/pokemon/slowking/galarian/normal.pal rename to graphics/pokemon/slowking/galar/normal.pal diff --git a/graphics/pokemon/slowking/galarian/overworld.png b/graphics/pokemon/slowking/galar/overworld.png similarity index 100% rename from graphics/pokemon/slowking/galarian/overworld.png rename to graphics/pokemon/slowking/galar/overworld.png diff --git a/graphics/pokemon/slowking/galarian/overworld_normal.pal b/graphics/pokemon/slowking/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slowking/galarian/overworld_normal.pal rename to graphics/pokemon/slowking/galar/overworld_normal.pal diff --git a/graphics/pokemon/slowking/galarian/overworld_shiny.pal b/graphics/pokemon/slowking/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slowking/galarian/overworld_shiny.pal rename to graphics/pokemon/slowking/galar/overworld_shiny.pal diff --git a/graphics/pokemon/slowking/galarian/shiny.pal b/graphics/pokemon/slowking/galar/shiny.pal similarity index 100% rename from graphics/pokemon/slowking/galarian/shiny.pal rename to graphics/pokemon/slowking/galar/shiny.pal diff --git a/graphics/pokemon/slowpoke/galarian/back.png b/graphics/pokemon/slowpoke/galar/back.png similarity index 100% rename from graphics/pokemon/slowpoke/galarian/back.png rename to graphics/pokemon/slowpoke/galar/back.png diff --git a/graphics/pokemon/slowpoke/galarian/front.png b/graphics/pokemon/slowpoke/galar/front.png similarity index 100% rename from graphics/pokemon/slowpoke/galarian/front.png rename to graphics/pokemon/slowpoke/galar/front.png diff --git a/graphics/pokemon/slowpoke/galarian/icon.png b/graphics/pokemon/slowpoke/galar/icon.png similarity index 100% rename from graphics/pokemon/slowpoke/galarian/icon.png rename to graphics/pokemon/slowpoke/galar/icon.png diff --git a/graphics/pokemon/slowpoke/galarian/normal.pal b/graphics/pokemon/slowpoke/galar/normal.pal similarity index 100% rename from graphics/pokemon/slowpoke/galarian/normal.pal rename to graphics/pokemon/slowpoke/galar/normal.pal diff --git a/graphics/pokemon/slowpoke/galarian/overworld.png b/graphics/pokemon/slowpoke/galar/overworld.png similarity index 100% rename from graphics/pokemon/slowpoke/galarian/overworld.png rename to graphics/pokemon/slowpoke/galar/overworld.png diff --git a/graphics/pokemon/slowpoke/galarian/overworld_normal.pal b/graphics/pokemon/slowpoke/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slowpoke/galarian/overworld_normal.pal rename to graphics/pokemon/slowpoke/galar/overworld_normal.pal diff --git a/graphics/pokemon/slowpoke/galarian/overworld_shiny.pal b/graphics/pokemon/slowpoke/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slowpoke/galarian/overworld_shiny.pal rename to graphics/pokemon/slowpoke/galar/overworld_shiny.pal diff --git a/graphics/pokemon/slowpoke/galarian/shiny.pal b/graphics/pokemon/slowpoke/galar/shiny.pal similarity index 100% rename from graphics/pokemon/slowpoke/galarian/shiny.pal rename to graphics/pokemon/slowpoke/galar/shiny.pal diff --git a/graphics/pokemon/sneasel/hisuian/back.png b/graphics/pokemon/sneasel/hisui/back.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/back.png rename to graphics/pokemon/sneasel/hisui/back.png diff --git a/graphics/pokemon/sneasel/hisuian/backf.png b/graphics/pokemon/sneasel/hisui/backf.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/backf.png rename to graphics/pokemon/sneasel/hisui/backf.png diff --git a/graphics/pokemon/sneasel/hisuian/front.png b/graphics/pokemon/sneasel/hisui/front.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/front.png rename to graphics/pokemon/sneasel/hisui/front.png diff --git a/graphics/pokemon/sneasel/hisuian/frontf.png b/graphics/pokemon/sneasel/hisui/frontf.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/frontf.png rename to graphics/pokemon/sneasel/hisui/frontf.png diff --git a/graphics/pokemon/sneasel/hisuian/icon.png b/graphics/pokemon/sneasel/hisui/icon.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/icon.png rename to graphics/pokemon/sneasel/hisui/icon.png diff --git a/graphics/pokemon/sneasel/hisuian/normal.pal b/graphics/pokemon/sneasel/hisui/normal.pal similarity index 100% rename from graphics/pokemon/sneasel/hisuian/normal.pal rename to graphics/pokemon/sneasel/hisui/normal.pal diff --git a/graphics/pokemon/sneasel/hisuian/overworld.png b/graphics/pokemon/sneasel/hisui/overworld.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/overworld.png rename to graphics/pokemon/sneasel/hisui/overworld.png diff --git a/graphics/pokemon/sneasel/hisuian/overworld_normal.pal b/graphics/pokemon/sneasel/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sneasel/hisuian/overworld_normal.pal rename to graphics/pokemon/sneasel/hisui/overworld_normal.pal diff --git a/graphics/pokemon/sneasel/hisuian/overworld_shiny.pal b/graphics/pokemon/sneasel/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sneasel/hisuian/overworld_shiny.pal rename to graphics/pokemon/sneasel/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/sneasel/hisuian/overworldf.png b/graphics/pokemon/sneasel/hisui/overworldf.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/overworldf.png rename to graphics/pokemon/sneasel/hisui/overworldf.png diff --git a/graphics/pokemon/sneasel/hisuian/shiny.pal b/graphics/pokemon/sneasel/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/sneasel/hisuian/shiny.pal rename to graphics/pokemon/sneasel/hisui/shiny.pal diff --git a/graphics/pokemon/snorlax/gigantamax/back.png b/graphics/pokemon/snorlax/gmax/back.png similarity index 100% rename from graphics/pokemon/snorlax/gigantamax/back.png rename to graphics/pokemon/snorlax/gmax/back.png diff --git a/graphics/pokemon/snorlax/gigantamax/front.png b/graphics/pokemon/snorlax/gmax/front.png similarity index 100% rename from graphics/pokemon/snorlax/gigantamax/front.png rename to graphics/pokemon/snorlax/gmax/front.png diff --git a/graphics/pokemon/snorlax/gigantamax/icon.png b/graphics/pokemon/snorlax/gmax/icon.png similarity index 100% rename from graphics/pokemon/snorlax/gigantamax/icon.png rename to graphics/pokemon/snorlax/gmax/icon.png diff --git a/graphics/pokemon/snorlax/gigantamax/normal.pal b/graphics/pokemon/snorlax/gmax/normal.pal similarity index 100% rename from graphics/pokemon/snorlax/gigantamax/normal.pal rename to graphics/pokemon/snorlax/gmax/normal.pal diff --git a/graphics/pokemon/snorlax/gigantamax/shiny.pal b/graphics/pokemon/snorlax/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/snorlax/gigantamax/shiny.pal rename to graphics/pokemon/snorlax/gmax/shiny.pal diff --git a/graphics/pokemon/squawkabilly/blue_plumage/icon.png b/graphics/pokemon/squawkabilly/blue/icon.png similarity index 100% rename from graphics/pokemon/squawkabilly/blue_plumage/icon.png rename to graphics/pokemon/squawkabilly/blue/icon.png diff --git a/graphics/pokemon/squawkabilly/blue_plumage/normal.pal b/graphics/pokemon/squawkabilly/blue/normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/blue_plumage/normal.pal rename to graphics/pokemon/squawkabilly/blue/normal.pal diff --git a/graphics/pokemon/squawkabilly/blue_plumage/overworld.png b/graphics/pokemon/squawkabilly/blue/overworld.png similarity index 100% rename from graphics/pokemon/squawkabilly/blue_plumage/overworld.png rename to graphics/pokemon/squawkabilly/blue/overworld.png diff --git a/graphics/pokemon/squawkabilly/blue_plumage/overworld_normal.pal b/graphics/pokemon/squawkabilly/blue/overworld_normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/blue_plumage/overworld_normal.pal rename to graphics/pokemon/squawkabilly/blue/overworld_normal.pal diff --git a/graphics/pokemon/squawkabilly/blue_plumage/overworld_shiny.pal b/graphics/pokemon/squawkabilly/blue/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/blue_plumage/overworld_shiny.pal rename to graphics/pokemon/squawkabilly/blue/overworld_shiny.pal diff --git a/graphics/pokemon/squawkabilly/blue_plumage/shiny.pal b/graphics/pokemon/squawkabilly/blue/shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/blue_plumage/shiny.pal rename to graphics/pokemon/squawkabilly/blue/shiny.pal diff --git a/graphics/pokemon/squawkabilly/white_plumage/icon.png b/graphics/pokemon/squawkabilly/white/icon.png similarity index 100% rename from graphics/pokemon/squawkabilly/white_plumage/icon.png rename to graphics/pokemon/squawkabilly/white/icon.png diff --git a/graphics/pokemon/squawkabilly/white_plumage/normal.pal b/graphics/pokemon/squawkabilly/white/normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/white_plumage/normal.pal rename to graphics/pokemon/squawkabilly/white/normal.pal diff --git a/graphics/pokemon/squawkabilly/white_plumage/overworld.png b/graphics/pokemon/squawkabilly/white/overworld.png similarity index 100% rename from graphics/pokemon/squawkabilly/white_plumage/overworld.png rename to graphics/pokemon/squawkabilly/white/overworld.png diff --git a/graphics/pokemon/squawkabilly/white_plumage/overworld_normal.pal b/graphics/pokemon/squawkabilly/white/overworld_normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/white_plumage/overworld_normal.pal rename to graphics/pokemon/squawkabilly/white/overworld_normal.pal diff --git a/graphics/pokemon/squawkabilly/white_plumage/overworld_shiny.pal b/graphics/pokemon/squawkabilly/white/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/white_plumage/overworld_shiny.pal rename to graphics/pokemon/squawkabilly/white/overworld_shiny.pal diff --git a/graphics/pokemon/squawkabilly/white_plumage/shiny.pal b/graphics/pokemon/squawkabilly/white/shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/white_plumage/shiny.pal rename to graphics/pokemon/squawkabilly/white/shiny.pal diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/icon.png b/graphics/pokemon/squawkabilly/yellow/icon.png similarity index 100% rename from graphics/pokemon/squawkabilly/yellow_plumage/icon.png rename to graphics/pokemon/squawkabilly/yellow/icon.png diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/normal.pal b/graphics/pokemon/squawkabilly/yellow/normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/yellow_plumage/normal.pal rename to graphics/pokemon/squawkabilly/yellow/normal.pal diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/overworld.png b/graphics/pokemon/squawkabilly/yellow/overworld.png similarity index 100% rename from graphics/pokemon/squawkabilly/yellow_plumage/overworld.png rename to graphics/pokemon/squawkabilly/yellow/overworld.png diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/overworld_normal.pal b/graphics/pokemon/squawkabilly/yellow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/squawkabilly/yellow_plumage/overworld_normal.pal rename to graphics/pokemon/squawkabilly/yellow/overworld_normal.pal diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/overworld_shiny.pal b/graphics/pokemon/squawkabilly/yellow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/yellow_plumage/overworld_shiny.pal rename to graphics/pokemon/squawkabilly/yellow/overworld_shiny.pal diff --git a/graphics/pokemon/squawkabilly/yellow_plumage/shiny.pal b/graphics/pokemon/squawkabilly/yellow/shiny.pal similarity index 100% rename from graphics/pokemon/squawkabilly/yellow_plumage/shiny.pal rename to graphics/pokemon/squawkabilly/yellow/shiny.pal diff --git a/graphics/pokemon/stunfisk/galarian/back.png b/graphics/pokemon/stunfisk/galar/back.png similarity index 100% rename from graphics/pokemon/stunfisk/galarian/back.png rename to graphics/pokemon/stunfisk/galar/back.png diff --git a/graphics/pokemon/stunfisk/galarian/front.png b/graphics/pokemon/stunfisk/galar/front.png similarity index 100% rename from graphics/pokemon/stunfisk/galarian/front.png rename to graphics/pokemon/stunfisk/galar/front.png diff --git a/graphics/pokemon/stunfisk/galarian/icon.png b/graphics/pokemon/stunfisk/galar/icon.png similarity index 100% rename from graphics/pokemon/stunfisk/galarian/icon.png rename to graphics/pokemon/stunfisk/galar/icon.png diff --git a/graphics/pokemon/stunfisk/galarian/normal.pal b/graphics/pokemon/stunfisk/galar/normal.pal similarity index 100% rename from graphics/pokemon/stunfisk/galarian/normal.pal rename to graphics/pokemon/stunfisk/galar/normal.pal diff --git a/graphics/pokemon/stunfisk/galarian/overworld.png b/graphics/pokemon/stunfisk/galar/overworld.png similarity index 100% rename from graphics/pokemon/stunfisk/galarian/overworld.png rename to graphics/pokemon/stunfisk/galar/overworld.png diff --git a/graphics/pokemon/stunfisk/galarian/overworld_normal.pal b/graphics/pokemon/stunfisk/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/stunfisk/galarian/overworld_normal.pal rename to graphics/pokemon/stunfisk/galar/overworld_normal.pal diff --git a/graphics/pokemon/stunfisk/galarian/overworld_shiny.pal b/graphics/pokemon/stunfisk/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/stunfisk/galarian/overworld_shiny.pal rename to graphics/pokemon/stunfisk/galar/overworld_shiny.pal diff --git a/graphics/pokemon/stunfisk/galarian/shiny.pal b/graphics/pokemon/stunfisk/galar/shiny.pal similarity index 100% rename from graphics/pokemon/stunfisk/galarian/shiny.pal rename to graphics/pokemon/stunfisk/galar/shiny.pal diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/back.png b/graphics/pokemon/tauros/paldea_aqua/back.png similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/back.png rename to graphics/pokemon/tauros/paldea_aqua/back.png diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/front.png b/graphics/pokemon/tauros/paldea_aqua/front.png similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/front.png rename to graphics/pokemon/tauros/paldea_aqua/front.png diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/icon.png b/graphics/pokemon/tauros/paldea_aqua/icon.png similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/icon.png rename to graphics/pokemon/tauros/paldea_aqua/icon.png diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/normal.pal b/graphics/pokemon/tauros/paldea_aqua/normal.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/normal.pal rename to graphics/pokemon/tauros/paldea_aqua/normal.pal diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/overworld.png b/graphics/pokemon/tauros/paldea_aqua/overworld.png similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/overworld.png rename to graphics/pokemon/tauros/paldea_aqua/overworld.png diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/overworld_normal.pal b/graphics/pokemon/tauros/paldea_aqua/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/overworld_normal.pal rename to graphics/pokemon/tauros/paldea_aqua/overworld_normal.pal diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/overworld_shiny.pal b/graphics/pokemon/tauros/paldea_aqua/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/overworld_shiny.pal rename to graphics/pokemon/tauros/paldea_aqua/overworld_shiny.pal diff --git a/graphics/pokemon/tauros/paldean_aqua_breed/shiny.pal b/graphics/pokemon/tauros/paldea_aqua/shiny.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_aqua_breed/shiny.pal rename to graphics/pokemon/tauros/paldea_aqua/shiny.pal diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/back.png b/graphics/pokemon/tauros/paldea_blaze/back.png similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/back.png rename to graphics/pokemon/tauros/paldea_blaze/back.png diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/front.png b/graphics/pokemon/tauros/paldea_blaze/front.png similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/front.png rename to graphics/pokemon/tauros/paldea_blaze/front.png diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/icon.png b/graphics/pokemon/tauros/paldea_blaze/icon.png similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/icon.png rename to graphics/pokemon/tauros/paldea_blaze/icon.png diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/normal.pal b/graphics/pokemon/tauros/paldea_blaze/normal.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/normal.pal rename to graphics/pokemon/tauros/paldea_blaze/normal.pal diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/overworld.png b/graphics/pokemon/tauros/paldea_blaze/overworld.png similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/overworld.png rename to graphics/pokemon/tauros/paldea_blaze/overworld.png diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/overworld_normal.pal b/graphics/pokemon/tauros/paldea_blaze/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/overworld_normal.pal rename to graphics/pokemon/tauros/paldea_blaze/overworld_normal.pal diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/overworld_shiny.pal b/graphics/pokemon/tauros/paldea_blaze/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/overworld_shiny.pal rename to graphics/pokemon/tauros/paldea_blaze/overworld_shiny.pal diff --git a/graphics/pokemon/tauros/paldean_blaze_breed/shiny.pal b/graphics/pokemon/tauros/paldea_blaze/shiny.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_blaze_breed/shiny.pal rename to graphics/pokemon/tauros/paldea_blaze/shiny.pal diff --git a/graphics/pokemon/tauros/paldean_combat_breed/back.png b/graphics/pokemon/tauros/paldea_combat/back.png similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/back.png rename to graphics/pokemon/tauros/paldea_combat/back.png diff --git a/graphics/pokemon/tauros/paldean_combat_breed/front.png b/graphics/pokemon/tauros/paldea_combat/front.png similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/front.png rename to graphics/pokemon/tauros/paldea_combat/front.png diff --git a/graphics/pokemon/tauros/paldean_combat_breed/icon.png b/graphics/pokemon/tauros/paldea_combat/icon.png similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/icon.png rename to graphics/pokemon/tauros/paldea_combat/icon.png diff --git a/graphics/pokemon/tauros/paldean_combat_breed/normal.pal b/graphics/pokemon/tauros/paldea_combat/normal.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/normal.pal rename to graphics/pokemon/tauros/paldea_combat/normal.pal diff --git a/graphics/pokemon/tauros/paldean_combat_breed/overworld.png b/graphics/pokemon/tauros/paldea_combat/overworld.png similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/overworld.png rename to graphics/pokemon/tauros/paldea_combat/overworld.png diff --git a/graphics/pokemon/tauros/paldean_combat_breed/overworld_normal.pal b/graphics/pokemon/tauros/paldea_combat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/overworld_normal.pal rename to graphics/pokemon/tauros/paldea_combat/overworld_normal.pal diff --git a/graphics/pokemon/tauros/paldean_combat_breed/overworld_shiny.pal b/graphics/pokemon/tauros/paldea_combat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/overworld_shiny.pal rename to graphics/pokemon/tauros/paldea_combat/overworld_shiny.pal diff --git a/graphics/pokemon/tauros/paldean_combat_breed/shiny.pal b/graphics/pokemon/tauros/paldea_combat/shiny.pal similarity index 100% rename from graphics/pokemon/tauros/paldean_combat_breed/shiny.pal rename to graphics/pokemon/tauros/paldea_combat/shiny.pal diff --git a/graphics/pokemon/toxtricity/gigantamax/back.png b/graphics/pokemon/toxtricity/gmax/back.png similarity index 100% rename from graphics/pokemon/toxtricity/gigantamax/back.png rename to graphics/pokemon/toxtricity/gmax/back.png diff --git a/graphics/pokemon/toxtricity/gigantamax/front.png b/graphics/pokemon/toxtricity/gmax/front.png similarity index 100% rename from graphics/pokemon/toxtricity/gigantamax/front.png rename to graphics/pokemon/toxtricity/gmax/front.png diff --git a/graphics/pokemon/toxtricity/gigantamax/icon.png b/graphics/pokemon/toxtricity/gmax/icon.png similarity index 100% rename from graphics/pokemon/toxtricity/gigantamax/icon.png rename to graphics/pokemon/toxtricity/gmax/icon.png diff --git a/graphics/pokemon/toxtricity/gigantamax/normal.pal b/graphics/pokemon/toxtricity/gmax/normal.pal similarity index 100% rename from graphics/pokemon/toxtricity/gigantamax/normal.pal rename to graphics/pokemon/toxtricity/gmax/normal.pal diff --git a/graphics/pokemon/toxtricity/gigantamax/shiny.pal b/graphics/pokemon/toxtricity/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/toxtricity/gigantamax/shiny.pal rename to graphics/pokemon/toxtricity/gmax/shiny.pal diff --git a/graphics/pokemon/typhlosion/hisuian/back.png b/graphics/pokemon/typhlosion/hisui/back.png similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/back.png rename to graphics/pokemon/typhlosion/hisui/back.png diff --git a/graphics/pokemon/typhlosion/hisuian/front.png b/graphics/pokemon/typhlosion/hisui/front.png similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/front.png rename to graphics/pokemon/typhlosion/hisui/front.png diff --git a/graphics/pokemon/typhlosion/hisuian/icon.png b/graphics/pokemon/typhlosion/hisui/icon.png similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/icon.png rename to graphics/pokemon/typhlosion/hisui/icon.png diff --git a/graphics/pokemon/typhlosion/hisuian/normal.pal b/graphics/pokemon/typhlosion/hisui/normal.pal similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/normal.pal rename to graphics/pokemon/typhlosion/hisui/normal.pal diff --git a/graphics/pokemon/typhlosion/hisuian/overworld.png b/graphics/pokemon/typhlosion/hisui/overworld.png similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/overworld.png rename to graphics/pokemon/typhlosion/hisui/overworld.png diff --git a/graphics/pokemon/typhlosion/hisuian/overworld_normal.pal b/graphics/pokemon/typhlosion/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/overworld_normal.pal rename to graphics/pokemon/typhlosion/hisui/overworld_normal.pal diff --git a/graphics/pokemon/typhlosion/hisuian/overworld_shiny.pal b/graphics/pokemon/typhlosion/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/overworld_shiny.pal rename to graphics/pokemon/typhlosion/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/typhlosion/hisuian/shiny.pal b/graphics/pokemon/typhlosion/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/shiny.pal rename to graphics/pokemon/typhlosion/hisui/shiny.pal diff --git a/graphics/pokemon/unown/exclamation_mark/back.png b/graphics/pokemon/unown/exclamation/back.png similarity index 100% rename from graphics/pokemon/unown/exclamation_mark/back.png rename to graphics/pokemon/unown/exclamation/back.png diff --git a/graphics/pokemon/unown/exclamation_mark/front.png b/graphics/pokemon/unown/exclamation/front.png similarity index 100% rename from graphics/pokemon/unown/exclamation_mark/front.png rename to graphics/pokemon/unown/exclamation/front.png diff --git a/graphics/pokemon/unown/exclamation_mark/icon.png b/graphics/pokemon/unown/exclamation/icon.png similarity index 100% rename from graphics/pokemon/unown/exclamation_mark/icon.png rename to graphics/pokemon/unown/exclamation/icon.png diff --git a/graphics/pokemon/unown/exclamation_mark/overworld.png b/graphics/pokemon/unown/exclamation/overworld.png similarity index 100% rename from graphics/pokemon/unown/exclamation_mark/overworld.png rename to graphics/pokemon/unown/exclamation/overworld.png diff --git a/graphics/pokemon/unown/question_mark/back.png b/graphics/pokemon/unown/question/back.png similarity index 100% rename from graphics/pokemon/unown/question_mark/back.png rename to graphics/pokemon/unown/question/back.png diff --git a/graphics/pokemon/unown/question_mark/front.png b/graphics/pokemon/unown/question/front.png similarity index 100% rename from graphics/pokemon/unown/question_mark/front.png rename to graphics/pokemon/unown/question/front.png diff --git a/graphics/pokemon/unown/question_mark/icon.png b/graphics/pokemon/unown/question/icon.png similarity index 100% rename from graphics/pokemon/unown/question_mark/icon.png rename to graphics/pokemon/unown/question/icon.png diff --git a/graphics/pokemon/unown/question_mark/overworld.png b/graphics/pokemon/unown/question/overworld.png similarity index 100% rename from graphics/pokemon/unown/question_mark/overworld.png rename to graphics/pokemon/unown/question/overworld.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style/back.png b/graphics/pokemon/urshifu/rapid_strike/back.png similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style/back.png rename to graphics/pokemon/urshifu/rapid_strike/back.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style/front.png b/graphics/pokemon/urshifu/rapid_strike/front.png similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style/front.png rename to graphics/pokemon/urshifu/rapid_strike/front.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style/normal.pal b/graphics/pokemon/urshifu/rapid_strike/normal.pal similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style/normal.pal rename to graphics/pokemon/urshifu/rapid_strike/normal.pal diff --git a/graphics/pokemon/urshifu/rapid_strike_style/shiny.pal b/graphics/pokemon/urshifu/rapid_strike/shiny.pal similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style/shiny.pal rename to graphics/pokemon/urshifu/rapid_strike/shiny.pal diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.png b/graphics/pokemon/urshifu/rapid_strike_gmax/back.png similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.png rename to graphics/pokemon/urshifu/rapid_strike_gmax/back.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.png b/graphics/pokemon/urshifu/rapid_strike_gmax/front.png similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.png rename to graphics/pokemon/urshifu/rapid_strike_gmax/front.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.png b/graphics/pokemon/urshifu/rapid_strike_gmax/icon.png similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.png rename to graphics/pokemon/urshifu/rapid_strike_gmax/icon.png diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.pal b/graphics/pokemon/urshifu/rapid_strike_gmax/normal.pal similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.pal rename to graphics/pokemon/urshifu/rapid_strike_gmax/normal.pal diff --git a/graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.pal b/graphics/pokemon/urshifu/rapid_strike_gmax/shiny.pal similarity index 100% rename from graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.pal rename to graphics/pokemon/urshifu/rapid_strike_gmax/shiny.pal diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/back.png b/graphics/pokemon/urshifu/single_strike_gmax/back.png similarity index 100% rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/back.png rename to graphics/pokemon/urshifu/single_strike_gmax/back.png diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/front.png b/graphics/pokemon/urshifu/single_strike_gmax/front.png similarity index 100% rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/front.png rename to graphics/pokemon/urshifu/single_strike_gmax/front.png diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.png b/graphics/pokemon/urshifu/single_strike_gmax/icon.png similarity index 100% rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.png rename to graphics/pokemon/urshifu/single_strike_gmax/icon.png diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.pal b/graphics/pokemon/urshifu/single_strike_gmax/normal.pal similarity index 100% rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.pal rename to graphics/pokemon/urshifu/single_strike_gmax/normal.pal diff --git a/graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.pal b/graphics/pokemon/urshifu/single_strike_gmax/shiny.pal similarity index 100% rename from graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.pal rename to graphics/pokemon/urshifu/single_strike_gmax/shiny.pal diff --git a/graphics/pokemon/venusaur/gigantamax/back.png b/graphics/pokemon/venusaur/gmax/back.png similarity index 100% rename from graphics/pokemon/venusaur/gigantamax/back.png rename to graphics/pokemon/venusaur/gmax/back.png diff --git a/graphics/pokemon/venusaur/gigantamax/front.png b/graphics/pokemon/venusaur/gmax/front.png similarity index 100% rename from graphics/pokemon/venusaur/gigantamax/front.png rename to graphics/pokemon/venusaur/gmax/front.png diff --git a/graphics/pokemon/venusaur/gigantamax/icon.png b/graphics/pokemon/venusaur/gmax/icon.png similarity index 100% rename from graphics/pokemon/venusaur/gigantamax/icon.png rename to graphics/pokemon/venusaur/gmax/icon.png diff --git a/graphics/pokemon/venusaur/gigantamax/normal.pal b/graphics/pokemon/venusaur/gmax/normal.pal similarity index 100% rename from graphics/pokemon/venusaur/gigantamax/normal.pal rename to graphics/pokemon/venusaur/gmax/normal.pal diff --git a/graphics/pokemon/venusaur/gigantamax/shiny.pal b/graphics/pokemon/venusaur/gmax/shiny.pal similarity index 100% rename from graphics/pokemon/venusaur/gigantamax/shiny.pal rename to graphics/pokemon/venusaur/gmax/shiny.pal diff --git a/graphics/pokemon/voltorb/hisuian/back.png b/graphics/pokemon/voltorb/hisui/back.png similarity index 100% rename from graphics/pokemon/voltorb/hisuian/back.png rename to graphics/pokemon/voltorb/hisui/back.png diff --git a/graphics/pokemon/voltorb/hisuian/front.png b/graphics/pokemon/voltorb/hisui/front.png similarity index 100% rename from graphics/pokemon/voltorb/hisuian/front.png rename to graphics/pokemon/voltorb/hisui/front.png diff --git a/graphics/pokemon/voltorb/hisuian/icon.png b/graphics/pokemon/voltorb/hisui/icon.png similarity index 100% rename from graphics/pokemon/voltorb/hisuian/icon.png rename to graphics/pokemon/voltorb/hisui/icon.png diff --git a/graphics/pokemon/voltorb/hisuian/normal.pal b/graphics/pokemon/voltorb/hisui/normal.pal similarity index 100% rename from graphics/pokemon/voltorb/hisuian/normal.pal rename to graphics/pokemon/voltorb/hisui/normal.pal diff --git a/graphics/pokemon/voltorb/hisuian/overworld.png b/graphics/pokemon/voltorb/hisui/overworld.png similarity index 100% rename from graphics/pokemon/voltorb/hisuian/overworld.png rename to graphics/pokemon/voltorb/hisui/overworld.png diff --git a/graphics/pokemon/voltorb/hisuian/overworld_normal.pal b/graphics/pokemon/voltorb/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/voltorb/hisuian/overworld_normal.pal rename to graphics/pokemon/voltorb/hisui/overworld_normal.pal diff --git a/graphics/pokemon/voltorb/hisuian/overworld_shiny.pal b/graphics/pokemon/voltorb/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/voltorb/hisuian/overworld_shiny.pal rename to graphics/pokemon/voltorb/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/voltorb/hisuian/shiny.pal b/graphics/pokemon/voltorb/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/voltorb/hisuian/shiny.pal rename to graphics/pokemon/voltorb/hisui/shiny.pal diff --git a/graphics/pokemon/vulpix/alolan/back.png b/graphics/pokemon/vulpix/alola/back.png similarity index 100% rename from graphics/pokemon/vulpix/alolan/back.png rename to graphics/pokemon/vulpix/alola/back.png diff --git a/graphics/pokemon/vulpix/alolan/front.png b/graphics/pokemon/vulpix/alola/front.png similarity index 100% rename from graphics/pokemon/vulpix/alolan/front.png rename to graphics/pokemon/vulpix/alola/front.png diff --git a/graphics/pokemon/vulpix/alolan/icon.png b/graphics/pokemon/vulpix/alola/icon.png similarity index 100% rename from graphics/pokemon/vulpix/alolan/icon.png rename to graphics/pokemon/vulpix/alola/icon.png diff --git a/graphics/pokemon/vulpix/alolan/normal.pal b/graphics/pokemon/vulpix/alola/normal.pal similarity index 100% rename from graphics/pokemon/vulpix/alolan/normal.pal rename to graphics/pokemon/vulpix/alola/normal.pal diff --git a/graphics/pokemon/vulpix/alolan/overworld.png b/graphics/pokemon/vulpix/alola/overworld.png similarity index 100% rename from graphics/pokemon/vulpix/alolan/overworld.png rename to graphics/pokemon/vulpix/alola/overworld.png diff --git a/graphics/pokemon/vulpix/alolan/overworld_normal.pal b/graphics/pokemon/vulpix/alola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vulpix/alolan/overworld_normal.pal rename to graphics/pokemon/vulpix/alola/overworld_normal.pal diff --git a/graphics/pokemon/vulpix/alolan/overworld_shiny.pal b/graphics/pokemon/vulpix/alola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vulpix/alolan/overworld_shiny.pal rename to graphics/pokemon/vulpix/alola/overworld_shiny.pal diff --git a/graphics/pokemon/vulpix/alolan/shiny.pal b/graphics/pokemon/vulpix/alola/shiny.pal similarity index 100% rename from graphics/pokemon/vulpix/alolan/shiny.pal rename to graphics/pokemon/vulpix/alola/shiny.pal diff --git a/graphics/pokemon/weezing/galarian/back.png b/graphics/pokemon/weezing/galar/back.png similarity index 100% rename from graphics/pokemon/weezing/galarian/back.png rename to graphics/pokemon/weezing/galar/back.png diff --git a/graphics/pokemon/weezing/galarian/front.png b/graphics/pokemon/weezing/galar/front.png similarity index 100% rename from graphics/pokemon/weezing/galarian/front.png rename to graphics/pokemon/weezing/galar/front.png diff --git a/graphics/pokemon/weezing/galarian/icon.png b/graphics/pokemon/weezing/galar/icon.png similarity index 100% rename from graphics/pokemon/weezing/galarian/icon.png rename to graphics/pokemon/weezing/galar/icon.png diff --git a/graphics/pokemon/weezing/galarian/normal.pal b/graphics/pokemon/weezing/galar/normal.pal similarity index 100% rename from graphics/pokemon/weezing/galarian/normal.pal rename to graphics/pokemon/weezing/galar/normal.pal diff --git a/graphics/pokemon/weezing/galarian/overworld.png b/graphics/pokemon/weezing/galar/overworld.png similarity index 100% rename from graphics/pokemon/weezing/galarian/overworld.png rename to graphics/pokemon/weezing/galar/overworld.png diff --git a/graphics/pokemon/weezing/galarian/overworld_normal.pal b/graphics/pokemon/weezing/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/weezing/galarian/overworld_normal.pal rename to graphics/pokemon/weezing/galar/overworld_normal.pal diff --git a/graphics/pokemon/weezing/galarian/overworld_shiny.pal b/graphics/pokemon/weezing/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/weezing/galarian/overworld_shiny.pal rename to graphics/pokemon/weezing/galar/overworld_shiny.pal diff --git a/graphics/pokemon/weezing/galarian/shiny.pal b/graphics/pokemon/weezing/galar/shiny.pal similarity index 100% rename from graphics/pokemon/weezing/galarian/shiny.pal rename to graphics/pokemon/weezing/galar/shiny.pal diff --git a/graphics/pokemon/wooper/wooper_paldean/back.png b/graphics/pokemon/wooper/paldea/back.png similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/back.png rename to graphics/pokemon/wooper/paldea/back.png diff --git a/graphics/pokemon/wooper/wooper_paldean/front.png b/graphics/pokemon/wooper/paldea/front.png similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/front.png rename to graphics/pokemon/wooper/paldea/front.png diff --git a/graphics/pokemon/wooper/wooper_paldean/icon.png b/graphics/pokemon/wooper/paldea/icon.png similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/icon.png rename to graphics/pokemon/wooper/paldea/icon.png diff --git a/graphics/pokemon/wooper/wooper_paldean/normal.pal b/graphics/pokemon/wooper/paldea/normal.pal similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/normal.pal rename to graphics/pokemon/wooper/paldea/normal.pal diff --git a/graphics/pokemon/wooper/wooper_paldean/overworld.png b/graphics/pokemon/wooper/paldea/overworld.png similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/overworld.png rename to graphics/pokemon/wooper/paldea/overworld.png diff --git a/graphics/pokemon/wooper/wooper_paldean/overworld_normal.pal b/graphics/pokemon/wooper/paldea/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/overworld_normal.pal rename to graphics/pokemon/wooper/paldea/overworld_normal.pal diff --git a/graphics/pokemon/wooper/wooper_paldean/overworld_shiny.pal b/graphics/pokemon/wooper/paldea/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/overworld_shiny.pal rename to graphics/pokemon/wooper/paldea/overworld_shiny.pal diff --git a/graphics/pokemon/wooper/wooper_paldean/shiny.pal b/graphics/pokemon/wooper/paldea/shiny.pal similarity index 100% rename from graphics/pokemon/wooper/wooper_paldean/shiny.pal rename to graphics/pokemon/wooper/paldea/shiny.pal diff --git a/graphics/pokemon/wormadam/plant/footprint.png b/graphics/pokemon/wormadam/footprint.png similarity index 100% rename from graphics/pokemon/wormadam/plant/footprint.png rename to graphics/pokemon/wormadam/footprint.png diff --git a/graphics/pokemon/wormadam/sandy_cloak/anim_front.png b/graphics/pokemon/wormadam/sandy/anim_front.png similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/anim_front.png rename to graphics/pokemon/wormadam/sandy/anim_front.png diff --git a/graphics/pokemon/wormadam/sandy_cloak/back.png b/graphics/pokemon/wormadam/sandy/back.png similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/back.png rename to graphics/pokemon/wormadam/sandy/back.png diff --git a/graphics/pokemon/wormadam/sandy_cloak/icon.png b/graphics/pokemon/wormadam/sandy/icon.png similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/icon.png rename to graphics/pokemon/wormadam/sandy/icon.png diff --git a/graphics/pokemon/wormadam/sandy_cloak/normal.pal b/graphics/pokemon/wormadam/sandy/normal.pal similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/normal.pal rename to graphics/pokemon/wormadam/sandy/normal.pal diff --git a/graphics/pokemon/wormadam/sandy_cloak/overworld.png b/graphics/pokemon/wormadam/sandy/overworld.png similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/overworld.png rename to graphics/pokemon/wormadam/sandy/overworld.png diff --git a/graphics/pokemon/wormadam/sandy_cloak/overworld_normal.pal b/graphics/pokemon/wormadam/sandy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/overworld_normal.pal rename to graphics/pokemon/wormadam/sandy/overworld_normal.pal diff --git a/graphics/pokemon/wormadam/sandy_cloak/overworld_shiny.pal b/graphics/pokemon/wormadam/sandy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/overworld_shiny.pal rename to graphics/pokemon/wormadam/sandy/overworld_shiny.pal diff --git a/graphics/pokemon/wormadam/sandy_cloak/shiny.pal b/graphics/pokemon/wormadam/sandy/shiny.pal similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/shiny.pal rename to graphics/pokemon/wormadam/sandy/shiny.pal diff --git a/graphics/pokemon/wormadam/trash_cloak/anim_front.png b/graphics/pokemon/wormadam/trash/anim_front.png similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/anim_front.png rename to graphics/pokemon/wormadam/trash/anim_front.png diff --git a/graphics/pokemon/wormadam/trash_cloak/back.png b/graphics/pokemon/wormadam/trash/back.png similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/back.png rename to graphics/pokemon/wormadam/trash/back.png diff --git a/graphics/pokemon/wormadam/trash_cloak/icon.png b/graphics/pokemon/wormadam/trash/icon.png similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/icon.png rename to graphics/pokemon/wormadam/trash/icon.png diff --git a/graphics/pokemon/wormadam/trash_cloak/normal.pal b/graphics/pokemon/wormadam/trash/normal.pal similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/normal.pal rename to graphics/pokemon/wormadam/trash/normal.pal diff --git a/graphics/pokemon/wormadam/trash_cloak/overworld.png b/graphics/pokemon/wormadam/trash/overworld.png similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/overworld.png rename to graphics/pokemon/wormadam/trash/overworld.png diff --git a/graphics/pokemon/wormadam/trash_cloak/overworld_normal.pal b/graphics/pokemon/wormadam/trash/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/overworld_normal.pal rename to graphics/pokemon/wormadam/trash/overworld_normal.pal diff --git a/graphics/pokemon/wormadam/trash_cloak/overworld_shiny.pal b/graphics/pokemon/wormadam/trash/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/overworld_shiny.pal rename to graphics/pokemon/wormadam/trash/overworld_shiny.pal diff --git a/graphics/pokemon/wormadam/trash_cloak/shiny.pal b/graphics/pokemon/wormadam/trash/shiny.pal similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/shiny.pal rename to graphics/pokemon/wormadam/trash/shiny.pal diff --git a/graphics/pokemon/yamask/galarian/back.png b/graphics/pokemon/yamask/galar/back.png similarity index 100% rename from graphics/pokemon/yamask/galarian/back.png rename to graphics/pokemon/yamask/galar/back.png diff --git a/graphics/pokemon/yamask/galarian/front.png b/graphics/pokemon/yamask/galar/front.png similarity index 100% rename from graphics/pokemon/yamask/galarian/front.png rename to graphics/pokemon/yamask/galar/front.png diff --git a/graphics/pokemon/yamask/galarian/icon.png b/graphics/pokemon/yamask/galar/icon.png similarity index 100% rename from graphics/pokemon/yamask/galarian/icon.png rename to graphics/pokemon/yamask/galar/icon.png diff --git a/graphics/pokemon/yamask/galarian/normal.pal b/graphics/pokemon/yamask/galar/normal.pal similarity index 100% rename from graphics/pokemon/yamask/galarian/normal.pal rename to graphics/pokemon/yamask/galar/normal.pal diff --git a/graphics/pokemon/yamask/galarian/overworld.png b/graphics/pokemon/yamask/galar/overworld.png similarity index 100% rename from graphics/pokemon/yamask/galarian/overworld.png rename to graphics/pokemon/yamask/galar/overworld.png diff --git a/graphics/pokemon/yamask/galarian/overworld_normal.pal b/graphics/pokemon/yamask/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/yamask/galarian/overworld_normal.pal rename to graphics/pokemon/yamask/galar/overworld_normal.pal diff --git a/graphics/pokemon/yamask/galarian/overworld_shiny.pal b/graphics/pokemon/yamask/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/yamask/galarian/overworld_shiny.pal rename to graphics/pokemon/yamask/galar/overworld_shiny.pal diff --git a/graphics/pokemon/yamask/galarian/shiny.pal b/graphics/pokemon/yamask/galar/shiny.pal similarity index 100% rename from graphics/pokemon/yamask/galarian/shiny.pal rename to graphics/pokemon/yamask/galar/shiny.pal diff --git a/graphics/pokemon/zapdos/galarian/back.png b/graphics/pokemon/zapdos/galar/back.png similarity index 100% rename from graphics/pokemon/zapdos/galarian/back.png rename to graphics/pokemon/zapdos/galar/back.png diff --git a/graphics/pokemon/zapdos/galarian/front.png b/graphics/pokemon/zapdos/galar/front.png similarity index 100% rename from graphics/pokemon/zapdos/galarian/front.png rename to graphics/pokemon/zapdos/galar/front.png diff --git a/graphics/pokemon/zapdos/galarian/icon.png b/graphics/pokemon/zapdos/galar/icon.png similarity index 100% rename from graphics/pokemon/zapdos/galarian/icon.png rename to graphics/pokemon/zapdos/galar/icon.png diff --git a/graphics/pokemon/zapdos/galarian/normal.pal b/graphics/pokemon/zapdos/galar/normal.pal similarity index 100% rename from graphics/pokemon/zapdos/galarian/normal.pal rename to graphics/pokemon/zapdos/galar/normal.pal diff --git a/graphics/pokemon/zapdos/galarian/overworld.png b/graphics/pokemon/zapdos/galar/overworld.png similarity index 100% rename from graphics/pokemon/zapdos/galarian/overworld.png rename to graphics/pokemon/zapdos/galar/overworld.png diff --git a/graphics/pokemon/zapdos/galarian/overworld_normal.pal b/graphics/pokemon/zapdos/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zapdos/galarian/overworld_normal.pal rename to graphics/pokemon/zapdos/galar/overworld_normal.pal diff --git a/graphics/pokemon/zapdos/galarian/overworld_shiny.pal b/graphics/pokemon/zapdos/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zapdos/galarian/overworld_shiny.pal rename to graphics/pokemon/zapdos/galar/overworld_shiny.pal diff --git a/graphics/pokemon/zapdos/galarian/shiny.pal b/graphics/pokemon/zapdos/galar/shiny.pal similarity index 100% rename from graphics/pokemon/zapdos/galarian/shiny.pal rename to graphics/pokemon/zapdos/galar/shiny.pal diff --git a/graphics/pokemon/zigzagoon/galarian/back.png b/graphics/pokemon/zigzagoon/galar/back.png similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/back.png rename to graphics/pokemon/zigzagoon/galar/back.png diff --git a/graphics/pokemon/zigzagoon/galarian/front.png b/graphics/pokemon/zigzagoon/galar/front.png similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/front.png rename to graphics/pokemon/zigzagoon/galar/front.png diff --git a/graphics/pokemon/zigzagoon/galarian/icon.png b/graphics/pokemon/zigzagoon/galar/icon.png similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/icon.png rename to graphics/pokemon/zigzagoon/galar/icon.png diff --git a/graphics/pokemon/zigzagoon/galarian/normal.pal b/graphics/pokemon/zigzagoon/galar/normal.pal similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/normal.pal rename to graphics/pokemon/zigzagoon/galar/normal.pal diff --git a/graphics/pokemon/zigzagoon/galarian/overworld.png b/graphics/pokemon/zigzagoon/galar/overworld.png similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/overworld.png rename to graphics/pokemon/zigzagoon/galar/overworld.png diff --git a/graphics/pokemon/zigzagoon/galarian/overworld_normal.pal b/graphics/pokemon/zigzagoon/galar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/overworld_normal.pal rename to graphics/pokemon/zigzagoon/galar/overworld_normal.pal diff --git a/graphics/pokemon/zigzagoon/galarian/overworld_shiny.pal b/graphics/pokemon/zigzagoon/galar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/overworld_shiny.pal rename to graphics/pokemon/zigzagoon/galar/overworld_shiny.pal diff --git a/graphics/pokemon/zigzagoon/galarian/shiny.pal b/graphics/pokemon/zigzagoon/galar/shiny.pal similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/shiny.pal rename to graphics/pokemon/zigzagoon/galar/shiny.pal diff --git a/graphics/pokemon/zoroark/hisuian/back.png b/graphics/pokemon/zoroark/hisui/back.png similarity index 100% rename from graphics/pokemon/zoroark/hisuian/back.png rename to graphics/pokemon/zoroark/hisui/back.png diff --git a/graphics/pokemon/zoroark/hisuian/front.png b/graphics/pokemon/zoroark/hisui/front.png similarity index 100% rename from graphics/pokemon/zoroark/hisuian/front.png rename to graphics/pokemon/zoroark/hisui/front.png diff --git a/graphics/pokemon/zoroark/hisuian/icon.png b/graphics/pokemon/zoroark/hisui/icon.png similarity index 100% rename from graphics/pokemon/zoroark/hisuian/icon.png rename to graphics/pokemon/zoroark/hisui/icon.png diff --git a/graphics/pokemon/zoroark/hisuian/normal.pal b/graphics/pokemon/zoroark/hisui/normal.pal similarity index 100% rename from graphics/pokemon/zoroark/hisuian/normal.pal rename to graphics/pokemon/zoroark/hisui/normal.pal diff --git a/graphics/pokemon/zoroark/hisuian/overworld.png b/graphics/pokemon/zoroark/hisui/overworld.png similarity index 100% rename from graphics/pokemon/zoroark/hisuian/overworld.png rename to graphics/pokemon/zoroark/hisui/overworld.png diff --git a/graphics/pokemon/zoroark/hisuian/overworld_normal.pal b/graphics/pokemon/zoroark/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zoroark/hisuian/overworld_normal.pal rename to graphics/pokemon/zoroark/hisui/overworld_normal.pal diff --git a/graphics/pokemon/zoroark/hisuian/overworld_shiny.pal b/graphics/pokemon/zoroark/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zoroark/hisuian/overworld_shiny.pal rename to graphics/pokemon/zoroark/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/zoroark/hisuian/shiny.pal b/graphics/pokemon/zoroark/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/zoroark/hisuian/shiny.pal rename to graphics/pokemon/zoroark/hisui/shiny.pal diff --git a/graphics/pokemon/zorua/hisuian/back.png b/graphics/pokemon/zorua/hisui/back.png similarity index 100% rename from graphics/pokemon/zorua/hisuian/back.png rename to graphics/pokemon/zorua/hisui/back.png diff --git a/graphics/pokemon/zorua/hisuian/front.png b/graphics/pokemon/zorua/hisui/front.png similarity index 100% rename from graphics/pokemon/zorua/hisuian/front.png rename to graphics/pokemon/zorua/hisui/front.png diff --git a/graphics/pokemon/zorua/hisuian/icon.png b/graphics/pokemon/zorua/hisui/icon.png similarity index 100% rename from graphics/pokemon/zorua/hisuian/icon.png rename to graphics/pokemon/zorua/hisui/icon.png diff --git a/graphics/pokemon/zorua/hisuian/normal.pal b/graphics/pokemon/zorua/hisui/normal.pal similarity index 100% rename from graphics/pokemon/zorua/hisuian/normal.pal rename to graphics/pokemon/zorua/hisui/normal.pal diff --git a/graphics/pokemon/zorua/hisuian/overworld.png b/graphics/pokemon/zorua/hisui/overworld.png similarity index 100% rename from graphics/pokemon/zorua/hisuian/overworld.png rename to graphics/pokemon/zorua/hisui/overworld.png diff --git a/graphics/pokemon/zorua/hisuian/overworld_normal.pal b/graphics/pokemon/zorua/hisui/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zorua/hisuian/overworld_normal.pal rename to graphics/pokemon/zorua/hisui/overworld_normal.pal diff --git a/graphics/pokemon/zorua/hisuian/overworld_shiny.pal b/graphics/pokemon/zorua/hisui/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zorua/hisuian/overworld_shiny.pal rename to graphics/pokemon/zorua/hisui/overworld_shiny.pal diff --git a/graphics/pokemon/zorua/hisuian/shiny.pal b/graphics/pokemon/zorua/hisui/shiny.pal similarity index 100% rename from graphics/pokemon/zorua/hisuian/shiny.pal rename to graphics/pokemon/zorua/hisui/shiny.pal diff --git a/include/constants/cries.h b/include/constants/cries.h index ca1529bbdf..554ffafc96 100644 --- a/include/constants/cries.h +++ b/include/constants/cries.h @@ -196,7 +196,7 @@ enum { CRY_SLOWBRO_MEGA, #endif //P_MEGA_EVOLUTIONS #if P_GALARIAN_FORMS - CRY_SLOWPOKE_GALARIAN, + CRY_SLOWPOKE_GALAR, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_SLOWPOKE #if P_FAMILY_MAGNEMITE @@ -2124,11 +2124,11 @@ enum { #endif //P_FAMILY_DREEPY #if P_FAMILY_ZACIAN CRY_ZACIAN_HERO, - CRY_ZACIAN_CROWNED_SWORD, + CRY_ZACIAN_CROWNED, #endif //P_FAMILY_ZACIAN #if P_FAMILY_ZAMAZENTA CRY_ZAMAZENTA_HERO, - CRY_ZAMAZENTA_CROWNED_SHIELD, + CRY_ZAMAZENTA_CROWNED, #endif //P_FAMILY_ZAMAZENTA #if P_FAMILY_ETERNATUS CRY_ETERNATUS, @@ -2136,8 +2136,8 @@ enum { #endif //P_FAMILY_ETERNATUS #if P_FAMILY_KUBFU CRY_KUBFU, - CRY_URSHIFU_SINGLE_STRIKE_STYLE, - CRY_URSHIFU_RAPID_STRIKE_STYLE, + CRY_URSHIFU_SINGLE_STRIKE, + CRY_URSHIFU_RAPID_STRIKE, #endif //P_FAMILY_KUBFU #if P_FAMILY_ZARUDE CRY_ZARUDE, @@ -2157,8 +2157,8 @@ enum { #if P_FAMILY_CALYREX CRY_CALYREX, #if P_FUSION_FORMS - CRY_CALYREX_ICE_RIDER, - CRY_CALYREX_SHADOW_RIDER, + CRY_CALYREX_ICE, + CRY_CALYREX_SHADOW, #endif //P_FUSION_FORMS #endif //P_FAMILY_CALYREX #if P_FAMILY_ENAMORUS @@ -2200,8 +2200,8 @@ enum { #endif //P_FAMILY_PAWMI #if P_FAMILY_TANDEMAUS CRY_TANDEMAUS, - CRY_MAUSHOLD_FAMILY_OF_THREE, - CRY_MAUSHOLD_FAMILY_OF_FOUR, + CRY_MAUSHOLD_THREE, + CRY_MAUSHOLD_FOUR, #endif //P_FAMILY_TANDEMAUS #if P_FAMILY_FIDOUGH CRY_FIDOUGH, diff --git a/include/constants/species.h b/include/constants/species.h index 4c9a32bb13..b94a15a396 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1088,7 +1088,7 @@ #define SPECIES_PIKACHU_UNOVA 1018 #define SPECIES_PIKACHU_KALOS 1019 #define SPECIES_PIKACHU_ALOLA 1020 -#define SPECIES_PIKACHU_PARTNER_CAP 1021 +#define SPECIES_PIKACHU_PARTNER 1021 #define SPECIES_PIKACHU_WORLD 1022 #define SPECIES_PICHU_SPIKY_EARED 1023 #define SPECIES_UNOWN_B 1024 diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index a6533157ff..050fdac57a 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -194,7 +194,7 @@ gCryTable:: cry Cry_SlowbroMega .endif @ P_MEGA_EVOLUTIONS .if P_GALARIAN_FORMS == TRUE - cry Cry_SlowpokeGalarian + cry Cry_SlowpokeGalar .endif @ P_GALARIAN_FORMS .endif @ P_FAMILY_SLOWPOKE .if P_FAMILY_MAGNEMITE == TRUE @@ -1634,7 +1634,7 @@ gCryTable:: .if P_FAMILY_FLABEBE == TRUE cry Cry_Flabebe cry Cry_Floette - cry Cry_FloetteEternalFlower + cry Cry_FloetteEternal cry Cry_Florges .endif @ P_FAMILY_FLABEBE .if P_FAMILY_SKIDDO == TRUE @@ -2082,12 +2082,12 @@ gCryTable:: cry Cry_Stonjourner .endif @ P_FAMILY_STONJOURNER .if P_FAMILY_EISCUE == TRUE - cry Cry_EiscueIceFace - cry Cry_EiscueNoiceFace + cry Cry_EiscueIce + cry Cry_EiscueNoice .endif @ P_FAMILY_EISCUE .if P_FAMILY_INDEEDEE == TRUE - cry Cry_IndeedeeMale - cry Cry_IndeedeeFemale + cry Cry_IndeedeeM + cry Cry_IndeedeeF .endif @ P_FAMILY_INDEEDEE .if P_FAMILY_MORPEKO == TRUE cry Cry_MorpekoFullBelly @@ -2121,12 +2121,12 @@ gCryTable:: cry Cry_Dragapult .endif @ P_FAMILY_DREEPY .if P_FAMILY_ZACIAN == TRUE - cry Cry_ZacianHeroOfManyBattles - cry Cry_ZacianCrownedSword + cry Cry_ZacianHero + cry Cry_ZacianCrowned .endif @ P_FAMILY_ZACIAN .if P_FAMILY_ZAMAZENTA == TRUE - cry Cry_ZamazentaHeroOfManyBattles - cry Cry_ZamazentaCrownedShield + cry Cry_ZamazentaHero + cry Cry_ZamazentaCrowned .endif @ P_FAMILY_ZAMAZENTA .if P_FAMILY_ETERNATUS == TRUE cry Cry_Eternatus @@ -2134,8 +2134,8 @@ gCryTable:: .endif @ P_FAMILY_ETERNATUS .if P_FAMILY_KUBFU == TRUE cry Cry_Kubfu - cry Cry_UrshifuSingleStrikeStyle - cry Cry_UrshifuRapidStrikeStyle + cry Cry_UrshifuSingleStrike + cry Cry_UrshifuRapidStrike .endif @ P_FAMILY_KUBFU .if P_FAMILY_ZARUDE == TRUE cry Cry_Zarude @@ -2155,8 +2155,8 @@ gCryTable:: .if P_FAMILY_CALYREX == TRUE cry Cry_Calyrex .if P_FUSION_FORMS == TRUE - cry Cry_CalyrexIceRider - cry Cry_CalyrexShadowRider + cry Cry_CalyrexIce + cry Cry_CalyrexShadow .endif @ P_FUSION_FORMS .endif @ P_FAMILY_CALYREX .if P_FAMILY_ENAMORUS == TRUE @@ -2180,8 +2180,8 @@ gCryTable:: .endif @ P_FAMILY_QUAXLY .if P_FAMILY_LECHONK == TRUE cry Cry_Lechonk - cry Cry_OinkologneMale - cry Cry_OinkologneFemale + cry Cry_OinkologneM + cry Cry_OinkologneF .endif @ P_FAMILY_LECHONK .if P_FAMILY_TAROUNTULA == TRUE cry Cry_Tarountula @@ -2198,8 +2198,8 @@ gCryTable:: .endif @ P_FAMILY_PAWMI .if P_FAMILY_TANDEMAUS == TRUE cry Cry_Tandemaus - cry Cry_MausholdFamilyOfThree - cry Cry_MausholdFamilyOfFour + cry Cry_MausholdThree + cry Cry_MausholdFour .endif @ P_FAMILY_TANDEMAUS .if P_FAMILY_FIDOUGH == TRUE cry Cry_Fidough @@ -2622,7 +2622,7 @@ gCryTable_Reverse:: cry_reverse Cry_SlowbroMega .endif @ P_MEGA_EVOLUTIONS .if P_GALARIAN_FORMS == TRUE - cry_reverse Cry_SlowpokeGalarian + cry_reverse Cry_SlowpokeGalar .endif @ P_GALARIAN_FORMS .endif @ P_FAMILY_SLOWPOKE .if P_FAMILY_MAGNEMITE == TRUE @@ -4062,7 +4062,7 @@ gCryTable_Reverse:: .if P_FAMILY_FLABEBE == TRUE cry_reverse Cry_Flabebe cry_reverse Cry_Floette - cry_reverse Cry_FloetteEternalFlower + cry_reverse Cry_FloetteEternal cry_reverse Cry_Florges .endif @ P_FAMILY_FLABEBE .if P_FAMILY_SKIDDO == TRUE @@ -4510,12 +4510,12 @@ gCryTable_Reverse:: cry_reverse Cry_Stonjourner .endif @ P_FAMILY_STONJOURNER .if P_FAMILY_EISCUE == TRUE - cry_reverse Cry_EiscueIceFace - cry_reverse Cry_EiscueNoiceFace + cry_reverse Cry_EiscueIce + cry_reverse Cry_EiscueNoice .endif @ P_FAMILY_EISCUE .if P_FAMILY_INDEEDEE == TRUE - cry_reverse Cry_IndeedeeMale - cry_reverse Cry_IndeedeeFemale + cry_reverse Cry_IndeedeeM + cry_reverse Cry_IndeedeeF .endif @ P_FAMILY_INDEEDEE .if P_FAMILY_MORPEKO == TRUE cry_reverse Cry_MorpekoFullBelly @@ -4549,12 +4549,12 @@ gCryTable_Reverse:: cry_reverse Cry_Dragapult .endif @ P_FAMILY_DREEPY .if P_FAMILY_ZACIAN == TRUE - cry_reverse Cry_ZacianHeroOfManyBattles - cry_reverse Cry_ZacianCrownedSword + cry_reverse Cry_ZacianHero + cry_reverse Cry_ZacianCrowned .endif @ P_FAMILY_ZACIAN .if P_FAMILY_ZAMAZENTA == TRUE - cry_reverse Cry_ZamazentaHeroOfManyBattles - cry_reverse Cry_ZamazentaCrownedShield + cry_reverse Cry_ZamazentaHero + cry_reverse Cry_ZamazentaCrowned .endif @ P_FAMILY_ZAMAZENTA .if P_FAMILY_ETERNATUS == TRUE cry_reverse Cry_Eternatus @@ -4562,8 +4562,8 @@ gCryTable_Reverse:: .endif @ P_FAMILY_ETERNATUS .if P_FAMILY_KUBFU == TRUE cry_reverse Cry_Kubfu - cry_reverse Cry_UrshifuSingleStrikeStyle - cry_reverse Cry_UrshifuRapidStrikeStyle + cry_reverse Cry_UrshifuSingleStrike + cry_reverse Cry_UrshifuRapidStrike .endif @ P_FAMILY_KUBFU .if P_FAMILY_ZARUDE == TRUE cry_reverse Cry_Zarude @@ -4583,8 +4583,8 @@ gCryTable_Reverse:: .if P_FAMILY_CALYREX == TRUE cry_reverse Cry_Calyrex .if P_FUSION_FORMS == TRUE - cry_reverse Cry_CalyrexIceRider - cry_reverse Cry_CalyrexShadowRider + cry_reverse Cry_CalyrexIce + cry_reverse Cry_CalyrexShadow .endif @ P_FUSION_FORMS .endif @ P_FAMILY_CALYREX .if P_FAMILY_ENAMORUS == TRUE @@ -4608,8 +4608,8 @@ gCryTable_Reverse:: .endif @ P_FAMILY_QUAXLY .if P_FAMILY_LECHONK == TRUE cry_reverse Cry_Lechonk - cry_reverse Cry_OinkologneMale - cry_reverse Cry_OinkologneFemale + cry_reverse Cry_OinkologneM + cry_reverse Cry_OinkologneF .endif @ P_FAMILY_LECHONK .if P_FAMILY_TAROUNTULA == TRUE cry_reverse Cry_Tarountula @@ -4626,8 +4626,8 @@ gCryTable_Reverse:: .endif @ P_FAMILY_PAWMI .if P_FAMILY_TANDEMAUS == TRUE cry_reverse Cry_Tandemaus - cry_reverse Cry_MausholdFamilyOfThree - cry_reverse Cry_MausholdFamilyOfFour + cry_reverse Cry_MausholdThree + cry_reverse Cry_MausholdFour .endif @ P_FAMILY_TANDEMAUS .if P_FAMILY_FIDOUGH == TRUE cry_reverse Cry_Fidough diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index b1cf174150..0e4980667c 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -871,8 +871,8 @@ Cry_SlowbroMega:: .endif @ P_MEGA_EVOLUTIONS .if P_GALARIAN_FORMS == TRUE .align 2 -Cry_SlowpokeGalarian:: - .incbin "sound/direct_sound_samples/cries/slowpoke_galarian.bin" +Cry_SlowpokeGalar:: + .incbin "sound/direct_sound_samples/cries/slowpoke_galar.bin" .endif @ P_GALARIAN_FORMS .endif @ P_FAMILY_SLOWPOKE @@ -4259,8 +4259,8 @@ Cry_Floette:: .incbin "sound/direct_sound_samples/cries/floette.bin" .align 2 -Cry_FloetteEternalFlower:: - .incbin "sound/direct_sound_samples/cries/floette_eternal_flower.bin" +Cry_FloetteEternal:: + .incbin "sound/direct_sound_samples/cries/floette_eternal.bin" .align 2 Cry_Florges:: @@ -5356,21 +5356,21 @@ Cry_Stonjourner:: .if P_FAMILY_EISCUE == TRUE .align 2 -Cry_EiscueIceFace:: +Cry_EiscueIce:: .incbin "sound/direct_sound_samples/cries/eiscue_ice_face.bin" .align 2 -Cry_EiscueNoiceFace:: +Cry_EiscueNoice:: .incbin "sound/direct_sound_samples/cries/eiscue_noice_face.bin" .endif @ P_FAMILY_EISCUE .if P_FAMILY_INDEEDEE == TRUE .align 2 -Cry_IndeedeeMale:: +Cry_IndeedeeM:: .incbin "sound/direct_sound_samples/cries/indeedee_male.bin" .align 2 -Cry_IndeedeeFemale:: +Cry_IndeedeeF:: .incbin "sound/direct_sound_samples/cries/indeedee_female.bin" .endif @ P_FAMILY_INDEEDEE @@ -5444,21 +5444,21 @@ Cry_Dragapult:: .if P_FAMILY_ZACIAN == TRUE .align 2 -Cry_ZacianHeroOfManyBattles:: +Cry_ZacianHero:: .incbin "sound/direct_sound_samples/cries/zacian_hero_of_many_battles.bin" .align 2 -Cry_ZacianCrownedSword:: +Cry_ZacianCrowned:: .incbin "sound/direct_sound_samples/cries/zacian_crowned_sword.bin" .endif @ P_FAMILY_ZACIAN .if P_FAMILY_ZAMAZENTA == TRUE .align 2 -Cry_ZamazentaHeroOfManyBattles:: +Cry_ZamazentaHero:: .incbin "sound/direct_sound_samples/cries/zamazenta_hero_of_many_battles.bin" .align 2 -Cry_ZamazentaCrownedShield:: +Cry_ZamazentaCrowned:: .incbin "sound/direct_sound_samples/cries/zamazenta_crowned_shield.bin" .endif @ P_FAMILY_ZAMAZENTA @@ -5478,12 +5478,12 @@ Cry_Kubfu:: .incbin "sound/direct_sound_samples/cries/kubfu.bin" .align 2 -Cry_UrshifuSingleStrikeStyle:: - .incbin "sound/direct_sound_samples/cries/urshifu_single_strike_style.bin" +Cry_UrshifuSingleStrike:: + .incbin "sound/direct_sound_samples/cries/urshifu_single_strike.bin" .align 2 -Cry_UrshifuRapidStrikeStyle:: - .incbin "sound/direct_sound_samples/cries/urshifu_rapid_strike_style.bin" +Cry_UrshifuRapidStrike:: + .incbin "sound/direct_sound_samples/cries/urshifu_rapid_strike.bin" .endif @ P_FAMILY_KUBFU .if P_FAMILY_ZARUDE == TRUE @@ -5523,12 +5523,12 @@ Cry_Calyrex:: .if P_FUSION_FORMS == TRUE .align 2 -Cry_CalyrexIceRider:: - .incbin "sound/direct_sound_samples/cries/calyrex_ice_rider.bin" +Cry_CalyrexIce:: + .incbin "sound/direct_sound_samples/cries/calyrex_ice.bin" .align 2 -Cry_CalyrexShadowRider:: - .incbin "sound/direct_sound_samples/cries/calyrex_shadow_rider.bin" +Cry_CalyrexShadow:: + .incbin "sound/direct_sound_samples/cries/calyrex_shadow.bin" .endif @ P_FUSION_FORMS .endif @ P_FAMILY_CALYREX @@ -5591,12 +5591,12 @@ Cry_Lechonk:: .incbin "sound/direct_sound_samples/cries/lechonk.bin" .align 2 -Cry_OinkologneMale:: - .incbin "sound/direct_sound_samples/cries/oinkologne_male.bin" +Cry_OinkologneM:: + .incbin "sound/direct_sound_samples/cries/oinkologne_m.bin" .align 2 -Cry_OinkologneFemale:: - .incbin "sound/direct_sound_samples/cries/oinkologne_female.bin" +Cry_OinkologneF:: + .incbin "sound/direct_sound_samples/cries/oinkologne_f.bin" .endif @ P_FAMILY_LECHONK .if P_FAMILY_TAROUNTULA == TRUE @@ -5639,12 +5639,12 @@ Cry_Tandemaus:: .incbin "sound/direct_sound_samples/cries/tandemaus.bin" .align 2 -Cry_MausholdFamilyOfThree:: - .incbin "sound/direct_sound_samples/cries/maushold_family_of_three.bin" +Cry_MausholdThree:: + .incbin "sound/direct_sound_samples/cries/maushold_three.bin" .align 2 -Cry_MausholdFamilyOfFour:: - .incbin "sound/direct_sound_samples/cries/maushold_family_of_four.bin" +Cry_MausholdFour:: + .incbin "sound/direct_sound_samples/cries/maushold_four.bin" .endif @ P_FAMILY_TANDEMAUS .if P_FAMILY_FIDOUGH == TRUE diff --git a/sound/direct_sound_samples/cries/calyrex_ice_rider.aif b/sound/direct_sound_samples/cries/calyrex_ice.aif similarity index 100% rename from sound/direct_sound_samples/cries/calyrex_ice_rider.aif rename to sound/direct_sound_samples/cries/calyrex_ice.aif diff --git a/sound/direct_sound_samples/cries/calyrex_shadow_rider.aif b/sound/direct_sound_samples/cries/calyrex_shadow.aif similarity index 100% rename from sound/direct_sound_samples/cries/calyrex_shadow_rider.aif rename to sound/direct_sound_samples/cries/calyrex_shadow.aif diff --git a/sound/direct_sound_samples/cries/floette_eternal_flower.aif b/sound/direct_sound_samples/cries/floette_eternal.aif similarity index 100% rename from sound/direct_sound_samples/cries/floette_eternal_flower.aif rename to sound/direct_sound_samples/cries/floette_eternal.aif diff --git a/sound/direct_sound_samples/cries/maushold_family_of_four.aif b/sound/direct_sound_samples/cries/maushold_four.aif similarity index 100% rename from sound/direct_sound_samples/cries/maushold_family_of_four.aif rename to sound/direct_sound_samples/cries/maushold_four.aif diff --git a/sound/direct_sound_samples/cries/maushold_family_of_three.aif b/sound/direct_sound_samples/cries/maushold_three.aif similarity index 100% rename from sound/direct_sound_samples/cries/maushold_family_of_three.aif rename to sound/direct_sound_samples/cries/maushold_three.aif diff --git a/sound/direct_sound_samples/cries/oinkologne_female.aif b/sound/direct_sound_samples/cries/oinkologne_f.aif similarity index 100% rename from sound/direct_sound_samples/cries/oinkologne_female.aif rename to sound/direct_sound_samples/cries/oinkologne_f.aif diff --git a/sound/direct_sound_samples/cries/oinkologne_male.aif b/sound/direct_sound_samples/cries/oinkologne_m.aif similarity index 100% rename from sound/direct_sound_samples/cries/oinkologne_male.aif rename to sound/direct_sound_samples/cries/oinkologne_m.aif diff --git a/sound/direct_sound_samples/cries/slowpoke_galarian.aif b/sound/direct_sound_samples/cries/slowpoke_galar.aif similarity index 100% rename from sound/direct_sound_samples/cries/slowpoke_galarian.aif rename to sound/direct_sound_samples/cries/slowpoke_galar.aif diff --git a/sound/direct_sound_samples/cries/urshifu_rapid_strike_style.aif b/sound/direct_sound_samples/cries/urshifu_rapid_strike.aif similarity index 100% rename from sound/direct_sound_samples/cries/urshifu_rapid_strike_style.aif rename to sound/direct_sound_samples/cries/urshifu_rapid_strike.aif diff --git a/sound/direct_sound_samples/cries/urshifu_single_strike_style.aif b/sound/direct_sound_samples/cries/urshifu_single_strike.aif similarity index 100% rename from sound/direct_sound_samples/cries/urshifu_single_strike_style.aif rename to sound/direct_sound_samples/cries/urshifu_single_strike.aif diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 5e9a4d7532..88725dda66 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -1512,10 +1512,10 @@ $(POKEMONGFXDIR)/unown/y/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/unown/z/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/exclamation_mark/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/exclamation/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/question_mark/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/question/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/wobbuffet/overworld.4bpp: %.4bpp: %.png @@ -3153,7 +3153,7 @@ $(POKEMONGFXDIR)/espurr/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/meowstic/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meowstic/female/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meowstic/f/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/honedge/overworld.4bpp: %.4bpp: %.png @@ -3768,7 +3768,7 @@ $(POKEMONGFXDIR)/eiscue/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/indeedee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/indeedee/female/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/indeedee/f/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/morpeko/overworld.4bpp: %.4bpp: %.png @@ -3843,118 +3843,118 @@ $(POKEMONGFXDIR)/spectrier/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/calyrex/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/calyrex/shadow_rider/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/calyrex/shadow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/calyrex/ice_rider/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/calyrex/ice/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zapdos/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zapdos/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meowth/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meowth/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ponyta/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ponyta/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rapidash/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rapidash/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slowpoke/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slowpoke/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slowbro/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slowbro/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/farfetchd/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/farfetchd/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/weezing/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/weezing/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mr_mime/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mr_mime/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/articuno/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/articuno/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/moltres/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/moltres/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slowking/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slowking/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/corsola/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/corsola/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zigzagoon/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zigzagoon/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/linoone/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/linoone/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/darumaka/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/darumaka/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/darmanitan/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/darmanitan/galar_standard/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/yamask/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/yamask/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/stunfisk/galarian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/stunfisk/galar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/growlithe/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/growlithe/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/arcanine/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arcanine/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/voltorb/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/voltorb/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/electrode/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/electrode/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/braviary/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/braviary/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/qwilfish/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/qwilfish/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sneasel/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sneasel/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sneasel/hisuian/overworldf.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sneasel/hisui/overworldf.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zorua/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zorua/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zoroark/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zoroark/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/samurott/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/samurott/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lilligant/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lilligant/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sliggoo/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sliggoo/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/goodra/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/goodra/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/avalugg/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/avalugg/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/decidueye/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/decidueye/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/typhlosion/hisuian/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/typhlosion/hisui/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/dialga/origin/overworld.4bpp: %.4bpp: %.png @@ -3975,7 +3975,7 @@ $(POKEMONGFXDIR)/basculin/white_striped/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/basculegion/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/basculegion/female/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/basculegion/f/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/ursaluna/overworld.4bpp: %.4bpp: %.png @@ -4005,22 +4005,22 @@ $(POKEMONGFXDIR)/deoxys/defense/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/deoxys/speed/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/burmy/sandy_cloak/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/burmy/sandy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/burmy/trash_cloak/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/burmy/trash/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wormadam/sandy_cloak/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wormadam/sandy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wormadam/trash_cloak/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wormadam/trash/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shellos/east_sea/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shellos/east/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gastrodon/east_sea/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gastrodon/east/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/rotom/heat/overworld.4bpp: %.4bpp: %.png @@ -4173,43 +4173,43 @@ $(POKEMONGFXDIR)/vivillon/poke_ball/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/vivillon/meadow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flabebe/yellow_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flabebe/yellow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flabebe/blue_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flabebe/blue/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flabebe/orange_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flabebe/orange/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flabebe/white_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flabebe/white/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/yellow_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/yellow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/blue_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/blue/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/orange_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/orange/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/white_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/white/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/eternal_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/eternal/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/florges/yellow_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/florges/yellow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/florges/blue_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/florges/blue/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/florges/orange_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/florges/orange/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/florges/white_flower/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/florges/white/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/furfrou/heart_trim/overworld.4bpp: %.4bpp: %.png @@ -4242,61 +4242,61 @@ $(POKEMONGFXDIR)/furfrou/pharaoh_trim/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/hoopa/unbound/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/rattata/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rattata/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/raticate/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/raticate/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/raichu/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/raichu/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sandshrew/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sandshrew/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sandslash/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sandslash/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vulpix/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vulpix/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ninetales/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ninetales/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/diglett/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/diglett/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dugtrio/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dugtrio/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meowth/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meowth/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/persian/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/persian/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/geodude/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/geodude/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/graveler/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/graveler/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/golem/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/golem/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/grimer/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/grimer/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/muk/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/muk/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/exeggutor/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/exeggutor/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/marowak/alolan/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/marowak/alola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wooper/wooper_paldean/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wooper/paldea/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/clodsire/overworld.4bpp: %.4bpp: %.png @@ -4335,7 +4335,7 @@ $(POKEMONGFXDIR)/lechonk/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/oinkologne/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/oinkologne/female/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/oinkologne/f/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/tarountula/overworld.4bpp: %.4bpp: %.png @@ -4386,13 +4386,13 @@ $(POKEMONGFXDIR)/arboliva/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/squawkabilly/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/squawkabilly/blue_plumage/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/squawkabilly/blue/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/squawkabilly/white_plumage/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/squawkabilly/white/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/squawkabilly/yellow_plumage/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/squawkabilly/yellow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/nacli/overworld.4bpp: %.4bpp: %.png @@ -4698,13 +4698,13 @@ $(POKEMONGFXDIR)/terapagos/terastal/overworld.4bpp: %.4bpp: %.png $(POKEMONGFXDIR)/pecharunt/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tauros/paldean_aqua_breed/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tauros/paldea_aqua/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tauros/paldean_blaze_breed/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tauros/paldea_blaze/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tauros/paldean_combat_breed/overworld.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tauros/paldea_combat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(POKEMONGFXDIR)/ursaluna/bloodmoon/overworld.4bpp: %.4bpp: %.png diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 436ffb8428..5e6cfe8e0e 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -79,7 +79,7 @@ static const struct SignatureZMove sSignatureZMoves[] = {SPECIES_PIKACHU_UNOVA, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT}, {SPECIES_PIKACHU_KALOS, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT}, {SPECIES_PIKACHU_ALOLA, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT}, - {SPECIES_PIKACHU_PARTNER_CAP, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT}, + {SPECIES_PIKACHU_PARTNER, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT}, {SPECIES_PIKACHU_WORLD, ITEM_PIKASHUNIUM_Z, MOVE_THUNDERBOLT, MOVE_10000000_VOLT_THUNDERBOLT}, {SPECIES_PRIMARINA, ITEM_PRIMARIUM_Z, MOVE_SPARKLING_ARIA, MOVE_OCEANIC_OPERETTA}, {SPECIES_SOLGALEO, ITEM_SOLGANIUM_Z, MOVE_SUNSTEEL_STRIKE, MOVE_SEARING_SUNRAZE_SMASH}, diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 38c1848c00..1bee8c537f 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -122,16 +122,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_VenusaurGigantamax[] = INCBIN_U8("graphics/pokemon/venusaur/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/front.4bpp.lz"); + const u32 gMonBackPic_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/back.4bpp.lz"); + const u32 gMonPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_VenusaurGmax[] = INCBIN_U8("graphics/pokemon/venusaur/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_VenusaurGigantamax[] = INCBIN_COMP("graphics/pokemon/venusaur/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_VenusaurGmax[] = INCBIN_COMP("graphics/pokemon/venusaur/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -248,16 +248,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CharizardGigantamax[] = INCBIN_U8("graphics/pokemon/charizard/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/front.4bpp.lz"); + const u32 gMonBackPic_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/back.4bpp.lz"); + const u32 gMonPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_CharizardGmax[] = INCBIN_U8("graphics/pokemon/charizard/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_CharizardGigantamax[] = INCBIN_COMP("graphics/pokemon/charizard/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_CharizardGmax[] = INCBIN_COMP("graphics/pokemon/charizard/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -361,16 +361,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_BlastoiseGigantamax[] = INCBIN_U8("graphics/pokemon/blastoise/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/front.4bpp.lz"); + const u32 gMonBackPic_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/back.4bpp.lz"); + const u32 gMonPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_BlastoiseGmax[] = INCBIN_U8("graphics/pokemon/blastoise/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_BlastoiseGigantamax[] = INCBIN_COMP("graphics/pokemon/blastoise/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_BlastoiseGmax[] = INCBIN_COMP("graphics/pokemon/blastoise/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -461,16 +461,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_ButterfreeGigantamax[] = INCBIN_U8("graphics/pokemon/butterfree/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/front.4bpp.lz"); + const u32 gMonBackPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/back.4bpp.lz"); + const u32 gMonPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_ButterfreeGmax[] = INCBIN_U8("graphics/pokemon/butterfree/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_ButterfreeGigantamax[] = INCBIN_COMP("graphics/pokemon/butterfree/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_ButterfreeGmax[] = INCBIN_COMP("graphics/pokemon/butterfree/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -740,29 +740,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/front.4bpp.lz"); - const u32 gMonPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_RattataAlolan[] = INCBIN_U8("graphics/pokemon/rattata/alolan/icon.4bpp"); + const u32 gMonFrontPic_RattataAlola[] = INCBIN_U32("graphics/pokemon/rattata/alola/front.4bpp.lz"); + const u32 gMonPalette_RattataAlola[] = INCBIN_U32("graphics/pokemon/rattata/alola/normal.gbapal.lz"); + const u32 gMonBackPic_RattataAlola[] = INCBIN_U32("graphics/pokemon/rattata/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_RattataAlola[] = INCBIN_U32("graphics/pokemon/rattata/alola/shiny.gbapal.lz"); + const u8 gMonIcon_RattataAlola[] = INCBIN_U8("graphics/pokemon/rattata/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_RattataAlolan[] = INCBIN_COMP("graphics/pokemon/rattata/alolan/overworld.4bpp"); + const u32 gObjectEventPic_RattataAlola[] = INCBIN_COMP("graphics/pokemon/rattata/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_RattataAlola[] = INCBIN_U32("graphics/pokemon/rattata/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_RattataAlola[] = INCBIN_U32("graphics/pokemon/rattata/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/front.4bpp.lz"); - const u32 gMonPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_RaticateAlolan[] = INCBIN_U8("graphics/pokemon/raticate/alolan/icon.4bpp"); + const u32 gMonFrontPic_RaticateAlola[] = INCBIN_U32("graphics/pokemon/raticate/alola/front.4bpp.lz"); + const u32 gMonPalette_RaticateAlola[] = INCBIN_U32("graphics/pokemon/raticate/alola/normal.gbapal.lz"); + const u32 gMonBackPic_RaticateAlola[] = INCBIN_U32("graphics/pokemon/raticate/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_RaticateAlola[] = INCBIN_U32("graphics/pokemon/raticate/alola/shiny.gbapal.lz"); + const u8 gMonIcon_RaticateAlola[] = INCBIN_U8("graphics/pokemon/raticate/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_RaticateAlolan[] = INCBIN_COMP("graphics/pokemon/raticate/alolan/overworld.4bpp"); + const u32 gObjectEventPic_RaticateAlola[] = INCBIN_COMP("graphics/pokemon/raticate/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_RaticateAlola[] = INCBIN_U32("graphics/pokemon/raticate/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_RaticateAlola[] = INCBIN_U32("graphics/pokemon/raticate/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS @@ -984,11 +984,11 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_PikachuPopStar[] = INCBIN_U32("graphics/pokemon/pikachu/pop_star/shiny.gbapal.lz"); const u8 gMonIcon_PikachuPopStar[] = INCBIN_U8("graphics/pokemon/pikachu/pop_star/icon.4bpp"); - const u32 gMonFrontPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/front.4bpp.lz"); - const u32 gMonPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/ph_d/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuPhD[] = INCBIN_U8("graphics/pokemon/pikachu/ph_d/icon.4bpp"); + const u32 gMonFrontPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/phd/front.4bpp.lz"); + const u32 gMonPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/phd/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/phd/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuPhD[] = INCBIN_U32("graphics/pokemon/pikachu/phd/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuPhD[] = INCBIN_U8("graphics/pokemon/pikachu/phd/icon.4bpp"); const u32 gMonFrontPic_PikachuLibre[] = INCBIN_U32("graphics/pokemon/pikachu/libre/front.4bpp.lz"); const u32 gMonPalette_PikachuLibre[] = INCBIN_U32("graphics/pokemon/pikachu/libre/normal.gbapal.lz"); @@ -1001,90 +1001,90 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ // const u32 gObjectEventPic_PikachuRockStar[] = INCBIN_COMP("graphics/pokemon/pikachu/rock_star/overworld.4bpp"); // const u32 gObjectEventPic_PikachuBelle[] = INCBIN_COMP("graphics/pokemon/pikachu/belle/overworld.4bpp"); // const u32 gObjectEventPic_PikachuPopStar[] = INCBIN_COMP("graphics/pokemon/pikachu/pop_star/overworld.4bpp"); - // const u32 gObjectEventPic_PikachuPhD[] = INCBIN_COMP("graphics/pokemon/pikachu/ph_d/overworld.4bpp"); + // const u32 gObjectEventPic_PikachuPhD[] = INCBIN_COMP("graphics/pokemon/pikachu/phd/overworld.4bpp"); // const u32 gObjectEventPic_PikachuLibre[] = INCBIN_COMP("graphics/pokemon/pikachu/libre/overworld.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_COSPLAY_PIKACHU_FORMS #if P_CAP_PIKACHU_FORMS - const u32 gMonFrontPic_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuOriginalCap[] = INCBIN_U32("graphics/pokemon/pikachu/original_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuOriginalCap[] = INCBIN_U8("graphics/pokemon/pikachu/original_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuOriginal[] = INCBIN_U32("graphics/pokemon/pikachu/original/front.4bpp.lz"); + const u32 gMonPalette_PikachuOriginal[] = INCBIN_U32("graphics/pokemon/pikachu/original/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuOriginal[] = INCBIN_U32("graphics/pokemon/pikachu/original/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuOriginal[] = INCBIN_U32("graphics/pokemon/pikachu/original/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuOriginal[] = INCBIN_U8("graphics/pokemon/pikachu/original/icon.4bpp"); - const u32 gMonFrontPic_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuHoennCap[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuHoennCap[] = INCBIN_U8("graphics/pokemon/pikachu/hoenn_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuHoenn[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn/front.4bpp.lz"); + const u32 gMonPalette_PikachuHoenn[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuHoenn[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuHoenn[] = INCBIN_U32("graphics/pokemon/pikachu/hoenn/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuHoenn[] = INCBIN_U8("graphics/pokemon/pikachu/hoenn/icon.4bpp"); - const u32 gMonFrontPic_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuSinnohCap[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuSinnohCap[] = INCBIN_U8("graphics/pokemon/pikachu/sinnoh_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuSinnoh[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh/front.4bpp.lz"); + const u32 gMonPalette_PikachuSinnoh[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuSinnoh[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuSinnoh[] = INCBIN_U32("graphics/pokemon/pikachu/sinnoh/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuSinnoh[] = INCBIN_U8("graphics/pokemon/pikachu/sinnoh/icon.4bpp"); - const u32 gMonFrontPic_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuUnovaCap[] = INCBIN_U32("graphics/pokemon/pikachu/unova_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuUnovaCap[] = INCBIN_U8("graphics/pokemon/pikachu/unova_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuUnova[] = INCBIN_U32("graphics/pokemon/pikachu/unova/front.4bpp.lz"); + const u32 gMonPalette_PikachuUnova[] = INCBIN_U32("graphics/pokemon/pikachu/unova/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuUnova[] = INCBIN_U32("graphics/pokemon/pikachu/unova/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuUnova[] = INCBIN_U32("graphics/pokemon/pikachu/unova/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuUnova[] = INCBIN_U8("graphics/pokemon/pikachu/unova/icon.4bpp"); - const u32 gMonFrontPic_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuKalosCap[] = INCBIN_U32("graphics/pokemon/pikachu/kalos_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuKalosCap[] = INCBIN_U8("graphics/pokemon/pikachu/kalos_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuKalos[] = INCBIN_U32("graphics/pokemon/pikachu/kalos/front.4bpp.lz"); + const u32 gMonPalette_PikachuKalos[] = INCBIN_U32("graphics/pokemon/pikachu/kalos/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuKalos[] = INCBIN_U32("graphics/pokemon/pikachu/kalos/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuKalos[] = INCBIN_U32("graphics/pokemon/pikachu/kalos/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuKalos[] = INCBIN_U8("graphics/pokemon/pikachu/kalos/icon.4bpp"); - const u32 gMonFrontPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/alola_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuAlolaCap[] = INCBIN_U8("graphics/pokemon/pikachu/alola_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuAlola[] = INCBIN_U32("graphics/pokemon/pikachu/alola/front.4bpp.lz"); + const u32 gMonPalette_PikachuAlola[] = INCBIN_U32("graphics/pokemon/pikachu/alola/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuAlola[] = INCBIN_U32("graphics/pokemon/pikachu/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuAlola[] = INCBIN_U32("graphics/pokemon/pikachu/alola/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuAlola[] = INCBIN_U8("graphics/pokemon/pikachu/alola/icon.4bpp"); - const u32 gMonFrontPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuPartnerCap[] = INCBIN_U8("graphics/pokemon/pikachu/partner_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuPartner[] = INCBIN_U32("graphics/pokemon/pikachu/partner/front.4bpp.lz"); + const u32 gMonPalette_PikachuPartner[] = INCBIN_U32("graphics/pokemon/pikachu/partner/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuPartner[] = INCBIN_U32("graphics/pokemon/pikachu/partner/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuPartner[] = INCBIN_U32("graphics/pokemon/pikachu/partner/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuPartner[] = INCBIN_U8("graphics/pokemon/pikachu/partner/icon.4bpp"); - const u32 gMonFrontPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/front.4bpp.lz"); - const u32 gMonPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/normal.gbapal.lz"); - const u32 gMonBackPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/back.4bpp.lz"); - const u32 gMonShinyPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuWorldCap[] = INCBIN_U8("graphics/pokemon/pikachu/world_cap/icon.4bpp"); + const u32 gMonFrontPic_PikachuWorld[] = INCBIN_U32("graphics/pokemon/pikachu/world/front.4bpp.lz"); + const u32 gMonPalette_PikachuWorld[] = INCBIN_U32("graphics/pokemon/pikachu/world/normal.gbapal.lz"); + const u32 gMonBackPic_PikachuWorld[] = INCBIN_U32("graphics/pokemon/pikachu/world/back.4bpp.lz"); + const u32 gMonShinyPalette_PikachuWorld[] = INCBIN_U32("graphics/pokemon/pikachu/world/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuWorld[] = INCBIN_U8("graphics/pokemon/pikachu/world/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_PikachuOriginalCap[] = INCBIN_COMP("graphics/pokemon/pikachu/original_cap/overworld.4bpp"); - // const u32 gObjectEventPic_PikachuHoennCap[] = INCBIN_COMP("graphics/pokemon/pikachu/hoenn_cap/overworld.4bpp"); - // const u32 gObjectEventPic_PikachuSinnohCap[] = INCBIN_COMP("graphics/pokemon/pikachu/sinnoh_cap/overworld.4bpp"); - // const u32 gObjectEventPic_PikachuUnovaCap[] = INCBIN_COMP("graphics/pokemon/pikachu/unova_cap/overworld.4bpp"); - // const u32 gObjectEventPic_PikachuKalosCap[] = INCBIN_COMP("graphics/pokemon/pikachu/kalos_cap/overworld.4bpp"); - // const u32 gObjectEventPic_PikachuAlolaCap[] = INCBIN_COMP("graphics/pokemon/pikachu/alola_cap/overworld.4bpp"); - // const u32 gObjectEventPic_PikachuPartnerCap[] = INCBIN_COMP("graphics/pokemon/pikachu/partner_cap/overworld.4bpp"); - // const u32 gObjectEventPic_PikachuWorldCap[] = INCBIN_COMP("graphics/pokemon/pikachu/world_cap/overworld.4bpp"); + // const u32 gObjectEventPic_PikachuOriginal[] = INCBIN_COMP("graphics/pokemon/pikachu/original/overworld.4bpp"); + // const u32 gObjectEventPic_PikachuHoenn[] = INCBIN_COMP("graphics/pokemon/pikachu/hoenn/overworld.4bpp"); + // const u32 gObjectEventPic_PikachuSinnoh[] = INCBIN_COMP("graphics/pokemon/pikachu/sinnoh/overworld.4bpp"); + // const u32 gObjectEventPic_PikachuUnova[] = INCBIN_COMP("graphics/pokemon/pikachu/unova/overworld.4bpp"); + // const u32 gObjectEventPic_PikachuKalos[] = INCBIN_COMP("graphics/pokemon/pikachu/kalos/overworld.4bpp"); + // const u32 gObjectEventPic_PikachuAlola[] = INCBIN_COMP("graphics/pokemon/pikachu/alola/overworld.4bpp"); + // const u32 gObjectEventPic_PikachuPartner[] = INCBIN_COMP("graphics/pokemon/pikachu/partner/overworld.4bpp"); + // const u32 gObjectEventPic_PikachuWorld[] = INCBIN_COMP("graphics/pokemon/pikachu/world/overworld.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_CAP_PIKACHU_FORMS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_PikachuGigantamax[] = INCBIN_U8("graphics/pokemon/pikachu/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/front.4bpp.lz"); + const u32 gMonBackPic_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/back.4bpp.lz"); + const u32 gMonPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_PikachuGmax[] = INCBIN_U8("graphics/pokemon/pikachu/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_PikachuGigantamax[] = INCBIN_COMP("graphics/pokemon/pikachu/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_PikachuGmax[] = INCBIN_COMP("graphics/pokemon/pikachu/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS - const u8 gMonIcon_PikachuPartner[] = INCBIN_U8("graphics/pokemon/pikachu/partner/icon.4bpp"); + const u8 gMonIcon_PikachuStarter[] = INCBIN_U8("graphics/pokemon/pikachu/starter/icon.4bpp"); #if P_CUSTOM_GENDER_DIFF_ICONS - const u8 gMonIcon_PikachuPartnerF[] = INCBIN_U8("graphics/pokemon/pikachu/partner/iconf.4bpp"); + const u8 gMonIcon_PikachuStarterF[] = INCBIN_U8("graphics/pokemon/pikachu/starter/iconf.4bpp"); #endif #if !P_GBA_STYLE_SPECIES_GFX @@ -1120,16 +1120,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/front.4bpp.lz"); - const u32 gMonPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_RaichuAlolan[] = INCBIN_U8("graphics/pokemon/raichu/alolan/icon.4bpp"); + const u32 gMonFrontPic_RaichuAlola[] = INCBIN_U32("graphics/pokemon/raichu/alola/front.4bpp.lz"); + const u32 gMonPalette_RaichuAlola[] = INCBIN_U32("graphics/pokemon/raichu/alola/normal.gbapal.lz"); + const u32 gMonBackPic_RaichuAlola[] = INCBIN_U32("graphics/pokemon/raichu/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_RaichuAlola[] = INCBIN_U32("graphics/pokemon/raichu/alola/shiny.gbapal.lz"); + const u8 gMonIcon_RaichuAlola[] = INCBIN_U8("graphics/pokemon/raichu/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_RaichuAlolan[] = INCBIN_COMP("graphics/pokemon/raichu/alolan/overworld.4bpp"); + const u32 gObjectEventPic_RaichuAlola[] = INCBIN_COMP("graphics/pokemon/raichu/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_RaichuAlola[] = INCBIN_U32("graphics/pokemon/raichu/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_RaichuAlola[] = INCBIN_U32("graphics/pokemon/raichu/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS @@ -1191,29 +1191,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/front.4bpp.lz"); - const u32 gMonPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_SandshrewAlolan[] = INCBIN_U8("graphics/pokemon/sandshrew/alolan/icon.4bpp"); + const u32 gMonFrontPic_SandshrewAlola[] = INCBIN_U32("graphics/pokemon/sandshrew/alola/front.4bpp.lz"); + const u32 gMonPalette_SandshrewAlola[] = INCBIN_U32("graphics/pokemon/sandshrew/alola/normal.gbapal.lz"); + const u32 gMonBackPic_SandshrewAlola[] = INCBIN_U32("graphics/pokemon/sandshrew/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_SandshrewAlola[] = INCBIN_U32("graphics/pokemon/sandshrew/alola/shiny.gbapal.lz"); + const u8 gMonIcon_SandshrewAlola[] = INCBIN_U8("graphics/pokemon/sandshrew/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SandshrewAlolan[] = INCBIN_COMP("graphics/pokemon/sandshrew/alolan/overworld.4bpp"); + const u32 gObjectEventPic_SandshrewAlola[] = INCBIN_COMP("graphics/pokemon/sandshrew/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SandshrewAlola[] = INCBIN_U32("graphics/pokemon/sandshrew/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SandshrewAlola[] = INCBIN_U32("graphics/pokemon/sandshrew/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/front.4bpp.lz"); - const u32 gMonPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_SandslashAlolan[] = INCBIN_U8("graphics/pokemon/sandslash/alolan/icon.4bpp"); + const u32 gMonFrontPic_SandslashAlola[] = INCBIN_U32("graphics/pokemon/sandslash/alola/front.4bpp.lz"); + const u32 gMonPalette_SandslashAlola[] = INCBIN_U32("graphics/pokemon/sandslash/alola/normal.gbapal.lz"); + const u32 gMonBackPic_SandslashAlola[] = INCBIN_U32("graphics/pokemon/sandslash/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_SandslashAlola[] = INCBIN_U32("graphics/pokemon/sandslash/alola/shiny.gbapal.lz"); + const u8 gMonIcon_SandslashAlola[] = INCBIN_U8("graphics/pokemon/sandslash/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SandslashAlolan[] = INCBIN_COMP("graphics/pokemon/sandslash/alolan/overworld.4bpp"); + const u32 gObjectEventPic_SandslashAlola[] = INCBIN_COMP("graphics/pokemon/sandslash/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SandslashAlola[] = INCBIN_U32("graphics/pokemon/sandslash/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SandslashAlola[] = INCBIN_U32("graphics/pokemon/sandslash/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS @@ -1524,29 +1524,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/front.4bpp.lz"); - const u32 gMonPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_VulpixAlolan[] = INCBIN_U8("graphics/pokemon/vulpix/alolan/icon.4bpp"); + const u32 gMonFrontPic_VulpixAlola[] = INCBIN_U32("graphics/pokemon/vulpix/alola/front.4bpp.lz"); + const u32 gMonPalette_VulpixAlola[] = INCBIN_U32("graphics/pokemon/vulpix/alola/normal.gbapal.lz"); + const u32 gMonBackPic_VulpixAlola[] = INCBIN_U32("graphics/pokemon/vulpix/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_VulpixAlola[] = INCBIN_U32("graphics/pokemon/vulpix/alola/shiny.gbapal.lz"); + const u8 gMonIcon_VulpixAlola[] = INCBIN_U8("graphics/pokemon/vulpix/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_VulpixAlolan[] = INCBIN_COMP("graphics/pokemon/vulpix/alolan/overworld.4bpp"); + const u32 gObjectEventPic_VulpixAlola[] = INCBIN_COMP("graphics/pokemon/vulpix/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_VulpixAlola[] = INCBIN_U32("graphics/pokemon/vulpix/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_VulpixAlola[] = INCBIN_U32("graphics/pokemon/vulpix/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/front.4bpp.lz"); - const u32 gMonPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_NinetalesAlolan[] = INCBIN_U8("graphics/pokemon/ninetales/alolan/icon.4bpp"); + const u32 gMonFrontPic_NinetalesAlola[] = INCBIN_U32("graphics/pokemon/ninetales/alola/front.4bpp.lz"); + const u32 gMonPalette_NinetalesAlola[] = INCBIN_U32("graphics/pokemon/ninetales/alola/normal.gbapal.lz"); + const u32 gMonBackPic_NinetalesAlola[] = INCBIN_U32("graphics/pokemon/ninetales/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_NinetalesAlola[] = INCBIN_U32("graphics/pokemon/ninetales/alola/shiny.gbapal.lz"); + const u8 gMonIcon_NinetalesAlola[] = INCBIN_U8("graphics/pokemon/ninetales/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_NinetalesAlolan[] = INCBIN_COMP("graphics/pokemon/ninetales/alolan/overworld.4bpp"); + const u32 gObjectEventPic_NinetalesAlola[] = INCBIN_COMP("graphics/pokemon/ninetales/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_NinetalesAlola[] = INCBIN_U32("graphics/pokemon/ninetales/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_NinetalesAlola[] = INCBIN_U32("graphics/pokemon/ninetales/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS @@ -2026,29 +2026,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/front.4bpp.lz"); - const u32 gMonPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_DiglettAlolan[] = INCBIN_U8("graphics/pokemon/diglett/alolan/icon.4bpp"); + const u32 gMonFrontPic_DiglettAlola[] = INCBIN_U32("graphics/pokemon/diglett/alola/front.4bpp.lz"); + const u32 gMonPalette_DiglettAlola[] = INCBIN_U32("graphics/pokemon/diglett/alola/normal.gbapal.lz"); + const u32 gMonBackPic_DiglettAlola[] = INCBIN_U32("graphics/pokemon/diglett/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_DiglettAlola[] = INCBIN_U32("graphics/pokemon/diglett/alola/shiny.gbapal.lz"); + const u8 gMonIcon_DiglettAlola[] = INCBIN_U8("graphics/pokemon/diglett/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_DiglettAlolan[] = INCBIN_COMP("graphics/pokemon/diglett/alolan/overworld.4bpp"); + const u32 gObjectEventPic_DiglettAlola[] = INCBIN_COMP("graphics/pokemon/diglett/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_DiglettAlola[] = INCBIN_U32("graphics/pokemon/diglett/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_DiglettAlola[] = INCBIN_U32("graphics/pokemon/diglett/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/front.4bpp.lz"); - const u32 gMonPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_DugtrioAlolan[] = INCBIN_U8("graphics/pokemon/dugtrio/alolan/icon.4bpp"); + const u32 gMonFrontPic_DugtrioAlola[] = INCBIN_U32("graphics/pokemon/dugtrio/alola/front.4bpp.lz"); + const u32 gMonPalette_DugtrioAlola[] = INCBIN_U32("graphics/pokemon/dugtrio/alola/normal.gbapal.lz"); + const u32 gMonBackPic_DugtrioAlola[] = INCBIN_U32("graphics/pokemon/dugtrio/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_DugtrioAlola[] = INCBIN_U32("graphics/pokemon/dugtrio/alola/shiny.gbapal.lz"); + const u8 gMonIcon_DugtrioAlola[] = INCBIN_U8("graphics/pokemon/dugtrio/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_DugtrioAlolan[] = INCBIN_COMP("graphics/pokemon/dugtrio/alolan/overworld.4bpp"); + const u32 gObjectEventPic_DugtrioAlola[] = INCBIN_COMP("graphics/pokemon/dugtrio/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_DugtrioAlola[] = INCBIN_U32("graphics/pokemon/dugtrio/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_DugtrioAlola[] = INCBIN_U32("graphics/pokemon/dugtrio/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS @@ -2110,44 +2110,44 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/front.4bpp.lz"); - const u32 gMonPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_MeowthAlolan[] = INCBIN_U8("graphics/pokemon/meowth/alolan/icon.4bpp"); + const u32 gMonFrontPic_MeowthAlola[] = INCBIN_U32("graphics/pokemon/meowth/alola/front.4bpp.lz"); + const u32 gMonPalette_MeowthAlola[] = INCBIN_U32("graphics/pokemon/meowth/alola/normal.gbapal.lz"); + const u32 gMonBackPic_MeowthAlola[] = INCBIN_U32("graphics/pokemon/meowth/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_MeowthAlola[] = INCBIN_U32("graphics/pokemon/meowth/alola/shiny.gbapal.lz"); + const u8 gMonIcon_MeowthAlola[] = INCBIN_U8("graphics/pokemon/meowth/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MeowthAlolan[] = INCBIN_COMP("graphics/pokemon/meowth/alolan/overworld.4bpp"); + const u32 gObjectEventPic_MeowthAlola[] = INCBIN_COMP("graphics/pokemon/meowth/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MeowthAlola[] = INCBIN_U32("graphics/pokemon/meowth/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MeowthAlola[] = INCBIN_U32("graphics/pokemon/meowth/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/front.4bpp.lz"); - const u32 gMonPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_PersianAlolan[] = INCBIN_U8("graphics/pokemon/persian/alolan/icon.4bpp"); + const u32 gMonFrontPic_PersianAlola[] = INCBIN_U32("graphics/pokemon/persian/alola/front.4bpp.lz"); + const u32 gMonPalette_PersianAlola[] = INCBIN_U32("graphics/pokemon/persian/alola/normal.gbapal.lz"); + const u32 gMonBackPic_PersianAlola[] = INCBIN_U32("graphics/pokemon/persian/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_PersianAlola[] = INCBIN_U32("graphics/pokemon/persian/alola/shiny.gbapal.lz"); + const u8 gMonIcon_PersianAlola[] = INCBIN_U8("graphics/pokemon/persian/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_PersianAlolan[] = INCBIN_COMP("graphics/pokemon/persian/alolan/overworld.4bpp"); + const u32 gObjectEventPic_PersianAlola[] = INCBIN_COMP("graphics/pokemon/persian/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_PersianAlola[] = INCBIN_U32("graphics/pokemon/persian/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_PersianAlola[] = INCBIN_U32("graphics/pokemon/persian/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/front.4bpp.lz"); - const u32 gMonPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_MeowthGalarian[] = INCBIN_U8("graphics/pokemon/meowth/galarian/icon.4bpp"); + const u32 gMonFrontPic_MeowthGalar[] = INCBIN_U32("graphics/pokemon/meowth/galar/front.4bpp.lz"); + const u32 gMonPalette_MeowthGalar[] = INCBIN_U32("graphics/pokemon/meowth/galar/normal.gbapal.lz"); + const u32 gMonBackPic_MeowthGalar[] = INCBIN_U32("graphics/pokemon/meowth/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_MeowthGalar[] = INCBIN_U32("graphics/pokemon/meowth/galar/shiny.gbapal.lz"); + const u8 gMonIcon_MeowthGalar[] = INCBIN_U8("graphics/pokemon/meowth/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MeowthGalarian[] = INCBIN_COMP("graphics/pokemon/meowth/galarian/overworld.4bpp"); + const u32 gObjectEventPic_MeowthGalar[] = INCBIN_COMP("graphics/pokemon/meowth/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MeowthGalar[] = INCBIN_U32("graphics/pokemon/meowth/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MeowthGalar[] = INCBIN_U32("graphics/pokemon/meowth/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -2169,16 +2169,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_GALARIAN_FORMS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_MeowthGigantamax[] = INCBIN_U8("graphics/pokemon/meowth/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/front.4bpp.lz"); + const u32 gMonBackPic_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/back.4bpp.lz"); + const u32 gMonPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_MeowthGmax[] = INCBIN_U8("graphics/pokemon/meowth/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_MeowthGigantamax[] = INCBIN_COMP("graphics/pokemon/meowth/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_MeowthGmax[] = INCBIN_COMP("graphics/pokemon/meowth/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -2370,29 +2370,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/front.4bpp.lz"); - const u32 gMonPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_GrowlitheHisuian[] = INCBIN_U8("graphics/pokemon/growlithe/hisuian/icon.4bpp"); + const u32 gMonFrontPic_GrowlitheHisui[] = INCBIN_U32("graphics/pokemon/growlithe/hisui/front.4bpp.lz"); + const u32 gMonPalette_GrowlitheHisui[] = INCBIN_U32("graphics/pokemon/growlithe/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_GrowlitheHisui[] = INCBIN_U32("graphics/pokemon/growlithe/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_GrowlitheHisui[] = INCBIN_U32("graphics/pokemon/growlithe/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_GrowlitheHisui[] = INCBIN_U8("graphics/pokemon/growlithe/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_GrowlitheHisuian[] = INCBIN_COMP("graphics/pokemon/growlithe/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_GrowlitheHisui[] = INCBIN_COMP("graphics/pokemon/growlithe/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GrowlitheHisui[] = INCBIN_U32("graphics/pokemon/growlithe/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GrowlitheHisui[] = INCBIN_U32("graphics/pokemon/growlithe/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/front.4bpp.lz"); - const u32 gMonPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_ArcanineHisuian[] = INCBIN_U8("graphics/pokemon/arcanine/hisuian/icon.4bpp"); + const u32 gMonFrontPic_ArcanineHisui[] = INCBIN_U32("graphics/pokemon/arcanine/hisui/front.4bpp.lz"); + const u32 gMonPalette_ArcanineHisui[] = INCBIN_U32("graphics/pokemon/arcanine/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_ArcanineHisui[] = INCBIN_U32("graphics/pokemon/arcanine/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_ArcanineHisui[] = INCBIN_U32("graphics/pokemon/arcanine/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_ArcanineHisui[] = INCBIN_U8("graphics/pokemon/arcanine/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ArcanineHisuian[] = INCBIN_COMP("graphics/pokemon/arcanine/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_ArcanineHisui[] = INCBIN_COMP("graphics/pokemon/arcanine/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ArcanineHisui[] = INCBIN_U32("graphics/pokemon/arcanine/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ArcanineHisui[] = INCBIN_U32("graphics/pokemon/arcanine/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -2709,16 +2709,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_MachampGigantamax[] = INCBIN_U8("graphics/pokemon/machamp/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/front.4bpp.lz"); + const u32 gMonBackPic_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/back.4bpp.lz"); + const u32 gMonPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_MachampGmax[] = INCBIN_U8("graphics/pokemon/machamp/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_MachampGigantamax[] = INCBIN_COMP("graphics/pokemon/machamp/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_MachampGmax[] = INCBIN_COMP("graphics/pokemon/machamp/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -2950,42 +2950,42 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/front.4bpp.lz"); - const u32 gMonPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_GeodudeAlolan[] = INCBIN_U8("graphics/pokemon/geodude/alolan/icon.4bpp"); + const u32 gMonFrontPic_GeodudeAlola[] = INCBIN_U32("graphics/pokemon/geodude/alola/front.4bpp.lz"); + const u32 gMonPalette_GeodudeAlola[] = INCBIN_U32("graphics/pokemon/geodude/alola/normal.gbapal.lz"); + const u32 gMonBackPic_GeodudeAlola[] = INCBIN_U32("graphics/pokemon/geodude/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_GeodudeAlola[] = INCBIN_U32("graphics/pokemon/geodude/alola/shiny.gbapal.lz"); + const u8 gMonIcon_GeodudeAlola[] = INCBIN_U8("graphics/pokemon/geodude/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_GeodudeAlolan[] = INCBIN_COMP("graphics/pokemon/geodude/alolan/overworld.4bpp"); + const u32 gObjectEventPic_GeodudeAlola[] = INCBIN_COMP("graphics/pokemon/geodude/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GeodudeAlola[] = INCBIN_U32("graphics/pokemon/geodude/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GeodudeAlola[] = INCBIN_U32("graphics/pokemon/geodude/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/front.4bpp.lz"); - const u32 gMonPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_GravelerAlolan[] = INCBIN_U8("graphics/pokemon/graveler/alolan/icon.4bpp"); + const u32 gMonFrontPic_GravelerAlola[] = INCBIN_U32("graphics/pokemon/graveler/alola/front.4bpp.lz"); + const u32 gMonPalette_GravelerAlola[] = INCBIN_U32("graphics/pokemon/graveler/alola/normal.gbapal.lz"); + const u32 gMonBackPic_GravelerAlola[] = INCBIN_U32("graphics/pokemon/graveler/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_GravelerAlola[] = INCBIN_U32("graphics/pokemon/graveler/alola/shiny.gbapal.lz"); + const u8 gMonIcon_GravelerAlola[] = INCBIN_U8("graphics/pokemon/graveler/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_GravelerAlolan[] = INCBIN_COMP("graphics/pokemon/graveler/alolan/overworld.4bpp"); + const u32 gObjectEventPic_GravelerAlola[] = INCBIN_COMP("graphics/pokemon/graveler/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GravelerAlola[] = INCBIN_U32("graphics/pokemon/graveler/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GravelerAlola[] = INCBIN_U32("graphics/pokemon/graveler/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/front.4bpp.lz"); - const u32 gMonPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_GolemAlolan[] = INCBIN_U8("graphics/pokemon/golem/alolan/icon.4bpp"); + const u32 gMonFrontPic_GolemAlola[] = INCBIN_U32("graphics/pokemon/golem/alola/front.4bpp.lz"); + const u32 gMonPalette_GolemAlola[] = INCBIN_U32("graphics/pokemon/golem/alola/normal.gbapal.lz"); + const u32 gMonBackPic_GolemAlola[] = INCBIN_U32("graphics/pokemon/golem/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_GolemAlola[] = INCBIN_U32("graphics/pokemon/golem/alola/shiny.gbapal.lz"); + const u8 gMonIcon_GolemAlola[] = INCBIN_U8("graphics/pokemon/golem/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_GolemAlolan[] = INCBIN_COMP("graphics/pokemon/golem/alolan/overworld.4bpp"); + const u32 gObjectEventPic_GolemAlola[] = INCBIN_COMP("graphics/pokemon/golem/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GolemAlola[] = INCBIN_U32("graphics/pokemon/golem/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GolemAlola[] = INCBIN_U32("graphics/pokemon/golem/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS @@ -3047,29 +3047,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/front.4bpp.lz"); - const u32 gMonPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_PonytaGalarian[] = INCBIN_U8("graphics/pokemon/ponyta/galarian/icon.4bpp"); + const u32 gMonFrontPic_PonytaGalar[] = INCBIN_U32("graphics/pokemon/ponyta/galar/front.4bpp.lz"); + const u32 gMonPalette_PonytaGalar[] = INCBIN_U32("graphics/pokemon/ponyta/galar/normal.gbapal.lz"); + const u32 gMonBackPic_PonytaGalar[] = INCBIN_U32("graphics/pokemon/ponyta/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_PonytaGalar[] = INCBIN_U32("graphics/pokemon/ponyta/galar/shiny.gbapal.lz"); + const u8 gMonIcon_PonytaGalar[] = INCBIN_U8("graphics/pokemon/ponyta/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_PonytaGalarian[] = INCBIN_COMP("graphics/pokemon/ponyta/galarian/overworld.4bpp"); + const u32 gObjectEventPic_PonytaGalar[] = INCBIN_COMP("graphics/pokemon/ponyta/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_PonytaGalar[] = INCBIN_U32("graphics/pokemon/ponyta/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_PonytaGalar[] = INCBIN_U32("graphics/pokemon/ponyta/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/front.4bpp.lz"); - const u32 gMonPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_RapidashGalarian[] = INCBIN_U8("graphics/pokemon/rapidash/galarian/icon.4bpp"); + const u32 gMonFrontPic_RapidashGalar[] = INCBIN_U32("graphics/pokemon/rapidash/galar/front.4bpp.lz"); + const u32 gMonPalette_RapidashGalar[] = INCBIN_U32("graphics/pokemon/rapidash/galar/normal.gbapal.lz"); + const u32 gMonBackPic_RapidashGalar[] = INCBIN_U32("graphics/pokemon/rapidash/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_RapidashGalar[] = INCBIN_U32("graphics/pokemon/rapidash/galar/shiny.gbapal.lz"); + const u8 gMonIcon_RapidashGalar[] = INCBIN_U8("graphics/pokemon/rapidash/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_RapidashGalarian[] = INCBIN_COMP("graphics/pokemon/rapidash/galarian/overworld.4bpp"); + const u32 gObjectEventPic_RapidashGalar[] = INCBIN_COMP("graphics/pokemon/rapidash/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_RapidashGalar[] = INCBIN_U32("graphics/pokemon/rapidash/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_RapidashGalar[] = INCBIN_U32("graphics/pokemon/rapidash/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS @@ -3175,43 +3175,43 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_MEGA_EVOLUTIONS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/front.4bpp.lz"); - const u32 gMonPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_SlowpokeGalarian[] = INCBIN_U8("graphics/pokemon/slowpoke/galarian/icon.4bpp"); + const u32 gMonFrontPic_SlowpokeGalar[] = INCBIN_U32("graphics/pokemon/slowpoke/galar/front.4bpp.lz"); + const u32 gMonPalette_SlowpokeGalar[] = INCBIN_U32("graphics/pokemon/slowpoke/galar/normal.gbapal.lz"); + const u32 gMonBackPic_SlowpokeGalar[] = INCBIN_U32("graphics/pokemon/slowpoke/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_SlowpokeGalar[] = INCBIN_U32("graphics/pokemon/slowpoke/galar/shiny.gbapal.lz"); + const u8 gMonIcon_SlowpokeGalar[] = INCBIN_U8("graphics/pokemon/slowpoke/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SlowpokeGalarian[] = INCBIN_COMP("graphics/pokemon/slowpoke/galarian/overworld.4bpp"); + const u32 gObjectEventPic_SlowpokeGalar[] = INCBIN_COMP("graphics/pokemon/slowpoke/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SlowpokeGalar[] = INCBIN_U32("graphics/pokemon/slowpoke/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SlowpokeGalar[] = INCBIN_U32("graphics/pokemon/slowpoke/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/front.4bpp.lz"); - const u32 gMonPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_SlowbroGalarian[] = INCBIN_U8("graphics/pokemon/slowbro/galarian/icon.4bpp"); + const u32 gMonFrontPic_SlowbroGalar[] = INCBIN_U32("graphics/pokemon/slowbro/galar/front.4bpp.lz"); + const u32 gMonPalette_SlowbroGalar[] = INCBIN_U32("graphics/pokemon/slowbro/galar/normal.gbapal.lz"); + const u32 gMonBackPic_SlowbroGalar[] = INCBIN_U32("graphics/pokemon/slowbro/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_SlowbroGalar[] = INCBIN_U32("graphics/pokemon/slowbro/galar/shiny.gbapal.lz"); + const u8 gMonIcon_SlowbroGalar[] = INCBIN_U8("graphics/pokemon/slowbro/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SlowbroGalarian[] = INCBIN_COMP("graphics/pokemon/slowbro/galarian/overworld.4bpp"); + const u32 gObjectEventPic_SlowbroGalar[] = INCBIN_COMP("graphics/pokemon/slowbro/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SlowbroGalar[] = INCBIN_U32("graphics/pokemon/slowbro/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SlowbroGalar[] = INCBIN_U32("graphics/pokemon/slowbro/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_2_CROSS_EVOS - const u32 gMonFrontPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/front.4bpp.lz"); - const u32 gMonPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_SlowkingGalarian[] = INCBIN_U8("graphics/pokemon/slowking/galarian/icon.4bpp"); + const u32 gMonFrontPic_SlowkingGalar[] = INCBIN_U32("graphics/pokemon/slowking/galar/front.4bpp.lz"); + const u32 gMonPalette_SlowkingGalar[] = INCBIN_U32("graphics/pokemon/slowking/galar/normal.gbapal.lz"); + const u32 gMonBackPic_SlowkingGalar[] = INCBIN_U32("graphics/pokemon/slowking/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_SlowkingGalar[] = INCBIN_U32("graphics/pokemon/slowking/galar/shiny.gbapal.lz"); + const u8 gMonIcon_SlowkingGalar[] = INCBIN_U8("graphics/pokemon/slowking/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SlowkingGalarian[] = INCBIN_COMP("graphics/pokemon/slowking/galarian/overworld.4bpp"); + const u32 gObjectEventPic_SlowkingGalar[] = INCBIN_COMP("graphics/pokemon/slowking/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SlowkingGalar[] = INCBIN_U32("graphics/pokemon/slowking/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SlowkingGalar[] = INCBIN_U32("graphics/pokemon/slowking/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS @@ -3321,16 +3321,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/front.4bpp.lz"); - const u32 gMonPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_FarfetchdGalarian[] = INCBIN_U8("graphics/pokemon/farfetchd/galarian/icon.4bpp"); + const u32 gMonFrontPic_FarfetchdGalar[] = INCBIN_U32("graphics/pokemon/farfetchd/galar/front.4bpp.lz"); + const u32 gMonPalette_FarfetchdGalar[] = INCBIN_U32("graphics/pokemon/farfetchd/galar/normal.gbapal.lz"); + const u32 gMonBackPic_FarfetchdGalar[] = INCBIN_U32("graphics/pokemon/farfetchd/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_FarfetchdGalar[] = INCBIN_U32("graphics/pokemon/farfetchd/galar/shiny.gbapal.lz"); + const u8 gMonIcon_FarfetchdGalar[] = INCBIN_U8("graphics/pokemon/farfetchd/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_FarfetchdGalarian[] = INCBIN_COMP("graphics/pokemon/farfetchd/galarian/overworld.4bpp"); + const u32 gObjectEventPic_FarfetchdGalar[] = INCBIN_COMP("graphics/pokemon/farfetchd/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_FarfetchdGalar[] = INCBIN_U32("graphics/pokemon/farfetchd/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_FarfetchdGalar[] = INCBIN_U32("graphics/pokemon/farfetchd/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -3532,29 +3532,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/front.4bpp.lz"); - const u32 gMonPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_GrimerAlolan[] = INCBIN_U8("graphics/pokemon/grimer/alolan/icon.4bpp"); + const u32 gMonFrontPic_GrimerAlola[] = INCBIN_U32("graphics/pokemon/grimer/alola/front.4bpp.lz"); + const u32 gMonPalette_GrimerAlola[] = INCBIN_U32("graphics/pokemon/grimer/alola/normal.gbapal.lz"); + const u32 gMonBackPic_GrimerAlola[] = INCBIN_U32("graphics/pokemon/grimer/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_GrimerAlola[] = INCBIN_U32("graphics/pokemon/grimer/alola/shiny.gbapal.lz"); + const u8 gMonIcon_GrimerAlola[] = INCBIN_U8("graphics/pokemon/grimer/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_GrimerAlolan[] = INCBIN_COMP("graphics/pokemon/grimer/alolan/overworld.4bpp"); + const u32 gObjectEventPic_GrimerAlola[] = INCBIN_COMP("graphics/pokemon/grimer/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GrimerAlola[] = INCBIN_U32("graphics/pokemon/grimer/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GrimerAlola[] = INCBIN_U32("graphics/pokemon/grimer/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/front.4bpp.lz"); - const u32 gMonPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_MukAlolan[] = INCBIN_U8("graphics/pokemon/muk/alolan/icon.4bpp"); + const u32 gMonFrontPic_MukAlola[] = INCBIN_U32("graphics/pokemon/muk/alola/front.4bpp.lz"); + const u32 gMonPalette_MukAlola[] = INCBIN_U32("graphics/pokemon/muk/alola/normal.gbapal.lz"); + const u32 gMonBackPic_MukAlola[] = INCBIN_U32("graphics/pokemon/muk/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_MukAlola[] = INCBIN_U32("graphics/pokemon/muk/alola/shiny.gbapal.lz"); + const u8 gMonIcon_MukAlola[] = INCBIN_U8("graphics/pokemon/muk/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MukAlolan[] = INCBIN_COMP("graphics/pokemon/muk/alolan/overworld.4bpp"); + const u32 gObjectEventPic_MukAlola[] = INCBIN_COMP("graphics/pokemon/muk/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MukAlola[] = INCBIN_U32("graphics/pokemon/muk/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MukAlola[] = INCBIN_U32("graphics/pokemon/muk/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS @@ -3714,16 +3714,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_GengarGigantamax[] = INCBIN_U8("graphics/pokemon/gengar/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/front.4bpp.lz"); + const u32 gMonBackPic_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/back.4bpp.lz"); + const u32 gMonPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_GengarGmax[] = INCBIN_U8("graphics/pokemon/gengar/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GengarGigantamax[] = INCBIN_COMP("graphics/pokemon/gengar/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_GengarGmax[] = INCBIN_COMP("graphics/pokemon/gengar/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -3926,16 +3926,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_KinglerGigantamax[] = INCBIN_U8("graphics/pokemon/kingler/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/front.4bpp.lz"); + const u32 gMonBackPic_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/back.4bpp.lz"); + const u32 gMonPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_KinglerGmax[] = INCBIN_U8("graphics/pokemon/kingler/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_KinglerGigantamax[] = INCBIN_COMP("graphics/pokemon/kingler/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_KinglerGmax[] = INCBIN_COMP("graphics/pokemon/kingler/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -3997,29 +3997,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/front.4bpp.lz"); - const u32 gMonPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_VoltorbHisuian[] = INCBIN_U8("graphics/pokemon/voltorb/hisuian/icon.4bpp"); + const u32 gMonFrontPic_VoltorbHisui[] = INCBIN_U32("graphics/pokemon/voltorb/hisui/front.4bpp.lz"); + const u32 gMonPalette_VoltorbHisui[] = INCBIN_U32("graphics/pokemon/voltorb/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_VoltorbHisui[] = INCBIN_U32("graphics/pokemon/voltorb/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_VoltorbHisui[] = INCBIN_U32("graphics/pokemon/voltorb/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_VoltorbHisui[] = INCBIN_U8("graphics/pokemon/voltorb/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_VoltorbHisuian[] = INCBIN_COMP("graphics/pokemon/voltorb/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_VoltorbHisui[] = INCBIN_COMP("graphics/pokemon/voltorb/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_VoltorbHisui[] = INCBIN_U32("graphics/pokemon/voltorb/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_VoltorbHisui[] = INCBIN_U32("graphics/pokemon/voltorb/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/front.4bpp.lz"); - const u32 gMonPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_ElectrodeHisuian[] = INCBIN_U8("graphics/pokemon/electrode/hisuian/icon.4bpp"); + const u32 gMonFrontPic_ElectrodeHisui[] = INCBIN_U32("graphics/pokemon/electrode/hisui/front.4bpp.lz"); + const u32 gMonPalette_ElectrodeHisui[] = INCBIN_U32("graphics/pokemon/electrode/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_ElectrodeHisui[] = INCBIN_U32("graphics/pokemon/electrode/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_ElectrodeHisui[] = INCBIN_U32("graphics/pokemon/electrode/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_ElectrodeHisui[] = INCBIN_U8("graphics/pokemon/electrode/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ElectrodeHisuian[] = INCBIN_COMP("graphics/pokemon/electrode/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_ElectrodeHisui[] = INCBIN_COMP("graphics/pokemon/electrode/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ElectrodeHisui[] = INCBIN_U32("graphics/pokemon/electrode/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ElectrodeHisui[] = INCBIN_U32("graphics/pokemon/electrode/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -4081,16 +4081,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/anim_front.4bpp.lz"); - const u32 gMonPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_ExeggutorAlolan[] = INCBIN_U8("graphics/pokemon/exeggutor/alolan/icon.4bpp"); + const u32 gMonFrontPic_ExeggutorAlola[] = INCBIN_U32("graphics/pokemon/exeggutor/alola/anim_front.4bpp.lz"); + const u32 gMonPalette_ExeggutorAlola[] = INCBIN_U32("graphics/pokemon/exeggutor/alola/normal.gbapal.lz"); + const u32 gMonBackPic_ExeggutorAlola[] = INCBIN_U32("graphics/pokemon/exeggutor/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_ExeggutorAlola[] = INCBIN_U32("graphics/pokemon/exeggutor/alola/shiny.gbapal.lz"); + const u8 gMonIcon_ExeggutorAlola[] = INCBIN_U8("graphics/pokemon/exeggutor/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ExeggutorAlolan[] = INCBIN_COMP("graphics/pokemon/exeggutor/alolan/overworld.4bpp"); + const u32 gObjectEventPic_ExeggutorAlola[] = INCBIN_COMP("graphics/pokemon/exeggutor/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ExeggutorAlola[] = INCBIN_U32("graphics/pokemon/exeggutor/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ExeggutorAlola[] = INCBIN_U32("graphics/pokemon/exeggutor/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS @@ -4152,16 +4152,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS - const u32 gMonFrontPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/front.4bpp.lz"); - const u32 gMonPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/normal.gbapal.lz"); - const u32 gMonBackPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/back.4bpp.lz"); - const u32 gMonShinyPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/shiny.gbapal.lz"); - const u8 gMonIcon_MarowakAlolan[] = INCBIN_U8("graphics/pokemon/marowak/alolan/icon.4bpp"); + const u32 gMonFrontPic_MarowakAlola[] = INCBIN_U32("graphics/pokemon/marowak/alola/front.4bpp.lz"); + const u32 gMonPalette_MarowakAlola[] = INCBIN_U32("graphics/pokemon/marowak/alola/normal.gbapal.lz"); + const u32 gMonBackPic_MarowakAlola[] = INCBIN_U32("graphics/pokemon/marowak/alola/back.4bpp.lz"); + const u32 gMonShinyPalette_MarowakAlola[] = INCBIN_U32("graphics/pokemon/marowak/alola/shiny.gbapal.lz"); + const u8 gMonIcon_MarowakAlola[] = INCBIN_U8("graphics/pokemon/marowak/alola/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MarowakAlolan[] = INCBIN_COMP("graphics/pokemon/marowak/alolan/overworld.4bpp"); + const u32 gObjectEventPic_MarowakAlola[] = INCBIN_COMP("graphics/pokemon/marowak/alola/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MarowakAlola[] = INCBIN_U32("graphics/pokemon/marowak/alola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MarowakAlola[] = INCBIN_U32("graphics/pokemon/marowak/alola/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS @@ -4384,16 +4384,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/front.4bpp.lz"); - const u32 gMonPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_WeezingGalarian[] = INCBIN_U8("graphics/pokemon/weezing/galarian/icon.4bpp"); + const u32 gMonFrontPic_WeezingGalar[] = INCBIN_U32("graphics/pokemon/weezing/galar/front.4bpp.lz"); + const u32 gMonPalette_WeezingGalar[] = INCBIN_U32("graphics/pokemon/weezing/galar/normal.gbapal.lz"); + const u32 gMonBackPic_WeezingGalar[] = INCBIN_U32("graphics/pokemon/weezing/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_WeezingGalar[] = INCBIN_U32("graphics/pokemon/weezing/galar/shiny.gbapal.lz"); + const u8 gMonIcon_WeezingGalar[] = INCBIN_U8("graphics/pokemon/weezing/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_WeezingGalarian[] = INCBIN_COMP("graphics/pokemon/weezing/galarian/overworld.4bpp"); + const u32 gObjectEventPic_WeezingGalar[] = INCBIN_COMP("graphics/pokemon/weezing/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_WeezingGalar[] = INCBIN_U32("graphics/pokemon/weezing/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_WeezingGalar[] = INCBIN_U32("graphics/pokemon/weezing/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS @@ -4919,16 +4919,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/front.4bpp.lz"); - const u32 gMonPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_MrMimeGalarian[] = INCBIN_U8("graphics/pokemon/mr_mime/galarian/icon.4bpp"); + const u32 gMonFrontPic_MrMimeGalar[] = INCBIN_U32("graphics/pokemon/mr_mime/galar/front.4bpp.lz"); + const u32 gMonPalette_MrMimeGalar[] = INCBIN_U32("graphics/pokemon/mr_mime/galar/normal.gbapal.lz"); + const u32 gMonBackPic_MrMimeGalar[] = INCBIN_U32("graphics/pokemon/mr_mime/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_MrMimeGalar[] = INCBIN_U32("graphics/pokemon/mr_mime/galar/shiny.gbapal.lz"); + const u8 gMonIcon_MrMimeGalar[] = INCBIN_U8("graphics/pokemon/mr_mime/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MrMimeGalarian[] = INCBIN_COMP("graphics/pokemon/mr_mime/galarian/overworld.4bpp"); + const u32 gObjectEventPic_MrMimeGalar[] = INCBIN_COMP("graphics/pokemon/mr_mime/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MrMimeGalar[] = INCBIN_U32("graphics/pokemon/mr_mime/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MrMimeGalar[] = INCBIN_U32("graphics/pokemon/mr_mime/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -5334,35 +5334,35 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_PALDEAN_FORMS - const u32 gMonFrontPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/front.4bpp.lz"); - const u32 gMonPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/normal.gbapal.lz"); - const u32 gMonBackPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/back.4bpp.lz"); - const u32 gMonShinyPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/shiny.gbapal.lz"); - const u8 gMonIcon_TaurosPaldeanCombatBreed[] = INCBIN_U8("graphics/pokemon/tauros/paldean_combat_breed/icon.4bpp"); + const u32 gMonFrontPic_TaurosPaldeaCombat[] = INCBIN_U32("graphics/pokemon/tauros/paldea_combat/front.4bpp.lz"); + const u32 gMonPalette_TaurosPaldeaCombat[] = INCBIN_U32("graphics/pokemon/tauros/paldea_combat/normal.gbapal.lz"); + const u32 gMonBackPic_TaurosPaldeaCombat[] = INCBIN_U32("graphics/pokemon/tauros/paldea_combat/back.4bpp.lz"); + const u32 gMonShinyPalette_TaurosPaldeaCombat[] = INCBIN_U32("graphics/pokemon/tauros/paldea_combat/shiny.gbapal.lz"); + const u8 gMonIcon_TaurosPaldeaCombat[] = INCBIN_U8("graphics/pokemon/tauros/paldea_combat/icon.4bpp"); - const u32 gMonFrontPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/front.4bpp.lz"); - const u32 gMonPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/normal.gbapal.lz"); - const u32 gMonBackPic_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/back.4bpp.lz"); - const u32 gMonShinyPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/shiny.gbapal.lz"); - const u8 gMonIcon_TaurosPaldeanBlazeBreed[] = INCBIN_U8("graphics/pokemon/tauros/paldean_blaze_breed/icon.4bpp"); + const u32 gMonFrontPic_TaurosPaldeaBlaze[] = INCBIN_U32("graphics/pokemon/tauros/paldea_blaze/front.4bpp.lz"); + const u32 gMonPalette_TaurosPaldeaBlaze[] = INCBIN_U32("graphics/pokemon/tauros/paldea_blaze/normal.gbapal.lz"); + const u32 gMonBackPic_TaurosPaldeaBlaze[] = INCBIN_U32("graphics/pokemon/tauros/paldea_blaze/back.4bpp.lz"); + const u32 gMonShinyPalette_TaurosPaldeaBlaze[] = INCBIN_U32("graphics/pokemon/tauros/paldea_blaze/shiny.gbapal.lz"); + const u8 gMonIcon_TaurosPaldeaBlaze[] = INCBIN_U8("graphics/pokemon/tauros/paldea_blaze/icon.4bpp"); - const u32 gMonFrontPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/front.4bpp.lz"); - const u32 gMonPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/normal.gbapal.lz"); - const u32 gMonBackPic_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/back.4bpp.lz"); - const u32 gMonShinyPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/shiny.gbapal.lz"); - const u8 gMonIcon_TaurosPaldeanAquaBreed[] = INCBIN_U8("graphics/pokemon/tauros/paldean_aqua_breed/icon.4bpp"); + const u32 gMonFrontPic_TaurosPaldeaAqua[] = INCBIN_U32("graphics/pokemon/tauros/paldea_aqua/front.4bpp.lz"); + const u32 gMonPalette_TaurosPaldeaAqua[] = INCBIN_U32("graphics/pokemon/tauros/paldea_aqua/normal.gbapal.lz"); + const u32 gMonBackPic_TaurosPaldeaAqua[] = INCBIN_U32("graphics/pokemon/tauros/paldea_aqua/back.4bpp.lz"); + const u32 gMonShinyPalette_TaurosPaldeaAqua[] = INCBIN_U32("graphics/pokemon/tauros/paldea_aqua/shiny.gbapal.lz"); + const u8 gMonIcon_TaurosPaldeaAqua[] = INCBIN_U8("graphics/pokemon/tauros/paldea_aqua/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_TaurosPaldeanCombatBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_combat_breed/overworld.4bpp"); - const u32 gObjectEventPic_TaurosPaldeanBlazeBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_blaze_breed/overworld.4bpp"); - const u32 gObjectEventPic_TaurosPaldeanAquaBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_aqua_breed/overworld.4bpp"); + const u32 gObjectEventPic_TaurosPaldeaCombat[] = INCBIN_COMP("graphics/pokemon/tauros/paldea_combat/overworld.4bpp"); + const u32 gObjectEventPic_TaurosPaldeaBlaze[] = INCBIN_COMP("graphics/pokemon/tauros/paldea_blaze/overworld.4bpp"); + const u32 gObjectEventPic_TaurosPaldeaAqua[] = INCBIN_COMP("graphics/pokemon/tauros/paldea_aqua/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_TaurosPaldeanBlazeBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_blaze_breed/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_TaurosPaldeanAquaBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_aqua_breed/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_TaurosPaldeaCombat[] = INCBIN_U32("graphics/pokemon/tauros/paldea_combat/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_TaurosPaldeaBlaze[] = INCBIN_U32("graphics/pokemon/tauros/paldea_blaze/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_TaurosPaldeaAqua[] = INCBIN_U32("graphics/pokemon/tauros/paldea_aqua/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_TaurosPaldeaCombat[] = INCBIN_U32("graphics/pokemon/tauros/paldea_combat/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_TaurosPaldeaBlaze[] = INCBIN_U32("graphics/pokemon/tauros/paldea_blaze/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_TaurosPaldeaAqua[] = INCBIN_U32("graphics/pokemon/tauros/paldea_aqua/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_PALDEAN_FORMS @@ -5480,16 +5480,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_LaprasGigantamax[] = INCBIN_U8("graphics/pokemon/lapras/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/front.4bpp.lz"); + const u32 gMonBackPic_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/back.4bpp.lz"); + const u32 gMonPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_LaprasGmax[] = INCBIN_U8("graphics/pokemon/lapras/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_LaprasGigantamax[] = INCBIN_COMP("graphics/pokemon/lapras/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_LaprasGmax[] = INCBIN_COMP("graphics/pokemon/lapras/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -5559,16 +5559,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_EeveeGigantamax[] = INCBIN_U8("graphics/pokemon/eevee/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/front.4bpp.lz"); + const u32 gMonBackPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/back.4bpp.lz"); + const u32 gMonPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_EeveeGmax[] = INCBIN_U8("graphics/pokemon/eevee/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_EeveeGigantamax[] = INCBIN_COMP("graphics/pokemon/eevee/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_EeveeGmax[] = INCBIN_COMP("graphics/pokemon/eevee/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -6047,16 +6047,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_SnorlaxGigantamax[] = INCBIN_U8("graphics/pokemon/snorlax/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/front.4bpp.lz"); + const u32 gMonBackPic_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/back.4bpp.lz"); + const u32 gMonPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_SnorlaxGmax[] = INCBIN_U8("graphics/pokemon/snorlax/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_SnorlaxGigantamax[] = INCBIN_COMP("graphics/pokemon/snorlax/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_SnorlaxGmax[] = INCBIN_COMP("graphics/pokemon/snorlax/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -6091,16 +6091,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/front.4bpp.lz"); - const u32 gMonPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_ArticunoGalarian[] = INCBIN_U8("graphics/pokemon/articuno/galarian/icon.4bpp"); + const u32 gMonFrontPic_ArticunoGalar[] = INCBIN_U32("graphics/pokemon/articuno/galar/front.4bpp.lz"); + const u32 gMonPalette_ArticunoGalar[] = INCBIN_U32("graphics/pokemon/articuno/galar/normal.gbapal.lz"); + const u32 gMonBackPic_ArticunoGalar[] = INCBIN_U32("graphics/pokemon/articuno/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_ArticunoGalar[] = INCBIN_U32("graphics/pokemon/articuno/galar/shiny.gbapal.lz"); + const u8 gMonIcon_ArticunoGalar[] = INCBIN_U8("graphics/pokemon/articuno/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ArticunoGalarian[] = INCBIN_COMP("graphics/pokemon/articuno/galarian/overworld.4bpp"); + const u32 gObjectEventPic_ArticunoGalar[] = INCBIN_COMP("graphics/pokemon/articuno/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ArticunoGalar[] = INCBIN_U32("graphics/pokemon/articuno/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ArticunoGalar[] = INCBIN_U32("graphics/pokemon/articuno/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS @@ -6135,16 +6135,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/front.4bpp.lz"); - const u32 gMonPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_ZapdosGalarian[] = INCBIN_U8("graphics/pokemon/zapdos/galarian/icon.4bpp"); + const u32 gMonFrontPic_ZapdosGalar[] = INCBIN_U32("graphics/pokemon/zapdos/galar/front.4bpp.lz"); + const u32 gMonPalette_ZapdosGalar[] = INCBIN_U32("graphics/pokemon/zapdos/galar/normal.gbapal.lz"); + const u32 gMonBackPic_ZapdosGalar[] = INCBIN_U32("graphics/pokemon/zapdos/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_ZapdosGalar[] = INCBIN_U32("graphics/pokemon/zapdos/galar/shiny.gbapal.lz"); + const u8 gMonIcon_ZapdosGalar[] = INCBIN_U8("graphics/pokemon/zapdos/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ZapdosGalarian[] = INCBIN_COMP("graphics/pokemon/zapdos/galarian/overworld.4bpp"); + const u32 gObjectEventPic_ZapdosGalar[] = INCBIN_COMP("graphics/pokemon/zapdos/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ZapdosGalar[] = INCBIN_U32("graphics/pokemon/zapdos/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ZapdosGalar[] = INCBIN_U32("graphics/pokemon/zapdos/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS @@ -6179,16 +6179,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/front.4bpp.lz"); - const u32 gMonPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_MoltresGalarian[] = INCBIN_U8("graphics/pokemon/moltres/galarian/icon.4bpp"); + const u32 gMonFrontPic_MoltresGalar[] = INCBIN_U32("graphics/pokemon/moltres/galar/front.4bpp.lz"); + const u32 gMonPalette_MoltresGalar[] = INCBIN_U32("graphics/pokemon/moltres/galar/normal.gbapal.lz"); + const u32 gMonBackPic_MoltresGalar[] = INCBIN_U32("graphics/pokemon/moltres/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_MoltresGalar[] = INCBIN_U32("graphics/pokemon/moltres/galar/shiny.gbapal.lz"); + const u8 gMonIcon_MoltresGalar[] = INCBIN_U8("graphics/pokemon/moltres/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MoltresGalarian[] = INCBIN_COMP("graphics/pokemon/moltres/galarian/overworld.4bpp"); + const u32 gObjectEventPic_MoltresGalar[] = INCBIN_COMP("graphics/pokemon/moltres/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MoltresGalar[] = INCBIN_U32("graphics/pokemon/moltres/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MoltresGalar[] = INCBIN_U32("graphics/pokemon/moltres/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS @@ -6535,16 +6535,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/front.4bpp.lz"); - const u32 gMonPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_TyphlosionHisuian[] = INCBIN_U8("graphics/pokemon/typhlosion/hisuian/icon.4bpp"); + const u32 gMonFrontPic_TyphlosionHisui[] = INCBIN_U32("graphics/pokemon/typhlosion/hisui/front.4bpp.lz"); + const u32 gMonPalette_TyphlosionHisui[] = INCBIN_U32("graphics/pokemon/typhlosion/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_TyphlosionHisui[] = INCBIN_U32("graphics/pokemon/typhlosion/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_TyphlosionHisui[] = INCBIN_U32("graphics/pokemon/typhlosion/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_TyphlosionHisui[] = INCBIN_U8("graphics/pokemon/typhlosion/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_TyphlosionHisuian[] = INCBIN_COMP("graphics/pokemon/typhlosion/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_TyphlosionHisui[] = INCBIN_COMP("graphics/pokemon/typhlosion/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_TyphlosionHisui[] = INCBIN_U32("graphics/pokemon/typhlosion/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_TyphlosionHisui[] = INCBIN_U32("graphics/pokemon/typhlosion/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -7609,16 +7609,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_PALDEAN_FORMS - const u32 gMonFrontPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/front.4bpp.lz"); - const u32 gMonPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/normal.gbapal.lz"); - const u32 gMonBackPic_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/back.4bpp.lz"); - const u32 gMonShinyPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/shiny.gbapal.lz"); - const u8 gMonIcon_WooperPaldean[] = INCBIN_U8("graphics/pokemon/wooper/wooper_paldean/icon.4bpp"); + const u32 gMonFrontPic_WooperPaldea[] = INCBIN_U32("graphics/pokemon/wooper/paldea/front.4bpp.lz"); + const u32 gMonPalette_WooperPaldea[] = INCBIN_U32("graphics/pokemon/wooper/paldea/normal.gbapal.lz"); + const u32 gMonBackPic_WooperPaldea[] = INCBIN_U32("graphics/pokemon/wooper/paldea/back.4bpp.lz"); + const u32 gMonShinyPalette_WooperPaldea[] = INCBIN_U32("graphics/pokemon/wooper/paldea/shiny.gbapal.lz"); + const u8 gMonIcon_WooperPaldea[] = INCBIN_U8("graphics/pokemon/wooper/paldea/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_WooperPaldean[] = INCBIN_COMP("graphics/pokemon/wooper/wooper_paldean/overworld.4bpp"); + const u32 gObjectEventPic_WooperPaldea[] = INCBIN_COMP("graphics/pokemon/wooper/paldea/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_WooperPaldea[] = INCBIN_U32("graphics/pokemon/wooper/paldea/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_WooperPaldea[] = INCBIN_U32("graphics/pokemon/wooper/paldea/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -7851,13 +7851,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/z/back.4bpp.lz"); const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/unown/z/icon.4bpp"); - const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/exclamation_mark/front.4bpp.lz"); - const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/exclamation_mark/back.4bpp.lz"); - const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/exclamation_mark/icon.4bpp"); + const u32 gMonFrontPic_UnownExclamation[] = INCBIN_U32("graphics/pokemon/unown/exclamation/front.4bpp.lz"); + const u32 gMonBackPic_UnownExclamation[] = INCBIN_U32("graphics/pokemon/unown/exclamation/back.4bpp.lz"); + const u8 gMonIcon_UnownExclamation[] = INCBIN_U8("graphics/pokemon/unown/exclamation/icon.4bpp"); - const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/question_mark/front.4bpp.lz"); - const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/question_mark/back.4bpp.lz"); - const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/question_mark/icon.4bpp"); + const u32 gMonFrontPic_UnownQuestion[] = INCBIN_U32("graphics/pokemon/unown/question/front.4bpp.lz"); + const u32 gMonBackPic_UnownQuestion[] = INCBIN_U32("graphics/pokemon/unown/question/back.4bpp.lz"); + const u8 gMonIcon_UnownQuestion[] = INCBIN_U8("graphics/pokemon/unown/question/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_UnownA[] = INCBIN_COMP("graphics/pokemon/unown/overworld.4bpp"); @@ -7886,8 +7886,8 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gObjectEventPic_UnownX[] = INCBIN_COMP("graphics/pokemon/unown/x/overworld.4bpp"); const u32 gObjectEventPic_UnownY[] = INCBIN_COMP("graphics/pokemon/unown/y/overworld.4bpp"); const u32 gObjectEventPic_UnownZ[] = INCBIN_COMP("graphics/pokemon/unown/z/overworld.4bpp"); - const u32 gObjectEventPic_UnownExclamationMark[] = INCBIN_COMP("graphics/pokemon/unown/exclamation_mark/overworld.4bpp"); - const u32 gObjectEventPic_UnownQuestionMark[] = INCBIN_COMP("graphics/pokemon/unown/question_mark/overworld.4bpp"); + const u32 gObjectEventPic_UnownExclamation[] = INCBIN_COMP("graphics/pokemon/unown/exclamation/overworld.4bpp"); + const u32 gObjectEventPic_UnownQuestion[] = INCBIN_COMP("graphics/pokemon/unown/question/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u32 gOverworldPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/overworld_normal.gbapal.lz"); const u32 gShinyOverworldPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/overworld_shiny.gbapal.lz"); @@ -8263,16 +8263,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz"); - const u32 gMonPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_QwilfishHisuian[] = INCBIN_U8("graphics/pokemon/qwilfish/hisuian/icon.4bpp"); + const u32 gMonFrontPic_QwilfishHisui[] = INCBIN_U32("graphics/pokemon/qwilfish/hisui/front.4bpp.lz"); + const u32 gMonPalette_QwilfishHisui[] = INCBIN_U32("graphics/pokemon/qwilfish/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_QwilfishHisui[] = INCBIN_U32("graphics/pokemon/qwilfish/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_QwilfishHisui[] = INCBIN_U32("graphics/pokemon/qwilfish/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_QwilfishHisui[] = INCBIN_U8("graphics/pokemon/qwilfish/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_QwilfishHisuian[] = INCBIN_COMP("graphics/pokemon/qwilfish/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_QwilfishHisui[] = INCBIN_COMP("graphics/pokemon/qwilfish/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_QwilfishHisui[] = INCBIN_U32("graphics/pokemon/qwilfish/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_QwilfishHisui[] = INCBIN_U32("graphics/pokemon/qwilfish/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -8432,23 +8432,23 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/front.4bpp.lz"); - const u32 gMonPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_SneaselHisuian[] = INCBIN_U8("graphics/pokemon/sneasel/hisuian/icon.4bpp"); + const u32 gMonFrontPic_SneaselHisui[] = INCBIN_U32("graphics/pokemon/sneasel/hisui/front.4bpp.lz"); + const u32 gMonPalette_SneaselHisui[] = INCBIN_U32("graphics/pokemon/sneasel/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_SneaselHisui[] = INCBIN_U32("graphics/pokemon/sneasel/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_SneaselHisui[] = INCBIN_U32("graphics/pokemon/sneasel/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_SneaselHisui[] = INCBIN_U8("graphics/pokemon/sneasel/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SneaselHisuian[] = INCBIN_COMP("graphics/pokemon/sneasel/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_SneaselHisui[] = INCBIN_COMP("graphics/pokemon/sneasel/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SneaselHisui[] = INCBIN_U32("graphics/pokemon/sneasel/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SneaselHisui[] = INCBIN_U32("graphics/pokemon/sneasel/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/frontf.4bpp.lz"); - const u32 gMonBackPic_SneaselHisuianF[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/backf.4bpp.lz"); + const u32 gMonFrontPic_SneaselHisuiF[] = INCBIN_U32("graphics/pokemon/sneasel/hisui/frontf.4bpp.lz"); + const u32 gMonBackPic_SneaselHisuiF[] = INCBIN_U32("graphics/pokemon/sneasel/hisui/backf.4bpp.lz"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SneaselHisuianF[] = INCBIN_COMP("graphics/pokemon/sneasel/hisuian/overworldf.4bpp"); + const u32 gObjectEventPic_SneaselHisuiF[] = INCBIN_COMP("graphics/pokemon/sneasel/hisui/overworldf.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz"); @@ -8732,16 +8732,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/front.4bpp.lz"); - const u32 gMonPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_CorsolaGalarian[] = INCBIN_U8("graphics/pokemon/corsola/galarian/icon.4bpp"); + const u32 gMonFrontPic_CorsolaGalar[] = INCBIN_U32("graphics/pokemon/corsola/galar/front.4bpp.lz"); + const u32 gMonPalette_CorsolaGalar[] = INCBIN_U32("graphics/pokemon/corsola/galar/normal.gbapal.lz"); + const u32 gMonBackPic_CorsolaGalar[] = INCBIN_U32("graphics/pokemon/corsola/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_CorsolaGalar[] = INCBIN_U32("graphics/pokemon/corsola/galar/shiny.gbapal.lz"); + const u8 gMonIcon_CorsolaGalar[] = INCBIN_U8("graphics/pokemon/corsola/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_CorsolaGalarian[] = INCBIN_COMP("graphics/pokemon/corsola/galarian/overworld.4bpp"); + const u32 gObjectEventPic_CorsolaGalar[] = INCBIN_COMP("graphics/pokemon/corsola/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_CorsolaGalar[] = INCBIN_U32("graphics/pokemon/corsola/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_CorsolaGalar[] = INCBIN_U32("graphics/pokemon/corsola/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -9869,29 +9869,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/front.4bpp.lz"); - const u32 gMonPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_ZigzagoonGalarian[] = INCBIN_U8("graphics/pokemon/zigzagoon/galarian/icon.4bpp"); + const u32 gMonFrontPic_ZigzagoonGalar[] = INCBIN_U32("graphics/pokemon/zigzagoon/galar/front.4bpp.lz"); + const u32 gMonPalette_ZigzagoonGalar[] = INCBIN_U32("graphics/pokemon/zigzagoon/galar/normal.gbapal.lz"); + const u32 gMonBackPic_ZigzagoonGalar[] = INCBIN_U32("graphics/pokemon/zigzagoon/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_ZigzagoonGalar[] = INCBIN_U32("graphics/pokemon/zigzagoon/galar/shiny.gbapal.lz"); + const u8 gMonIcon_ZigzagoonGalar[] = INCBIN_U8("graphics/pokemon/zigzagoon/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ZigzagoonGalarian[] = INCBIN_COMP("graphics/pokemon/zigzagoon/galarian/overworld.4bpp"); + const u32 gObjectEventPic_ZigzagoonGalar[] = INCBIN_COMP("graphics/pokemon/zigzagoon/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ZigzagoonGalar[] = INCBIN_U32("graphics/pokemon/zigzagoon/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ZigzagoonGalar[] = INCBIN_U32("graphics/pokemon/zigzagoon/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/front.4bpp.lz"); - const u32 gMonPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_LinooneGalarian[] = INCBIN_U8("graphics/pokemon/linoone/galarian/icon.4bpp"); + const u32 gMonFrontPic_LinooneGalar[] = INCBIN_U32("graphics/pokemon/linoone/galar/front.4bpp.lz"); + const u32 gMonPalette_LinooneGalar[] = INCBIN_U32("graphics/pokemon/linoone/galar/normal.gbapal.lz"); + const u32 gMonBackPic_LinooneGalar[] = INCBIN_U32("graphics/pokemon/linoone/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_LinooneGalar[] = INCBIN_U32("graphics/pokemon/linoone/galar/shiny.gbapal.lz"); + const u8 gMonIcon_LinooneGalar[] = INCBIN_U8("graphics/pokemon/linoone/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_LinooneGalarian[] = INCBIN_COMP("graphics/pokemon/linoone/galarian/overworld.4bpp"); + const u32 gObjectEventPic_LinooneGalar[] = INCBIN_COMP("graphics/pokemon/linoone/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_LinooneGalar[] = INCBIN_U32("graphics/pokemon/linoone/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_LinooneGalar[] = INCBIN_U32("graphics/pokemon/linoone/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -14305,32 +14305,32 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz"); const u8 gMonIcon_BurmyPlantCloak[] = INCBIN_U8("graphics/pokemon/burmy/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Burmy[] = INCBIN_U8("graphics/pokemon/burmy/plant/footprint.1bpp"); + const u8 gMonFootprint_Burmy[] = INCBIN_U8("graphics/pokemon/burmy/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/anim_front.4bpp.lz"); - const u32 gMonPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/normal.gbapal.lz"); - const u32 gMonBackPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/back.4bpp.lz"); - const u32 gMonShinyPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/shiny.gbapal.lz"); - const u8 gMonIcon_BurmySandyCloak[] = INCBIN_U8("graphics/pokemon/burmy/sandy_cloak/icon.4bpp"); + const u32 gMonFrontPic_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/anim_front.4bpp.lz"); + const u32 gMonPalette_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/normal.gbapal.lz"); + const u32 gMonBackPic_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/back.4bpp.lz"); + const u32 gMonShinyPalette_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/shiny.gbapal.lz"); + const u8 gMonIcon_BurmySandy[] = INCBIN_U8("graphics/pokemon/burmy/sandy/icon.4bpp"); - const u32 gMonFrontPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/anim_front.4bpp.lz"); - const u32 gMonPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/normal.gbapal.lz"); - const u32 gMonBackPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/back.4bpp.lz"); - const u32 gMonShinyPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/shiny.gbapal.lz"); - const u8 gMonIcon_BurmyTrashCloak[] = INCBIN_U8("graphics/pokemon/burmy/trash_cloak/icon.4bpp"); + const u32 gMonFrontPic_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/anim_front.4bpp.lz"); + const u32 gMonPalette_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/normal.gbapal.lz"); + const u32 gMonBackPic_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/back.4bpp.lz"); + const u32 gMonShinyPalette_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/shiny.gbapal.lz"); + const u8 gMonIcon_BurmyTrash[] = INCBIN_U8("graphics/pokemon/burmy/trash/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_BurmyPlantCloak[] = INCBIN_COMP("graphics/pokemon/burmy/overworld.4bpp"); - const u32 gObjectEventPic_BurmySandyCloak[] = INCBIN_COMP("graphics/pokemon/burmy/sandy_cloak/overworld.4bpp"); - const u32 gObjectEventPic_BurmyTrashCloak[] = INCBIN_COMP("graphics/pokemon/burmy/trash_cloak/overworld.4bpp"); + const u32 gObjectEventPic_BurmySandy[] = INCBIN_COMP("graphics/pokemon/burmy/sandy/overworld.4bpp"); + const u32 gObjectEventPic_BurmyTrash[] = INCBIN_COMP("graphics/pokemon/burmy/trash/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u32 gOverworldPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/overworld_normal.gbapal.lz"); const u32 gShinyOverworldPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_BurmySandy[] = INCBIN_U32("graphics/pokemon/burmy/sandy/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_BurmyTrash[] = INCBIN_U32("graphics/pokemon/burmy/trash/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -14340,32 +14340,32 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz"); const u8 gMonIcon_WormadamPlantCloak[] = INCBIN_U8("graphics/pokemon/wormadam/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_Wormadam[] = INCBIN_U8("graphics/pokemon/wormadam/plant/footprint.1bpp"); + const u8 gMonFootprint_Wormadam[] = INCBIN_U8("graphics/pokemon/wormadam/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/anim_front.4bpp.lz"); - const u32 gMonPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/normal.gbapal.lz"); - const u32 gMonBackPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/back.4bpp.lz"); - const u32 gMonShinyPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/shiny.gbapal.lz"); - const u8 gMonIcon_WormadamSandyCloak[] = INCBIN_U8("graphics/pokemon/wormadam/sandy_cloak/icon.4bpp"); + const u32 gMonFrontPic_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/anim_front.4bpp.lz"); + const u32 gMonPalette_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/normal.gbapal.lz"); + const u32 gMonBackPic_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/back.4bpp.lz"); + const u32 gMonShinyPalette_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/shiny.gbapal.lz"); + const u8 gMonIcon_WormadamSandy[] = INCBIN_U8("graphics/pokemon/wormadam/sandy/icon.4bpp"); - const u32 gMonFrontPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/anim_front.4bpp.lz"); - const u32 gMonPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/normal.gbapal.lz"); - const u32 gMonBackPic_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/back.4bpp.lz"); - const u32 gMonShinyPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/shiny.gbapal.lz"); - const u8 gMonIcon_WormadamTrashCloak[] = INCBIN_U8("graphics/pokemon/wormadam/trash_cloak/icon.4bpp"); + const u32 gMonFrontPic_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/anim_front.4bpp.lz"); + const u32 gMonPalette_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/normal.gbapal.lz"); + const u32 gMonBackPic_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/back.4bpp.lz"); + const u32 gMonShinyPalette_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/shiny.gbapal.lz"); + const u8 gMonIcon_WormadamTrash[] = INCBIN_U8("graphics/pokemon/wormadam/trash/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_WormadamPlantCloak[] = INCBIN_COMP("graphics/pokemon/wormadam/overworld.4bpp"); - const u32 gObjectEventPic_WormadamSandyCloak[] = INCBIN_COMP("graphics/pokemon/wormadam/sandy_cloak/overworld.4bpp"); - const u32 gObjectEventPic_WormadamTrashCloak[] = INCBIN_COMP("graphics/pokemon/wormadam/trash_cloak/overworld.4bpp"); + const u32 gObjectEventPic_WormadamSandy[] = INCBIN_COMP("graphics/pokemon/wormadam/sandy/overworld.4bpp"); + const u32 gObjectEventPic_WormadamTrash[] = INCBIN_COMP("graphics/pokemon/wormadam/trash/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u32 gOverworldPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/overworld_normal.gbapal.lz"); const u32 gShinyOverworldPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_WormadamSandy[] = INCBIN_U32("graphics/pokemon/wormadam/sandy/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_WormadamTrash[] = INCBIN_U32("graphics/pokemon/wormadam/trash/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -14547,20 +14547,20 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u8 gMonFootprint_Shellos[] = INCBIN_U8("graphics/pokemon/shellos/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/anim_front.4bpp.lz"); - const u32 gMonPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/normal.gbapal.lz"); - const u32 gMonBackPic_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/back.4bpp.lz"); - const u32 gMonShinyPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/shiny.gbapal.lz"); - const u8 gMonIcon_ShellosEastSea[] = INCBIN_U8("graphics/pokemon/shellos/east_sea/icon.4bpp"); + const u32 gMonFrontPic_ShellosEast[] = INCBIN_U32("graphics/pokemon/shellos/east/anim_front.4bpp.lz"); + const u32 gMonPalette_ShellosEast[] = INCBIN_U32("graphics/pokemon/shellos/east/normal.gbapal.lz"); + const u32 gMonBackPic_ShellosEast[] = INCBIN_U32("graphics/pokemon/shellos/east/back.4bpp.lz"); + const u32 gMonShinyPalette_ShellosEast[] = INCBIN_U32("graphics/pokemon/shellos/east/shiny.gbapal.lz"); + const u8 gMonIcon_ShellosEast[] = INCBIN_U8("graphics/pokemon/shellos/east/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_ShellosWestSea[] = INCBIN_COMP("graphics/pokemon/shellos/overworld.4bpp"); - const u32 gObjectEventPic_ShellosEastSea[] = INCBIN_COMP("graphics/pokemon/shellos/east_sea/overworld.4bpp"); + const u32 gObjectEventPic_ShellosEast[] = INCBIN_COMP("graphics/pokemon/shellos/east/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u32 gOverworldPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ShellosEast[] = INCBIN_U32("graphics/pokemon/shellos/east/overworld_normal.gbapal.lz"); const u32 gShinyOverworldPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ShellosEast[] = INCBIN_U32("graphics/pokemon/shellos/east/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -14573,19 +14573,19 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u8 gMonFootprint_Gastrodon[] = INCBIN_U8("graphics/pokemon/gastrodon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/anim_front.4bpp.lz"); - const u32 gMonPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/normal.gbapal.lz"); - const u32 gMonBackPic_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/back.4bpp.lz"); - const u32 gMonShinyPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/shiny.gbapal.lz"); - const u8 gMonIcon_GastrodonEastSea[] = INCBIN_U8("graphics/pokemon/gastrodon/east_sea/icon.4bpp"); + const u32 gMonFrontPic_GastrodonEast[] = INCBIN_U32("graphics/pokemon/gastrodon/east/anim_front.4bpp.lz"); + const u32 gMonPalette_GastrodonEast[] = INCBIN_U32("graphics/pokemon/gastrodon/east/normal.gbapal.lz"); + const u32 gMonBackPic_GastrodonEast[] = INCBIN_U32("graphics/pokemon/gastrodon/east/back.4bpp.lz"); + const u32 gMonShinyPalette_GastrodonEast[] = INCBIN_U32("graphics/pokemon/gastrodon/east/shiny.gbapal.lz"); + const u8 gMonIcon_GastrodonEast[] = INCBIN_U8("graphics/pokemon/gastrodon/east/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_GastrodonWestSea[] = INCBIN_COMP("graphics/pokemon/gastrodon/overworld.4bpp"); - const u32 gObjectEventPic_GastrodonEastSea[] = INCBIN_COMP("graphics/pokemon/gastrodon/east_sea/overworld.4bpp"); + const u32 gObjectEventPic_GastrodonEast[] = INCBIN_COMP("graphics/pokemon/gastrodon/east/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE const u32 gOverworldPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_GastrodonEast[] = INCBIN_U32("graphics/pokemon/gastrodon/east/overworld_normal.gbapal.lz"); const u32 gShinyOverworldPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_GastrodonEast[] = INCBIN_U32("graphics/pokemon/gastrodon/east/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SHELLOS @@ -15861,16 +15861,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz"); - const u32 gMonPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_SamurottHisuian[] = INCBIN_U8("graphics/pokemon/samurott/hisuian/icon.4bpp"); + const u32 gMonFrontPic_SamurottHisui[] = INCBIN_U32("graphics/pokemon/samurott/hisui/front.4bpp.lz"); + const u32 gMonPalette_SamurottHisui[] = INCBIN_U32("graphics/pokemon/samurott/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_SamurottHisui[] = INCBIN_U32("graphics/pokemon/samurott/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_SamurottHisui[] = INCBIN_U32("graphics/pokemon/samurott/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_SamurottHisui[] = INCBIN_U8("graphics/pokemon/samurott/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SamurottHisuian[] = INCBIN_COMP("graphics/pokemon/samurott/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_SamurottHisui[] = INCBIN_COMP("graphics/pokemon/samurott/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SamurottHisui[] = INCBIN_U32("graphics/pokemon/samurott/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SamurottHisui[] = INCBIN_U32("graphics/pokemon/samurott/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -16682,16 +16682,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz"); - const u32 gMonPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_LilligantHisuian[] = INCBIN_U8("graphics/pokemon/lilligant/hisuian/icon.4bpp"); + const u32 gMonFrontPic_LilligantHisui[] = INCBIN_U32("graphics/pokemon/lilligant/hisui/front.4bpp.lz"); + const u32 gMonPalette_LilligantHisui[] = INCBIN_U32("graphics/pokemon/lilligant/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_LilligantHisui[] = INCBIN_U32("graphics/pokemon/lilligant/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_LilligantHisui[] = INCBIN_U32("graphics/pokemon/lilligant/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_LilligantHisui[] = INCBIN_U8("graphics/pokemon/lilligant/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_LilligantHisuian[] = INCBIN_COMP("graphics/pokemon/lilligant/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_LilligantHisui[] = INCBIN_COMP("graphics/pokemon/lilligant/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_LilligantHisui[] = INCBIN_U32("graphics/pokemon/lilligant/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_LilligantHisui[] = INCBIN_U32("graphics/pokemon/lilligant/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -16739,29 +16739,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz"); - const u32 gMonPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz"); - const u32 gMonBackPic_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz"); - const u32 gMonShinyPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz"); - const u8 gMonIcon_BasculegionMale[] = INCBIN_U8("graphics/pokemon/basculegion/icon.4bpp"); + const u32 gMonFrontPic_BasculegionM[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz"); + const u32 gMonPalette_BasculegionM[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz"); + const u32 gMonBackPic_BasculegionM[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz"); + const u32 gMonShinyPalette_BasculegionM[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz"); + const u8 gMonIcon_BasculegionM[] = INCBIN_U8("graphics/pokemon/basculegion/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/front.4bpp.lz"); - const u32 gMonPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/normal.gbapal.lz"); - const u32 gMonBackPic_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/back.4bpp.lz"); - const u32 gMonShinyPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/shiny.gbapal.lz"); - const u8 gMonIcon_BasculegionFemale[] = INCBIN_U8("graphics/pokemon/basculegion/female/icon.4bpp"); + const u32 gMonFrontPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/f/front.4bpp.lz"); + const u32 gMonPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/f/normal.gbapal.lz"); + const u32 gMonBackPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/f/back.4bpp.lz"); + const u32 gMonShinyPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/f/shiny.gbapal.lz"); + const u8 gMonIcon_BasculegionF[] = INCBIN_U8("graphics/pokemon/basculegion/f/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_BasculegionMale[] = INCBIN_COMP("graphics/pokemon/basculegion/overworld.4bpp"); - const u32 gObjectEventPic_BasculegionFemale[] = INCBIN_COMP("graphics/pokemon/basculegion/female/overworld.4bpp"); + const u32 gObjectEventPic_BasculegionM[] = INCBIN_COMP("graphics/pokemon/basculegion/overworld.4bpp"); + const u32 gObjectEventPic_BasculegionF[] = INCBIN_COMP("graphics/pokemon/basculegion/f/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_BasculegionM[] = INCBIN_U32("graphics/pokemon/basculegion/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/f/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_BasculegionM[] = INCBIN_U32("graphics/pokemon/basculegion/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/f/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -16834,72 +16834,72 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/anim_front.4bpp.lz"); - const u32 gMonPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/normal.gbapal.lz"); - const u32 gMonBackPic_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/back.4bpp.lz"); - const u32 gMonShinyPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/shiny.gbapal.lz"); - const u8 gMonIcon_DarmanitanStandardMode[] = INCBIN_U8("graphics/pokemon/darmanitan/icon.4bpp"); + const u32 gMonFrontPic_DarmanitanStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/anim_front.4bpp.lz"); + const u32 gMonPalette_DarmanitanStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/normal.gbapal.lz"); + const u32 gMonBackPic_DarmanitanStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/back.4bpp.lz"); + const u32 gMonShinyPalette_DarmanitanStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/shiny.gbapal.lz"); + const u8 gMonIcon_DarmanitanStandard[] = INCBIN_U8("graphics/pokemon/darmanitan/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_Darmanitan[] = INCBIN_U8("graphics/pokemon/darmanitan/footprint.1bpp"); #endif //P_FOOTPRINTS #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_DarmanitanStandardMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/overworld.4bpp"); + const u32 gObjectEventPic_DarmanitanStandard[] = INCBIN_COMP("graphics/pokemon/darmanitan/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_DarmanitanStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_DarmanitanStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/anim_front.4bpp.lz"); - const u32 gMonPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/normal.gbapal.lz"); - const u32 gMonBackPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/back.4bpp.lz"); - const u32 gMonShinyPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/shiny.gbapal.lz"); - const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/icon.4bpp"); + const u32 gMonFrontPic_DarmanitanZen[] = INCBIN_U32("graphics/pokemon/darmanitan/zen/anim_front.4bpp.lz"); + const u32 gMonPalette_DarmanitanZen[] = INCBIN_U32("graphics/pokemon/darmanitan/zen/normal.gbapal.lz"); + const u32 gMonBackPic_DarmanitanZen[] = INCBIN_U32("graphics/pokemon/darmanitan/zen/back.4bpp.lz"); + const u32 gMonShinyPalette_DarmanitanZen[] = INCBIN_U32("graphics/pokemon/darmanitan/zen/shiny.gbapal.lz"); + const u8 gMonIcon_DarmanitanZen[] = INCBIN_U8("graphics/pokemon/darmanitan/zen/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_DarmanitanZenMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/zen_mode/overworld.4bpp"); + // const u32 gObjectEventPic_DarmanitanZen[] = INCBIN_COMP("graphics/pokemon/darmanitan/zen/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_DarmanitanZen[] = INCBIN_U32("graphics/pokemon/darmanitan/zen/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_DarmanitanZen[] = INCBIN_U32("graphics/pokemon/darmanitan/zen/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/front.4bpp.lz"); - const u32 gMonPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/darumaka/galarian/icon.4bpp"); + const u32 gMonFrontPic_DarumakaGalar[] = INCBIN_U32("graphics/pokemon/darumaka/galar/front.4bpp.lz"); + const u32 gMonPalette_DarumakaGalar[] = INCBIN_U32("graphics/pokemon/darumaka/galar/normal.gbapal.lz"); + const u32 gMonBackPic_DarumakaGalar[] = INCBIN_U32("graphics/pokemon/darumaka/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_DarumakaGalar[] = INCBIN_U32("graphics/pokemon/darumaka/galar/shiny.gbapal.lz"); + const u8 gMonIcon_DarumakaGalar[] = INCBIN_U8("graphics/pokemon/darumaka/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_DarumakaGalarian[] = INCBIN_COMP("graphics/pokemon/darumaka/galarian/overworld.4bpp"); + const u32 gObjectEventPic_DarumakaGalar[] = INCBIN_COMP("graphics/pokemon/darumaka/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_DarumakaGalar[] = INCBIN_U32("graphics/pokemon/darumaka/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_DarumakaGalar[] = INCBIN_U32("graphics/pokemon/darumaka/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/front.4bpp.lz"); - const u32 gMonPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_DarmanitanGalarianStandardMode[] = INCBIN_U8("graphics/pokemon/darmanitan/galarian/icon.4bpp"); + const u32 gMonFrontPic_DarmanitanGalarStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_standard/front.4bpp.lz"); + const u32 gMonPalette_DarmanitanGalarStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_standard/normal.gbapal.lz"); + const u32 gMonBackPic_DarmanitanGalarStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_standard/back.4bpp.lz"); + const u32 gMonShinyPalette_DarmanitanGalarStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_standard/shiny.gbapal.lz"); + const u8 gMonIcon_DarmanitanGalarStandard[] = INCBIN_U8("graphics/pokemon/darmanitan/galar_standard/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_DarmanitanGalarianStandardMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/galarian/overworld.4bpp"); + const u32 gObjectEventPic_DarmanitanGalarStandard[] = INCBIN_COMP("graphics/pokemon/darmanitan/galar_standard/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_DarmanitanGalarStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_standard/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_DarmanitanGalarStandard[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_standard/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/front.4bpp.lz"); - const u32 gMonPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_DarmanitanGalarianZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/galarian/icon.4bpp"); + const u32 gMonFrontPic_DarmanitanGalarZen[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_zen/front.4bpp.lz"); + const u32 gMonPalette_DarmanitanGalarZen[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_zen/normal.gbapal.lz"); + const u32 gMonBackPic_DarmanitanGalarZen[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_zen/back.4bpp.lz"); + const u32 gMonShinyPalette_DarmanitanGalarZen[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_zen/shiny.gbapal.lz"); + const u8 gMonIcon_DarmanitanGalarZen[] = INCBIN_U8("graphics/pokemon/darmanitan/galar_zen/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_DarmanitanGalarianZenMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/zen_mode/galarian/overworld.4bpp"); + // const u32 gObjectEventPic_DarmanitanGalarZen[] = INCBIN_COMP("graphics/pokemon/darmanitan/galar_zen/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_DarmanitanGalarZen[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_zen/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_DarmanitanGalarZen[] = INCBIN_U32("graphics/pokemon/darmanitan/galar_zen/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS @@ -17043,16 +17043,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/front.4bpp.lz"); - const u32 gMonPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/yamask/galarian/icon.4bpp"); + const u32 gMonFrontPic_YamaskGalar[] = INCBIN_U32("graphics/pokemon/yamask/galar/front.4bpp.lz"); + const u32 gMonPalette_YamaskGalar[] = INCBIN_U32("graphics/pokemon/yamask/galar/normal.gbapal.lz"); + const u32 gMonBackPic_YamaskGalar[] = INCBIN_U32("graphics/pokemon/yamask/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_YamaskGalar[] = INCBIN_U32("graphics/pokemon/yamask/galar/shiny.gbapal.lz"); + const u8 gMonIcon_YamaskGalar[] = INCBIN_U8("graphics/pokemon/yamask/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_YamaskGalarian[] = INCBIN_COMP("graphics/pokemon/yamask/galarian/overworld.4bpp"); + const u32 gObjectEventPic_YamaskGalar[] = INCBIN_COMP("graphics/pokemon/yamask/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_YamaskGalar[] = INCBIN_U32("graphics/pokemon/yamask/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_YamaskGalar[] = INCBIN_U32("graphics/pokemon/yamask/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -17176,16 +17176,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_GarbodorGigantamax[] = INCBIN_U8("graphics/pokemon/garbodor/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/front.4bpp.lz"); + const u32 gMonBackPic_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/back.4bpp.lz"); + const u32 gMonPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_GarbodorGmax[] = INCBIN_U8("graphics/pokemon/garbodor/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GarbodorGigantamax[] = INCBIN_COMP("graphics/pokemon/garbodor/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_GarbodorGmax[] = INCBIN_COMP("graphics/pokemon/garbodor/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -17225,29 +17225,29 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/front.4bpp.lz"); - const u32 gMonPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_ZoruaHisuian[] = INCBIN_U8("graphics/pokemon/zorua/hisuian/icon.4bpp"); + const u32 gMonFrontPic_ZoruaHisui[] = INCBIN_U32("graphics/pokemon/zorua/hisui/front.4bpp.lz"); + const u32 gMonPalette_ZoruaHisui[] = INCBIN_U32("graphics/pokemon/zorua/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_ZoruaHisui[] = INCBIN_U32("graphics/pokemon/zorua/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_ZoruaHisui[] = INCBIN_U32("graphics/pokemon/zorua/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_ZoruaHisui[] = INCBIN_U8("graphics/pokemon/zorua/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ZoruaHisuian[] = INCBIN_COMP("graphics/pokemon/zorua/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_ZoruaHisui[] = INCBIN_COMP("graphics/pokemon/zorua/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ZoruaHisui[] = INCBIN_U32("graphics/pokemon/zorua/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ZoruaHisui[] = INCBIN_U32("graphics/pokemon/zorua/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/front.4bpp.lz"); - const u32 gMonPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_ZoroarkHisuian[] = INCBIN_U8("graphics/pokemon/zoroark/hisuian/icon.4bpp"); + const u32 gMonFrontPic_ZoroarkHisui[] = INCBIN_U32("graphics/pokemon/zoroark/hisui/front.4bpp.lz"); + const u32 gMonPalette_ZoroarkHisui[] = INCBIN_U32("graphics/pokemon/zoroark/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_ZoroarkHisui[] = INCBIN_U32("graphics/pokemon/zoroark/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_ZoroarkHisui[] = INCBIN_U32("graphics/pokemon/zoroark/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_ZoroarkHisui[] = INCBIN_U8("graphics/pokemon/zoroark/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ZoroarkHisuian[] = INCBIN_COMP("graphics/pokemon/zoroark/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_ZoroarkHisui[] = INCBIN_COMP("graphics/pokemon/zoroark/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ZoroarkHisui[] = INCBIN_U32("graphics/pokemon/zoroark/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ZoroarkHisui[] = INCBIN_U32("graphics/pokemon/zoroark/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -18126,16 +18126,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS - const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/front.4bpp.lz"); - const u32 gMonPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/normal.gbapal.lz"); - const u32 gMonBackPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/back.4bpp.lz"); - const u32 gMonShinyPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/shiny.gbapal.lz"); - const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/stunfisk/galarian/icon.4bpp"); + const u32 gMonFrontPic_StunfiskGalar[] = INCBIN_U32("graphics/pokemon/stunfisk/galar/front.4bpp.lz"); + const u32 gMonPalette_StunfiskGalar[] = INCBIN_U32("graphics/pokemon/stunfisk/galar/normal.gbapal.lz"); + const u32 gMonBackPic_StunfiskGalar[] = INCBIN_U32("graphics/pokemon/stunfisk/galar/back.4bpp.lz"); + const u32 gMonShinyPalette_StunfiskGalar[] = INCBIN_U32("graphics/pokemon/stunfisk/galar/shiny.gbapal.lz"); + const u8 gMonIcon_StunfiskGalar[] = INCBIN_U8("graphics/pokemon/stunfisk/galar/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_StunfiskGalarian[] = INCBIN_COMP("graphics/pokemon/stunfisk/galarian/overworld.4bpp"); + const u32 gObjectEventPic_StunfiskGalar[] = INCBIN_COMP("graphics/pokemon/stunfisk/galar/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_StunfiskGalar[] = INCBIN_U32("graphics/pokemon/stunfisk/galar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_StunfiskGalar[] = INCBIN_U32("graphics/pokemon/stunfisk/galar/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS @@ -18331,16 +18331,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/front.4bpp.lz"); - const u32 gMonPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_BraviaryHisuian[] = INCBIN_U8("graphics/pokemon/braviary/hisuian/icon.4bpp"); + const u32 gMonFrontPic_BraviaryHisui[] = INCBIN_U32("graphics/pokemon/braviary/hisui/front.4bpp.lz"); + const u32 gMonPalette_BraviaryHisui[] = INCBIN_U32("graphics/pokemon/braviary/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_BraviaryHisui[] = INCBIN_U32("graphics/pokemon/braviary/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_BraviaryHisui[] = INCBIN_U32("graphics/pokemon/braviary/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_BraviaryHisui[] = INCBIN_U8("graphics/pokemon/braviary/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_BraviaryHisuian[] = INCBIN_COMP("graphics/pokemon/braviary/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_BraviaryHisui[] = INCBIN_COMP("graphics/pokemon/braviary/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_BraviaryHisui[] = INCBIN_U32("graphics/pokemon/braviary/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_BraviaryHisui[] = INCBIN_U32("graphics/pokemon/braviary/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -19369,43 +19369,43 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u8 gMonFootprint_Flabebe[] = INCBIN_U8("graphics/pokemon/flabebe/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/shiny.gbapal.lz"); - const u8 gMonIcon_FlabebeRedFlower[] = INCBIN_U8("graphics/pokemon/flabebe/icon.4bpp"); + const u32 gMonPalette_FlabebeRed[] = INCBIN_U32("graphics/pokemon/flabebe/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlabebeRed[] = INCBIN_U32("graphics/pokemon/flabebe/shiny.gbapal.lz"); + const u8 gMonIcon_FlabebeRed[] = INCBIN_U8("graphics/pokemon/flabebe/icon.4bpp"); - const u32 gMonPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/flabebe/yellow_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/flabebe/yellow_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlabebeYellowFlower[] = INCBIN_U8("graphics/pokemon/flabebe/yellow_flower/icon.4bpp"); + const u32 gMonPalette_FlabebeYellow[] = INCBIN_U32("graphics/pokemon/flabebe/yellow/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlabebeYellow[] = INCBIN_U32("graphics/pokemon/flabebe/yellow/shiny.gbapal.lz"); + const u8 gMonIcon_FlabebeYellow[] = INCBIN_U8("graphics/pokemon/flabebe/yellow/icon.4bpp"); - const u32 gMonPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/flabebe/orange_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/flabebe/orange_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlabebeOrangeFlower[] = INCBIN_U8("graphics/pokemon/flabebe/orange_flower/icon.4bpp"); + const u32 gMonPalette_FlabebeOrange[] = INCBIN_U32("graphics/pokemon/flabebe/orange/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlabebeOrange[] = INCBIN_U32("graphics/pokemon/flabebe/orange/shiny.gbapal.lz"); + const u8 gMonIcon_FlabebeOrange[] = INCBIN_U8("graphics/pokemon/flabebe/orange/icon.4bpp"); - const u32 gMonPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/flabebe/blue_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/flabebe/blue_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlabebeBlueFlower[] = INCBIN_U8("graphics/pokemon/flabebe/blue_flower/icon.4bpp"); + const u32 gMonPalette_FlabebeBlue[] = INCBIN_U32("graphics/pokemon/flabebe/blue/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlabebeBlue[] = INCBIN_U32("graphics/pokemon/flabebe/blue/shiny.gbapal.lz"); + const u8 gMonIcon_FlabebeBlue[] = INCBIN_U8("graphics/pokemon/flabebe/blue/icon.4bpp"); - const u32 gMonPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/flabebe/white_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/flabebe/white_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlabebeWhiteFlower[] = INCBIN_U8("graphics/pokemon/flabebe/white_flower/icon.4bpp"); + const u32 gMonPalette_FlabebeWhite[] = INCBIN_U32("graphics/pokemon/flabebe/white/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlabebeWhite[] = INCBIN_U32("graphics/pokemon/flabebe/white/shiny.gbapal.lz"); + const u8 gMonIcon_FlabebeWhite[] = INCBIN_U8("graphics/pokemon/flabebe/white/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_FlabebeRedFlower[] = INCBIN_COMP("graphics/pokemon/flabebe/overworld.4bpp"); - const u32 gObjectEventPic_FlabebeYellowFlower[] = INCBIN_COMP("graphics/pokemon/flabebe/yellow_flower/overworld.4bpp"); - const u32 gObjectEventPic_FlabebeOrangeFlower[] = INCBIN_COMP("graphics/pokemon/flabebe/orange_flower/overworld.4bpp"); - const u32 gObjectEventPic_FlabebeBlueFlower[] = INCBIN_COMP("graphics/pokemon/flabebe/blue_flower/overworld.4bpp"); - const u32 gObjectEventPic_FlabebeWhiteFlower[] = INCBIN_COMP("graphics/pokemon/flabebe/white_flower/overworld.4bpp"); + const u32 gObjectEventPic_FlabebeRed[] = INCBIN_COMP("graphics/pokemon/flabebe/overworld.4bpp"); + const u32 gObjectEventPic_FlabebeYellow[] = INCBIN_COMP("graphics/pokemon/flabebe/yellow/overworld.4bpp"); + const u32 gObjectEventPic_FlabebeOrange[] = INCBIN_COMP("graphics/pokemon/flabebe/orange/overworld.4bpp"); + const u32 gObjectEventPic_FlabebeBlue[] = INCBIN_COMP("graphics/pokemon/flabebe/blue/overworld.4bpp"); + const u32 gObjectEventPic_FlabebeWhite[] = INCBIN_COMP("graphics/pokemon/flabebe/white/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/flabebe/yellow_flower/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/flabebe/orange_flower/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/flabebe/blue_flower/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/flabebe/white_flower/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/flabebe/yellow_flower/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/flabebe/orange_flower/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/flabebe/blue_flower/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/flabebe/white_flower/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_FlabebeRed[] = INCBIN_U32("graphics/pokemon/flabebe/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FlabebeYellow[] = INCBIN_U32("graphics/pokemon/flabebe/yellow/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FlabebeOrange[] = INCBIN_U32("graphics/pokemon/flabebe/orange/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FlabebeBlue[] = INCBIN_U32("graphics/pokemon/flabebe/blue/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FlabebeWhite[] = INCBIN_U32("graphics/pokemon/flabebe/white/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_FlabebeRed[] = INCBIN_U32("graphics/pokemon/flabebe/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FlabebeYellow[] = INCBIN_U32("graphics/pokemon/flabebe/yellow/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FlabebeOrange[] = INCBIN_U32("graphics/pokemon/flabebe/orange/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FlabebeBlue[] = INCBIN_U32("graphics/pokemon/flabebe/blue/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FlabebeWhite[] = INCBIN_U32("graphics/pokemon/flabebe/white/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -19415,52 +19415,52 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u8 gMonFootprint_Floette[] = INCBIN_U8("graphics/pokemon/floette/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/normal.gbapal.lz"); - const u32 gMonShinyPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteRedFlower[] = INCBIN_U8("graphics/pokemon/floette/icon.4bpp"); + const u32 gMonPalette_FloetteRed[] = INCBIN_U32("graphics/pokemon/floette/normal.gbapal.lz"); + const u32 gMonShinyPalette_FloetteRed[] = INCBIN_U32("graphics/pokemon/floette/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteRed[] = INCBIN_U8("graphics/pokemon/floette/icon.4bpp"); - const u32 gMonPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/floette/yellow_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/floette/yellow_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteYellowFlower[] = INCBIN_U8("graphics/pokemon/floette/yellow_flower/icon.4bpp"); + const u32 gMonPalette_FloetteYellow[] = INCBIN_U32("graphics/pokemon/floette/yellow/normal.gbapal.lz"); + const u32 gMonShinyPalette_FloetteYellow[] = INCBIN_U32("graphics/pokemon/floette/yellow/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteYellow[] = INCBIN_U8("graphics/pokemon/floette/yellow/icon.4bpp"); - const u32 gMonPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/floette/orange_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/floette/orange_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteOrangeFlower[] = INCBIN_U8("graphics/pokemon/floette/orange_flower/icon.4bpp"); + const u32 gMonPalette_FloetteOrange[] = INCBIN_U32("graphics/pokemon/floette/orange/normal.gbapal.lz"); + const u32 gMonShinyPalette_FloetteOrange[] = INCBIN_U32("graphics/pokemon/floette/orange/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteOrange[] = INCBIN_U8("graphics/pokemon/floette/orange/icon.4bpp"); - const u32 gMonPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/floette/blue_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/floette/blue_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteBlueFlower[] = INCBIN_U8("graphics/pokemon/floette/blue_flower/icon.4bpp"); + const u32 gMonPalette_FloetteBlue[] = INCBIN_U32("graphics/pokemon/floette/blue/normal.gbapal.lz"); + const u32 gMonShinyPalette_FloetteBlue[] = INCBIN_U32("graphics/pokemon/floette/blue/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteBlue[] = INCBIN_U8("graphics/pokemon/floette/blue/icon.4bpp"); - const u32 gMonPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/floette/white_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/floette/white_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteWhiteFlower[] = INCBIN_U8("graphics/pokemon/floette/white_flower/icon.4bpp"); + const u32 gMonPalette_FloetteWhite[] = INCBIN_U32("graphics/pokemon/floette/white/normal.gbapal.lz"); + const u32 gMonShinyPalette_FloetteWhite[] = INCBIN_U32("graphics/pokemon/floette/white/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteWhite[] = INCBIN_U8("graphics/pokemon/floette/white/icon.4bpp"); - const u32 gMonFrontPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/anim_front.4bpp.lz"); - const u32 gMonPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/normal.gbapal.lz"); - const u32 gMonBackPic_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/back.4bpp.lz"); - const u32 gMonShinyPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FloetteEternalFlower[] = INCBIN_U8("graphics/pokemon/floette/eternal_flower/icon.4bpp"); + const u32 gMonFrontPic_FloetteEternal[] = INCBIN_U32("graphics/pokemon/floette/eternal/anim_front.4bpp.lz"); + const u32 gMonPalette_FloetteEternal[] = INCBIN_U32("graphics/pokemon/floette/eternal/normal.gbapal.lz"); + const u32 gMonBackPic_FloetteEternal[] = INCBIN_U32("graphics/pokemon/floette/eternal/back.4bpp.lz"); + const u32 gMonShinyPalette_FloetteEternal[] = INCBIN_U32("graphics/pokemon/floette/eternal/shiny.gbapal.lz"); + const u8 gMonIcon_FloetteEternal[] = INCBIN_U8("graphics/pokemon/floette/eternal/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_FloetteRedFlower[] = INCBIN_COMP("graphics/pokemon/floette/overworld.4bpp"); - const u32 gObjectEventPic_FloetteYellowFlower[] = INCBIN_COMP("graphics/pokemon/floette/yellow_flower/overworld.4bpp"); - const u32 gObjectEventPic_FloetteOrangeFlower[] = INCBIN_COMP("graphics/pokemon/floette/orange_flower/overworld.4bpp"); - const u32 gObjectEventPic_FloetteBlueFlower[] = INCBIN_COMP("graphics/pokemon/floette/blue_flower/overworld.4bpp"); - const u32 gObjectEventPic_FloetteWhiteFlower[] = INCBIN_COMP("graphics/pokemon/floette/white_flower/overworld.4bpp"); - const u32 gObjectEventPic_FloetteEternalFlower[] = INCBIN_COMP("graphics/pokemon/floette/eternal_flower/overworld.4bpp"); + const u32 gObjectEventPic_FloetteRed[] = INCBIN_COMP("graphics/pokemon/floette/overworld.4bpp"); + const u32 gObjectEventPic_FloetteYellow[] = INCBIN_COMP("graphics/pokemon/floette/yellow/overworld.4bpp"); + const u32 gObjectEventPic_FloetteOrange[] = INCBIN_COMP("graphics/pokemon/floette/orange/overworld.4bpp"); + const u32 gObjectEventPic_FloetteBlue[] = INCBIN_COMP("graphics/pokemon/floette/blue/overworld.4bpp"); + const u32 gObjectEventPic_FloetteWhite[] = INCBIN_COMP("graphics/pokemon/floette/white/overworld.4bpp"); + const u32 gObjectEventPic_FloetteEternal[] = INCBIN_COMP("graphics/pokemon/floette/eternal/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/floette/yellow_flower/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/floette/orange_flower/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/floette/blue_flower/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/floette/white_flower/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/floette/yellow_flower/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/floette/orange_flower/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/floette/blue_flower/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/floette/white_flower/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_FloetteRed[] = INCBIN_U32("graphics/pokemon/floette/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FloetteYellow[] = INCBIN_U32("graphics/pokemon/floette/yellow/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FloetteOrange[] = INCBIN_U32("graphics/pokemon/floette/orange/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FloetteBlue[] = INCBIN_U32("graphics/pokemon/floette/blue/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FloetteWhite[] = INCBIN_U32("graphics/pokemon/floette/white/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FloetteEternal[] = INCBIN_U32("graphics/pokemon/floette/eternal/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_FloetteRed[] = INCBIN_U32("graphics/pokemon/floette/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FloetteYellow[] = INCBIN_U32("graphics/pokemon/floette/yellow/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FloetteOrange[] = INCBIN_U32("graphics/pokemon/floette/orange/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FloetteBlue[] = INCBIN_U32("graphics/pokemon/floette/blue/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FloetteWhite[] = INCBIN_U32("graphics/pokemon/floette/white/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FloetteEternal[] = INCBIN_U32("graphics/pokemon/floette/eternal/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS @@ -19470,43 +19470,43 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u8 gMonFootprint_Florges[] = INCBIN_U8("graphics/pokemon/florges/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/shiny.gbapal.lz"); - const u8 gMonIcon_FlorgesRedFlower[] = INCBIN_U8("graphics/pokemon/florges/icon.4bpp"); + const u32 gMonPalette_FlorgesRed[] = INCBIN_U32("graphics/pokemon/florges/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlorgesRed[] = INCBIN_U32("graphics/pokemon/florges/shiny.gbapal.lz"); + const u8 gMonIcon_FlorgesRed[] = INCBIN_U8("graphics/pokemon/florges/icon.4bpp"); - const u32 gMonPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/florges/yellow_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/florges/yellow_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlorgesYellowFlower[] = INCBIN_U8("graphics/pokemon/florges/yellow_flower/icon.4bpp"); + const u32 gMonPalette_FlorgesYellow[] = INCBIN_U32("graphics/pokemon/florges/yellow/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlorgesYellow[] = INCBIN_U32("graphics/pokemon/florges/yellow/shiny.gbapal.lz"); + const u8 gMonIcon_FlorgesYellow[] = INCBIN_U8("graphics/pokemon/florges/yellow/icon.4bpp"); - const u32 gMonPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/florges/orange_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/florges/orange_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlorgesOrangeFlower[] = INCBIN_U8("graphics/pokemon/florges/orange_flower/icon.4bpp"); + const u32 gMonPalette_FlorgesOrange[] = INCBIN_U32("graphics/pokemon/florges/orange/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlorgesOrange[] = INCBIN_U32("graphics/pokemon/florges/orange/shiny.gbapal.lz"); + const u8 gMonIcon_FlorgesOrange[] = INCBIN_U8("graphics/pokemon/florges/orange/icon.4bpp"); - const u32 gMonPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/florges/blue_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/florges/blue_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlorgesBlueFlower[] = INCBIN_U8("graphics/pokemon/florges/blue_flower/icon.4bpp"); + const u32 gMonPalette_FlorgesBlue[] = INCBIN_U32("graphics/pokemon/florges/blue/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlorgesBlue[] = INCBIN_U32("graphics/pokemon/florges/blue/shiny.gbapal.lz"); + const u8 gMonIcon_FlorgesBlue[] = INCBIN_U8("graphics/pokemon/florges/blue/icon.4bpp"); - const u32 gMonPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/florges/white_flower/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/florges/white_flower/shiny.gbapal.lz"); - const u8 gMonIcon_FlorgesWhiteFlower[] = INCBIN_U8("graphics/pokemon/florges/white_flower/icon.4bpp"); + const u32 gMonPalette_FlorgesWhite[] = INCBIN_U32("graphics/pokemon/florges/white/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlorgesWhite[] = INCBIN_U32("graphics/pokemon/florges/white/shiny.gbapal.lz"); + const u8 gMonIcon_FlorgesWhite[] = INCBIN_U8("graphics/pokemon/florges/white/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_FlorgesRedFlower[] = INCBIN_COMP("graphics/pokemon/florges/overworld.4bpp"); - const u32 gObjectEventPic_FlorgesYellowFlower[] = INCBIN_COMP("graphics/pokemon/florges/yellow_flower/overworld.4bpp"); - const u32 gObjectEventPic_FlorgesOrangeFlower[] = INCBIN_COMP("graphics/pokemon/florges/orange_flower/overworld.4bpp"); - const u32 gObjectEventPic_FlorgesBlueFlower[] = INCBIN_COMP("graphics/pokemon/florges/blue_flower/overworld.4bpp"); - const u32 gObjectEventPic_FlorgesWhiteFlower[] = INCBIN_COMP("graphics/pokemon/florges/white_flower/overworld.4bpp"); + const u32 gObjectEventPic_FlorgesRed[] = INCBIN_COMP("graphics/pokemon/florges/overworld.4bpp"); + const u32 gObjectEventPic_FlorgesYellow[] = INCBIN_COMP("graphics/pokemon/florges/yellow/overworld.4bpp"); + const u32 gObjectEventPic_FlorgesOrange[] = INCBIN_COMP("graphics/pokemon/florges/orange/overworld.4bpp"); + const u32 gObjectEventPic_FlorgesBlue[] = INCBIN_COMP("graphics/pokemon/florges/blue/overworld.4bpp"); + const u32 gObjectEventPic_FlorgesWhite[] = INCBIN_COMP("graphics/pokemon/florges/white/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/florges/yellow_flower/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/florges/orange_flower/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/florges/blue_flower/overworld_normal.gbapal.lz"); - const u32 gOverworldPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/florges/white_flower/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/florges/yellow_flower/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/florges/orange_flower/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/florges/blue_flower/overworld_shiny.gbapal.lz"); - const u32 gShinyOverworldPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/florges/white_flower/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_FlorgesRed[] = INCBIN_U32("graphics/pokemon/florges/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FlorgesYellow[] = INCBIN_U32("graphics/pokemon/florges/yellow/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FlorgesOrange[] = INCBIN_U32("graphics/pokemon/florges/orange/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FlorgesBlue[] = INCBIN_U32("graphics/pokemon/florges/blue/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FlorgesWhite[] = INCBIN_U32("graphics/pokemon/florges/white/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_FlorgesRed[] = INCBIN_U32("graphics/pokemon/florges/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FlorgesYellow[] = INCBIN_U32("graphics/pokemon/florges/yellow/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FlorgesOrange[] = INCBIN_U32("graphics/pokemon/florges/orange/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FlorgesBlue[] = INCBIN_U32("graphics/pokemon/florges/blue/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FlorgesWhite[] = INCBIN_U32("graphics/pokemon/florges/white/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FLABEBE @@ -19696,32 +19696,32 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/anim_front.4bpp.lz"); - const u32 gMonPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/normal.gbapal.lz"); - const u32 gMonBackPic_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/back.4bpp.lz"); - const u32 gMonShinyPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/shiny.gbapal.lz"); - const u8 gMonIcon_MeowsticMale[] = INCBIN_U8("graphics/pokemon/meowstic/icon.4bpp"); + const u32 gMonFrontPic_MeowsticM[] = INCBIN_U32("graphics/pokemon/meowstic/anim_front.4bpp.lz"); + const u32 gMonPalette_MeowsticM[] = INCBIN_U32("graphics/pokemon/meowstic/normal.gbapal.lz"); + const u32 gMonBackPic_MeowsticM[] = INCBIN_U32("graphics/pokemon/meowstic/back.4bpp.lz"); + const u32 gMonShinyPalette_MeowsticM[] = INCBIN_U32("graphics/pokemon/meowstic/shiny.gbapal.lz"); + const u8 gMonIcon_MeowsticM[] = INCBIN_U8("graphics/pokemon/meowstic/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_Meowstic[] = INCBIN_U8("graphics/pokemon/meowstic/footprint.1bpp"); #endif //P_FOOTPRINTS #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MeowsticMale[] = INCBIN_COMP("graphics/pokemon/meowstic/overworld.4bpp"); + const u32 gObjectEventPic_MeowsticM[] = INCBIN_COMP("graphics/pokemon/meowstic/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MeowsticM[] = INCBIN_U32("graphics/pokemon/meowstic/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MeowsticM[] = INCBIN_U32("graphics/pokemon/meowstic/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/anim_front.4bpp.lz"); - const u32 gMonPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/normal.gbapal.lz"); - const u32 gMonBackPic_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/back.4bpp.lz"); - const u32 gMonShinyPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/shiny.gbapal.lz"); - const u8 gMonIcon_MeowsticFemale[] = INCBIN_U8("graphics/pokemon/meowstic/female/icon.4bpp"); + const u32 gMonFrontPic_MeowsticF[] = INCBIN_U32("graphics/pokemon/meowstic/f/anim_front.4bpp.lz"); + const u32 gMonPalette_MeowsticF[] = INCBIN_U32("graphics/pokemon/meowstic/f/normal.gbapal.lz"); + const u32 gMonBackPic_MeowsticF[] = INCBIN_U32("graphics/pokemon/meowstic/f/back.4bpp.lz"); + const u32 gMonShinyPalette_MeowsticF[] = INCBIN_U32("graphics/pokemon/meowstic/f/shiny.gbapal.lz"); + const u8 gMonIcon_MeowsticF[] = INCBIN_U8("graphics/pokemon/meowstic/f/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MeowsticFemale[] = INCBIN_COMP("graphics/pokemon/meowstic/female/overworld.4bpp"); + const u32 gObjectEventPic_MeowsticF[] = INCBIN_COMP("graphics/pokemon/meowstic/f/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MeowsticF[] = INCBIN_U32("graphics/pokemon/meowstic/f/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MeowsticF[] = INCBIN_U32("graphics/pokemon/meowstic/f/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ESPURR @@ -20183,16 +20183,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/front.4bpp.lz"); - const u32 gMonPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_SliggooHisuian[] = INCBIN_U8("graphics/pokemon/sliggoo/hisuian/icon.4bpp"); + const u32 gMonFrontPic_SliggooHisui[] = INCBIN_U32("graphics/pokemon/sliggoo/hisui/front.4bpp.lz"); + const u32 gMonPalette_SliggooHisui[] = INCBIN_U32("graphics/pokemon/sliggoo/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_SliggooHisui[] = INCBIN_U32("graphics/pokemon/sliggoo/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_SliggooHisui[] = INCBIN_U32("graphics/pokemon/sliggoo/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_SliggooHisui[] = INCBIN_U8("graphics/pokemon/sliggoo/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SliggooHisuian[] = INCBIN_COMP("graphics/pokemon/sliggoo/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_SliggooHisui[] = INCBIN_COMP("graphics/pokemon/sliggoo/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SliggooHisui[] = INCBIN_U32("graphics/pokemon/sliggoo/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SliggooHisui[] = INCBIN_U32("graphics/pokemon/sliggoo/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -20214,16 +20214,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/front.4bpp.lz"); - const u32 gMonPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_GoodraHisuian[] = INCBIN_U8("graphics/pokemon/goodra/hisuian/icon.4bpp"); + const u32 gMonFrontPic_GoodraHisui[] = INCBIN_U32("graphics/pokemon/goodra/hisui/front.4bpp.lz"); + const u32 gMonPalette_GoodraHisui[] = INCBIN_U32("graphics/pokemon/goodra/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_GoodraHisui[] = INCBIN_U32("graphics/pokemon/goodra/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_GoodraHisui[] = INCBIN_U32("graphics/pokemon/goodra/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_GoodraHisui[] = INCBIN_U8("graphics/pokemon/goodra/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_GoodraHisuian[] = INCBIN_COMP("graphics/pokemon/goodra/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_GoodraHisui[] = INCBIN_COMP("graphics/pokemon/goodra/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_GoodraHisui[] = INCBIN_U32("graphics/pokemon/goodra/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GoodraHisui[] = INCBIN_U32("graphics/pokemon/goodra/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -20379,16 +20379,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/front.4bpp.lz"); - const u32 gMonPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_AvaluggHisuian[] = INCBIN_U8("graphics/pokemon/avalugg/hisuian/icon.4bpp"); + const u32 gMonFrontPic_AvaluggHisui[] = INCBIN_U32("graphics/pokemon/avalugg/hisui/front.4bpp.lz"); + const u32 gMonPalette_AvaluggHisui[] = INCBIN_U32("graphics/pokemon/avalugg/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_AvaluggHisui[] = INCBIN_U32("graphics/pokemon/avalugg/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_AvaluggHisui[] = INCBIN_U32("graphics/pokemon/avalugg/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_AvaluggHisui[] = INCBIN_U8("graphics/pokemon/avalugg/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_AvaluggHisuian[] = INCBIN_COMP("graphics/pokemon/avalugg/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_AvaluggHisui[] = INCBIN_COMP("graphics/pokemon/avalugg/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_AvaluggHisui[] = INCBIN_U32("graphics/pokemon/avalugg/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AvaluggHisui[] = INCBIN_U32("graphics/pokemon/avalugg/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -20654,16 +20654,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS - const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz"); - const u32 gMonPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/normal.gbapal.lz"); - const u32 gMonBackPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/back.4bpp.lz"); - const u32 gMonShinyPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/shiny.gbapal.lz"); - const u8 gMonIcon_DecidueyeHisuian[] = INCBIN_U8("graphics/pokemon/decidueye/hisuian/icon.4bpp"); + const u32 gMonFrontPic_DecidueyeHisui[] = INCBIN_U32("graphics/pokemon/decidueye/hisui/front.4bpp.lz"); + const u32 gMonPalette_DecidueyeHisui[] = INCBIN_U32("graphics/pokemon/decidueye/hisui/normal.gbapal.lz"); + const u32 gMonBackPic_DecidueyeHisui[] = INCBIN_U32("graphics/pokemon/decidueye/hisui/back.4bpp.lz"); + const u32 gMonShinyPalette_DecidueyeHisui[] = INCBIN_U32("graphics/pokemon/decidueye/hisui/shiny.gbapal.lz"); + const u8 gMonIcon_DecidueyeHisui[] = INCBIN_U8("graphics/pokemon/decidueye/hisui/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_DecidueyeHisuian[] = INCBIN_COMP("graphics/pokemon/decidueye/hisuian/overworld.4bpp"); + const u32 gObjectEventPic_DecidueyeHisui[] = INCBIN_COMP("graphics/pokemon/decidueye/hisui/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_DecidueyeHisui[] = INCBIN_U32("graphics/pokemon/decidueye/hisui/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_DecidueyeHisui[] = INCBIN_U32("graphics/pokemon/decidueye/hisui/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS @@ -22208,16 +22208,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/front.4bpp.lz"); - const u32 gMonPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/normal.gbapal.lz"); - const u32 gMonBackPic_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/back.4bpp.lz"); - const u32 gMonShinyPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/shiny.gbapal.lz"); - const u8 gMonIcon_MagearnaOriginalColor[] = INCBIN_U8("graphics/pokemon/magearna/original_color/icon.4bpp"); + const u32 gMonFrontPic_MagearnaOriginal[] = INCBIN_U32("graphics/pokemon/magearna/original_color/front.4bpp.lz"); + const u32 gMonPalette_MagearnaOriginal[] = INCBIN_U32("graphics/pokemon/magearna/original_color/normal.gbapal.lz"); + const u32 gMonBackPic_MagearnaOriginal[] = INCBIN_U32("graphics/pokemon/magearna/original_color/back.4bpp.lz"); + const u32 gMonShinyPalette_MagearnaOriginal[] = INCBIN_U32("graphics/pokemon/magearna/original_color/shiny.gbapal.lz"); + const u8 gMonIcon_MagearnaOriginal[] = INCBIN_U8("graphics/pokemon/magearna/original_color/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MagearnaOriginalColor[] = INCBIN_COMP("graphics/pokemon/magearna/original_color/overworld.4bpp"); + const u32 gObjectEventPic_MagearnaOriginal[] = INCBIN_COMP("graphics/pokemon/magearna/original_color/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MagearnaOriginal[] = INCBIN_U32("graphics/pokemon/magearna/original_color/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MagearnaOriginal[] = INCBIN_U32("graphics/pokemon/magearna/original_color/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MAGEARNA @@ -22362,16 +22362,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_MelmetalGigantamax[] = INCBIN_U8("graphics/pokemon/melmetal/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/front.4bpp.lz"); + const u32 gMonBackPic_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/back.4bpp.lz"); + const u32 gMonPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_MelmetalGmax[] = INCBIN_U8("graphics/pokemon/melmetal/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_MelmetalGigantamax[] = INCBIN_COMP("graphics/pokemon/melmetal/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_MelmetalGmax[] = INCBIN_COMP("graphics/pokemon/melmetal/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -22427,16 +22427,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_RillaboomGigantamax[] = INCBIN_U8("graphics/pokemon/rillaboom/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/front.4bpp.lz"); + const u32 gMonBackPic_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/back.4bpp.lz"); + const u32 gMonPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_RillaboomGmax[] = INCBIN_U8("graphics/pokemon/rillaboom/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_RillaboomGigantamax[] = INCBIN_COMP("graphics/pokemon/rillaboom/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_RillaboomGmax[] = INCBIN_COMP("graphics/pokemon/rillaboom/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -22492,16 +22492,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CinderaceGigantamax[] = INCBIN_U8("graphics/pokemon/cinderace/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/front.4bpp.lz"); + const u32 gMonBackPic_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/back.4bpp.lz"); + const u32 gMonPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_CinderaceGmax[] = INCBIN_U8("graphics/pokemon/cinderace/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_CinderaceGigantamax[] = INCBIN_COMP("graphics/pokemon/cinderace/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_CinderaceGmax[] = INCBIN_COMP("graphics/pokemon/cinderace/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -22557,16 +22557,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_InteleonGigantamax[] = INCBIN_U8("graphics/pokemon/inteleon/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/front.4bpp.lz"); + const u32 gMonBackPic_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/back.4bpp.lz"); + const u32 gMonPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_InteleonGmax[] = INCBIN_U8("graphics/pokemon/inteleon/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_InteleonGigantamax[] = INCBIN_COMP("graphics/pokemon/inteleon/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_InteleonGmax[] = INCBIN_COMP("graphics/pokemon/inteleon/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -22656,16 +22656,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CorviknightGigantamax[] = INCBIN_U8("graphics/pokemon/corviknight/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/front.4bpp.lz"); + const u32 gMonBackPic_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/back.4bpp.lz"); + const u32 gMonPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_CorviknightGmax[] = INCBIN_U8("graphics/pokemon/corviknight/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_CorviknightGigantamax[] = INCBIN_COMP("graphics/pokemon/corviknight/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_CorviknightGmax[] = INCBIN_COMP("graphics/pokemon/corviknight/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -22721,16 +22721,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_OrbeetleGigantamax[] = INCBIN_U8("graphics/pokemon/orbeetle/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/front.4bpp.lz"); + const u32 gMonBackPic_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/back.4bpp.lz"); + const u32 gMonPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_OrbeetleGmax[] = INCBIN_U8("graphics/pokemon/orbeetle/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_OrbeetleGigantamax[] = INCBIN_COMP("graphics/pokemon/orbeetle/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_OrbeetleGmax[] = INCBIN_COMP("graphics/pokemon/orbeetle/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -22872,16 +22872,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_DrednawGigantamax[] = INCBIN_U8("graphics/pokemon/drednaw/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/front.4bpp.lz"); + const u32 gMonBackPic_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/back.4bpp.lz"); + const u32 gMonPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_DrednawGmax[] = INCBIN_U8("graphics/pokemon/drednaw/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_DrednawGigantamax[] = INCBIN_COMP("graphics/pokemon/drednaw/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_DrednawGmax[] = INCBIN_COMP("graphics/pokemon/drednaw/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -22971,16 +22971,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CoalossalGigantamax[] = INCBIN_U8("graphics/pokemon/coalossal/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/front.4bpp.lz"); + const u32 gMonBackPic_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/back.4bpp.lz"); + const u32 gMonPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_CoalossalGmax[] = INCBIN_U8("graphics/pokemon/coalossal/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_CoalossalGigantamax[] = INCBIN_COMP("graphics/pokemon/coalossal/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_CoalossalGmax[] = INCBIN_COMP("graphics/pokemon/coalossal/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -23020,16 +23020,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_FlappleGigantamax[] = INCBIN_U8("graphics/pokemon/flapple/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/front.4bpp.lz"); + const u32 gMonBackPic_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/back.4bpp.lz"); + const u32 gMonPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_FlappleGmax[] = INCBIN_U8("graphics/pokemon/flapple/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_FlappleGigantamax[] = INCBIN_COMP("graphics/pokemon/flapple/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_FlappleGmax[] = INCBIN_COMP("graphics/pokemon/flapple/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -23051,16 +23051,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_AppletunGigantamax[] = INCBIN_U8("graphics/pokemon/appletun/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/front.4bpp.lz"); + const u32 gMonBackPic_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/back.4bpp.lz"); + const u32 gMonPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_AppletunGmax[] = INCBIN_U8("graphics/pokemon/appletun/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_AppletunGigantamax[] = INCBIN_COMP("graphics/pokemon/appletun/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_AppletunGmax[] = INCBIN_COMP("graphics/pokemon/appletun/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -23134,16 +23134,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_SandacondaGigantamax[] = INCBIN_U8("graphics/pokemon/sandaconda/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/front.4bpp.lz"); + const u32 gMonBackPic_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/back.4bpp.lz"); + const u32 gMonPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_SandacondaGmax[] = INCBIN_U8("graphics/pokemon/sandaconda/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_SandacondaGigantamax[] = INCBIN_COMP("graphics/pokemon/sandaconda/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_SandacondaGmax[] = INCBIN_COMP("graphics/pokemon/sandaconda/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -23274,16 +23274,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_ToxtricityGigantamax[] = INCBIN_U8("graphics/pokemon/toxtricity/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/front.4bpp.lz"); + const u32 gMonBackPic_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/back.4bpp.lz"); + const u32 gMonPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_ToxtricityGmax[] = INCBIN_U8("graphics/pokemon/toxtricity/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_ToxtricityGigantamax[] = INCBIN_COMP("graphics/pokemon/toxtricity/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_ToxtricityGmax[] = INCBIN_COMP("graphics/pokemon/toxtricity/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -23323,16 +23323,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CentiskorchGigantamax[] = INCBIN_U8("graphics/pokemon/centiskorch/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/front.4bpp.lz"); + const u32 gMonBackPic_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/back.4bpp.lz"); + const u32 gMonPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_CentiskorchGmax[] = INCBIN_U8("graphics/pokemon/centiskorch/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_CentiskorchGigantamax[] = INCBIN_COMP("graphics/pokemon/centiskorch/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_CentiskorchGmax[] = INCBIN_COMP("graphics/pokemon/centiskorch/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -23456,16 +23456,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_HattereneGigantamax[] = INCBIN_U8("graphics/pokemon/hatterene/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/front.4bpp.lz"); + const u32 gMonBackPic_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/back.4bpp.lz"); + const u32 gMonPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_HattereneGmax[] = INCBIN_U8("graphics/pokemon/hatterene/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_HattereneGigantamax[] = INCBIN_COMP("graphics/pokemon/hatterene/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_HattereneGmax[] = INCBIN_COMP("graphics/pokemon/hatterene/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -23521,16 +23521,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_GrimmsnarlGigantamax[] = INCBIN_U8("graphics/pokemon/grimmsnarl/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/front.4bpp.lz"); + const u32 gMonBackPic_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/back.4bpp.lz"); + const u32 gMonPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_GrimmsnarlGmax[] = INCBIN_U8("graphics/pokemon/grimmsnarl/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_GrimmsnarlGigantamax[] = INCBIN_COMP("graphics/pokemon/grimmsnarl/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_GrimmsnarlGmax[] = INCBIN_COMP("graphics/pokemon/grimmsnarl/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -23670,16 +23670,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_AlcremieGigantamax[] = INCBIN_U8("graphics/pokemon/alcremie/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/front.4bpp.lz"); + const u32 gMonBackPic_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/back.4bpp.lz"); + const u32 gMonPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_AlcremieGmax[] = INCBIN_U8("graphics/pokemon/alcremie/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_AlcremieGigantamax[] = INCBIN_COMP("graphics/pokemon/alcremie/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_AlcremieGmax[] = INCBIN_COMP("graphics/pokemon/alcremie/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -23774,63 +23774,63 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_FAMILY_STONJOURNER #if P_FAMILY_EISCUE - const u32 gMonFrontPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/front.4bpp.lz"); - const u32 gMonPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/normal.gbapal.lz"); - const u32 gMonBackPic_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/back.4bpp.lz"); - const u32 gMonShinyPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/shiny.gbapal.lz"); - const u8 gMonIcon_EiscueIceFace[] = INCBIN_U8("graphics/pokemon/eiscue/icon.4bpp"); + const u32 gMonFrontPic_EiscueIce[] = INCBIN_U32("graphics/pokemon/eiscue/front.4bpp.lz"); + const u32 gMonPalette_EiscueIce[] = INCBIN_U32("graphics/pokemon/eiscue/normal.gbapal.lz"); + const u32 gMonBackPic_EiscueIce[] = INCBIN_U32("graphics/pokemon/eiscue/back.4bpp.lz"); + const u32 gMonShinyPalette_EiscueIce[] = INCBIN_U32("graphics/pokemon/eiscue/shiny.gbapal.lz"); + const u8 gMonIcon_EiscueIce[] = INCBIN_U8("graphics/pokemon/eiscue/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_Eiscue[] = INCBIN_U8("graphics/pokemon/eiscue/footprint.1bpp"); #endif //P_FOOTPRINTS #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_EiscueIceFace[] = INCBIN_COMP("graphics/pokemon/eiscue/overworld.4bpp"); + const u32 gObjectEventPic_EiscueIce[] = INCBIN_COMP("graphics/pokemon/eiscue/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_EiscueIce[] = INCBIN_U32("graphics/pokemon/eiscue/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_EiscueIce[] = INCBIN_U32("graphics/pokemon/eiscue/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/front.4bpp.lz"); - const u32 gMonPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/normal.gbapal.lz"); - const u32 gMonBackPic_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/back.4bpp.lz"); - const u32 gMonShinyPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/shiny.gbapal.lz"); - const u8 gMonIcon_EiscueNoiceFace[] = INCBIN_U8("graphics/pokemon/eiscue/noice_face/icon.4bpp"); + const u32 gMonFrontPic_EiscueNoice[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/front.4bpp.lz"); + const u32 gMonPalette_EiscueNoice[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/normal.gbapal.lz"); + const u32 gMonBackPic_EiscueNoice[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/back.4bpp.lz"); + const u32 gMonShinyPalette_EiscueNoice[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/shiny.gbapal.lz"); + const u8 gMonIcon_EiscueNoice[] = INCBIN_U8("graphics/pokemon/eiscue/noice_face/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_EiscueNoiceFace[] = INCBIN_COMP("graphics/pokemon/eiscue/noice_face/overworld.4bpp"); + // const u32 gObjectEventPic_EiscueNoice[] = INCBIN_COMP("graphics/pokemon/eiscue/noice_face/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_EiscueNoice[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_EiscueNoice[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE - const u32 gMonFrontPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/front.4bpp.lz"); - const u32 gMonPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/normal.gbapal.lz"); - const u32 gMonBackPic_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/back.4bpp.lz"); - const u32 gMonShinyPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/shiny.gbapal.lz"); - const u8 gMonIcon_IndeedeeMale[] = INCBIN_U8("graphics/pokemon/indeedee/icon.4bpp"); + const u32 gMonFrontPic_IndeedeeM[] = INCBIN_U32("graphics/pokemon/indeedee/front.4bpp.lz"); + const u32 gMonPalette_IndeedeeM[] = INCBIN_U32("graphics/pokemon/indeedee/normal.gbapal.lz"); + const u32 gMonBackPic_IndeedeeM[] = INCBIN_U32("graphics/pokemon/indeedee/back.4bpp.lz"); + const u32 gMonShinyPalette_IndeedeeM[] = INCBIN_U32("graphics/pokemon/indeedee/shiny.gbapal.lz"); + const u8 gMonIcon_IndeedeeM[] = INCBIN_U8("graphics/pokemon/indeedee/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_Indeedee[] = INCBIN_U8("graphics/pokemon/indeedee/footprint.1bpp"); #endif //P_FOOTPRINTS #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_IndeedeeMale[] = INCBIN_COMP("graphics/pokemon/indeedee/overworld.4bpp"); + const u32 gObjectEventPic_IndeedeeM[] = INCBIN_COMP("graphics/pokemon/indeedee/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_IndeedeeM[] = INCBIN_U32("graphics/pokemon/indeedee/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_IndeedeeM[] = INCBIN_U32("graphics/pokemon/indeedee/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/front.4bpp.lz"); - const u32 gMonPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/normal.gbapal.lz"); - const u32 gMonBackPic_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/back.4bpp.lz"); - const u32 gMonShinyPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/shiny.gbapal.lz"); - const u8 gMonIcon_IndeedeeFemale[] = INCBIN_U8("graphics/pokemon/indeedee/female/icon.4bpp"); + const u32 gMonFrontPic_IndeedeeF[] = INCBIN_U32("graphics/pokemon/indeedee/f/front.4bpp.lz"); + const u32 gMonPalette_IndeedeeF[] = INCBIN_U32("graphics/pokemon/indeedee/f/normal.gbapal.lz"); + const u32 gMonBackPic_IndeedeeF[] = INCBIN_U32("graphics/pokemon/indeedee/f/back.4bpp.lz"); + const u32 gMonShinyPalette_IndeedeeF[] = INCBIN_U32("graphics/pokemon/indeedee/f/shiny.gbapal.lz"); + const u8 gMonIcon_IndeedeeF[] = INCBIN_U8("graphics/pokemon/indeedee/f/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_IndeedeeFemale[] = INCBIN_COMP("graphics/pokemon/indeedee/female/overworld.4bpp"); + const u32 gObjectEventPic_IndeedeeF[] = INCBIN_COMP("graphics/pokemon/indeedee/f/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_IndeedeeF[] = INCBIN_U32("graphics/pokemon/indeedee/f/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_IndeedeeF[] = INCBIN_U32("graphics/pokemon/indeedee/f/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_INDEEDEE @@ -23900,16 +23900,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_CopperajahGigantamax[] = INCBIN_U8("graphics/pokemon/copperajah/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/front.4bpp.lz"); + const u32 gMonBackPic_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/back.4bpp.lz"); + const u32 gMonPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_CopperajahGmax[] = INCBIN_U8("graphics/pokemon/copperajah/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_CopperajahGigantamax[] = INCBIN_COMP("graphics/pokemon/copperajah/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_CopperajahGmax[] = INCBIN_COMP("graphics/pokemon/copperajah/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -24005,16 +24005,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/back.4bpp.lz"); - const u32 gMonPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_DuraludonGigantamax[] = INCBIN_U8("graphics/pokemon/duraludon/gigantamax/icon.4bpp"); + const u32 gMonFrontPic_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/front.4bpp.lz"); + const u32 gMonBackPic_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/back.4bpp.lz"); + const u32 gMonPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/shiny.gbapal.lz"); + const u8 gMonIcon_DuraludonGmax[] = INCBIN_U8("graphics/pokemon/duraludon/gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_DuraludonGigantamax[] = INCBIN_COMP("graphics/pokemon/duraludon/gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_DuraludonGmax[] = INCBIN_COMP("graphics/pokemon/duraludon/gmax/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - // const u32 gOverworldPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/overworld_normal.gbapal.lz"); - // const u32 gShinyOverworldPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/overworld_shiny.gbapal.lz"); + // const u32 gOverworldPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS @@ -24089,63 +24089,63 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_FAMILY_DREEPY #if P_FAMILY_ZACIAN - const u32 gMonFrontPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/front.4bpp.lz"); - const u32 gMonPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/normal.gbapal.lz"); - const u32 gMonBackPic_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/back.4bpp.lz"); - const u32 gMonShinyPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/shiny.gbapal.lz"); - const u8 gMonIcon_ZacianHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/zacian/icon.4bpp"); + const u32 gMonFrontPic_ZacianHero[] = INCBIN_U32("graphics/pokemon/zacian/front.4bpp.lz"); + const u32 gMonPalette_ZacianHero[] = INCBIN_U32("graphics/pokemon/zacian/normal.gbapal.lz"); + const u32 gMonBackPic_ZacianHero[] = INCBIN_U32("graphics/pokemon/zacian/back.4bpp.lz"); + const u32 gMonShinyPalette_ZacianHero[] = INCBIN_U32("graphics/pokemon/zacian/shiny.gbapal.lz"); + const u8 gMonIcon_ZacianHero[] = INCBIN_U8("graphics/pokemon/zacian/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_Zacian[] = INCBIN_U8("graphics/pokemon/zacian/footprint.1bpp"); #endif //P_FOOTPRINTS #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ZacianHeroOfManyBattles[] = INCBIN_COMP("graphics/pokemon/zacian/overworld.4bpp"); + const u32 gObjectEventPic_ZacianHero[] = INCBIN_COMP("graphics/pokemon/zacian/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ZacianHero[] = INCBIN_U32("graphics/pokemon/zacian/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ZacianHero[] = INCBIN_U32("graphics/pokemon/zacian/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/front.4bpp.lz"); - const u32 gMonPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/normal.gbapal.lz"); - const u32 gMonBackPic_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/back.4bpp.lz"); - const u32 gMonShinyPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/shiny.gbapal.lz"); - const u8 gMonIcon_ZacianCrownedSword[] = INCBIN_U8("graphics/pokemon/zacian/crowned_sword/icon.4bpp"); + const u32 gMonFrontPic_ZacianCrowned[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/front.4bpp.lz"); + const u32 gMonPalette_ZacianCrowned[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/normal.gbapal.lz"); + const u32 gMonBackPic_ZacianCrowned[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/back.4bpp.lz"); + const u32 gMonShinyPalette_ZacianCrowned[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/shiny.gbapal.lz"); + const u8 gMonIcon_ZacianCrowned[] = INCBIN_U8("graphics/pokemon/zacian/crowned_sword/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ZacianCrownedSword[] = INCBIN_COMP("graphics/pokemon/zacian/crowned_sword/overworld.4bpp"); + const u32 gObjectEventPic_ZacianCrowned[] = INCBIN_COMP("graphics/pokemon/zacian/crowned_sword/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ZacianCrowned[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ZacianCrowned[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ZACIAN #if P_FAMILY_ZAMAZENTA - const u32 gMonFrontPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/front.4bpp.lz"); - const u32 gMonPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/normal.gbapal.lz"); - const u32 gMonBackPic_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/back.4bpp.lz"); - const u32 gMonShinyPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/shiny.gbapal.lz"); - const u8 gMonIcon_ZamazentaHeroOfManyBattles[] = INCBIN_U8("graphics/pokemon/zamazenta/icon.4bpp"); + const u32 gMonFrontPic_ZamazentaHero[] = INCBIN_U32("graphics/pokemon/zamazenta/front.4bpp.lz"); + const u32 gMonPalette_ZamazentaHero[] = INCBIN_U32("graphics/pokemon/zamazenta/normal.gbapal.lz"); + const u32 gMonBackPic_ZamazentaHero[] = INCBIN_U32("graphics/pokemon/zamazenta/back.4bpp.lz"); + const u32 gMonShinyPalette_ZamazentaHero[] = INCBIN_U32("graphics/pokemon/zamazenta/shiny.gbapal.lz"); + const u8 gMonIcon_ZamazentaHero[] = INCBIN_U8("graphics/pokemon/zamazenta/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_Zamazenta[] = INCBIN_U8("graphics/pokemon/zamazenta/footprint.1bpp"); #endif //P_FOOTPRINTS #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ZamazentaHeroOfManyBattles[] = INCBIN_COMP("graphics/pokemon/zamazenta/overworld.4bpp"); + const u32 gObjectEventPic_ZamazentaHero[] = INCBIN_COMP("graphics/pokemon/zamazenta/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ZamazentaHero[] = INCBIN_U32("graphics/pokemon/zamazenta/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ZamazentaHero[] = INCBIN_U32("graphics/pokemon/zamazenta/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/front.4bpp.lz"); - const u32 gMonPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/normal.gbapal.lz"); - const u32 gMonBackPic_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/back.4bpp.lz"); - const u32 gMonShinyPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/shiny.gbapal.lz"); - const u8 gMonIcon_ZamazentaCrownedShield[] = INCBIN_U8("graphics/pokemon/zamazenta/crowned_shield/icon.4bpp"); + const u32 gMonFrontPic_ZamazentaCrowned[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/front.4bpp.lz"); + const u32 gMonPalette_ZamazentaCrowned[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/normal.gbapal.lz"); + const u32 gMonBackPic_ZamazentaCrowned[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/back.4bpp.lz"); + const u32 gMonShinyPalette_ZamazentaCrowned[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/shiny.gbapal.lz"); + const u8 gMonIcon_ZamazentaCrowned[] = INCBIN_U8("graphics/pokemon/zamazenta/crowned_shield/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_ZamazentaCrownedShield[] = INCBIN_COMP("graphics/pokemon/zamazenta/crowned_shield/overworld.4bpp"); + const u32 gObjectEventPic_ZamazentaCrowned[] = INCBIN_COMP("graphics/pokemon/zamazenta/crowned_shield/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_ZamazentaCrowned[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ZamazentaCrowned[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ZAMAZENTA @@ -24198,10 +24198,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/front.4bpp.lz"); - const u32 gMonPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/normal.gbapal.lz"); - const u32 gMonBackPic_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/back.4bpp.lz"); - const u32 gMonShinyPalette_UrshifuSingleStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/shiny.gbapal.lz"); + const u32 gMonFrontPic_UrshifuSingleStrike[] = INCBIN_U32("graphics/pokemon/urshifu/front.4bpp.lz"); + const u32 gMonPalette_UrshifuSingleStrike[] = INCBIN_U32("graphics/pokemon/urshifu/normal.gbapal.lz"); + const u32 gMonBackPic_UrshifuSingleStrike[] = INCBIN_U32("graphics/pokemon/urshifu/back.4bpp.lz"); + const u32 gMonShinyPalette_UrshifuSingleStrike[] = INCBIN_U32("graphics/pokemon/urshifu/shiny.gbapal.lz"); const u8 gMonIcon_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/footprint.1bpp"); @@ -24214,27 +24214,27 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/front.4bpp.lz"); - const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/normal.gbapal.lz"); - const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/back.4bpp.lz"); - const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style/shiny.gbapal.lz"); + const u32 gMonFrontPic_UrshifuRapidStrike[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike/front.4bpp.lz"); + const u32 gMonPalette_UrshifuRapidStrike[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike/normal.gbapal.lz"); + const u32 gMonBackPic_UrshifuRapidStrike[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike/back.4bpp.lz"); + const u32 gMonShinyPalette_UrshifuRapidStrike[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike/shiny.gbapal.lz"); #if P_GIGANTAMAX_FORMS - const u32 gMonFrontPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/back.4bpp.lz"); - const u32 gMonPalette_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_style_gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/single_strike_style_gigantamax/icon.4bpp"); + const u32 gMonFrontPic_UrshifuSingleStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_gmax/front.4bpp.lz"); + const u32 gMonBackPic_UrshifuSingleStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_gmax/back.4bpp.lz"); + const u32 gMonPalette_UrshifuSingleStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_UrshifuSingleStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/single_strike_gmax/shiny.gbapal.lz"); + const u8 gMonIcon_UrshifuSingleStrikeGmax[] = INCBIN_U8("graphics/pokemon/urshifu/single_strike_gmax/icon.4bpp"); - const u32 gMonFrontPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/front.4bpp.lz"); - const u32 gMonBackPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/back.4bpp.lz"); - const u32 gMonPalette_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/normal.gbapal.lz"); - const u32 gMonShinyPalette_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/shiny.gbapal.lz"); - const u8 gMonIcon_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_U8("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/icon.4bpp"); + const u32 gMonFrontPic_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_gmax/front.4bpp.lz"); + const u32 gMonBackPic_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_gmax/back.4bpp.lz"); + const u32 gMonPalette_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_gmax/normal.gbapal.lz"); + const u32 gMonShinyPalette_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/rapid_strike_gmax/shiny.gbapal.lz"); + const u8 gMonIcon_UrshifuRapidStrikeGmax[] = INCBIN_U8("graphics/pokemon/urshifu/rapid_strike_gmax/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - // const u32 gObjectEventPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_COMP("graphics/pokemon/urshifu/single_strike_style_gigantamax/overworld.4bpp"); - // const u32 gObjectEventPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_COMP("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/overworld.4bpp"); + // const u32 gObjectEventPic_UrshifuSingleStrikeGmax[] = INCBIN_COMP("graphics/pokemon/urshifu/single_strike_gmax/overworld.4bpp"); + // const u32 gObjectEventPic_UrshifuRapidStrikeGmax[] = INCBIN_COMP("graphics/pokemon/urshifu/rapid_strike_gmax/overworld.4bpp"); #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KUBFU @@ -24360,31 +24360,31 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_POKEMON_OBJECT_EVENTS #if P_FUSION_FORMS - const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz"); - const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz"); - const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz"); - const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz"); - const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp"); + const u32 gMonFrontPic_CalyrexIce[] = INCBIN_U32("graphics/pokemon/calyrex/ice/front.4bpp.lz"); + const u32 gMonPalette_CalyrexIce[] = INCBIN_U32("graphics/pokemon/calyrex/ice/normal.gbapal.lz"); + const u32 gMonBackPic_CalyrexIce[] = INCBIN_U32("graphics/pokemon/calyrex/ice/back.4bpp.lz"); + const u32 gMonShinyPalette_CalyrexIce[] = INCBIN_U32("graphics/pokemon/calyrex/ice/shiny.gbapal.lz"); + const u8 gMonIcon_CalyrexIce[] = INCBIN_U8("graphics/pokemon/calyrex/ice/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_CalyrexIceRider[] = INCBIN_COMP("graphics/pokemon/calyrex/ice_rider/overworld.4bpp"); + const u32 gObjectEventPic_CalyrexIce[] = INCBIN_COMP("graphics/pokemon/calyrex/ice/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_CalyrexIce[] = INCBIN_U32("graphics/pokemon/calyrex/ice/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_CalyrexIce[] = INCBIN_U32("graphics/pokemon/calyrex/ice/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FUSION_FORMS #if P_FUSION_FORMS - const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz"); - const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz"); - const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz"); - const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz"); - const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp"); + const u32 gMonFrontPic_CalyrexShadow[] = INCBIN_U32("graphics/pokemon/calyrex/shadow/front.4bpp.lz"); + const u32 gMonPalette_CalyrexShadow[] = INCBIN_U32("graphics/pokemon/calyrex/shadow/normal.gbapal.lz"); + const u32 gMonBackPic_CalyrexShadow[] = INCBIN_U32("graphics/pokemon/calyrex/shadow/back.4bpp.lz"); + const u32 gMonShinyPalette_CalyrexShadow[] = INCBIN_U32("graphics/pokemon/calyrex/shadow/shiny.gbapal.lz"); + const u8 gMonIcon_CalyrexShadow[] = INCBIN_U8("graphics/pokemon/calyrex/shadow/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_CalyrexShadowRider[] = INCBIN_COMP("graphics/pokemon/calyrex/shadow_rider/overworld.4bpp"); + const u32 gObjectEventPic_CalyrexShadow[] = INCBIN_COMP("graphics/pokemon/calyrex/shadow/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_CalyrexShadow[] = INCBIN_U32("graphics/pokemon/calyrex/shadow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_CalyrexShadow[] = INCBIN_U32("graphics/pokemon/calyrex/shadow/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FUSION_FORMS @@ -24557,32 +24557,32 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/front.4bpp.lz"); - const u32 gMonPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/normal.gbapal.lz"); - const u32 gMonBackPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/back.4bpp.lz"); - const u32 gMonShinyPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/shiny.gbapal.lz"); - const u8 gMonIcon_OinkologneMale[] = INCBIN_U8("graphics/pokemon/oinkologne/icon.4bpp"); + const u32 gMonFrontPic_OinkologneM[] = INCBIN_U32("graphics/pokemon/oinkologne/front.4bpp.lz"); + const u32 gMonPalette_OinkologneM[] = INCBIN_U32("graphics/pokemon/oinkologne/normal.gbapal.lz"); + const u32 gMonBackPic_OinkologneM[] = INCBIN_U32("graphics/pokemon/oinkologne/back.4bpp.lz"); + const u32 gMonShinyPalette_OinkologneM[] = INCBIN_U32("graphics/pokemon/oinkologne/shiny.gbapal.lz"); + const u8 gMonIcon_OinkologneM[] = INCBIN_U8("graphics/pokemon/oinkologne/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/footprint.1bpp"); #endif //P_FOOTPRINTS #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_OinkologneMale[] = INCBIN_COMP("graphics/pokemon/oinkologne/overworld.4bpp"); + const u32 gObjectEventPic_OinkologneM[] = INCBIN_COMP("graphics/pokemon/oinkologne/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_OinkologneM[] = INCBIN_U32("graphics/pokemon/oinkologne/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OinkologneM[] = INCBIN_U32("graphics/pokemon/oinkologne/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/front.4bpp.lz"); - const u32 gMonPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/normal.gbapal.lz"); - const u32 gMonBackPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/back.4bpp.lz"); - const u32 gMonShinyPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/shiny.gbapal.lz"); - const u8 gMonIcon_OinkologneFemale[] = INCBIN_U8("graphics/pokemon/oinkologne/female/icon.4bpp"); + const u32 gMonFrontPic_OinkologneF[] = INCBIN_U32("graphics/pokemon/oinkologne/f/front.4bpp.lz"); + const u32 gMonPalette_OinkologneF[] = INCBIN_U32("graphics/pokemon/oinkologne/f/normal.gbapal.lz"); + const u32 gMonBackPic_OinkologneF[] = INCBIN_U32("graphics/pokemon/oinkologne/f/back.4bpp.lz"); + const u32 gMonShinyPalette_OinkologneF[] = INCBIN_U32("graphics/pokemon/oinkologne/f/shiny.gbapal.lz"); + const u8 gMonIcon_OinkologneF[] = INCBIN_U8("graphics/pokemon/oinkologne/f/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_OinkologneFemale[] = INCBIN_COMP("graphics/pokemon/oinkologne/female/overworld.4bpp"); + const u32 gObjectEventPic_OinkologneF[] = INCBIN_COMP("graphics/pokemon/oinkologne/f/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_OinkologneF[] = INCBIN_U32("graphics/pokemon/oinkologne/f/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OinkologneF[] = INCBIN_U32("graphics/pokemon/oinkologne/f/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LECHONK @@ -24725,31 +24725,31 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/normal.gbapal.lz"); const u32 gMonShinyPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/shiny.gbapal.lz"); - const u32 gMonFrontPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/front.4bpp.lz"); - const u32 gMonBackPic_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/back.4bpp.lz"); - const u8 gMonIcon_MausholdFamilyOfThree[] = INCBIN_U8("graphics/pokemon/maushold/icon.4bpp"); + const u32 gMonFrontPic_MausholdThree[] = INCBIN_U32("graphics/pokemon/maushold/front.4bpp.lz"); + const u32 gMonBackPic_MausholdThree[] = INCBIN_U32("graphics/pokemon/maushold/back.4bpp.lz"); + const u8 gMonIcon_MausholdThree[] = INCBIN_U8("graphics/pokemon/maushold/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_MausholdFamilyOfThree[] = INCBIN_U8("graphics/pokemon/maushold/footprint.1bpp"); + const u8 gMonFootprint_MausholdThree[] = INCBIN_U8("graphics/pokemon/maushold/footprint.1bpp"); #endif //P_FOOTPRINTS #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MausholdFamilyOfThree[] = INCBIN_COMP("graphics/pokemon/maushold/overworld.4bpp"); + const u32 gObjectEventPic_MausholdThree[] = INCBIN_COMP("graphics/pokemon/maushold/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MausholdThree[] = INCBIN_U32("graphics/pokemon/maushold/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MausholdThree[] = INCBIN_U32("graphics/pokemon/maushold/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonFrontPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/front.4bpp.lz"); - const u32 gMonBackPic_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/back.4bpp.lz"); - const u8 gMonIcon_MausholdFamilyOfFour[] = INCBIN_U8("graphics/pokemon/maushold/four/icon.4bpp"); + const u32 gMonFrontPic_MausholdFour[] = INCBIN_U32("graphics/pokemon/maushold/four/front.4bpp.lz"); + const u32 gMonBackPic_MausholdFour[] = INCBIN_U32("graphics/pokemon/maushold/four/back.4bpp.lz"); + const u8 gMonIcon_MausholdFour[] = INCBIN_U8("graphics/pokemon/maushold/four/icon.4bpp"); #if P_FOOTPRINTS - const u8 gMonFootprint_MausholdFamilyOfFour[] = INCBIN_U8("graphics/pokemon/maushold/four/footprint.1bpp"); + const u8 gMonFootprint_MausholdFour[] = INCBIN_U8("graphics/pokemon/maushold/four/footprint.1bpp"); #endif //P_FOOTPRINTS #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_MausholdFamilyOfFour[] = INCBIN_COMP("graphics/pokemon/maushold/four/overworld.4bpp"); + const u32 gObjectEventPic_MausholdFour[] = INCBIN_COMP("graphics/pokemon/maushold/four/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_MausholdFour[] = INCBIN_U32("graphics/pokemon/maushold/four/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MausholdFour[] = INCBIN_U32("graphics/pokemon/maushold/four/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TANDEMAUS @@ -24845,47 +24845,47 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u8 gMonFootprint_Squawkabilly[] = INCBIN_U8("graphics/pokemon/squawkabilly/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/normal.gbapal.lz"); - const u32 gMonShinyPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/shiny.gbapal.lz"); - const u8 gMonIcon_SquawkabillyGreenPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/icon.4bpp"); + const u32 gMonPalette_SquawkabillyGreen[] = INCBIN_U32("graphics/pokemon/squawkabilly/normal.gbapal.lz"); + const u32 gMonShinyPalette_SquawkabillyGreen[] = INCBIN_U32("graphics/pokemon/squawkabilly/shiny.gbapal.lz"); + const u8 gMonIcon_SquawkabillyGreen[] = INCBIN_U8("graphics/pokemon/squawkabilly/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SquawkabillyGreenPlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/overworld.4bpp"); + const u32 gObjectEventPic_SquawkabillyGreen[] = INCBIN_COMP("graphics/pokemon/squawkabilly/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SquawkabillyGreen[] = INCBIN_U32("graphics/pokemon/squawkabilly/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SquawkabillyGreen[] = INCBIN_U32("graphics/pokemon/squawkabilly/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/normal.gbapal.lz"); - const u32 gMonShinyPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/shiny.gbapal.lz"); - const u8 gMonIcon_SquawkabillyBluePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/blue_plumage/icon.4bpp"); + const u32 gMonPalette_SquawkabillyBlue[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue/normal.gbapal.lz"); + const u32 gMonShinyPalette_SquawkabillyBlue[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue/shiny.gbapal.lz"); + const u8 gMonIcon_SquawkabillyBlue[] = INCBIN_U8("graphics/pokemon/squawkabilly/blue/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SquawkabillyBluePlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/blue_plumage/overworld.4bpp"); + const u32 gObjectEventPic_SquawkabillyBlue[] = INCBIN_COMP("graphics/pokemon/squawkabilly/blue/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SquawkabillyBlue[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SquawkabillyBlue[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/normal.gbapal.lz"); - const u32 gMonShinyPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/shiny.gbapal.lz"); - const u8 gMonIcon_SquawkabillyYellowPlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/yellow_plumage/icon.4bpp"); + const u32 gMonPalette_SquawkabillyYellow[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow/normal.gbapal.lz"); + const u32 gMonShinyPalette_SquawkabillyYellow[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow/shiny.gbapal.lz"); + const u8 gMonIcon_SquawkabillyYellow[] = INCBIN_U8("graphics/pokemon/squawkabilly/yellow/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SquawkabillyYellowPlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/yellow_plumage/overworld.4bpp"); + const u32 gObjectEventPic_SquawkabillyYellow[] = INCBIN_COMP("graphics/pokemon/squawkabilly/yellow/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SquawkabillyYellow[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SquawkabillyYellow[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS - const u32 gMonPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/normal.gbapal.lz"); - const u32 gMonShinyPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/shiny.gbapal.lz"); - const u8 gMonIcon_SquawkabillyWhitePlumage[] = INCBIN_U8("graphics/pokemon/squawkabilly/white_plumage/icon.4bpp"); + const u32 gMonPalette_SquawkabillyWhite[] = INCBIN_U32("graphics/pokemon/squawkabilly/white/normal.gbapal.lz"); + const u32 gMonShinyPalette_SquawkabillyWhite[] = INCBIN_U32("graphics/pokemon/squawkabilly/white/shiny.gbapal.lz"); + const u8 gMonIcon_SquawkabillyWhite[] = INCBIN_U8("graphics/pokemon/squawkabilly/white/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_SquawkabillyWhitePlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/white_plumage/overworld.4bpp"); + const u32 gObjectEventPic_SquawkabillyWhite[] = INCBIN_COMP("graphics/pokemon/squawkabilly/white/overworld.4bpp"); #if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE - const u32 gOverworldPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_SquawkabillyWhite[] = INCBIN_U32("graphics/pokemon/squawkabilly/white/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SquawkabillyWhite[] = INCBIN_U32("graphics/pokemon/squawkabilly/white/overworld_shiny.gbapal.lz"); #endif //OW_PKMN_OBJECTS_SHARE_PALETTES #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SQUAWKABILLY @@ -26318,79 +26318,79 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_FAMILY_FEZANDIPITI #if P_FAMILY_OGERPON - const u32 gMonFrontPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/front.4bpp.lz"); - const u32 gMonPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz"); - const u32 gMonShinyPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz"); - const u8 gMonIcon_OgerponTealMask[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp"); + const u32 gMonFrontPic_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/front.4bpp.lz"); + const u32 gMonPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/back.4bpp.lz"); + const u32 gMonShinyPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/shiny.gbapal.lz"); + const u8 gMonIcon_OgerponTeal[] = INCBIN_U8("graphics/pokemon/ogerpon/icon.4bpp"); #if P_FOOTPRINTS const u8 gMonFootprint_Ogerpon[] = INCBIN_U8("graphics/pokemon/ogerpon/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz"); - const u32 gMonPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz"); - const u32 gMonShinyPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz"); - const u8 gMonIcon_OgerponWellspringMask[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp"); + const u32 gMonFrontPic_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/front.4bpp.lz"); + const u32 gMonPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/back.4bpp.lz"); + const u32 gMonShinyPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/shiny.gbapal.lz"); + const u8 gMonIcon_OgerponWellspring[] = INCBIN_U8("graphics/pokemon/ogerpon/wellspring/icon.4bpp"); - const u32 gMonFrontPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz"); - const u32 gMonPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz"); - const u32 gMonShinyPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz"); - const u8 gMonIcon_OgerponHearthflameMask[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp"); + const u32 gMonFrontPic_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/front.4bpp.lz"); + const u32 gMonPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/back.4bpp.lz"); + const u32 gMonShinyPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/shiny.gbapal.lz"); + const u8 gMonIcon_OgerponHearthflame[] = INCBIN_U8("graphics/pokemon/ogerpon/hearthflame/icon.4bpp"); - const u32 gMonFrontPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz"); - const u32 gMonPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz"); - const u32 gMonShinyPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz"); - const u8 gMonIcon_OgerponCornerstoneMask[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp"); + const u32 gMonFrontPic_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/front.4bpp.lz"); + const u32 gMonPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/back.4bpp.lz"); + const u32 gMonShinyPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/shiny.gbapal.lz"); + const u8 gMonIcon_OgerponCornerstone[] = INCBIN_U8("graphics/pokemon/ogerpon/cornerstone/icon.4bpp"); - const u32 gMonFrontPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/front.4bpp.lz"); - const u32 gMonPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/back.4bpp.lz"); - const u32 gMonShinyPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/tera/shiny.gbapal.lz"); + const u32 gMonFrontPic_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/teal_tera/front.4bpp.lz"); + const u32 gMonPalette_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/teal_tera/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/teal_tera/back.4bpp.lz"); + const u32 gMonShinyPalette_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/teal_tera/shiny.gbapal.lz"); - const u32 gMonFrontPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/front.4bpp.lz"); - const u32 gMonPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/back.4bpp.lz"); - const u32 gMonShinyPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/tera/shiny.gbapal.lz"); + const u32 gMonFrontPic_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring_tera/front.4bpp.lz"); + const u32 gMonPalette_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring_tera/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring_tera/back.4bpp.lz"); + const u32 gMonShinyPalette_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring_tera/shiny.gbapal.lz"); - const u32 gMonFrontPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/front.4bpp.lz"); - const u32 gMonPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/back.4bpp.lz"); - const u32 gMonShinyPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/tera/shiny.gbapal.lz"); + const u32 gMonFrontPic_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame_tera/front.4bpp.lz"); + const u32 gMonPalette_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame_tera/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame_tera/back.4bpp.lz"); + const u32 gMonShinyPalette_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame_tera/shiny.gbapal.lz"); - const u32 gMonFrontPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/front.4bpp.lz"); - const u32 gMonPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/normal.gbapal.lz"); - const u32 gMonBackPic_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/back.4bpp.lz"); - const u32 gMonShinyPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/tera/shiny.gbapal.lz"); + const u32 gMonFrontPic_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone_tera/front.4bpp.lz"); + const u32 gMonPalette_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone_tera/normal.gbapal.lz"); + const u32 gMonBackPic_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone_tera/back.4bpp.lz"); + const u32 gMonShinyPalette_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone_tera/shiny.gbapal.lz"); #if OW_POKEMON_OBJECT_EVENTS - const u32 gObjectEventPic_OgerponTealMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/overworld.4bpp"); - const u32 gObjectEventPic_OgerponWellspringMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/wellspring/overworld.4bpp"); - const u32 gObjectEventPic_OgerponHearthflameMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/hearthflame/overworld.4bpp"); - const u32 gObjectEventPic_OgerponCornerstoneMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/cornerstone/overworld.4bpp"); - const u32 gOverworldPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_OgerponWellspringMask[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_shiny.gbapal.lz"); - const u32 gOverworldPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_OgerponHearthflameMask[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_shiny.gbapal.lz"); - const u32 gOverworldPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_OgerponCornerstoneMask[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_shiny.gbapal.lz"); - const u32 gOverworldPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_OgerponTealMask[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_shiny.gbapal.lz"); + const u32 gObjectEventPic_OgerponTeal[] = INCBIN_COMP("graphics/pokemon/ogerpon/overworld.4bpp"); + const u32 gObjectEventPic_OgerponWellspring[] = INCBIN_COMP("graphics/pokemon/ogerpon/wellspring/overworld.4bpp"); + const u32 gObjectEventPic_OgerponHearthflame[] = INCBIN_COMP("graphics/pokemon/ogerpon/hearthflame/overworld.4bpp"); + const u32 gObjectEventPic_OgerponCornerstone[] = INCBIN_COMP("graphics/pokemon/ogerpon/cornerstone/overworld.4bpp"); + const u32 gOverworldPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OgerponWellspring[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OgerponHearthflame[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OgerponCornerstone[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OgerponTeal[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_shiny.gbapal.lz"); - const u32 gObjectEventPic_OgerponTealMaskTeraTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/overworld.4bpp"); - const u32 gObjectEventPic_OgerponWellspringMaskTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/wellspring/overworld.4bpp"); - const u32 gObjectEventPic_OgerponHearthflameMaskTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/hearthflame/overworld.4bpp"); - const u32 gObjectEventPic_OgerponCornerstoneMaskTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/cornerstone/overworld.4bpp"); - const u32 gOverworldPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_OgerponWellspringMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_shiny.gbapal.lz"); - const u32 gOverworldPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_OgerponHearthflameMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_shiny.gbapal.lz"); - const u32 gOverworldPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_OgerponCornerstoneMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_shiny.gbapal.lz"); - const u32 gOverworldPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_normal.gbapal.lz"); - const u32 gShinyOverworldPalette_OgerponTealMaskTera[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_shiny.gbapal.lz"); + const u32 gObjectEventPic_OgerponTealTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/overworld.4bpp"); + const u32 gObjectEventPic_OgerponWellspringTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/wellspring/overworld.4bpp"); + const u32 gObjectEventPic_OgerponHearthflameTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/hearthflame/overworld.4bpp"); + const u32 gObjectEventPic_OgerponCornerstoneTera[] = INCBIN_COMP("graphics/pokemon/ogerpon/cornerstone/overworld.4bpp"); + const u32 gOverworldPalette_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OgerponWellspringTera[] = INCBIN_U32("graphics/pokemon/ogerpon/wellspring/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OgerponHearthflameTera[] = INCBIN_U32("graphics/pokemon/ogerpon/hearthflame/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OgerponCornerstoneTera[] = INCBIN_U32("graphics/pokemon/ogerpon/cornerstone/overworld_shiny.gbapal.lz"); + const u32 gOverworldPalette_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OgerponTealTera[] = INCBIN_U32("graphics/pokemon/ogerpon/overworld_shiny.gbapal.lz"); #endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_OGERPON diff --git a/src/data/object_events/object_event_pic_tables_followers.h b/src/data/object_events/object_event_pic_tables_followers.h index 1164e92c52..cc55512337 100644 --- a/src/data/object_events/object_event_pic_tables_followers.h +++ b/src/data/object_events/object_event_pic_tables_followers.h @@ -22,8 +22,8 @@ static const struct SpriteFrameImage sPicTable_VenusaurF[] = { };*/ #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_VenusaurGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_VenusaurGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_VenusaurGmax[] = { + overworld_ascending_frames(gObjectEventPic_VenusaurGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BULBASAUR @@ -47,8 +47,8 @@ static const struct SpriteFrameImage sPicTable_CharizardMegaY[] = { };*/ #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_CharizardGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_CharizardGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_CharizardGmax[] = { + overworld_ascending_frames(gObjectEventPic_CharizardGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHARMANDER @@ -69,8 +69,8 @@ static const struct SpriteFrameImage sPicTable_Blastoise[] = { };*/ #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_BlastoiseGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_BlastoiseGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_BlastoiseGmax[] = { + overworld_ascending_frames(gObjectEventPic_BlastoiseGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SQUIRTLE @@ -89,8 +89,8 @@ static const struct SpriteFrameImage sPicTable_ButterfreeF[] = { overworld_ascending_frames(gObjectEventPic_ButterfreeF, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_ButterfreeGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_ButterfreeGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_ButterfreeGmax[] = { + overworld_ascending_frames(gObjectEventPic_ButterfreeGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CATERPIE @@ -143,11 +143,11 @@ static const struct SpriteFrameImage sPicTable_RaticateF[] = { overworld_ascending_frames(gObjectEventPic_RaticateF, 4, 4), }; #if P_ALOLAN_FORMS -static const struct SpriteFrameImage sPicTable_RattataAlolan[] = { - overworld_ascending_frames(gObjectEventPic_RattataAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_RattataAlola[] = { + overworld_ascending_frames(gObjectEventPic_RattataAlola, 4, 4), }; -static const struct SpriteFrameImage sPicTable_RaticateAlolan[] = { - overworld_ascending_frames(gObjectEventPic_RaticateAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_RaticateAlola[] = { + overworld_ascending_frames(gObjectEventPic_RaticateAlola, 4, 4), }; #endif //P_ALOLAN_FORMS #endif //P_FAMILY_RATTATA @@ -207,35 +207,35 @@ static const struct SpriteFrameImage sPicTable_PikachuLibre[] = { #endif //P_COSPLAY_PIKACHU_FORMS #if P_CAP_PIKACHU_FORMS -/*static const struct SpriteFrameImage sPicTable_PikachuOriginalCap[] = { - overworld_ascending_frames(gObjectEventPic_PikachuOriginalCap, 4, 4), +/*static const struct SpriteFrameImage sPicTable_PikachuOriginal[] = { + overworld_ascending_frames(gObjectEventPic_PikachuOriginal, 4, 4), }; -static const struct SpriteFrameImage sPicTable_PikachuHoennCap[] = { - overworld_ascending_frames(gObjectEventPic_PikachuHoennCap, 4, 4), +static const struct SpriteFrameImage sPicTable_PikachuHoenn[] = { + overworld_ascending_frames(gObjectEventPic_PikachuHoenn, 4, 4), }; -static const struct SpriteFrameImage sPicTable_PikachuSinnohCap[] = { - overworld_ascending_frames(gObjectEventPic_PikachuSinnohCap, 4, 4), +static const struct SpriteFrameImage sPicTable_PikachuSinnoh[] = { + overworld_ascending_frames(gObjectEventPic_PikachuSinnoh, 4, 4), }; -static const struct SpriteFrameImage sPicTable_PikachuUnovaCap[] = { - overworld_ascending_frames(gObjectEventPic_PikachuUnovaCap, 4, 4), +static const struct SpriteFrameImage sPicTable_PikachuUnova[] = { + overworld_ascending_frames(gObjectEventPic_PikachuUnova, 4, 4), }; -static const struct SpriteFrameImage sPicTable_PikachuKalosCap[] = { - overworld_ascending_frames(gObjectEventPic_PikachuKalosCap, 4, 4), +static const struct SpriteFrameImage sPicTable_PikachuKalos[] = { + overworld_ascending_frames(gObjectEventPic_PikachuKalos, 4, 4), }; -static const struct SpriteFrameImage sPicTable_PikachuAlolaCap[] = { - overworld_ascending_frames(gObjectEventPic_PikachuAlolaCap, 4, 4), +static const struct SpriteFrameImage sPicTable_PikachuAlola[] = { + overworld_ascending_frames(gObjectEventPic_PikachuAlola, 4, 4), }; -static const struct SpriteFrameImage sPicTable_PikachuPartnerCap[] = { - overworld_ascending_frames(gObjectEventPic_PikachuPartnerCap, 4, 4), +static const struct SpriteFrameImage sPicTable_PikachuPartner[] = { + overworld_ascending_frames(gObjectEventPic_PikachuPartner, 4, 4), }; -static const struct SpriteFrameImage sPicTable_PikachuWorldCap[] = { - overworld_ascending_frames(gObjectEventPic_PikachuWorldCap, 4, 4), +static const struct SpriteFrameImage sPicTable_PikachuWorld[] = { + overworld_ascending_frames(gObjectEventPic_PikachuWorld, 4, 4), };*/ #endif //P_CAP_PIKACHU_FORMS #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_PikachuGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_PikachuGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_PikachuGmax[] = { + overworld_ascending_frames(gObjectEventPic_PikachuGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS @@ -246,8 +246,8 @@ static const struct SpriteFrameImage sPicTable_RaichuF[] = { overworld_ascending_frames(gObjectEventPic_RaichuF, 4, 4), }; #if P_ALOLAN_FORMS -static const struct SpriteFrameImage sPicTable_RaichuAlolan[] = { - overworld_ascending_frames(gObjectEventPic_RaichuAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_RaichuAlola[] = { + overworld_ascending_frames(gObjectEventPic_RaichuAlola, 4, 4), }; #endif //P_ALOLAN_FORMS #endif //P_FAMILY_PIKACHU @@ -260,11 +260,11 @@ static const struct SpriteFrameImage sPicTable_Sandslash[] = { overworld_ascending_frames(gObjectEventPic_Sandslash, 4, 4), }; #if P_ALOLAN_FORMS -static const struct SpriteFrameImage sPicTable_SandshrewAlolan[] = { - overworld_ascending_frames(gObjectEventPic_SandshrewAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_SandshrewAlola[] = { + overworld_ascending_frames(gObjectEventPic_SandshrewAlola, 4, 4), }; -static const struct SpriteFrameImage sPicTable_SandslashAlolan[] = { - overworld_ascending_frames(gObjectEventPic_SandslashAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_SandslashAlola[] = { + overworld_ascending_frames(gObjectEventPic_SandslashAlola, 4, 4), }; #endif //P_ALOLAN_FORMS #endif //P_FAMILY_SANDSHREW @@ -312,11 +312,11 @@ static const struct SpriteFrameImage sPicTable_Ninetales[] = { overworld_ascending_frames(gObjectEventPic_Ninetales, 4, 4), }; #if P_ALOLAN_FORMS -static const struct SpriteFrameImage sPicTable_VulpixAlolan[] = { - overworld_ascending_frames(gObjectEventPic_VulpixAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_VulpixAlola[] = { + overworld_ascending_frames(gObjectEventPic_VulpixAlola, 4, 4), }; -static const struct SpriteFrameImage sPicTable_NinetalesAlolan[] = { - overworld_ascending_frames(gObjectEventPic_NinetalesAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_NinetalesAlola[] = { + overworld_ascending_frames(gObjectEventPic_NinetalesAlola, 4, 4), }; #endif //P_ALOLAN_FORMS #endif //P_FAMILY_VULPIX @@ -404,11 +404,11 @@ static const struct SpriteFrameImage sPicTable_Dugtrio[] = { overworld_ascending_frames(gObjectEventPic_Dugtrio, 4, 4), }; #if P_ALOLAN_FORMS -static const struct SpriteFrameImage sPicTable_DiglettAlolan[] = { - overworld_ascending_frames(gObjectEventPic_DiglettAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_DiglettAlola[] = { + overworld_ascending_frames(gObjectEventPic_DiglettAlola, 4, 4), }; -static const struct SpriteFrameImage sPicTable_DugtrioAlolan[] = { - overworld_ascending_frames(gObjectEventPic_DugtrioAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_DugtrioAlola[] = { + overworld_ascending_frames(gObjectEventPic_DugtrioAlola, 4, 4), }; #endif //P_ALOLAN_FORMS #endif //P_FAMILY_DIGLETT @@ -421,17 +421,17 @@ static const struct SpriteFrameImage sPicTable_Persian[] = { overworld_ascending_frames(gObjectEventPic_Persian, 4, 4), }; #if P_ALOLAN_FORMS -static const struct SpriteFrameImage sPicTable_MeowthAlolan[] = { - overworld_ascending_frames(gObjectEventPic_MeowthAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_MeowthAlola[] = { + overworld_ascending_frames(gObjectEventPic_MeowthAlola, 4, 4), }; -static const struct SpriteFrameImage sPicTable_PersianAlolan[] = { - overworld_ascending_frames(gObjectEventPic_PersianAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_PersianAlola[] = { + overworld_ascending_frames(gObjectEventPic_PersianAlola, 4, 4), }; #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_MeowthGalarian[] = { - overworld_ascending_frames(gObjectEventPic_MeowthGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_MeowthGalar[] = { + overworld_ascending_frames(gObjectEventPic_MeowthGalar, 4, 4), }; static const struct SpriteFrameImage sPicTable_Perrserker[] = { overworld_ascending_frames(gObjectEventPic_Perrserker, 4, 4), @@ -439,8 +439,8 @@ static const struct SpriteFrameImage sPicTable_Perrserker[] = { #endif //P_GALARIAN_FORMS #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_MeowthGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_MeowthGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_MeowthGmax[] = { + overworld_ascending_frames(gObjectEventPic_MeowthGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MEOWTH @@ -476,11 +476,11 @@ static const struct SpriteFrameImage sPicTable_Arcanine[] = { overworld_ascending_frames(gObjectEventPic_Arcanine, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_GrowlitheHisuian[] = { - overworld_ascending_frames(gObjectEventPic_GrowlitheHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_GrowlitheHisui[] = { + overworld_ascending_frames(gObjectEventPic_GrowlitheHisui, 4, 4), }; -static const struct SpriteFrameImage sPicTable_ArcanineHisuian[] = { - overworld_ascending_frames(gObjectEventPic_ArcanineHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_ArcanineHisui[] = { + overworld_ascending_frames(gObjectEventPic_ArcanineHisui, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GROWLITHE @@ -539,8 +539,8 @@ static const struct SpriteFrameImage sPicTable_Machamp[] = { overworld_ascending_frames(gObjectEventPic_Machamp, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_MachampGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_MachampGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_MachampGmax[] = { + overworld_ascending_frames(gObjectEventPic_MachampGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MACHOP @@ -577,14 +577,14 @@ static const struct SpriteFrameImage sPicTable_Golem[] = { overworld_ascending_frames(gObjectEventPic_Golem, 4, 4), }; #if P_ALOLAN_FORMS -static const struct SpriteFrameImage sPicTable_GeodudeAlolan[] = { - overworld_ascending_frames(gObjectEventPic_GeodudeAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_GeodudeAlola[] = { + overworld_ascending_frames(gObjectEventPic_GeodudeAlola, 4, 4), }; -static const struct SpriteFrameImage sPicTable_GravelerAlolan[] = { - overworld_ascending_frames(gObjectEventPic_GravelerAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_GravelerAlola[] = { + overworld_ascending_frames(gObjectEventPic_GravelerAlola, 4, 4), }; -static const struct SpriteFrameImage sPicTable_GolemAlolan[] = { - overworld_ascending_frames(gObjectEventPic_GolemAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_GolemAlola[] = { + overworld_ascending_frames(gObjectEventPic_GolemAlola, 4, 4), }; #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GEODUDE @@ -597,11 +597,11 @@ static const struct SpriteFrameImage sPicTable_Rapidash[] = { overworld_ascending_frames(gObjectEventPic_Rapidash, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_PonytaGalarian[] = { - overworld_ascending_frames(gObjectEventPic_PonytaGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_PonytaGalar[] = { + overworld_ascending_frames(gObjectEventPic_PonytaGalar, 4, 4), }; -static const struct SpriteFrameImage sPicTable_RapidashGalarian[] = { - overworld_ascending_frames(gObjectEventPic_RapidashGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_RapidashGalar[] = { + overworld_ascending_frames(gObjectEventPic_RapidashGalar, 4, 4), }; #endif //P_GALARIAN_FORMS #endif //P_FAMILY_PONYTA @@ -626,15 +626,15 @@ static const struct SpriteFrameImage sPicTable_Slowking[] = { #endif //P_MEGA_EVOLUTIONS #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_SlowpokeGalarian[] = { - overworld_ascending_frames(gObjectEventPic_SlowpokeGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_SlowpokeGalar[] = { + overworld_ascending_frames(gObjectEventPic_SlowpokeGalar, 4, 4), }; -static const struct SpriteFrameImage sPicTable_SlowbroGalarian[] = { - overworld_ascending_frames(gObjectEventPic_SlowbroGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_SlowbroGalar[] = { + overworld_ascending_frames(gObjectEventPic_SlowbroGalar, 4, 4), }; #if P_GEN_2_CROSS_EVOS -static const struct SpriteFrameImage sPicTable_SlowkingGalarian[] = { - overworld_ascending_frames(gObjectEventPic_SlowkingGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_SlowkingGalar[] = { + overworld_ascending_frames(gObjectEventPic_SlowkingGalar, 4, 4), }; #endif //P_GEN_2_CROSS_EVOS #endif //P_GALARIAN_FORMS @@ -659,8 +659,8 @@ static const struct SpriteFrameImage sPicTable_Farfetchd[] = { overworld_ascending_frames(gObjectEventPic_Farfetchd, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_FarfetchdGalarian[] = { - overworld_ascending_frames(gObjectEventPic_FarfetchdGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_FarfetchdGalar[] = { + overworld_ascending_frames(gObjectEventPic_FarfetchdGalar, 4, 4), }; static const struct SpriteFrameImage sPicTable_Sirfetchd[] = { overworld_ascending_frames(gObjectEventPic_Sirfetchd, 4, 4), @@ -700,11 +700,11 @@ static const struct SpriteFrameImage sPicTable_Muk[] = { overworld_ascending_frames(gObjectEventPic_Muk, 4, 4), }; #if P_ALOLAN_FORMS -static const struct SpriteFrameImage sPicTable_GrimerAlolan[] = { - overworld_ascending_frames(gObjectEventPic_GrimerAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_GrimerAlola[] = { + overworld_ascending_frames(gObjectEventPic_GrimerAlola, 4, 4), }; -static const struct SpriteFrameImage sPicTable_MukAlolan[] = { - overworld_ascending_frames(gObjectEventPic_MukAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_MukAlola[] = { + overworld_ascending_frames(gObjectEventPic_MukAlola, 4, 4), }; #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GRIMER @@ -734,8 +734,8 @@ static const struct SpriteFrameImage sPicTable_Gengar[] = { };*/ #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_GengarGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_GengarGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_GengarGmax[] = { + overworld_ascending_frames(gObjectEventPic_GengarGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GASTLY @@ -779,8 +779,8 @@ static const struct SpriteFrameImage sPicTable_Kingler[] = { overworld_ascending_frames(gObjectEventPic_Kingler, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_KinglerGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_KinglerGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_KinglerGmax[] = { + overworld_ascending_frames(gObjectEventPic_KinglerGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KRABBY @@ -793,11 +793,11 @@ static const struct SpriteFrameImage sPicTable_Electrode[] = { overworld_ascending_frames(gObjectEventPic_Electrode, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_VoltorbHisuian[] = { - overworld_ascending_frames(gObjectEventPic_VoltorbHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_VoltorbHisui[] = { + overworld_ascending_frames(gObjectEventPic_VoltorbHisui, 4, 4), }; -static const struct SpriteFrameImage sPicTable_ElectrodeHisuian[] = { - overworld_ascending_frames(gObjectEventPic_ElectrodeHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_ElectrodeHisui[] = { + overworld_ascending_frames(gObjectEventPic_ElectrodeHisui, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_VOLTORB @@ -810,8 +810,8 @@ static const struct SpriteFrameImage sPicTable_Exeggutor[] = { overworld_ascending_frames(gObjectEventPic_Exeggutor, 4, 4), }; #if P_ALOLAN_FORMS -static const struct SpriteFrameImage sPicTable_ExeggutorAlolan[] = { - overworld_ascending_frames(gObjectEventPic_ExeggutorAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_ExeggutorAlola[] = { + overworld_ascending_frames(gObjectEventPic_ExeggutorAlola, 4, 4), }; #endif //P_ALOLAN_FORMS #endif //P_FAMILY_EXEGGCUTE @@ -824,8 +824,8 @@ static const struct SpriteFrameImage sPicTable_Marowak[] = { overworld_ascending_frames(gObjectEventPic_Marowak, 4, 4), }; #if P_ALOLAN_FORMS -static const struct SpriteFrameImage sPicTable_MarowakAlolan[] = { - overworld_ascending_frames(gObjectEventPic_MarowakAlolan, 4, 4), +static const struct SpriteFrameImage sPicTable_MarowakAlola[] = { + overworld_ascending_frames(gObjectEventPic_MarowakAlola, 4, 4), }; #endif //P_ALOLAN_FORMS #endif //P_FAMILY_CUBONE @@ -868,8 +868,8 @@ static const struct SpriteFrameImage sPicTable_Weezing[] = { overworld_ascending_frames(gObjectEventPic_Weezing, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_WeezingGalarian[] = { - overworld_ascending_frames(gObjectEventPic_WeezingGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_WeezingGalar[] = { + overworld_ascending_frames(gObjectEventPic_WeezingGalar, 4, 4), }; #endif //P_GALARIAN_FORMS #endif //P_FAMILY_KOFFING @@ -986,8 +986,8 @@ static const struct SpriteFrameImage sPicTable_MrMime[] = { overworld_ascending_frames(gObjectEventPic_MrMime, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_MrMimeGalarian[] = { - overworld_ascending_frames(gObjectEventPic_MrMimeGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_MrMimeGalar[] = { + overworld_ascending_frames(gObjectEventPic_MrMimeGalar, 4, 4), }; static const struct SpriteFrameImage sPicTable_MrRime[] = { overworld_ascending_frames(gObjectEventPic_MrRime, 4, 4), @@ -1082,14 +1082,14 @@ static const struct SpriteFrameImage sPicTable_Tauros[] = { overworld_ascending_frames(gObjectEventPic_Tauros, 4, 4), }; #if P_PALDEAN_FORMS -static const struct SpriteFrameImage sPicTable_TaurosPaldeanCombatBreed[] = { - overworld_ascending_frames(gObjectEventPic_TaurosPaldeanCombatBreed, 4, 4), +static const struct SpriteFrameImage sPicTable_TaurosPaldeaCombat[] = { + overworld_ascending_frames(gObjectEventPic_TaurosPaldeaCombat, 4, 4), }; -static const struct SpriteFrameImage sPicTable_TaurosPaldeanBlazeBreed[] = { - overworld_ascending_frames(gObjectEventPic_TaurosPaldeanBlazeBreed, 4, 4), +static const struct SpriteFrameImage sPicTable_TaurosPaldeaBlaze[] = { + overworld_ascending_frames(gObjectEventPic_TaurosPaldeaBlaze, 4, 4), }; -static const struct SpriteFrameImage sPicTable_TaurosPaldeanAquaBreed[] = { - overworld_ascending_frames(gObjectEventPic_TaurosPaldeanAquaBreed, 4, 4), +static const struct SpriteFrameImage sPicTable_TaurosPaldeaAqua[] = { + overworld_ascending_frames(gObjectEventPic_TaurosPaldeaAqua, 4, 4), }; #endif //P_PALDEAN_FORMS #endif //P_FAMILY_TAUROS @@ -1119,8 +1119,8 @@ static const struct SpriteFrameImage sPicTable_Lapras[] = { overworld_ascending_frames(gObjectEventPic_Lapras, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_LaprasGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_LaprasGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_LaprasGmax[] = { + overworld_ascending_frames(gObjectEventPic_LaprasGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_LAPRAS @@ -1139,8 +1139,8 @@ static const struct SpriteFrameImage sPicTable_EeveeF[] = { overworld_ascending_frames(gObjectEventPic_EeveeF, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_EeveeGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_EeveeGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_EeveeGmax[] = { + overworld_ascending_frames(gObjectEventPic_EeveeGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS @@ -1233,8 +1233,8 @@ static const struct SpriteFrameImage sPicTable_Snorlax[] = { overworld_ascending_frames(gObjectEventPic_Snorlax, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_SnorlaxGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_SnorlaxGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_SnorlaxGmax[] = { + overworld_ascending_frames(gObjectEventPic_SnorlaxGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SNORLAX @@ -1244,8 +1244,8 @@ static const struct SpriteFrameImage sPicTable_Articuno[] = { overworld_ascending_frames(gObjectEventPic_Articuno, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_ArticunoGalarian[] = { - overworld_ascending_frames(gObjectEventPic_ArticunoGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_ArticunoGalar[] = { + overworld_ascending_frames(gObjectEventPic_ArticunoGalar, 4, 4), }; #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ARTICUNO @@ -1255,8 +1255,8 @@ static const struct SpriteFrameImage sPicTable_Zapdos[] = { overworld_ascending_frames(gObjectEventPic_Zapdos, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_ZapdosGalarian[] = { - overworld_ascending_frames(gObjectEventPic_ZapdosGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_ZapdosGalar[] = { + overworld_ascending_frames(gObjectEventPic_ZapdosGalar, 4, 4), }; #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZAPDOS @@ -1266,8 +1266,8 @@ static const struct SpriteFrameImage sPicTable_Moltres[] = { overworld_ascending_frames(gObjectEventPic_Moltres, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_MoltresGalarian[] = { - overworld_ascending_frames(gObjectEventPic_MoltresGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_MoltresGalar[] = { + overworld_ascending_frames(gObjectEventPic_MoltresGalar, 4, 4), }; #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MOLTRES @@ -1330,8 +1330,8 @@ static const struct SpriteFrameImage sPicTable_Typhlosion[] = { overworld_ascending_frames(gObjectEventPic_Typhlosion, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_TyphlosionHisuian[] = { - overworld_ascending_frames(gObjectEventPic_TyphlosionHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_TyphlosionHisui[] = { + overworld_ascending_frames(gObjectEventPic_TyphlosionHisui, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_CYNDAQUIL @@ -1533,8 +1533,8 @@ static const struct SpriteFrameImage sPicTable_QuagsireF[] = { overworld_ascending_frames(gObjectEventPic_QuagsireF, 4, 4), }; #if P_PALDEAN_FORMS -static const struct SpriteFrameImage sPicTable_WooperPaldean[] = { - overworld_ascending_frames(gObjectEventPic_WooperPaldean, 4, 4), +static const struct SpriteFrameImage sPicTable_WooperPaldea[] = { + overworld_ascending_frames(gObjectEventPic_WooperPaldea, 4, 4), }; static const struct SpriteFrameImage sPicTable_Clodsire[] = { overworld_ascending_frames(gObjectEventPic_Clodsire, 4, 4), @@ -1646,11 +1646,11 @@ static const struct SpriteFrameImage sPicTable_UnownY[] = { static const struct SpriteFrameImage sPicTable_UnownZ[] = { overworld_ascending_frames(gObjectEventPic_UnownZ, 4, 4), }; -static const struct SpriteFrameImage sPicTable_UnownExclamationMark[] = { - overworld_ascending_frames(gObjectEventPic_UnownExclamationMark, 4, 4), +static const struct SpriteFrameImage sPicTable_UnownExclamation[] = { + overworld_ascending_frames(gObjectEventPic_UnownExclamation, 4, 4), }; -static const struct SpriteFrameImage sPicTable_UnownQuestionMark[] = { - overworld_ascending_frames(gObjectEventPic_UnownQuestionMark, 4, 4), +static const struct SpriteFrameImage sPicTable_UnownQuestion[] = { + overworld_ascending_frames(gObjectEventPic_UnownQuestion, 4, 4), }; #endif //P_FAMILY_UNOWN @@ -1735,8 +1735,8 @@ static const struct SpriteFrameImage sPicTable_Qwilfish[] = { overworld_ascending_frames(gObjectEventPic_Qwilfish, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_QwilfishHisuian[] = { - overworld_ascending_frames(gObjectEventPic_QwilfishHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_QwilfishHisui[] = { + overworld_ascending_frames(gObjectEventPic_QwilfishHisui, 4, 4), }; static const struct SpriteFrameImage sPicTable_Overqwil[] = { overworld_ascending_frames(gObjectEventPic_Overqwil, 4, 4), @@ -1781,11 +1781,11 @@ static const struct SpriteFrameImage sPicTable_WeavileF[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_SneaselHisuian[] = { - overworld_ascending_frames(gObjectEventPic_SneaselHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_SneaselHisui[] = { + overworld_ascending_frames(gObjectEventPic_SneaselHisui, 4, 4), }; -static const struct SpriteFrameImage sPicTable_SneaselHisuianF[] = { - overworld_ascending_frames(gObjectEventPic_SneaselHisuianF, 4, 4), +static const struct SpriteFrameImage sPicTable_SneaselHisuiF[] = { + overworld_ascending_frames(gObjectEventPic_SneaselHisuiF, 4, 4), }; static const struct SpriteFrameImage sPicTable_Sneasler[] = { overworld_ascending_frames(gObjectEventPic_Sneasler, 4, 4), @@ -1847,8 +1847,8 @@ static const struct SpriteFrameImage sPicTable_Corsola[] = { overworld_ascending_frames(gObjectEventPic_Corsola, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_CorsolaGalarian[] = { - overworld_ascending_frames(gObjectEventPic_CorsolaGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_CorsolaGalar[] = { + overworld_ascending_frames(gObjectEventPic_CorsolaGalar, 4, 4), }; static const struct SpriteFrameImage sPicTable_Cursola[] = { overworld_ascending_frames(gObjectEventPic_Cursola, 4, 4), @@ -2073,11 +2073,11 @@ static const struct SpriteFrameImage sPicTable_Linoone[] = { overworld_ascending_frames(gObjectEventPic_Linoone, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_ZigzagoonGalarian[] = { - overworld_ascending_frames(gObjectEventPic_ZigzagoonGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_ZigzagoonGalar[] = { + overworld_ascending_frames(gObjectEventPic_ZigzagoonGalar, 4, 4), }; -static const struct SpriteFrameImage sPicTable_LinooneGalarian[] = { - overworld_ascending_frames(gObjectEventPic_LinooneGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_LinooneGalar[] = { + overworld_ascending_frames(gObjectEventPic_LinooneGalar, 4, 4), }; static const struct SpriteFrameImage sPicTable_Obstagoon[] = { overworld_ascending_frames(gObjectEventPic_Obstagoon, 4, 4), @@ -2980,20 +2980,20 @@ static const struct SpriteFrameImage sPicTable_Bastiodon[] = { static const struct SpriteFrameImage sPicTable_BurmyPlantCloak[] = { overworld_ascending_frames(gObjectEventPic_BurmyPlantCloak, 4, 4), }; -static const struct SpriteFrameImage sPicTable_BurmySandyCloak[] = { - overworld_ascending_frames(gObjectEventPic_BurmySandyCloak, 4, 4), +static const struct SpriteFrameImage sPicTable_BurmySandy[] = { + overworld_ascending_frames(gObjectEventPic_BurmySandy, 4, 4), }; -static const struct SpriteFrameImage sPicTable_BurmyTrashCloak[] = { - overworld_ascending_frames(gObjectEventPic_BurmyTrashCloak, 4, 4), +static const struct SpriteFrameImage sPicTable_BurmyTrash[] = { + overworld_ascending_frames(gObjectEventPic_BurmyTrash, 4, 4), }; static const struct SpriteFrameImage sPicTable_WormadamPlantCloak[] = { overworld_ascending_frames(gObjectEventPic_WormadamPlantCloak, 4, 4), }; -static const struct SpriteFrameImage sPicTable_WormadamSandyCloak[] = { - overworld_ascending_frames(gObjectEventPic_WormadamSandyCloak, 4, 4), +static const struct SpriteFrameImage sPicTable_WormadamSandy[] = { + overworld_ascending_frames(gObjectEventPic_WormadamSandy, 4, 4), }; -static const struct SpriteFrameImage sPicTable_WormadamTrashCloak[] = { - overworld_ascending_frames(gObjectEventPic_WormadamTrashCloak, 4, 4), +static const struct SpriteFrameImage sPicTable_WormadamTrash[] = { + overworld_ascending_frames(gObjectEventPic_WormadamTrash, 4, 4), }; static const struct SpriteFrameImage sPicTable_Mothim[] = { overworld_ascending_frames(gObjectEventPic_Mothim, 4, 4), @@ -3052,14 +3052,14 @@ static const struct SpriteFrameImage sPicTable_CherrimOvercast[] = { static const struct SpriteFrameImage sPicTable_ShellosWestSea[] = { overworld_ascending_frames(gObjectEventPic_ShellosWestSea, 4, 4), }; -static const struct SpriteFrameImage sPicTable_ShellosEastSea[] = { - overworld_ascending_frames(gObjectEventPic_ShellosEastSea, 4, 4), +static const struct SpriteFrameImage sPicTable_ShellosEast[] = { + overworld_ascending_frames(gObjectEventPic_ShellosEast, 4, 4), }; static const struct SpriteFrameImage sPicTable_GastrodonWestSea[] = { overworld_ascending_frames(gObjectEventPic_GastrodonWestSea, 4, 4), }; -static const struct SpriteFrameImage sPicTable_GastrodonEastSea[] = { - overworld_ascending_frames(gObjectEventPic_GastrodonEastSea, 4, 4), +static const struct SpriteFrameImage sPicTable_GastrodonEast[] = { + overworld_ascending_frames(gObjectEventPic_GastrodonEast, 4, 4), }; #endif //P_FAMILY_SHELLOS @@ -3449,8 +3449,8 @@ static const struct SpriteFrameImage sPicTable_Samurott[] = { overworld_ascending_frames(gObjectEventPic_Samurott, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_SamurottHisuian[] = { - overworld_ascending_frames(gObjectEventPic_SamurottHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_SamurottHisui[] = { + overworld_ascending_frames(gObjectEventPic_SamurottHisui, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_OSHAWOTT @@ -3664,8 +3664,8 @@ static const struct SpriteFrameImage sPicTable_Lilligant[] = { overworld_ascending_frames(gObjectEventPic_Lilligant, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_LilligantHisuian[] = { - overworld_ascending_frames(gObjectEventPic_LilligantHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_LilligantHisui[] = { + overworld_ascending_frames(gObjectEventPic_LilligantHisui, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_PETILIL @@ -3681,11 +3681,11 @@ static const struct SpriteFrameImage sPicTable_BasculinBlueStriped[] = { static const struct SpriteFrameImage sPicTable_BasculinWhiteStriped[] = { overworld_ascending_frames(gObjectEventPic_BasculinWhiteStriped, 4, 4), }; -static const struct SpriteFrameImage sPicTable_BasculegionMale[] = { - overworld_ascending_frames(gObjectEventPic_BasculegionMale, 4, 4), +static const struct SpriteFrameImage sPicTable_BasculegionM[] = { + overworld_ascending_frames(gObjectEventPic_BasculegionM, 4, 4), }; -static const struct SpriteFrameImage sPicTable_BasculegionFemale[] = { - overworld_ascending_frames(gObjectEventPic_BasculegionFemale, 4, 4), +static const struct SpriteFrameImage sPicTable_BasculegionF[] = { + overworld_ascending_frames(gObjectEventPic_BasculegionF, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BASCULIN @@ -3706,21 +3706,21 @@ static const struct SpriteFrameImage sPicTable_Krookodile[] = { static const struct SpriteFrameImage sPicTable_Darumaka[] = { overworld_ascending_frames(gObjectEventPic_Darumaka, 4, 4), }; -static const struct SpriteFrameImage sPicTable_DarmanitanStandardMode[] = { - overworld_ascending_frames(gObjectEventPic_DarmanitanStandardMode, 4, 4), +static const struct SpriteFrameImage sPicTable_DarmanitanStandard[] = { + overworld_ascending_frames(gObjectEventPic_DarmanitanStandard, 4, 4), }; -/*static const struct SpriteFrameImage sPicTable_DarmanitanZenMode[] = { - overworld_ascending_frames(gObjectEventPic_DarmanitanZenMode, 4, 4), +/*static const struct SpriteFrameImage sPicTable_DarmanitanZen[] = { + overworld_ascending_frames(gObjectEventPic_DarmanitanZen, 4, 4), };*/ #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_DarumakaGalarian[] = { - overworld_ascending_frames(gObjectEventPic_DarumakaGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_DarumakaGalar[] = { + overworld_ascending_frames(gObjectEventPic_DarumakaGalar, 4, 4), }; -static const struct SpriteFrameImage sPicTable_DarmanitanGalarianStandardMode[] = { - overworld_ascending_frames(gObjectEventPic_DarmanitanGalarianStandardMode, 4, 4), +static const struct SpriteFrameImage sPicTable_DarmanitanGalarStandard[] = { + overworld_ascending_frames(gObjectEventPic_DarmanitanGalarStandard, 4, 4), }; -/*static const struct SpriteFrameImage sPicTable_DarmanitanGalarianZenMode[] = { - overworld_ascending_frames(gObjectEventPic_DarmanitanGalarianZenMode, 4, 4), +/*static const struct SpriteFrameImage sPicTable_DarmanitanGalarZen[] = { + overworld_ascending_frames(gObjectEventPic_DarmanitanGalarZen, 4, 4), };*/ #endif //P_GALARIAN_FORMS #endif //P_FAMILY_DARUMAKA @@ -3763,8 +3763,8 @@ static const struct SpriteFrameImage sPicTable_Cofagrigus[] = { overworld_ascending_frames(gObjectEventPic_Cofagrigus, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_YamaskGalarian[] = { - overworld_ascending_frames(gObjectEventPic_YamaskGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_YamaskGalar[] = { + overworld_ascending_frames(gObjectEventPic_YamaskGalar, 4, 4), }; static const struct SpriteFrameImage sPicTable_Runerigus[] = { overworld_ascending_frames(gObjectEventPic_Runerigus, 4, 4), @@ -3798,8 +3798,8 @@ static const struct SpriteFrameImage sPicTable_Garbodor[] = { overworld_ascending_frames(gObjectEventPic_Garbodor, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_GarbodorGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_GarbodorGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_GarbodorGmax[] = { + overworld_ascending_frames(gObjectEventPic_GarbodorGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TRUBBISH @@ -3812,11 +3812,11 @@ static const struct SpriteFrameImage sPicTable_Zoroark[] = { overworld_ascending_frames(gObjectEventPic_Zoroark, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_ZoruaHisuian[] = { - overworld_ascending_frames(gObjectEventPic_ZoruaHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_ZoruaHisui[] = { + overworld_ascending_frames(gObjectEventPic_ZoruaHisui, 4, 4), }; -static const struct SpriteFrameImage sPicTable_ZoroarkHisuian[] = { - overworld_ascending_frames(gObjectEventPic_ZoroarkHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_ZoroarkHisui[] = { + overworld_ascending_frames(gObjectEventPic_ZoroarkHisui, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ZORUA @@ -4052,8 +4052,8 @@ static const struct SpriteFrameImage sPicTable_Stunfisk[] = { overworld_ascending_frames(gObjectEventPic_Stunfisk, 4, 4), }; #if P_GALARIAN_FORMS -static const struct SpriteFrameImage sPicTable_StunfiskGalarian[] = { - overworld_ascending_frames(gObjectEventPic_StunfiskGalarian, 4, 4), +static const struct SpriteFrameImage sPicTable_StunfiskGalar[] = { + overworld_ascending_frames(gObjectEventPic_StunfiskGalar, 4, 4), }; #endif //P_GALARIAN_FORMS #endif //P_FAMILY_STUNFISK @@ -4110,8 +4110,8 @@ static const struct SpriteFrameImage sPicTable_Braviary[] = { overworld_ascending_frames(gObjectEventPic_Braviary, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_BraviaryHisuian[] = { - overworld_ascending_frames(gObjectEventPic_BraviaryHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_BraviaryHisui[] = { + overworld_ascending_frames(gObjectEventPic_BraviaryHisui, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_RUFFLET @@ -4412,53 +4412,53 @@ static const struct SpriteFrameImage sPicTable_PyroarF[] = { #if P_FAMILY_FLABEBE -static const struct SpriteFrameImage sPicTable_FlabebeRedFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlabebeRedFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FlabebeRed[] = { + overworld_ascending_frames(gObjectEventPic_FlabebeRed, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlabebeYellowFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlabebeYellowFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FlabebeYellow[] = { + overworld_ascending_frames(gObjectEventPic_FlabebeYellow, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlabebeOrangeFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlabebeOrangeFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FlabebeOrange[] = { + overworld_ascending_frames(gObjectEventPic_FlabebeOrange, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlabebeBlueFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlabebeBlueFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FlabebeBlue[] = { + overworld_ascending_frames(gObjectEventPic_FlabebeBlue, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlabebeWhiteFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlabebeWhiteFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FlabebeWhite[] = { + overworld_ascending_frames(gObjectEventPic_FlabebeWhite, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FloetteRedFlower[] = { - overworld_ascending_frames(gObjectEventPic_FloetteRedFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FloetteRed[] = { + overworld_ascending_frames(gObjectEventPic_FloetteRed, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FloetteYellowFlower[] = { - overworld_ascending_frames(gObjectEventPic_FloetteYellowFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FloetteYellow[] = { + overworld_ascending_frames(gObjectEventPic_FloetteYellow, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FloetteOrangeFlower[] = { - overworld_ascending_frames(gObjectEventPic_FloetteOrangeFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FloetteOrange[] = { + overworld_ascending_frames(gObjectEventPic_FloetteOrange, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FloetteBlueFlower[] = { - overworld_ascending_frames(gObjectEventPic_FloetteBlueFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FloetteBlue[] = { + overworld_ascending_frames(gObjectEventPic_FloetteBlue, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FloetteWhiteFlower[] = { - overworld_ascending_frames(gObjectEventPic_FloetteWhiteFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FloetteWhite[] = { + overworld_ascending_frames(gObjectEventPic_FloetteWhite, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FloetteEternalFlower[] = { - overworld_ascending_frames(gObjectEventPic_FloetteEternalFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FloetteEternal[] = { + overworld_ascending_frames(gObjectEventPic_FloetteEternal, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlorgesRedFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlorgesRedFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FlorgesRed[] = { + overworld_ascending_frames(gObjectEventPic_FlorgesRed, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlorgesYellowFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlorgesYellowFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FlorgesYellow[] = { + overworld_ascending_frames(gObjectEventPic_FlorgesYellow, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlorgesOrangeFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlorgesOrangeFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FlorgesOrange[] = { + overworld_ascending_frames(gObjectEventPic_FlorgesOrange, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlorgesBlueFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlorgesBlueFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FlorgesBlue[] = { + overworld_ascending_frames(gObjectEventPic_FlorgesBlue, 4, 4), }; -static const struct SpriteFrameImage sPicTable_FlorgesWhiteFlower[] = { - overworld_ascending_frames(gObjectEventPic_FlorgesWhiteFlower, 4, 4), +static const struct SpriteFrameImage sPicTable_FlorgesWhite[] = { + overworld_ascending_frames(gObjectEventPic_FlorgesWhite, 4, 4), }; #endif //P_FAMILY_FLABEBE @@ -4517,11 +4517,11 @@ static const struct SpriteFrameImage sPicTable_FurfrouPharaohTrim[] = { static const struct SpriteFrameImage sPicTable_Espurr[] = { overworld_ascending_frames(gObjectEventPic_Espurr, 4, 4), }; -static const struct SpriteFrameImage sPicTable_MeowsticMale[] = { - overworld_ascending_frames(gObjectEventPic_MeowsticMale, 4, 4), +static const struct SpriteFrameImage sPicTable_MeowsticM[] = { + overworld_ascending_frames(gObjectEventPic_MeowsticM, 4, 4), }; -static const struct SpriteFrameImage sPicTable_MeowsticFemale[] = { - overworld_ascending_frames(gObjectEventPic_MeowsticFemale, 4, 4), +static const struct SpriteFrameImage sPicTable_MeowsticF[] = { + overworld_ascending_frames(gObjectEventPic_MeowsticF, 4, 4), }; #endif //P_FAMILY_ESPURR @@ -4648,8 +4648,8 @@ static const struct SpriteFrameImage sPicTable_Sliggoo[] = { overworld_ascending_frames(gObjectEventPic_Sliggoo, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_SliggooHisuian[] = { - overworld_ascending_frames(gObjectEventPic_SliggooHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_SliggooHisui[] = { + overworld_ascending_frames(gObjectEventPic_SliggooHisui, 4, 4), }; #endif //P_HISUIAN_FORMS @@ -4657,8 +4657,8 @@ static const struct SpriteFrameImage sPicTable_Goodra[] = { overworld_ascending_frames(gObjectEventPic_Goodra, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_GoodraHisuian[] = { - overworld_ascending_frames(gObjectEventPic_GoodraHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_GoodraHisui[] = { + overworld_ascending_frames(gObjectEventPic_GoodraHisui, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GOOMY @@ -4715,8 +4715,8 @@ static const struct SpriteFrameImage sPicTable_Avalugg[] = { overworld_ascending_frames(gObjectEventPic_Avalugg, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_AvaluggHisuian[] = { - overworld_ascending_frames(gObjectEventPic_AvaluggHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_AvaluggHisui[] = { + overworld_ascending_frames(gObjectEventPic_AvaluggHisui, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BERGMITE @@ -4797,8 +4797,8 @@ static const struct SpriteFrameImage sPicTable_Decidueye[] = { overworld_ascending_frames(gObjectEventPic_Decidueye, 4, 4), }; #if P_HISUIAN_FORMS -static const struct SpriteFrameImage sPicTable_DecidueyeHisuian[] = { - overworld_ascending_frames(gObjectEventPic_DecidueyeHisuian, 4, 4), +static const struct SpriteFrameImage sPicTable_DecidueyeHisui[] = { + overworld_ascending_frames(gObjectEventPic_DecidueyeHisui, 4, 4), }; #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ROWLET @@ -5234,8 +5234,8 @@ static const struct SpriteFrameImage sPicTable_NecrozmaDawnWings[] = { static const struct SpriteFrameImage sPicTable_Magearna[] = { overworld_ascending_frames(gObjectEventPic_Magearna, 4, 4), }; -static const struct SpriteFrameImage sPicTable_MagearnaOriginalColor[] = { - overworld_ascending_frames(gObjectEventPic_MagearnaOriginalColor, 4, 4), +static const struct SpriteFrameImage sPicTable_MagearnaOriginal[] = { + overworld_ascending_frames(gObjectEventPic_MagearnaOriginal, 4, 4), }; #endif //P_FAMILY_MAGEARNA @@ -5280,8 +5280,8 @@ static const struct SpriteFrameImage sPicTable_Melmetal[] = { overworld_ascending_frames(gObjectEventPic_Melmetal, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_MelmetalGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_MelmetalGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_MelmetalGmax[] = { + overworld_ascending_frames(gObjectEventPic_MelmetalGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MELTAN @@ -5297,8 +5297,8 @@ static const struct SpriteFrameImage sPicTable_Rillaboom[] = { overworld_ascending_frames(gObjectEventPic_Rillaboom, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_RillaboomGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_RillaboomGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_RillaboomGmax[] = { + overworld_ascending_frames(gObjectEventPic_RillaboomGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GROOKEY @@ -5314,8 +5314,8 @@ static const struct SpriteFrameImage sPicTable_Cinderace[] = { overworld_ascending_frames(gObjectEventPic_Cinderace, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_CinderaceGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_CinderaceGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_CinderaceGmax[] = { + overworld_ascending_frames(gObjectEventPic_CinderaceGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SCORBUNNY @@ -5331,8 +5331,8 @@ static const struct SpriteFrameImage sPicTable_Inteleon[] = { overworld_ascending_frames(gObjectEventPic_Inteleon, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_InteleonGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_InteleonGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_InteleonGmax[] = { + overworld_ascending_frames(gObjectEventPic_InteleonGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SOBBLE @@ -5357,8 +5357,8 @@ static const struct SpriteFrameImage sPicTable_Corviknight[] = { overworld_ascending_frames(gObjectEventPic_Corviknight, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_CorviknightGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_CorviknightGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_CorviknightGmax[] = { + overworld_ascending_frames(gObjectEventPic_CorviknightGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROOKIDEE @@ -5374,8 +5374,8 @@ static const struct SpriteFrameImage sPicTable_Orbeetle[] = { overworld_ascending_frames(gObjectEventPic_Orbeetle, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_OrbeetleGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_OrbeetleGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_OrbeetleGmax[] = { + overworld_ascending_frames(gObjectEventPic_OrbeetleGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BLIPBUG @@ -5415,8 +5415,8 @@ static const struct SpriteFrameImage sPicTable_Drednaw[] = { overworld_ascending_frames(gObjectEventPic_Drednaw, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_DrednawGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_DrednawGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_DrednawGmax[] = { + overworld_ascending_frames(gObjectEventPic_DrednawGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHEWTLE @@ -5441,8 +5441,8 @@ static const struct SpriteFrameImage sPicTable_Coalossal[] = { overworld_ascending_frames(gObjectEventPic_Coalossal, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_CoalossalGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_CoalossalGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_CoalossalGmax[] = { + overworld_ascending_frames(gObjectEventPic_CoalossalGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROLYCOLY @@ -5455,8 +5455,8 @@ static const struct SpriteFrameImage sPicTable_Flapple[] = { overworld_ascending_frames(gObjectEventPic_Flapple, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_FlappleGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_FlappleGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_FlappleGmax[] = { + overworld_ascending_frames(gObjectEventPic_FlappleGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS @@ -5464,8 +5464,8 @@ static const struct SpriteFrameImage sPicTable_Appletun[] = { overworld_ascending_frames(gObjectEventPic_Appletun, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_AppletunGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_AppletunGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_AppletunGmax[] = { + overworld_ascending_frames(gObjectEventPic_AppletunGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS @@ -5487,8 +5487,8 @@ static const struct SpriteFrameImage sPicTable_Sandaconda[] = { overworld_ascending_frames(gObjectEventPic_Sandaconda, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_SandacondaGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_SandacondaGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_SandacondaGmax[] = { + overworld_ascending_frames(gObjectEventPic_SandacondaGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SILICOBRA @@ -5525,8 +5525,8 @@ static const struct SpriteFrameImage sPicTable_ToxtricityLowKey[] = { overworld_ascending_frames(gObjectEventPic_ToxtricityLowKey, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_ToxtricityGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_ToxtricityGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_ToxtricityGmax[] = { + overworld_ascending_frames(gObjectEventPic_ToxtricityGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TOXEL @@ -5539,8 +5539,8 @@ static const struct SpriteFrameImage sPicTable_Centiskorch[] = { overworld_ascending_frames(gObjectEventPic_Centiskorch, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_CentiskorchGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_CentiskorchGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_CentiskorchGmax[] = { + overworld_ascending_frames(gObjectEventPic_CentiskorchGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SIZZLIPEDE @@ -5574,8 +5574,8 @@ static const struct SpriteFrameImage sPicTable_Hatterene[] = { overworld_ascending_frames(gObjectEventPic_Hatterene, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_HattereneGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_HattereneGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_HattereneGmax[] = { + overworld_ascending_frames(gObjectEventPic_HattereneGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_HATENNA @@ -5591,8 +5591,8 @@ static const struct SpriteFrameImage sPicTable_Grimmsnarl[] = { overworld_ascending_frames(gObjectEventPic_Grimmsnarl, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_GrimmsnarlGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_GrimmsnarlGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_GrimmsnarlGmax[] = { + overworld_ascending_frames(gObjectEventPic_GrimmsnarlGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_IMPIDIMP @@ -5606,8 +5606,8 @@ static const struct SpriteFrameImage sPicTable_AlcremieStrawberry[] = { overworld_ascending_frames(gObjectEventPic_AlcremieStrawberry, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_AlcremieGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_AlcremieGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_AlcremieGmax[] = { + overworld_ascending_frames(gObjectEventPic_AlcremieGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MILCERY @@ -5640,20 +5640,20 @@ static const struct SpriteFrameImage sPicTable_Stonjourner[] = { #endif //P_FAMILY_STONJOURNER #if P_FAMILY_EISCUE -static const struct SpriteFrameImage sPicTable_EiscueIceFace[] = { - overworld_ascending_frames(gObjectEventPic_EiscueIceFace, 4, 4), +static const struct SpriteFrameImage sPicTable_EiscueIce[] = { + overworld_ascending_frames(gObjectEventPic_EiscueIce, 4, 4), }; -/*static const struct SpriteFrameImage sPicTable_EiscueNoiceFace[] = { - overworld_ascending_frames(gObjectEventPic_EiscueNoiceFace, 4, 4), +/*static const struct SpriteFrameImage sPicTable_EiscueNoice[] = { + overworld_ascending_frames(gObjectEventPic_EiscueNoice, 4, 4), };*/ #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const struct SpriteFrameImage sPicTable_IndeedeeMale[] = { - overworld_ascending_frames(gObjectEventPic_IndeedeeMale, 4, 4), +static const struct SpriteFrameImage sPicTable_IndeedeeM[] = { + overworld_ascending_frames(gObjectEventPic_IndeedeeM, 4, 4), }; -static const struct SpriteFrameImage sPicTable_IndeedeeFemale[] = { - overworld_ascending_frames(gObjectEventPic_IndeedeeFemale, 4, 4), +static const struct SpriteFrameImage sPicTable_IndeedeeF[] = { + overworld_ascending_frames(gObjectEventPic_IndeedeeF, 4, 4), }; #endif //P_FAMILY_INDEEDEE @@ -5674,8 +5674,8 @@ static const struct SpriteFrameImage sPicTable_Copperajah[] = { overworld_ascending_frames(gObjectEventPic_Copperajah, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_CopperajahGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_CopperajahGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_CopperajahGmax[] = { + overworld_ascending_frames(gObjectEventPic_CopperajahGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CUFANT @@ -5709,8 +5709,8 @@ static const struct SpriteFrameImage sPicTable_Duraludon[] = { overworld_ascending_frames(gObjectEventPic_Duraludon, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_DuraludonGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_DuraludonGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_DuraludonGmax[] = { + overworld_ascending_frames(gObjectEventPic_DuraludonGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS @@ -5734,20 +5734,20 @@ static const struct SpriteFrameImage sPicTable_Dragapult[] = { #endif //P_FAMILY_DREEPY #if P_FAMILY_ZACIAN -static const struct SpriteFrameImage sPicTable_ZacianHeroOfManyBattles[] = { - overworld_ascending_frames(gObjectEventPic_ZacianHeroOfManyBattles, 4, 4), +static const struct SpriteFrameImage sPicTable_ZacianHero[] = { + overworld_ascending_frames(gObjectEventPic_ZacianHero, 4, 4), }; -static const struct SpriteFrameImage sPicTable_ZacianCrownedSword[] = { - overworld_ascending_frames(gObjectEventPic_ZacianCrownedSword, 4, 4), +static const struct SpriteFrameImage sPicTable_ZacianCrowned[] = { + overworld_ascending_frames(gObjectEventPic_ZacianCrowned, 4, 4), }; #endif //P_FAMILY_ZACIAN #if P_FAMILY_ZAMAZENTA -static const struct SpriteFrameImage sPicTable_ZamazentaHeroOfManyBattles[] = { - overworld_ascending_frames(gObjectEventPic_ZamazentaHeroOfManyBattles, 4, 4), +static const struct SpriteFrameImage sPicTable_ZamazentaHero[] = { + overworld_ascending_frames(gObjectEventPic_ZamazentaHero, 4, 4), }; -static const struct SpriteFrameImage sPicTable_ZamazentaCrownedShield[] = { - overworld_ascending_frames(gObjectEventPic_ZamazentaCrownedShield, 4, 4), +static const struct SpriteFrameImage sPicTable_ZamazentaCrowned[] = { + overworld_ascending_frames(gObjectEventPic_ZamazentaCrowned, 4, 4), }; #endif //P_FAMILY_ZAMAZENTA @@ -5768,11 +5768,11 @@ static const struct SpriteFrameImage sPicTable_Urshifu[] = { overworld_ascending_frames(gObjectEventPic_Urshifu, 4, 4), }; #if P_GIGANTAMAX_FORMS -/*static const struct SpriteFrameImage sPicTable_UrshifuSingleStrikeStyleGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_UrshifuSingleStrikeStyleGigantamax, 4, 4), +/*static const struct SpriteFrameImage sPicTable_UrshifuSingleStrikeGmax[] = { + overworld_ascending_frames(gObjectEventPic_UrshifuSingleStrikeGmax, 4, 4), }; -static const struct SpriteFrameImage sPicTable_UrshifuRapidStrikeStyleGigantamax[] = { - overworld_ascending_frames(gObjectEventPic_UrshifuRapidStrikeStyleGigantamax, 4, 4), +static const struct SpriteFrameImage sPicTable_UrshifuRapidStrikeGmax[] = { + overworld_ascending_frames(gObjectEventPic_UrshifuRapidStrikeGmax, 4, 4), };*/ #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KUBFU @@ -5816,14 +5816,14 @@ static const struct SpriteFrameImage sPicTable_Calyrex[] = { overworld_ascending_frames(gObjectEventPic_Calyrex, 4, 4), }; #if P_FUSION_FORMS -static const struct SpriteFrameImage sPicTable_CalyrexIceRider[] = { - overworld_ascending_frames(gObjectEventPic_CalyrexIceRider, 4, 4), +static const struct SpriteFrameImage sPicTable_CalyrexIce[] = { + overworld_ascending_frames(gObjectEventPic_CalyrexIce, 4, 4), }; #endif //P_FUSION_FORMS #if P_FUSION_FORMS -static const struct SpriteFrameImage sPicTable_CalyrexShadowRider[] = { - overworld_ascending_frames(gObjectEventPic_CalyrexShadowRider, 4, 4), +static const struct SpriteFrameImage sPicTable_CalyrexShadow[] = { + overworld_ascending_frames(gObjectEventPic_CalyrexShadow, 4, 4), }; #endif //P_FUSION_FORMS #endif //P_FAMILY_CALYREX @@ -5868,11 +5868,11 @@ static const struct SpriteFrameImage sPicTable_Quaquaval[] = { static const struct SpriteFrameImage sPicTable_Lechonk[] = { overworld_ascending_frames(gObjectEventPic_Lechonk, 4, 4), }; -static const struct SpriteFrameImage sPicTable_OinkologneMale[] = { - overworld_ascending_frames(gObjectEventPic_OinkologneMale, 4, 4), +static const struct SpriteFrameImage sPicTable_OinkologneM[] = { + overworld_ascending_frames(gObjectEventPic_OinkologneM, 4, 4), }; -static const struct SpriteFrameImage sPicTable_OinkologneFemale[] = { - overworld_ascending_frames(gObjectEventPic_OinkologneFemale, 4, 4), +static const struct SpriteFrameImage sPicTable_OinkologneF[] = { + overworld_ascending_frames(gObjectEventPic_OinkologneF, 4, 4), }; #endif //P_FAMILY_LECHONK @@ -5910,11 +5910,11 @@ static const struct SpriteFrameImage sPicTable_Pawmot[] = { static const struct SpriteFrameImage sPicTable_Tandemaus[] = { overworld_ascending_frames(gObjectEventPic_Tandemaus, 4, 4), }; -static const struct SpriteFrameImage sPicTable_MausholdFamilyOfThree[] = { - overworld_ascending_frames(gObjectEventPic_MausholdFamilyOfThree, 4, 4), +static const struct SpriteFrameImage sPicTable_MausholdThree[] = { + overworld_ascending_frames(gObjectEventPic_MausholdThree, 4, 4), }; -static const struct SpriteFrameImage sPicTable_MausholdFamilyOfFour[] = { - overworld_ascending_frames(gObjectEventPic_MausholdFamilyOfFour, 4, 4), +static const struct SpriteFrameImage sPicTable_MausholdFour[] = { + overworld_ascending_frames(gObjectEventPic_MausholdFour, 4, 4), }; #endif //P_FAMILY_TANDEMAUS @@ -5940,17 +5940,17 @@ static const struct SpriteFrameImage sPicTable_Arboliva[] = { #endif //P_FAMILY_SMOLIV #if P_FAMILY_SQUAWKABILLY -static const struct SpriteFrameImage sPicTable_SquawkabillyGreenPlumage[] = { - overworld_ascending_frames(gObjectEventPic_SquawkabillyGreenPlumage, 4, 4), +static const struct SpriteFrameImage sPicTable_SquawkabillyGreen[] = { + overworld_ascending_frames(gObjectEventPic_SquawkabillyGreen, 4, 4), }; -static const struct SpriteFrameImage sPicTable_SquawkabillyBluePlumage[] = { - overworld_ascending_frames(gObjectEventPic_SquawkabillyBluePlumage, 4, 4), +static const struct SpriteFrameImage sPicTable_SquawkabillyBlue[] = { + overworld_ascending_frames(gObjectEventPic_SquawkabillyBlue, 4, 4), }; -static const struct SpriteFrameImage sPicTable_SquawkabillyYellowPlumage[] = { - overworld_ascending_frames(gObjectEventPic_SquawkabillyYellowPlumage, 4, 4), +static const struct SpriteFrameImage sPicTable_SquawkabillyYellow[] = { + overworld_ascending_frames(gObjectEventPic_SquawkabillyYellow, 4, 4), }; -static const struct SpriteFrameImage sPicTable_SquawkabillyWhitePlumage[] = { - overworld_ascending_frames(gObjectEventPic_SquawkabillyWhitePlumage, 4, 4), +static const struct SpriteFrameImage sPicTable_SquawkabillyWhite[] = { + overworld_ascending_frames(gObjectEventPic_SquawkabillyWhite, 4, 4), }; #endif //P_FAMILY_SQUAWKABILLY @@ -6366,29 +6366,29 @@ static const struct SpriteFrameImage sPicTable_Fezandipiti[] = { #endif //P_FAMILY_FEZANDIPITI #if P_FAMILY_OGERPON -static const struct SpriteFrameImage sPicTable_OgerponTealMask[] = { - overworld_ascending_frames(gObjectEventPic_OgerponTealMask, 4, 4), +static const struct SpriteFrameImage sPicTable_OgerponTeal[] = { + overworld_ascending_frames(gObjectEventPic_OgerponTeal, 4, 4), }; -static const struct SpriteFrameImage sPicTable_OgerponWellspringMask[] = { - overworld_ascending_frames(gObjectEventPic_OgerponWellspringMask, 4, 4), +static const struct SpriteFrameImage sPicTable_OgerponWellspring[] = { + overworld_ascending_frames(gObjectEventPic_OgerponWellspring, 4, 4), }; -static const struct SpriteFrameImage sPicTable_OgerponHearthflameMask[] = { - overworld_ascending_frames(gObjectEventPic_OgerponHearthflameMask, 4, 4), +static const struct SpriteFrameImage sPicTable_OgerponHearthflame[] = { + overworld_ascending_frames(gObjectEventPic_OgerponHearthflame, 4, 4), }; -static const struct SpriteFrameImage sPicTable_OgerponCornerstoneMask[] = { - overworld_ascending_frames(gObjectEventPic_OgerponCornerstoneMask, 4, 4), +static const struct SpriteFrameImage sPicTable_OgerponCornerstone[] = { + overworld_ascending_frames(gObjectEventPic_OgerponCornerstone, 4, 4), }; -static const struct SpriteFrameImage sPicTable_OgerponTealMaskTera[] = { - overworld_ascending_frames(gObjectEventPic_OgerponTealMask, 4, 4), +static const struct SpriteFrameImage sPicTable_OgerponTealTera[] = { + overworld_ascending_frames(gObjectEventPic_OgerponTeal, 4, 4), }; -static const struct SpriteFrameImage sPicTable_OgerponWellspringMaskTera[] = { - overworld_ascending_frames(gObjectEventPic_OgerponWellspringMask, 4, 4), +static const struct SpriteFrameImage sPicTable_OgerponWellspringTera[] = { + overworld_ascending_frames(gObjectEventPic_OgerponWellspring, 4, 4), }; -static const struct SpriteFrameImage sPicTable_OgerponHearthflameMaskTera[] = { - overworld_ascending_frames(gObjectEventPic_OgerponHearthflameMask, 4, 4), +static const struct SpriteFrameImage sPicTable_OgerponHearthflameTera[] = { + overworld_ascending_frames(gObjectEventPic_OgerponHearthflame, 4, 4), }; -static const struct SpriteFrameImage sPicTable_OgerponCornerstoneMaskTera[] = { - overworld_ascending_frames(gObjectEventPic_OgerponCornerstoneMask, 4, 4), +static const struct SpriteFrameImage sPicTable_OgerponCornerstoneTera[] = { + overworld_ascending_frames(gObjectEventPic_OgerponCornerstone, 4, 4), }; #endif //P_FAMILY_OGERPON diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 18ce19a7a1..23c233de58 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -99,7 +99,7 @@ static const u16 sRattataEggMoveLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sRattataAlolanEggMoveLearnset[] = { +static const u16 sRattataAlolaEggMoveLearnset[] = { MOVE_COUNTER, MOVE_FINAL_GAMBIT, MOVE_FURY_SWIPES, @@ -192,7 +192,7 @@ static const u16 sSandshrewEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_ALOLAN_FORMS -static const u16 sSandshrewAlolanEggMoveLearnset[] = { +static const u16 sSandshrewAlolaEggMoveLearnset[] = { MOVE_AMNESIA, MOVE_CHIP_AWAY, MOVE_COUNTER, @@ -289,7 +289,7 @@ static const u16 sVulpixEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_ALOLAN_FORMS -static const u16 sVulpixAlolanEggMoveLearnset[] = { +static const u16 sVulpixAlolaEggMoveLearnset[] = { MOVE_AGILITY, MOVE_CHARM, MOVE_DISABLE, @@ -425,7 +425,7 @@ static const u16 sDiglettEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_ALOLAN_FORMS -static const u16 sDiglettAlolanEggMoveLearnset[] = { +static const u16 sDiglettAlolaEggMoveLearnset[] = { MOVE_ANCIENT_POWER, MOVE_BEAT_UP, MOVE_ENDURE, @@ -460,7 +460,7 @@ static const u16 sMeowthEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_ALOLAN_FORMS -static const u16 sMeowthAlolanEggMoveLearnset[] = { +static const u16 sMeowthAlolaEggMoveLearnset[] = { MOVE_AMNESIA, MOVE_ASSIST, MOVE_CHARM, @@ -477,7 +477,7 @@ static const u16 sMeowthAlolanEggMoveLearnset[] = { }; #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const u16 sMeowthGalarianEggMoveLearnset[] = { +static const u16 sMeowthGalarEggMoveLearnset[] = { MOVE_SPITE, MOVE_DOUBLE_EDGE, MOVE_CURSE, @@ -662,7 +662,7 @@ static const u16 sGeodudeEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_ALOLAN_FORMS -static const u16 sGeodudeAlolanEggMoveLearnset[] = { +static const u16 sGeodudeAlolaEggMoveLearnset[] = { MOVE_AUTOTOMIZE, MOVE_BLOCK, MOVE_COUNTER, @@ -695,7 +695,7 @@ static const u16 sPonytaEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_GALARIAN_FORMS -static const u16 sPonytaGalarianEggMoveLearnset[] = { +static const u16 sPonytaGalarEggMoveLearnset[] = { MOVE_THRASH, MOVE_DOUBLE_KICK, MOVE_HYPNOSIS, @@ -723,7 +723,7 @@ static const u16 sSlowpokeEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_GALARIAN_FORMS -static const u16 sSlowpokeGalarianEggMoveLearnset[] = { +static const u16 sSlowpokeGalarEggMoveLearnset[] = { MOVE_BELCH, MOVE_BELLY_DRUM, MOVE_BLOCK, @@ -756,7 +756,7 @@ static const u16 sFarfetchdEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_GALARIAN_FORMS -static const u16 sFarfetchdGalarianEggMoveLearnset[] = { +static const u16 sFarfetchdGalarEggMoveLearnset[] = { MOVE_COUNTER, MOVE_QUICK_ATTACK, MOVE_FLAIL, @@ -830,7 +830,7 @@ static const u16 sGrimerEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_ALOLAN_FORMS -static const u16 sGrimerAlolanEggMoveLearnset[] = { +static const u16 sGrimerAlolaEggMoveLearnset[] = { MOVE_ASSURANCE, MOVE_CLEAR_SMOG, MOVE_CURSE, @@ -1201,7 +1201,7 @@ static const u16 sMrMimeEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_GALARIAN_FORMS -static const u16 sMrMimeGalarianEggMoveLearnset[] = { +static const u16 sMrMimeGalarEggMoveLearnset[] = { MOVE_FAKE_OUT, MOVE_CONFUSE_RAY, MOVE_POWER_SPLIT, @@ -1302,19 +1302,19 @@ static const u16 sPinsirEggMoveLearnset[] = { #if P_FAMILY_TAUROS #if P_PALDEAN_FORMS -static const u16 sTaurosPaldeanCombatBreedEggMoveLearnset[] = { +static const u16 sTaurosPaldeaCombatEggMoveLearnset[] = { MOVE_CURSE, MOVE_ENDEAVOR, MOVE_UNAVAILABLE, }; -static const u16 sTaurosPaldeanBlazeBreedEggMoveLearnset[] = { +static const u16 sTaurosPaldeaBlazeEggMoveLearnset[] = { MOVE_CURSE, MOVE_ENDEAVOR, MOVE_UNAVAILABLE, }; -static const u16 sTaurosPaldeanAquaBreedEggMoveLearnset[] = { +static const u16 sTaurosPaldeaAquaEggMoveLearnset[] = { MOVE_CURSE, MOVE_ENDEAVOR, MOVE_UNAVAILABLE, @@ -1840,7 +1840,7 @@ static const u16 sWooperEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_PALDEAN_FORMS -static const u16 sWooperPaldeanEggMoveLearnset[] = { +static const u16 sWooperPaldeaEggMoveLearnset[] = { MOVE_ACID_SPRAY, MOVE_AFTER_YOU, MOVE_ANCIENT_POWER, @@ -2145,7 +2145,7 @@ static const u16 sCorsolaEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_GALARIAN_FORMS -static const u16 sCorsolaGalarianEggMoveLearnset[] = { +static const u16 sCorsolaGalarEggMoveLearnset[] = { MOVE_HAZE, MOVE_CONFUSE_RAY, MOVE_NATURE_POWER, @@ -2440,7 +2440,7 @@ static const u16 sZigzagoonEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_GALARIAN_FORMS -static const u16 sZigzagoonGalarianEggMoveLearnset[] = { +static const u16 sZigzagoonGalarEggMoveLearnset[] = { MOVE_PARTING_SHOT, MOVE_QUICK_GUARD, MOVE_KNOCK_OFF, @@ -4314,7 +4314,7 @@ static const u16 sDarumakaEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_GALARIAN_FORMS -static const u16 sDarumakaGalarianEggMoveLearnset[] = { +static const u16 sDarumakaGalarEggMoveLearnset[] = { MOVE_FOCUS_PUNCH, MOVE_HAMMER_ARM, MOVE_TAKE_DOWN, @@ -4408,7 +4408,7 @@ static const u16 sYamaskEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_GALARIAN_FORMS -static const u16 sYamaskGalarianEggMoveLearnset[] = { +static const u16 sYamaskGalarEggMoveLearnset[] = { MOVE_MEMENTO, MOVE_UNAVAILABLE, }; @@ -4760,7 +4760,7 @@ static const u16 sStunfiskEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; #if P_GALARIAN_FORMS -static const u16 sStunfiskGalarianEggMoveLearnset[] = { +static const u16 sStunfiskGalarEggMoveLearnset[] = { MOVE_BIND, MOVE_YAWN, MOVE_ASTONISH, @@ -5855,7 +5855,7 @@ static const u16 sIndeedeeEggMoveLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sIndeedeeFemaleEggMoveLearnset[] = { +static const u16 sIndeedeeFEggMoveLearnset[] = { MOVE_PSYCH_UP, MOVE_FAKE_OUT, MOVE_PSYCHO_SHIFT, diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index 5316427b4c..46dec53544 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -692,7 +692,7 @@ static const struct FormChange sDarmanitanFormChangeTable[] = { }; #if P_GALARIAN_FORMS -static const struct FormChange sDarmanitanGalarianFormChangeTable[] = { +static const struct FormChange sDarmanitanGalarFormChangeTable[] = { {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_GALAR_STANDARD, ABILITY_ZEN_MODE, HP_HIGHER_THAN, 50}, {FORM_CHANGE_BATTLE_HP_PERCENT, SPECIES_DARMANITAN_GALAR_ZEN, ABILITY_ZEN_MODE, HP_LOWER_EQ_THAN, 50}, {FORM_CHANGE_FAINT, SPECIES_DARMANITAN_GALAR_STANDARD}, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 1a8e1818ef..f2c4560216 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -113,7 +113,7 @@ static const u16 sPikachuFormSpeciesIdTable[] = { SPECIES_PIKACHU_UNOVA, SPECIES_PIKACHU_KALOS, SPECIES_PIKACHU_ALOLA, - SPECIES_PIKACHU_PARTNER_CAP, + SPECIES_PIKACHU_PARTNER, SPECIES_PIKACHU_WORLD, #endif #if P_GIGANTAMAX_FORMS diff --git a/src/data/pokemon/level_up_learnsets/gen_1.h b/src/data/pokemon/level_up_learnsets/gen_1.h index e7b9d23238..8470b1b14e 100644 --- a/src/data/pokemon/level_up_learnsets/gen_1.h +++ b/src/data/pokemon/level_up_learnsets/gen_1.h @@ -244,7 +244,7 @@ static const struct LevelUpMove sRaticateLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRattataAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK), @@ -261,7 +261,7 @@ static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaticateAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), @@ -370,7 +370,7 @@ static const struct LevelUpMove sRaichuLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaichuAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_SPEED_SWAP), @@ -406,7 +406,7 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandshrewAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 3, MOVE_BIDE), @@ -427,7 +427,7 @@ static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandslashAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), @@ -569,7 +569,7 @@ static const struct LevelUpMove sNinetalesLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sVulpixAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 4, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 7, MOVE_ROAR), @@ -593,7 +593,7 @@ static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sNinetalesAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_IMPRISON), @@ -805,7 +805,7 @@ static const struct LevelUpMove sDugtrioLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDiglettAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), LEVEL_UP_MOVE( 4, MOVE_GROWL), @@ -823,7 +823,7 @@ static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDugtrioAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER), @@ -875,7 +875,7 @@ static const struct LevelUpMove sPersianLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 6, MOVE_BITE), @@ -895,7 +895,7 @@ static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sPersianAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_QUASH), @@ -924,7 +924,7 @@ static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const struct LevelUpMove sMeowthGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 4, MOVE_HONE_CLAWS), @@ -1065,7 +1065,7 @@ static const struct LevelUpMove sArcanineLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGrowlitheHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1077,7 +1077,7 @@ static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sArcanineHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1314,7 +1314,7 @@ static const struct LevelUpMove sGolemLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGeodudeAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 4, MOVE_CHARGE), @@ -1334,7 +1334,7 @@ static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGravelerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -1356,7 +1356,7 @@ static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGolemAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HEAVY_SLAM), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), @@ -1409,7 +1409,7 @@ static const struct LevelUpMove sRapidashLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sPonytaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_TAIL_WHIP), @@ -1426,7 +1426,7 @@ static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRapidashGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sRapidashGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_MEGAHORN), @@ -1491,7 +1491,7 @@ static const struct LevelUpMove sSlowkingLevelUpLearnset[] = { #endif //P_GEN_2_CROSS_EVOS #if P_GALARIAN_FORMS -static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowpokeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CURSE), LEVEL_UP_MOVE( 3, MOVE_GROWL), @@ -1512,7 +1512,7 @@ static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowbroGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), @@ -1537,7 +1537,7 @@ static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { }; #if P_GEN_2_CROSS_EVOS -static const struct LevelUpMove sSlowkingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowkingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_POWER_GEM), @@ -1630,7 +1630,7 @@ static const struct LevelUpMove sFarfetchdLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sFarfetchdGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sFarfetchdGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 5, MOVE_LEER), @@ -1751,7 +1751,7 @@ static const struct LevelUpMove sMukLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGrimerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), LEVEL_UP_MOVE( 4, MOVE_HARDEN), @@ -1771,7 +1771,7 @@ static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMukAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -1954,7 +1954,7 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sVoltorbHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -1966,7 +1966,7 @@ static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sElectrodeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2002,7 +2002,7 @@ static const struct LevelUpMove sExeggutorLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sExeggutorAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_SEED_BOMB), @@ -2047,7 +2047,7 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMarowakAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB), @@ -2177,7 +2177,7 @@ static const struct LevelUpMove sWeezingLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sWeezingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sWeezingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_STRANGE_STEAM), @@ -2475,7 +2475,7 @@ static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMrMimeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COPYCAT), LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_ROLE_PLAY), @@ -2742,7 +2742,7 @@ static const struct LevelUpMove sTaurosLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaCombatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -2760,7 +2760,7 @@ static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaBlazeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -2778,7 +2778,7 @@ static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanAquaBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaAquaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3144,7 +3144,7 @@ static const struct LevelUpMove sArticunoLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sArticunoGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sArticunoGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_SHIFT), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), @@ -3177,7 +3177,7 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZapdosGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZapdosGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE( 5, MOVE_ROCK_SMASH), @@ -3210,7 +3210,7 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMoltresGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMoltresGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_PAYBACK), @@ -3385,7 +3385,7 @@ static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sTyphlosionHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_EMBER), @@ -3940,7 +3940,7 @@ static const struct LevelUpMove sQuagsireLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sWooperPaldeanLevelUpLearnset[] = { +static const struct LevelUpMove sWooperPaldeaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_MUD_SHOT), LEVEL_UP_MOVE( 4, MOVE_TACKLE), @@ -4242,7 +4242,7 @@ static const struct LevelUpMove sQwilfishLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sQwilfishHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 5, MOVE_SPIKES), LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE), @@ -4339,7 +4339,7 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSneaselHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -4521,7 +4521,7 @@ static const struct LevelUpMove sCorsolaLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sCorsolaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sCorsolaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 5, MOVE_ASTONISH), @@ -5125,7 +5125,7 @@ static const struct LevelUpMove sLinooneLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZigzagoonGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_SAND_ATTACK), @@ -5143,7 +5143,7 @@ static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sLinooneGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO), @@ -7734,7 +7734,7 @@ static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -7751,7 +7751,7 @@ static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamTrashCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -8964,7 +8964,7 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSamurottHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_AQUA_JET), @@ -9858,7 +9858,7 @@ static const struct LevelUpMove sLilligantLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sLilligantHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 5, MOVE_LEAFAGE), @@ -10041,7 +10041,7 @@ static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarumakaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_TAUNT), @@ -10059,7 +10059,7 @@ static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDarmanitanGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarmanitanGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), @@ -10258,7 +10258,7 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sYamaskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sYamaskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 4, MOVE_HAZE), @@ -10487,7 +10487,7 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoruaHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -10498,7 +10498,7 @@ static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoroarkHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -11501,7 +11501,7 @@ static const struct LevelUpMove sStunfiskLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sStunfiskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), @@ -11765,7 +11765,7 @@ static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sBraviaryHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_AERIAL_ACE), LEVEL_UP_MOVE(11, MOVE_TWISTER), @@ -12684,7 +12684,7 @@ static const struct LevelUpMove sFloetteLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { +static const struct LevelUpMove sFloetteEternalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), LEVEL_UP_MOVE( 6, MOVE_FAIRY_WIND), @@ -12840,7 +12840,7 @@ static const struct LevelUpMove sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_HELPING_HAND), @@ -12865,7 +12865,7 @@ static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_ME_FIRST), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), @@ -13461,7 +13461,7 @@ static const struct LevelUpMove sGoodraLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSliggooHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -13473,7 +13473,7 @@ static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGoodraHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -13634,7 +13634,7 @@ static const struct LevelUpMove sAvaluggLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sAvaluggHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW), @@ -13934,7 +13934,7 @@ static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sDecidueyeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 6, MOVE_LEAFAGE), @@ -16946,7 +16946,7 @@ static const struct LevelUpMove sEiscueLevelUpLearnset[] = { #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_ENCORE), @@ -16963,7 +16963,7 @@ static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sIndeedeeFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_BATON_PASS), @@ -17291,7 +17291,7 @@ static const struct LevelUpMove sKubfuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuSingleStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -17313,7 +17313,7 @@ static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuRapidStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuRapidStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_AQUA_JET), @@ -17462,7 +17462,7 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { }; #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexIceLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GLACIAL_LANCE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -17498,7 +17498,7 @@ static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { #endif //P_FUSION_FORMS #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexShadowLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTRAL_BARRAGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -17749,7 +17749,7 @@ static const struct LevelUpMove sLechonkLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_DISARMING_VOICE), @@ -17768,7 +17768,7 @@ static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 3, MOVE_DISARMING_VOICE), diff --git a/src/data/pokemon/level_up_learnsets/gen_2.h b/src/data/pokemon/level_up_learnsets/gen_2.h index 991cf5daf8..0f39631c4f 100644 --- a/src/data/pokemon/level_up_learnsets/gen_2.h +++ b/src/data/pokemon/level_up_learnsets/gen_2.h @@ -280,7 +280,7 @@ static const struct LevelUpMove sRaticateLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRattataAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK), @@ -297,7 +297,7 @@ static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaticateAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), @@ -413,7 +413,7 @@ static const struct LevelUpMove sRaichuLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaichuAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_SPEED_SWAP), @@ -454,7 +454,7 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandshrewAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 3, MOVE_BIDE), @@ -475,7 +475,7 @@ static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandslashAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), @@ -615,7 +615,7 @@ static const struct LevelUpMove sNinetalesLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sVulpixAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 4, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 7, MOVE_ROAR), @@ -639,7 +639,7 @@ static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sNinetalesAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_IMPRISON), @@ -866,7 +866,7 @@ static const struct LevelUpMove sDugtrioLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDiglettAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), LEVEL_UP_MOVE( 4, MOVE_GROWL), @@ -884,7 +884,7 @@ static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDugtrioAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER), @@ -937,7 +937,7 @@ static const struct LevelUpMove sPersianLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 6, MOVE_BITE), @@ -957,7 +957,7 @@ static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sPersianAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_QUASH), @@ -986,7 +986,7 @@ static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const struct LevelUpMove sMeowthGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 4, MOVE_HONE_CLAWS), @@ -1136,7 +1136,7 @@ static const struct LevelUpMove sArcanineLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGrowlitheHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1148,7 +1148,7 @@ static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sArcanineHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1410,7 +1410,7 @@ static const struct LevelUpMove sGolemLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGeodudeAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 4, MOVE_CHARGE), @@ -1430,7 +1430,7 @@ static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGravelerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -1452,7 +1452,7 @@ static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGolemAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HEAVY_SLAM), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), @@ -1510,7 +1510,7 @@ static const struct LevelUpMove sRapidashLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sPonytaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_TAIL_WHIP), @@ -1527,7 +1527,7 @@ static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRapidashGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sRapidashGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_MEGAHORN), @@ -1596,7 +1596,7 @@ static const struct LevelUpMove sSlowkingLevelUpLearnset[] = { #endif //P_GEN_2_CROSS_EVOS #if P_GALARIAN_FORMS -static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowpokeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CURSE), LEVEL_UP_MOVE( 3, MOVE_GROWL), @@ -1617,7 +1617,7 @@ static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowbroGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), @@ -1642,7 +1642,7 @@ static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { }; #if P_GEN_2_CROSS_EVOS -static const struct LevelUpMove sSlowkingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowkingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_POWER_GEM), @@ -1741,7 +1741,7 @@ static const struct LevelUpMove sFarfetchdLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sFarfetchdGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sFarfetchdGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 5, MOVE_LEER), @@ -1868,7 +1868,7 @@ static const struct LevelUpMove sMukLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGrimerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), LEVEL_UP_MOVE( 4, MOVE_HARDEN), @@ -1888,7 +1888,7 @@ static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMukAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -2101,7 +2101,7 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sVoltorbHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2113,7 +2113,7 @@ static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sElectrodeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2152,7 +2152,7 @@ static const struct LevelUpMove sExeggutorLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sExeggutorAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_SEED_BOMB), @@ -2203,7 +2203,7 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMarowakAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB), @@ -2346,7 +2346,7 @@ static const struct LevelUpMove sWeezingLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sWeezingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sWeezingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_STRANGE_STEAM), @@ -2663,7 +2663,7 @@ static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMrMimeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COPYCAT), LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_ROLE_PLAY), @@ -2946,7 +2946,7 @@ static const struct LevelUpMove sTaurosLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaCombatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -2964,7 +2964,7 @@ static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaBlazeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -2982,7 +2982,7 @@ static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanAquaBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaAquaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3368,7 +3368,7 @@ static const struct LevelUpMove sArticunoLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sArticunoGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sArticunoGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_SHIFT), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), @@ -3404,7 +3404,7 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZapdosGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZapdosGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE( 5, MOVE_ROCK_SMASH), @@ -3440,7 +3440,7 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMoltresGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMoltresGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_PAYBACK), @@ -3629,7 +3629,7 @@ static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sTyphlosionHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_EMBER), @@ -4184,7 +4184,7 @@ static const struct LevelUpMove sQuagsireLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sWooperPaldeanLevelUpLearnset[] = { +static const struct LevelUpMove sWooperPaldeaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_MUD_SHOT), LEVEL_UP_MOVE( 4, MOVE_TACKLE), @@ -4486,7 +4486,7 @@ static const struct LevelUpMove sQwilfishLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sQwilfishHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 5, MOVE_SPIKES), LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE), @@ -4583,7 +4583,7 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSneaselHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -4765,7 +4765,7 @@ static const struct LevelUpMove sCorsolaLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sCorsolaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sCorsolaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 5, MOVE_ASTONISH), @@ -5369,7 +5369,7 @@ static const struct LevelUpMove sLinooneLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZigzagoonGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_SAND_ATTACK), @@ -5387,7 +5387,7 @@ static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sLinooneGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO), @@ -7978,7 +7978,7 @@ static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -7995,7 +7995,7 @@ static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamTrashCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -9208,7 +9208,7 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSamurottHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_AQUA_JET), @@ -10102,7 +10102,7 @@ static const struct LevelUpMove sLilligantLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sLilligantHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 5, MOVE_LEAFAGE), @@ -10285,7 +10285,7 @@ static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarumakaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_TAUNT), @@ -10303,7 +10303,7 @@ static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDarmanitanGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarmanitanGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), @@ -10502,7 +10502,7 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sYamaskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sYamaskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 4, MOVE_HAZE), @@ -10731,7 +10731,7 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoruaHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -10742,7 +10742,7 @@ static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoroarkHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -11745,7 +11745,7 @@ static const struct LevelUpMove sStunfiskLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sStunfiskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), @@ -12009,7 +12009,7 @@ static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sBraviaryHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_AERIAL_ACE), LEVEL_UP_MOVE(11, MOVE_TWISTER), @@ -12928,7 +12928,7 @@ static const struct LevelUpMove sFloetteLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { +static const struct LevelUpMove sFloetteEternalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), LEVEL_UP_MOVE( 6, MOVE_FAIRY_WIND), @@ -13084,7 +13084,7 @@ static const struct LevelUpMove sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_HELPING_HAND), @@ -13109,7 +13109,7 @@ static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_ME_FIRST), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), @@ -13705,7 +13705,7 @@ static const struct LevelUpMove sGoodraLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSliggooHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -13717,7 +13717,7 @@ static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGoodraHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -13878,7 +13878,7 @@ static const struct LevelUpMove sAvaluggLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sAvaluggHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW), @@ -14178,7 +14178,7 @@ static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sDecidueyeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 6, MOVE_LEAFAGE), @@ -17190,7 +17190,7 @@ static const struct LevelUpMove sEiscueLevelUpLearnset[] = { #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_ENCORE), @@ -17207,7 +17207,7 @@ static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sIndeedeeFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_BATON_PASS), @@ -17535,7 +17535,7 @@ static const struct LevelUpMove sKubfuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuSingleStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -17557,7 +17557,7 @@ static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuRapidStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuRapidStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_AQUA_JET), @@ -17706,7 +17706,7 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { }; #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexIceLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GLACIAL_LANCE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -17742,7 +17742,7 @@ static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { #endif //P_FUSION_FORMS #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexShadowLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTRAL_BARRAGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -17993,7 +17993,7 @@ static const struct LevelUpMove sLechonkLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_DISARMING_VOICE), @@ -18012,7 +18012,7 @@ static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 3, MOVE_DISARMING_VOICE), diff --git a/src/data/pokemon/level_up_learnsets/gen_3.h b/src/data/pokemon/level_up_learnsets/gen_3.h index 99b8cc397f..81e6d06b46 100644 --- a/src/data/pokemon/level_up_learnsets/gen_3.h +++ b/src/data/pokemon/level_up_learnsets/gen_3.h @@ -287,7 +287,7 @@ static const struct LevelUpMove sRaticateLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRattataAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK), @@ -304,7 +304,7 @@ static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaticateAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), @@ -427,7 +427,7 @@ static const struct LevelUpMove sRaichuLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaichuAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_SPEED_SWAP), @@ -470,7 +470,7 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandshrewAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 3, MOVE_BIDE), @@ -491,7 +491,7 @@ static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandslashAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), @@ -645,7 +645,7 @@ static const struct LevelUpMove sNinetalesLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sVulpixAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 4, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 7, MOVE_ROAR), @@ -669,7 +669,7 @@ static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sNinetalesAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_IMPRISON), @@ -916,7 +916,7 @@ static const struct LevelUpMove sDugtrioLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDiglettAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), LEVEL_UP_MOVE( 4, MOVE_GROWL), @@ -934,7 +934,7 @@ static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDugtrioAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER), @@ -989,7 +989,7 @@ static const struct LevelUpMove sPersianLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 6, MOVE_BITE), @@ -1009,7 +1009,7 @@ static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sPersianAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_QUASH), @@ -1038,7 +1038,7 @@ static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const struct LevelUpMove sMeowthGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 4, MOVE_HONE_CLAWS), @@ -1191,7 +1191,7 @@ static const struct LevelUpMove sArcanineLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGrowlitheHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1203,7 +1203,7 @@ static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sArcanineHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1480,7 +1480,7 @@ static const struct LevelUpMove sGolemLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGeodudeAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 4, MOVE_CHARGE), @@ -1500,7 +1500,7 @@ static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGravelerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -1522,7 +1522,7 @@ static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGolemAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HEAVY_SLAM), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), @@ -1582,7 +1582,7 @@ static const struct LevelUpMove sRapidashLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sPonytaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_TAIL_WHIP), @@ -1599,7 +1599,7 @@ static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRapidashGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sRapidashGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_MEGAHORN), @@ -1670,7 +1670,7 @@ static const struct LevelUpMove sSlowkingLevelUpLearnset[] = { #endif //P_GEN_2_CROSS_EVOS #if P_GALARIAN_FORMS -static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowpokeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CURSE), LEVEL_UP_MOVE( 3, MOVE_GROWL), @@ -1691,7 +1691,7 @@ static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowbroGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), @@ -1716,7 +1716,7 @@ static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { }; #if P_GEN_2_CROSS_EVOS -static const struct LevelUpMove sSlowkingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowkingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_POWER_GEM), @@ -1820,7 +1820,7 @@ static const struct LevelUpMove sFarfetchdLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sFarfetchdGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sFarfetchdGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 5, MOVE_LEER), @@ -1955,7 +1955,7 @@ static const struct LevelUpMove sMukLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGrimerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), LEVEL_UP_MOVE( 4, MOVE_HARDEN), @@ -1975,7 +1975,7 @@ static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMukAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -2200,7 +2200,7 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sVoltorbHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2212,7 +2212,7 @@ static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sElectrodeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2252,7 +2252,7 @@ static const struct LevelUpMove sExeggutorLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sExeggutorAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_SEED_BOMB), @@ -2305,7 +2305,7 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMarowakAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB), @@ -2458,7 +2458,7 @@ static const struct LevelUpMove sWeezingLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sWeezingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sWeezingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_STRANGE_STEAM), @@ -2796,7 +2796,7 @@ static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMrMimeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COPYCAT), LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_ROLE_PLAY), @@ -3085,7 +3085,7 @@ static const struct LevelUpMove sTaurosLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaCombatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3103,7 +3103,7 @@ static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaBlazeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3121,7 +3121,7 @@ static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanAquaBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaAquaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3529,7 +3529,7 @@ static const struct LevelUpMove sArticunoLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sArticunoGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sArticunoGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_SHIFT), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), @@ -3566,7 +3566,7 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZapdosGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZapdosGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE( 5, MOVE_ROCK_SMASH), @@ -3603,7 +3603,7 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMoltresGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMoltresGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_PAYBACK), @@ -3792,7 +3792,7 @@ static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sTyphlosionHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_EMBER), @@ -4375,7 +4375,7 @@ static const struct LevelUpMove sQuagsireLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sWooperPaldeanLevelUpLearnset[] = { +static const struct LevelUpMove sWooperPaldeaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_MUD_SHOT), LEVEL_UP_MOVE( 4, MOVE_TACKLE), @@ -4685,7 +4685,7 @@ static const struct LevelUpMove sQwilfishLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sQwilfishHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 5, MOVE_SPIKES), LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE), @@ -4785,7 +4785,7 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSneaselHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -4975,7 +4975,7 @@ static const struct LevelUpMove sCorsolaLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sCorsolaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sCorsolaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 5, MOVE_ASTONISH), @@ -5595,7 +5595,7 @@ static const struct LevelUpMove sLinooneLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZigzagoonGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_SAND_ATTACK), @@ -5613,7 +5613,7 @@ static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sLinooneGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO), @@ -8204,7 +8204,7 @@ static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -8221,7 +8221,7 @@ static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamTrashCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -9434,7 +9434,7 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSamurottHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_AQUA_JET), @@ -10328,7 +10328,7 @@ static const struct LevelUpMove sLilligantLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sLilligantHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 5, MOVE_LEAFAGE), @@ -10511,7 +10511,7 @@ static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarumakaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_TAUNT), @@ -10529,7 +10529,7 @@ static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDarmanitanGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarmanitanGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), @@ -10728,7 +10728,7 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sYamaskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sYamaskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 4, MOVE_HAZE), @@ -10957,7 +10957,7 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoruaHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -10968,7 +10968,7 @@ static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoroarkHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -11971,7 +11971,7 @@ static const struct LevelUpMove sStunfiskLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sStunfiskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), @@ -12235,7 +12235,7 @@ static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sBraviaryHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_AERIAL_ACE), LEVEL_UP_MOVE(11, MOVE_TWISTER), @@ -13154,7 +13154,7 @@ static const struct LevelUpMove sFloetteLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { +static const struct LevelUpMove sFloetteEternalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), LEVEL_UP_MOVE( 6, MOVE_FAIRY_WIND), @@ -13310,7 +13310,7 @@ static const struct LevelUpMove sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_HELPING_HAND), @@ -13335,7 +13335,7 @@ static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_ME_FIRST), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), @@ -13931,7 +13931,7 @@ static const struct LevelUpMove sGoodraLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSliggooHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -13943,7 +13943,7 @@ static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGoodraHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -14104,7 +14104,7 @@ static const struct LevelUpMove sAvaluggLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sAvaluggHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW), @@ -14404,7 +14404,7 @@ static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sDecidueyeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 6, MOVE_LEAFAGE), @@ -17416,7 +17416,7 @@ static const struct LevelUpMove sEiscueLevelUpLearnset[] = { #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_ENCORE), @@ -17433,7 +17433,7 @@ static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sIndeedeeFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_BATON_PASS), @@ -17761,7 +17761,7 @@ static const struct LevelUpMove sKubfuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuSingleStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -17783,7 +17783,7 @@ static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuRapidStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuRapidStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_AQUA_JET), @@ -17932,7 +17932,7 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { }; #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexIceLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GLACIAL_LANCE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -17968,7 +17968,7 @@ static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { #endif //P_FUSION_FORMS #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexShadowLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTRAL_BARRAGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -18219,7 +18219,7 @@ static const struct LevelUpMove sLechonkLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_DISARMING_VOICE), @@ -18238,7 +18238,7 @@ static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 3, MOVE_DISARMING_VOICE), diff --git a/src/data/pokemon/level_up_learnsets/gen_4.h b/src/data/pokemon/level_up_learnsets/gen_4.h index f620abc3df..5c9f6872b5 100644 --- a/src/data/pokemon/level_up_learnsets/gen_4.h +++ b/src/data/pokemon/level_up_learnsets/gen_4.h @@ -345,7 +345,7 @@ static const struct LevelUpMove sRaticateLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRattataAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK), @@ -362,7 +362,7 @@ static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaticateAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), @@ -504,7 +504,7 @@ static const struct LevelUpMove sRaichuLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaichuAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_SPEED_SWAP), @@ -556,7 +556,7 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandshrewAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 3, MOVE_BIDE), @@ -577,7 +577,7 @@ static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandslashAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), @@ -757,7 +757,7 @@ static const struct LevelUpMove sNinetalesLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sVulpixAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 4, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 7, MOVE_ROAR), @@ -781,7 +781,7 @@ static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sNinetalesAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_IMPRISON), @@ -1065,7 +1065,7 @@ static const struct LevelUpMove sDugtrioLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDiglettAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), LEVEL_UP_MOVE( 4, MOVE_GROWL), @@ -1083,7 +1083,7 @@ static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDugtrioAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER), @@ -1152,7 +1152,7 @@ static const struct LevelUpMove sPersianLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 6, MOVE_BITE), @@ -1172,7 +1172,7 @@ static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sPersianAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_QUASH), @@ -1201,7 +1201,7 @@ static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const struct LevelUpMove sMeowthGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 4, MOVE_HONE_CLAWS), @@ -1377,7 +1377,7 @@ static const struct LevelUpMove sArcanineLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGrowlitheHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1389,7 +1389,7 @@ static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sArcanineHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1709,7 +1709,7 @@ static const struct LevelUpMove sGolemLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGeodudeAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 4, MOVE_CHARGE), @@ -1729,7 +1729,7 @@ static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGravelerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -1751,7 +1751,7 @@ static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGolemAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HEAVY_SLAM), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), @@ -1816,7 +1816,7 @@ static const struct LevelUpMove sRapidashLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sPonytaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_TAIL_WHIP), @@ -1833,7 +1833,7 @@ static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRapidashGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sRapidashGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_MEGAHORN), @@ -1921,7 +1921,7 @@ static const struct LevelUpMove sSlowkingLevelUpLearnset[] = { #endif //P_GEN_2_CROSS_EVOS #if P_GALARIAN_FORMS -static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowpokeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CURSE), LEVEL_UP_MOVE( 3, MOVE_GROWL), @@ -1942,7 +1942,7 @@ static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowbroGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), @@ -1967,7 +1967,7 @@ static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { }; #if P_GEN_2_CROSS_EVOS -static const struct LevelUpMove sSlowkingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowkingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_POWER_GEM), @@ -2086,7 +2086,7 @@ static const struct LevelUpMove sFarfetchdLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sFarfetchdGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sFarfetchdGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 5, MOVE_LEER), @@ -2253,7 +2253,7 @@ static const struct LevelUpMove sMukLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGrimerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), LEVEL_UP_MOVE( 4, MOVE_HARDEN), @@ -2273,7 +2273,7 @@ static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMukAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -2562,7 +2562,7 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sVoltorbHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2574,7 +2574,7 @@ static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sElectrodeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2622,7 +2622,7 @@ static const struct LevelUpMove sExeggutorLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sExeggutorAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_SEED_BOMB), @@ -2679,7 +2679,7 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMarowakAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB), @@ -2855,7 +2855,7 @@ static const struct LevelUpMove sWeezingLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sWeezingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sWeezingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_STRANGE_STEAM), @@ -3236,7 +3236,7 @@ static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMrMimeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COPYCAT), LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_ROLE_PLAY), @@ -3566,7 +3566,7 @@ static const struct LevelUpMove sTaurosLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaCombatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3584,7 +3584,7 @@ static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaBlazeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3602,7 +3602,7 @@ static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanAquaBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaAquaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -4068,7 +4068,7 @@ static const struct LevelUpMove sArticunoLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sArticunoGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sArticunoGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_SHIFT), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), @@ -4110,7 +4110,7 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZapdosGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZapdosGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE( 5, MOVE_ROCK_SMASH), @@ -4152,7 +4152,7 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMoltresGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMoltresGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_PAYBACK), @@ -4394,7 +4394,7 @@ static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sTyphlosionHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_EMBER), @@ -5141,7 +5141,7 @@ static const struct LevelUpMove sQuagsireLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sWooperPaldeanLevelUpLearnset[] = { +static const struct LevelUpMove sWooperPaldeaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_MUD_SHOT), LEVEL_UP_MOVE( 4, MOVE_TACKLE), @@ -5507,7 +5507,7 @@ static const struct LevelUpMove sQwilfishLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sQwilfishHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 5, MOVE_SPIKES), LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE), @@ -5615,7 +5615,7 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSneaselHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -5836,7 +5836,7 @@ static const struct LevelUpMove sCorsolaLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sCorsolaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sCorsolaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 5, MOVE_ASTONISH), @@ -6565,7 +6565,7 @@ static const struct LevelUpMove sLinooneLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZigzagoonGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_SAND_ATTACK), @@ -6583,7 +6583,7 @@ static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sLinooneGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO), @@ -9478,7 +9478,7 @@ static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -9495,7 +9495,7 @@ static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamTrashCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -10708,7 +10708,7 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSamurottHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_AQUA_JET), @@ -11602,7 +11602,7 @@ static const struct LevelUpMove sLilligantLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sLilligantHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 5, MOVE_LEAFAGE), @@ -11785,7 +11785,7 @@ static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarumakaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_TAUNT), @@ -11803,7 +11803,7 @@ static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDarmanitanGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarmanitanGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), @@ -12002,7 +12002,7 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sYamaskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sYamaskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 4, MOVE_HAZE), @@ -12231,7 +12231,7 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoruaHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -12242,7 +12242,7 @@ static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoroarkHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -13245,7 +13245,7 @@ static const struct LevelUpMove sStunfiskLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sStunfiskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), @@ -13509,7 +13509,7 @@ static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sBraviaryHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_AERIAL_ACE), LEVEL_UP_MOVE(11, MOVE_TWISTER), @@ -14428,7 +14428,7 @@ static const struct LevelUpMove sFloetteLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { +static const struct LevelUpMove sFloetteEternalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), LEVEL_UP_MOVE( 6, MOVE_FAIRY_WIND), @@ -14584,7 +14584,7 @@ static const struct LevelUpMove sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_HELPING_HAND), @@ -14609,7 +14609,7 @@ static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_ME_FIRST), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), @@ -15205,7 +15205,7 @@ static const struct LevelUpMove sGoodraLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSliggooHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -15217,7 +15217,7 @@ static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGoodraHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -15378,7 +15378,7 @@ static const struct LevelUpMove sAvaluggLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sAvaluggHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW), @@ -15678,7 +15678,7 @@ static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sDecidueyeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 6, MOVE_LEAFAGE), @@ -18690,7 +18690,7 @@ static const struct LevelUpMove sEiscueLevelUpLearnset[] = { #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_ENCORE), @@ -18707,7 +18707,7 @@ static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sIndeedeeFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_BATON_PASS), @@ -19035,7 +19035,7 @@ static const struct LevelUpMove sKubfuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuSingleStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -19057,7 +19057,7 @@ static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuRapidStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuRapidStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_AQUA_JET), @@ -19206,7 +19206,7 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { }; #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexIceLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GLACIAL_LANCE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -19242,7 +19242,7 @@ static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { #endif //P_FUSION_FORMS #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexShadowLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTRAL_BARRAGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -19493,7 +19493,7 @@ static const struct LevelUpMove sLechonkLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_DISARMING_VOICE), @@ -19512,7 +19512,7 @@ static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 3, MOVE_DISARMING_VOICE), diff --git a/src/data/pokemon/level_up_learnsets/gen_5.h b/src/data/pokemon/level_up_learnsets/gen_5.h index b02bbdf430..cb99b6375d 100644 --- a/src/data/pokemon/level_up_learnsets/gen_5.h +++ b/src/data/pokemon/level_up_learnsets/gen_5.h @@ -356,7 +356,7 @@ static const struct LevelUpMove sRaticateLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRattataAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK), @@ -373,7 +373,7 @@ static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaticateAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), @@ -521,7 +521,7 @@ static const struct LevelUpMove sRaichuLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaichuAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_SPEED_SWAP), @@ -581,7 +581,7 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandshrewAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 3, MOVE_BIDE), @@ -602,7 +602,7 @@ static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandslashAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), @@ -792,7 +792,7 @@ static const struct LevelUpMove sNinetalesLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sVulpixAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 4, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 7, MOVE_ROAR), @@ -816,7 +816,7 @@ static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sNinetalesAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_IMPRISON), @@ -1114,7 +1114,7 @@ static const struct LevelUpMove sDugtrioLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDiglettAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), LEVEL_UP_MOVE( 4, MOVE_GROWL), @@ -1132,7 +1132,7 @@ static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDugtrioAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER), @@ -1202,7 +1202,7 @@ static const struct LevelUpMove sPersianLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 6, MOVE_BITE), @@ -1222,7 +1222,7 @@ static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sPersianAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_QUASH), @@ -1251,7 +1251,7 @@ static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const struct LevelUpMove sMeowthGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 4, MOVE_HONE_CLAWS), @@ -1438,7 +1438,7 @@ static const struct LevelUpMove sArcanineLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGrowlitheHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1450,7 +1450,7 @@ static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sArcanineHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1798,7 +1798,7 @@ static const struct LevelUpMove sGolemLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGeodudeAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 4, MOVE_CHARGE), @@ -1818,7 +1818,7 @@ static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGravelerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -1840,7 +1840,7 @@ static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGolemAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HEAVY_SLAM), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), @@ -1909,7 +1909,7 @@ static const struct LevelUpMove sRapidashLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sPonytaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_TAIL_WHIP), @@ -1926,7 +1926,7 @@ static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRapidashGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sRapidashGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_MEGAHORN), @@ -2017,7 +2017,7 @@ static const struct LevelUpMove sSlowkingLevelUpLearnset[] = { #endif //P_GEN_2_CROSS_EVOS #if P_GALARIAN_FORMS -static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowpokeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CURSE), LEVEL_UP_MOVE( 3, MOVE_GROWL), @@ -2038,7 +2038,7 @@ static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowbroGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), @@ -2063,7 +2063,7 @@ static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { }; #if P_GEN_2_CROSS_EVOS -static const struct LevelUpMove sSlowkingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowkingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_POWER_GEM), @@ -2192,7 +2192,7 @@ static const struct LevelUpMove sFarfetchdLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sFarfetchdGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sFarfetchdGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 5, MOVE_LEER), @@ -2365,7 +2365,7 @@ static const struct LevelUpMove sMukLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGrimerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), LEVEL_UP_MOVE( 4, MOVE_HARDEN), @@ -2385,7 +2385,7 @@ static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMukAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -2697,7 +2697,7 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sVoltorbHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2709,7 +2709,7 @@ static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sElectrodeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2758,7 +2758,7 @@ static const struct LevelUpMove sExeggutorLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sExeggutorAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_SEED_BOMB), @@ -2817,7 +2817,7 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMarowakAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB), @@ -3002,7 +3002,7 @@ static const struct LevelUpMove sWeezingLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sWeezingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sWeezingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_STRANGE_STEAM), @@ -3407,7 +3407,7 @@ static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMrMimeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COPYCAT), LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_ROLE_PLAY), @@ -3753,7 +3753,7 @@ static const struct LevelUpMove sTaurosLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaCombatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3771,7 +3771,7 @@ static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaBlazeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3789,7 +3789,7 @@ static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanAquaBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaAquaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -4266,7 +4266,7 @@ static const struct LevelUpMove sArticunoLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sArticunoGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sArticunoGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_SHIFT), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), @@ -4309,7 +4309,7 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZapdosGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZapdosGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE( 5, MOVE_ROCK_SMASH), @@ -4352,7 +4352,7 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMoltresGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMoltresGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_PAYBACK), @@ -4606,7 +4606,7 @@ static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sTyphlosionHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_EMBER), @@ -5406,7 +5406,7 @@ static const struct LevelUpMove sQuagsireLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sWooperPaldeanLevelUpLearnset[] = { +static const struct LevelUpMove sWooperPaldeaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_MUD_SHOT), LEVEL_UP_MOVE( 4, MOVE_TACKLE), @@ -5790,7 +5790,7 @@ static const struct LevelUpMove sQwilfishLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sQwilfishHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 5, MOVE_SPIKES), LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE), @@ -5913,7 +5913,7 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSneaselHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -6143,7 +6143,7 @@ static const struct LevelUpMove sCorsolaLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sCorsolaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sCorsolaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 5, MOVE_ASTONISH), @@ -6893,7 +6893,7 @@ static const struct LevelUpMove sLinooneLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZigzagoonGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_SAND_ATTACK), @@ -6911,7 +6911,7 @@ static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sLinooneGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO), @@ -9937,7 +9937,7 @@ static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -9954,7 +9954,7 @@ static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamTrashCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -11231,7 +11231,7 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSamurottHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_AQUA_JET), @@ -12125,7 +12125,7 @@ static const struct LevelUpMove sLilligantLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sLilligantHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 5, MOVE_LEAFAGE), @@ -12308,7 +12308,7 @@ static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarumakaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_TAUNT), @@ -12326,7 +12326,7 @@ static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDarmanitanGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarmanitanGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), @@ -12525,7 +12525,7 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sYamaskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sYamaskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 4, MOVE_HAZE), @@ -12754,7 +12754,7 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoruaHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -12765,7 +12765,7 @@ static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoroarkHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -13768,7 +13768,7 @@ static const struct LevelUpMove sStunfiskLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sStunfiskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), @@ -14032,7 +14032,7 @@ static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sBraviaryHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_AERIAL_ACE), LEVEL_UP_MOVE(11, MOVE_TWISTER), @@ -14951,7 +14951,7 @@ static const struct LevelUpMove sFloetteLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { +static const struct LevelUpMove sFloetteEternalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), LEVEL_UP_MOVE( 6, MOVE_FAIRY_WIND), @@ -15107,7 +15107,7 @@ static const struct LevelUpMove sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_HELPING_HAND), @@ -15132,7 +15132,7 @@ static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_ME_FIRST), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), @@ -15728,7 +15728,7 @@ static const struct LevelUpMove sGoodraLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSliggooHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -15740,7 +15740,7 @@ static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGoodraHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -15901,7 +15901,7 @@ static const struct LevelUpMove sAvaluggLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sAvaluggHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW), @@ -16201,7 +16201,7 @@ static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sDecidueyeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 6, MOVE_LEAFAGE), @@ -19213,7 +19213,7 @@ static const struct LevelUpMove sEiscueLevelUpLearnset[] = { #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_ENCORE), @@ -19230,7 +19230,7 @@ static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sIndeedeeFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_BATON_PASS), @@ -19558,7 +19558,7 @@ static const struct LevelUpMove sKubfuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuSingleStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -19580,7 +19580,7 @@ static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuRapidStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuRapidStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_AQUA_JET), @@ -19729,7 +19729,7 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { }; #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexIceLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GLACIAL_LANCE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -19765,7 +19765,7 @@ static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { #endif //P_FUSION_FORMS #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexShadowLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTRAL_BARRAGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -20016,7 +20016,7 @@ static const struct LevelUpMove sLechonkLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_DISARMING_VOICE), @@ -20035,7 +20035,7 @@ static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 3, MOVE_DISARMING_VOICE), diff --git a/src/data/pokemon/level_up_learnsets/gen_6.h b/src/data/pokemon/level_up_learnsets/gen_6.h index 3286c5ce4e..32e5849cda 100644 --- a/src/data/pokemon/level_up_learnsets/gen_6.h +++ b/src/data/pokemon/level_up_learnsets/gen_6.h @@ -361,7 +361,7 @@ static const struct LevelUpMove sRaticateLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRattataAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK), @@ -378,7 +378,7 @@ static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaticateAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), @@ -533,7 +533,7 @@ static const struct LevelUpMove sRaichuLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaichuAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_SPEED_SWAP), @@ -593,7 +593,7 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandshrewAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 3, MOVE_BIDE), @@ -614,7 +614,7 @@ static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandslashAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), @@ -812,7 +812,7 @@ static const struct LevelUpMove sNinetalesLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sVulpixAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 4, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 7, MOVE_ROAR), @@ -836,7 +836,7 @@ static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sNinetalesAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_IMPRISON), @@ -1158,7 +1158,7 @@ static const struct LevelUpMove sDugtrioLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDiglettAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), LEVEL_UP_MOVE( 4, MOVE_GROWL), @@ -1176,7 +1176,7 @@ static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDugtrioAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER), @@ -1247,7 +1247,7 @@ static const struct LevelUpMove sPersianLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 6, MOVE_BITE), @@ -1267,7 +1267,7 @@ static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sPersianAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_QUASH), @@ -1296,7 +1296,7 @@ static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const struct LevelUpMove sMeowthGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 4, MOVE_HONE_CLAWS), @@ -1484,7 +1484,7 @@ static const struct LevelUpMove sArcanineLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGrowlitheHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1496,7 +1496,7 @@ static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sArcanineHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1860,7 +1860,7 @@ static const struct LevelUpMove sGolemLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGeodudeAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 4, MOVE_CHARGE), @@ -1880,7 +1880,7 @@ static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGravelerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -1902,7 +1902,7 @@ static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGolemAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HEAVY_SLAM), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), @@ -1971,7 +1971,7 @@ static const struct LevelUpMove sRapidashLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sPonytaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_TAIL_WHIP), @@ -1988,7 +1988,7 @@ static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRapidashGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sRapidashGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_MEGAHORN), @@ -2081,7 +2081,7 @@ static const struct LevelUpMove sSlowkingLevelUpLearnset[] = { #endif //P_GEN_2_CROSS_EVOS #if P_GALARIAN_FORMS -static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowpokeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CURSE), LEVEL_UP_MOVE( 3, MOVE_GROWL), @@ -2102,7 +2102,7 @@ static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowbroGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), @@ -2127,7 +2127,7 @@ static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { }; #if P_GEN_2_CROSS_EVOS -static const struct LevelUpMove sSlowkingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowkingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_POWER_GEM), @@ -2262,7 +2262,7 @@ static const struct LevelUpMove sFarfetchdLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sFarfetchdGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sFarfetchdGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 5, MOVE_LEER), @@ -2439,7 +2439,7 @@ static const struct LevelUpMove sMukLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGrimerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), LEVEL_UP_MOVE( 4, MOVE_HARDEN), @@ -2459,7 +2459,7 @@ static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMukAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -2781,7 +2781,7 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sVoltorbHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2793,7 +2793,7 @@ static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sElectrodeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2842,7 +2842,7 @@ static const struct LevelUpMove sExeggutorLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sExeggutorAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_SEED_BOMB), @@ -2901,7 +2901,7 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMarowakAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB), @@ -3098,7 +3098,7 @@ static const struct LevelUpMove sWeezingLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sWeezingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sWeezingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_STRANGE_STEAM), @@ -3523,7 +3523,7 @@ static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMrMimeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COPYCAT), LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_ROLE_PLAY), @@ -3876,7 +3876,7 @@ static const struct LevelUpMove sTaurosLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaCombatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3894,7 +3894,7 @@ static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaBlazeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3912,7 +3912,7 @@ static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanAquaBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaAquaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -4408,7 +4408,7 @@ static const struct LevelUpMove sArticunoLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sArticunoGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sArticunoGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_SHIFT), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), @@ -4454,7 +4454,7 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZapdosGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZapdosGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE( 5, MOVE_ROCK_SMASH), @@ -4501,7 +4501,7 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMoltresGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMoltresGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_PAYBACK), @@ -4760,7 +4760,7 @@ static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sTyphlosionHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_EMBER), @@ -5588,7 +5588,7 @@ static const struct LevelUpMove sQuagsireLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sWooperPaldeanLevelUpLearnset[] = { +static const struct LevelUpMove sWooperPaldeaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_MUD_SHOT), LEVEL_UP_MOVE( 4, MOVE_TACKLE), @@ -5986,7 +5986,7 @@ static const struct LevelUpMove sQwilfishLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sQwilfishHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 5, MOVE_SPIKES), LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE), @@ -6114,7 +6114,7 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSneaselHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -6355,7 +6355,7 @@ static const struct LevelUpMove sCorsolaLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sCorsolaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sCorsolaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 5, MOVE_ASTONISH), @@ -7144,7 +7144,7 @@ static const struct LevelUpMove sLinooneLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZigzagoonGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_SAND_ATTACK), @@ -7162,7 +7162,7 @@ static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sLinooneGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO), @@ -10399,7 +10399,7 @@ static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -10416,7 +10416,7 @@ static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamTrashCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE(10, MOVE_PROTECT), LEVEL_UP_MOVE(15, MOVE_BUG_BITE), @@ -11744,7 +11744,7 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSamurottHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_AQUA_JET), @@ -12664,7 +12664,7 @@ static const struct LevelUpMove sLilligantLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sLilligantHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 5, MOVE_LEAFAGE), @@ -12851,7 +12851,7 @@ static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarumakaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_TAUNT), @@ -12869,7 +12869,7 @@ static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDarmanitanGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarmanitanGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), @@ -13072,7 +13072,7 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sYamaskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sYamaskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 4, MOVE_HAZE), @@ -13305,7 +13305,7 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoruaHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -13316,7 +13316,7 @@ static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoroarkHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -14360,7 +14360,7 @@ static const struct LevelUpMove sStunfiskLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sStunfiskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), @@ -14635,7 +14635,7 @@ static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sBraviaryHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_AERIAL_ACE), LEVEL_UP_MOVE(11, MOVE_TWISTER), @@ -15599,7 +15599,7 @@ static const struct LevelUpMove sFloetteLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { +static const struct LevelUpMove sFloetteEternalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), LEVEL_UP_MOVE( 6, MOVE_FAIRY_WIND), @@ -15755,7 +15755,7 @@ static const struct LevelUpMove sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_HELPING_HAND), @@ -15780,7 +15780,7 @@ static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_ME_FIRST), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), @@ -16376,7 +16376,7 @@ static const struct LevelUpMove sGoodraLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSliggooHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -16388,7 +16388,7 @@ static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGoodraHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -16549,7 +16549,7 @@ static const struct LevelUpMove sAvaluggLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sAvaluggHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW), @@ -16851,7 +16851,7 @@ static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sDecidueyeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 6, MOVE_LEAFAGE), @@ -19863,7 +19863,7 @@ static const struct LevelUpMove sEiscueLevelUpLearnset[] = { #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_ENCORE), @@ -19880,7 +19880,7 @@ static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sIndeedeeFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_BATON_PASS), @@ -20208,7 +20208,7 @@ static const struct LevelUpMove sKubfuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuSingleStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -20230,7 +20230,7 @@ static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuRapidStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuRapidStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_AQUA_JET), @@ -20379,7 +20379,7 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { }; #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexIceLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GLACIAL_LANCE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -20415,7 +20415,7 @@ static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { #endif //P_FUSION_FORMS #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexShadowLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTRAL_BARRAGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -20666,7 +20666,7 @@ static const struct LevelUpMove sLechonkLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_DISARMING_VOICE), @@ -20685,7 +20685,7 @@ static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 3, MOVE_DISARMING_VOICE), diff --git a/src/data/pokemon/level_up_learnsets/gen_7.h b/src/data/pokemon/level_up_learnsets/gen_7.h index 1b95b442e0..f88e4bcba7 100644 --- a/src/data/pokemon/level_up_learnsets/gen_7.h +++ b/src/data/pokemon/level_up_learnsets/gen_7.h @@ -367,7 +367,7 @@ static const struct LevelUpMove sRaticateLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRattataAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK), @@ -384,7 +384,7 @@ static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaticateAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), @@ -542,7 +542,7 @@ static const struct LevelUpMove sRaichuLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaichuAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_SPEED_SWAP), @@ -603,7 +603,7 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandshrewAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 3, MOVE_BIDE), @@ -624,7 +624,7 @@ static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandslashAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), @@ -822,7 +822,7 @@ static const struct LevelUpMove sNinetalesLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sVulpixAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 4, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 7, MOVE_ROAR), @@ -846,7 +846,7 @@ static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sNinetalesAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_IMPRISON), @@ -1179,7 +1179,7 @@ static const struct LevelUpMove sDugtrioLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDiglettAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), LEVEL_UP_MOVE( 4, MOVE_GROWL), @@ -1197,7 +1197,7 @@ static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDugtrioAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER), @@ -1269,7 +1269,7 @@ static const struct LevelUpMove sPersianLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 6, MOVE_BITE), @@ -1289,7 +1289,7 @@ static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sPersianAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_QUASH), @@ -1318,7 +1318,7 @@ static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const struct LevelUpMove sMeowthGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 4, MOVE_HONE_CLAWS), @@ -1514,7 +1514,7 @@ static const struct LevelUpMove sArcanineLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGrowlitheHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1526,7 +1526,7 @@ static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sArcanineHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1898,7 +1898,7 @@ static const struct LevelUpMove sGolemLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGeodudeAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 4, MOVE_CHARGE), @@ -1918,7 +1918,7 @@ static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGravelerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -1940,7 +1940,7 @@ static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGolemAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HEAVY_SLAM), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), @@ -2010,7 +2010,7 @@ static const struct LevelUpMove sRapidashLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sPonytaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_TAIL_WHIP), @@ -2027,7 +2027,7 @@ static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRapidashGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sRapidashGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_MEGAHORN), @@ -2121,7 +2121,7 @@ static const struct LevelUpMove sSlowkingLevelUpLearnset[] = { #endif //P_GEN_2_CROSS_EVOS #if P_GALARIAN_FORMS -static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowpokeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CURSE), LEVEL_UP_MOVE( 3, MOVE_GROWL), @@ -2142,7 +2142,7 @@ static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowbroGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), @@ -2167,7 +2167,7 @@ static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { }; #if P_GEN_2_CROSS_EVOS -static const struct LevelUpMove sSlowkingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowkingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_POWER_GEM), @@ -2305,7 +2305,7 @@ static const struct LevelUpMove sFarfetchdLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sFarfetchdGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sFarfetchdGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 5, MOVE_LEER), @@ -2490,7 +2490,7 @@ static const struct LevelUpMove sMukLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGrimerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), LEVEL_UP_MOVE( 4, MOVE_HARDEN), @@ -2510,7 +2510,7 @@ static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMukAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -2837,7 +2837,7 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sVoltorbHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2849,7 +2849,7 @@ static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sElectrodeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2899,7 +2899,7 @@ static const struct LevelUpMove sExeggutorLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sExeggutorAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_SEED_BOMB), @@ -2960,7 +2960,7 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMarowakAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB), @@ -3172,7 +3172,7 @@ static const struct LevelUpMove sWeezingLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sWeezingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sWeezingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_STRANGE_STEAM), @@ -3601,7 +3601,7 @@ static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMrMimeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COPYCAT), LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_ROLE_PLAY), @@ -3955,7 +3955,7 @@ static const struct LevelUpMove sTaurosLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaCombatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3973,7 +3973,7 @@ static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaBlazeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3991,7 +3991,7 @@ static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanAquaBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaAquaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -4505,7 +4505,7 @@ static const struct LevelUpMove sArticunoLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sArticunoGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sArticunoGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_SHIFT), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), @@ -4549,7 +4549,7 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZapdosGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZapdosGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE( 5, MOVE_ROCK_SMASH), @@ -4593,7 +4593,7 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMoltresGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMoltresGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_PAYBACK), @@ -4859,7 +4859,7 @@ static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sTyphlosionHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_EMBER), @@ -5712,7 +5712,7 @@ static const struct LevelUpMove sQuagsireLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sWooperPaldeanLevelUpLearnset[] = { +static const struct LevelUpMove sWooperPaldeaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_MUD_SHOT), LEVEL_UP_MOVE( 4, MOVE_TACKLE), @@ -6118,7 +6118,7 @@ static const struct LevelUpMove sQwilfishLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sQwilfishHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 5, MOVE_SPIKES), LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE), @@ -6246,7 +6246,7 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSneaselHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -6490,7 +6490,7 @@ static const struct LevelUpMove sCorsolaLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sCorsolaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sCorsolaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 5, MOVE_ASTONISH), @@ -7296,7 +7296,7 @@ static const struct LevelUpMove sLinooneLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZigzagoonGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_SAND_ATTACK), @@ -7314,7 +7314,7 @@ static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sLinooneGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO), @@ -10633,7 +10633,7 @@ static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -10656,7 +10656,7 @@ static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamTrashCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), @@ -12015,7 +12015,7 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSamurottHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_AQUA_JET), @@ -12953,7 +12953,7 @@ static const struct LevelUpMove sLilligantLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sLilligantHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 5, MOVE_LEAFAGE), @@ -13140,7 +13140,7 @@ static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarumakaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_TAUNT), @@ -13158,7 +13158,7 @@ static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDarmanitanGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarmanitanGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), @@ -13362,7 +13362,7 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sYamaskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sYamaskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 4, MOVE_HAZE), @@ -13596,7 +13596,7 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoruaHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -13607,7 +13607,7 @@ static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoroarkHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -14660,7 +14660,7 @@ static const struct LevelUpMove sStunfiskLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sStunfiskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), @@ -14937,7 +14937,7 @@ static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sBraviaryHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_AERIAL_ACE), LEVEL_UP_MOVE(11, MOVE_TWISTER), @@ -15926,7 +15926,7 @@ static const struct LevelUpMove sFloetteLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { +static const struct LevelUpMove sFloetteEternalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), LEVEL_UP_MOVE( 1, MOVE_FAIRY_WIND), @@ -16090,7 +16090,7 @@ static const struct LevelUpMove sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_HELPING_HAND), @@ -16117,7 +16117,7 @@ static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_ME_FIRST), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), @@ -16731,7 +16731,7 @@ static const struct LevelUpMove sGoodraLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSliggooHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -16743,7 +16743,7 @@ static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGoodraHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -16912,7 +16912,7 @@ static const struct LevelUpMove sAvaluggLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sAvaluggHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW), @@ -17214,7 +17214,7 @@ static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sDecidueyeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 6, MOVE_LEAFAGE), @@ -20226,7 +20226,7 @@ static const struct LevelUpMove sEiscueLevelUpLearnset[] = { #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_ENCORE), @@ -20243,7 +20243,7 @@ static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sIndeedeeFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_BATON_PASS), @@ -20571,7 +20571,7 @@ static const struct LevelUpMove sKubfuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuSingleStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -20593,7 +20593,7 @@ static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuRapidStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuRapidStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_AQUA_JET), @@ -20742,7 +20742,7 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { }; #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexIceLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GLACIAL_LANCE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -20778,7 +20778,7 @@ static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { #endif //P_FUSION_FORMS #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexShadowLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTRAL_BARRAGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -21029,7 +21029,7 @@ static const struct LevelUpMove sLechonkLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_DISARMING_VOICE), @@ -21048,7 +21048,7 @@ static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 3, MOVE_DISARMING_VOICE), diff --git a/src/data/pokemon/level_up_learnsets/gen_8.h b/src/data/pokemon/level_up_learnsets/gen_8.h index 4357fdf643..67d263c859 100644 --- a/src/data/pokemon/level_up_learnsets/gen_8.h +++ b/src/data/pokemon/level_up_learnsets/gen_8.h @@ -358,7 +358,7 @@ static const struct LevelUpMove sRaticateLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRattataAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK), @@ -375,7 +375,7 @@ static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaticateAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), @@ -553,7 +553,7 @@ static const struct LevelUpMove sRaichuLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaichuAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), @@ -626,7 +626,7 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandshrewAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 3, MOVE_MIST), @@ -647,7 +647,7 @@ static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandslashAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), @@ -893,7 +893,7 @@ static const struct LevelUpMove sNinetalesLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sVulpixAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 4, MOVE_DISABLE), @@ -913,7 +913,7 @@ static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sNinetalesAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_NASTY_PLOT), @@ -1271,7 +1271,7 @@ static const struct LevelUpMove sDugtrioLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDiglettAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), LEVEL_UP_MOVE( 4, MOVE_GROWL), @@ -1288,7 +1288,7 @@ static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDugtrioAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), @@ -1350,7 +1350,7 @@ static const struct LevelUpMove sPersianLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 4, MOVE_FEINT), @@ -1367,7 +1367,7 @@ static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sPersianAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_POWER_GEM), LEVEL_UP_MOVE( 1, MOVE_POWER_GEM), LEVEL_UP_MOVE( 1, MOVE_QUASH), @@ -1390,7 +1390,7 @@ static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const struct LevelUpMove sMeowthGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 4, MOVE_HONE_CLAWS), @@ -1591,7 +1591,7 @@ static const struct LevelUpMove sArcanineLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGrowlitheHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1603,7 +1603,7 @@ static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sArcanineHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_EMBER), LEVEL_UP_MOVE( 9, MOVE_BITE), @@ -1963,7 +1963,7 @@ static const struct LevelUpMove sGolemLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGeodudeAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 4, MOVE_CHARGE), @@ -1983,7 +1983,7 @@ static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGravelerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -2005,7 +2005,7 @@ static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGolemAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_HEAVY_SLAM), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), @@ -2072,7 +2072,7 @@ static const struct LevelUpMove sRapidashLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sPonytaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_TAIL_WHIP), @@ -2089,7 +2089,7 @@ static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRapidashGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sRapidashGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_MEGAHORN), @@ -2183,7 +2183,7 @@ static const struct LevelUpMove sSlowkingLevelUpLearnset[] = { #endif //P_GEN_2_CROSS_EVOS #if P_GALARIAN_FORMS -static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowpokeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CURSE), LEVEL_UP_MOVE( 3, MOVE_GROWL), @@ -2204,7 +2204,7 @@ static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowbroGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), @@ -2229,7 +2229,7 @@ static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { }; #if P_GEN_2_CROSS_EVOS -static const struct LevelUpMove sSlowkingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowkingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_POWER_GEM), @@ -2347,7 +2347,7 @@ static const struct LevelUpMove sFarfetchdLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sFarfetchdGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sFarfetchdGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 5, MOVE_LEER), @@ -2532,7 +2532,7 @@ static const struct LevelUpMove sMukLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGrimerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), LEVEL_UP_MOVE( 4, MOVE_HARDEN), @@ -2552,7 +2552,7 @@ static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMukAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_VENOM_DRENCH), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -2869,7 +2869,7 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sVoltorbHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2881,7 +2881,7 @@ static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sElectrodeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), LEVEL_UP_MOVE( 5, MOVE_TACKLE), LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), @@ -2938,7 +2938,7 @@ static const struct LevelUpMove sExeggutorLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sExeggutorAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_SEED_BOMB), @@ -3001,7 +3001,7 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMarowakAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHADOW_BONE), LEVEL_UP_MOVE( 1, MOVE_FALSE_SWIPE), LEVEL_UP_MOVE( 1, MOVE_HEADBUTT), @@ -3193,7 +3193,7 @@ static const struct LevelUpMove sWeezingLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sWeezingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sWeezingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_STRANGE_STEAM), @@ -3602,7 +3602,7 @@ static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMrMimeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COPYCAT), LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_ROLE_PLAY), @@ -3936,7 +3936,7 @@ static const struct LevelUpMove sTaurosLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaCombatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3954,7 +3954,7 @@ static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaBlazeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3972,7 +3972,7 @@ static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanAquaBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaAquaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -4555,7 +4555,7 @@ static const struct LevelUpMove sArticunoLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sArticunoGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sArticunoGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_SHIFT), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), @@ -4599,7 +4599,7 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZapdosGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZapdosGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE( 5, MOVE_ROCK_SMASH), @@ -4643,7 +4643,7 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMoltresGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMoltresGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_PAYBACK), @@ -4901,7 +4901,7 @@ static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sTyphlosionHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_EMBER), @@ -5737,7 +5737,7 @@ static const struct LevelUpMove sQuagsireLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sWooperPaldeanLevelUpLearnset[] = { +static const struct LevelUpMove sWooperPaldeaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_MUD_SHOT), LEVEL_UP_MOVE( 4, MOVE_TACKLE), @@ -6158,7 +6158,7 @@ static const struct LevelUpMove sQwilfishLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sQwilfishHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 5, MOVE_SPIKES), LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE), @@ -6273,7 +6273,7 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSneaselHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -6502,7 +6502,7 @@ static const struct LevelUpMove sCorsolaLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sCorsolaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sCorsolaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 5, MOVE_ASTONISH), @@ -7316,7 +7316,7 @@ static const struct LevelUpMove sLinooneLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZigzagoonGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_SAND_ATTACK), @@ -7334,7 +7334,7 @@ static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sLinooneGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO), @@ -10656,7 +10656,7 @@ static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -10679,7 +10679,7 @@ static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamTrashCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), @@ -12011,7 +12011,7 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSamurottHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 6, MOVE_AQUA_JET), @@ -12904,7 +12904,7 @@ static const struct LevelUpMove sLilligantLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sLilligantHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 5, MOVE_LEAFAGE), @@ -13074,7 +13074,7 @@ static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarumakaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_TAUNT), @@ -13092,7 +13092,7 @@ static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDarmanitanGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarmanitanGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), @@ -13284,7 +13284,7 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sYamaskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sYamaskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 4, MOVE_HAZE), @@ -13504,7 +13504,7 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoruaHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -13515,7 +13515,7 @@ static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoroarkHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), LEVEL_UP_MOVE( 6, MOVE_SNARL), LEVEL_UP_MOVE(11, MOVE_SWIFT), @@ -14490,7 +14490,7 @@ static const struct LevelUpMove sStunfiskLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sStunfiskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), @@ -14737,7 +14737,7 @@ static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sBraviaryHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), LEVEL_UP_MOVE( 6, MOVE_AERIAL_ACE), LEVEL_UP_MOVE(11, MOVE_TWISTER), @@ -15676,7 +15676,7 @@ static const struct LevelUpMove sFloetteLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { +static const struct LevelUpMove sFloetteEternalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), LEVEL_UP_MOVE( 1, MOVE_FAIRY_WIND), @@ -15833,7 +15833,7 @@ static const struct LevelUpMove sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), @@ -15856,7 +15856,7 @@ static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), @@ -16419,7 +16419,7 @@ static const struct LevelUpMove sGoodraLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSliggooHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -16431,7 +16431,7 @@ static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGoodraHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), @@ -16595,7 +16595,7 @@ static const struct LevelUpMove sAvaluggLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sAvaluggHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW), @@ -16885,7 +16885,7 @@ static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sDecidueyeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 6, MOVE_LEAFAGE), @@ -19797,7 +19797,7 @@ static const struct LevelUpMove sEiscueLevelUpLearnset[] = { #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_ENCORE), @@ -19814,7 +19814,7 @@ static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sIndeedeeFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_BATON_PASS), @@ -20142,7 +20142,7 @@ static const struct LevelUpMove sKubfuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuSingleStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -20164,7 +20164,7 @@ static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuRapidStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuRapidStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_AQUA_JET), @@ -20313,7 +20313,7 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { }; #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexIceLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GLACIAL_LANCE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -20349,7 +20349,7 @@ static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { #endif //P_FUSION_FORMS #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexShadowLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTRAL_BARRAGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -20600,7 +20600,7 @@ static const struct LevelUpMove sLechonkLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_DISARMING_VOICE), @@ -20619,7 +20619,7 @@ static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 3, MOVE_DISARMING_VOICE), diff --git a/src/data/pokemon/level_up_learnsets/gen_9.h b/src/data/pokemon/level_up_learnsets/gen_9.h index de35a1d36d..9f6985bc9a 100644 --- a/src/data/pokemon/level_up_learnsets/gen_9.h +++ b/src/data/pokemon/level_up_learnsets/gen_9.h @@ -354,7 +354,7 @@ static const struct LevelUpMove sRaticateLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRattataAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK), @@ -371,7 +371,7 @@ static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaticateAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE), LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE), @@ -545,7 +545,7 @@ static const struct LevelUpMove sRaichuLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sRaichuAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHIC), LEVEL_UP_MOVE( 1, MOVE_NUZZLE), LEVEL_UP_MOVE( 1, MOVE_ELECTRO_BALL), @@ -617,7 +617,7 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandshrewAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 3, MOVE_MIST), @@ -638,7 +638,7 @@ static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sSandslashAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_SPEAR), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_MIST), @@ -881,7 +881,7 @@ static const struct LevelUpMove sNinetalesLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sVulpixAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 4, MOVE_DISABLE), @@ -900,7 +900,7 @@ static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sNinetalesAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DAZZLING_GLEAM), LEVEL_UP_MOVE( 1, MOVE_DISABLE), LEVEL_UP_MOVE( 1, MOVE_MIST), @@ -1243,7 +1243,7 @@ static const struct LevelUpMove sDugtrioLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDiglettAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW), LEVEL_UP_MOVE( 4, MOVE_GROWL), @@ -1260,7 +1260,7 @@ static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sDugtrioAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SAND_TOMB), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 1, MOVE_GROWL), @@ -1320,7 +1320,7 @@ static const struct LevelUpMove sPersianLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 4, MOVE_FEINT), @@ -1337,7 +1337,7 @@ static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sPersianAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_POWER_GEM), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_GROWL), @@ -1359,7 +1359,7 @@ static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = { #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const struct LevelUpMove sMeowthGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMeowthGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), LEVEL_UP_MOVE( 4, MOVE_HONE_CLAWS), @@ -1549,7 +1549,7 @@ static const struct LevelUpMove sArcanineLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGrowlitheHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 4, MOVE_HOWL), @@ -1568,7 +1568,7 @@ static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sArcanineHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EXTREME_SPEED), LEVEL_UP_MOVE( 1, MOVE_FLAME_WHEEL), LEVEL_UP_MOVE( 1, MOVE_FIRE_FANG), @@ -1916,7 +1916,7 @@ static const struct LevelUpMove sGolemLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGeodudeAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 4, MOVE_CHARGE), @@ -1936,7 +1936,7 @@ static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGravelerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -1956,7 +1956,7 @@ static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGolemAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL), LEVEL_UP_MOVE( 1, MOVE_CHARGE), @@ -2019,7 +2019,7 @@ static const struct LevelUpMove sRapidashLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sPonytaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 5, MOVE_TAIL_WHIP), @@ -2036,7 +2036,7 @@ static const struct LevelUpMove sPonytaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sRapidashGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sRapidashGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_PSYCHO_CUT), LEVEL_UP_MOVE( 1, MOVE_MEGAHORN), @@ -2132,7 +2132,7 @@ static const struct LevelUpMove sSlowkingLevelUpLearnset[] = { #endif //P_GEN_2_CROSS_EVOS #if P_GALARIAN_FORMS -static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowpokeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CURSE), LEVEL_UP_MOVE( 3, MOVE_GROWL), @@ -2153,7 +2153,7 @@ static const struct LevelUpMove sSlowpokeGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowbroGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELL_SIDE_ARM), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), @@ -2177,7 +2177,7 @@ static const struct LevelUpMove sSlowbroGalarianLevelUpLearnset[] = { }; #if P_GEN_2_CROSS_EVOS -static const struct LevelUpMove sSlowkingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sSlowkingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EERIE_SPELL), LEVEL_UP_MOVE( 1, MOVE_TOXIC), LEVEL_UP_MOVE( 1, MOVE_FUTURE_SIGHT), @@ -2296,7 +2296,7 @@ static const struct LevelUpMove sFarfetchdLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sFarfetchdGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sFarfetchdGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK), LEVEL_UP_MOVE( 5, MOVE_LEER), @@ -2463,7 +2463,7 @@ static const struct LevelUpMove sMukLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sGrimerAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_POISON_GAS), LEVEL_UP_MOVE( 4, MOVE_HARDEN), @@ -2483,7 +2483,7 @@ static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMukAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POUND), LEVEL_UP_MOVE( 1, MOVE_BITE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), @@ -2785,7 +2785,7 @@ static const struct LevelUpMove sElectrodeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sVoltorbHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_CHARGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_THUNDER_SHOCK), @@ -2806,7 +2806,7 @@ static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sElectrodeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_CHLOROBLAST), LEVEL_UP_MOVE( 1, MOVE_CHARGE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -2872,7 +2872,7 @@ static const struct LevelUpMove sExeggutorLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sExeggutorAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGON_HAMMER), LEVEL_UP_MOVE( 1, MOVE_GROWTH), LEVEL_UP_MOVE( 1, MOVE_WOOD_HAMMER), @@ -2935,7 +2935,7 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = { }; #if P_ALOLAN_FORMS -static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = { +static const struct LevelUpMove sMarowakAlolaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHADOW_BONE), LEVEL_UP_MOVE( 1, MOVE_FALSE_SWIPE), LEVEL_UP_MOVE( 1, MOVE_HEADBUTT), @@ -3120,7 +3120,7 @@ static const struct LevelUpMove sWeezingLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sWeezingGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sWeezingGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DOUBLE_HIT), LEVEL_UP_MOVE( 1, MOVE_STRANGE_STEAM), LEVEL_UP_MOVE( 1, MOVE_DEFOG), @@ -3524,7 +3524,7 @@ static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMrMimeGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COPYCAT), LEVEL_UP_MOVE( 1, MOVE_ENCORE), LEVEL_UP_MOVE( 1, MOVE_ROLE_PLAY), @@ -3858,7 +3858,7 @@ static const struct LevelUpMove sTaurosLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaCombatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3876,7 +3876,7 @@ static const struct LevelUpMove sTaurosPaldeanCombatBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaBlazeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -3894,7 +3894,7 @@ static const struct LevelUpMove sTaurosPaldeanBlazeBreedLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sTaurosPaldeanAquaBreedLevelUpLearnset[] = { +static const struct LevelUpMove sTaurosPaldeaAquaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_WORK_UP), @@ -4466,7 +4466,7 @@ static const struct LevelUpMove sArticunoLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sArticunoGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sArticunoGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 5, MOVE_CONFUSION), LEVEL_UP_MOVE(10, MOVE_REFLECT), @@ -4509,7 +4509,7 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZapdosGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZapdosGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY), LEVEL_UP_MOVE( 5, MOVE_ROCK_SMASH), @@ -4553,7 +4553,7 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sMoltresGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sMoltresGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 5, MOVE_PAYBACK), @@ -4798,7 +4798,7 @@ static const struct LevelUpMove sTyphlosionLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sTyphlosionHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_INFERNAL_PARADE), LEVEL_UP_MOVE( 1, MOVE_GYRO_BALL), LEVEL_UP_MOVE( 1, MOVE_ERUPTION), @@ -5583,7 +5583,7 @@ static const struct LevelUpMove sQuagsireLevelUpLearnset[] = { }; #if P_PALDEAN_FORMS -static const struct LevelUpMove sWooperPaldeanLevelUpLearnset[] = { +static const struct LevelUpMove sWooperPaldeaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 1, MOVE_MUD_SHOT), LEVEL_UP_MOVE( 4, MOVE_TACKLE), @@ -5962,7 +5962,7 @@ static const struct LevelUpMove sQwilfishLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sQwilfishHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_POISON_STING), LEVEL_UP_MOVE( 4, MOVE_HARDEN), @@ -6091,7 +6091,7 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSneaselHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_ROCK_SMASH), @@ -6335,7 +6335,7 @@ static const struct LevelUpMove sCorsolaLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sCorsolaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sCorsolaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 5, MOVE_ASTONISH), @@ -7131,7 +7131,7 @@ static const struct LevelUpMove sLinooneLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sZigzagoonGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 3, MOVE_SAND_ATTACK), @@ -7149,7 +7149,7 @@ static const struct LevelUpMove sZigzagoonGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sLinooneGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sLinooneGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH), LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO), @@ -10314,7 +10314,7 @@ static const struct LevelUpMove sWormadamPlantCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamSandyLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -10337,7 +10337,7 @@ static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sWormadamTrashCloakLevelUpLearnset[] = { +static const struct LevelUpMove sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_METAL_BURST), @@ -11663,7 +11663,7 @@ static const struct LevelUpMove sSamurottLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSamurottHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_CEASELESS_EDGE), LEVEL_UP_MOVE( 1, MOVE_SLASH), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -12555,7 +12555,7 @@ static const struct LevelUpMove sLilligantLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sLilligantHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_VICTORY_DANCE), LEVEL_UP_MOVE( 1, MOVE_TEETER_DANCE), LEVEL_UP_MOVE( 1, MOVE_SOLAR_BLADE), @@ -12750,7 +12750,7 @@ static const struct LevelUpMove sDarmanitanLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarumakaGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 4, MOVE_TAUNT), @@ -12768,7 +12768,7 @@ static const struct LevelUpMove sDarumakaGalarianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sDarmanitanGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sDarmanitanGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), @@ -12960,7 +12960,7 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sYamaskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sYamaskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_PROTECT), LEVEL_UP_MOVE( 4, MOVE_HAZE), @@ -13178,7 +13178,7 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoruaHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 4, MOVE_TORMENT), @@ -13195,7 +13195,7 @@ static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sZoroarkHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHADOW_CLAW), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_LEER), @@ -14149,7 +14149,7 @@ static const struct LevelUpMove sStunfiskLevelUpLearnset[] = { }; #if P_GALARIAN_FORMS -static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { +static const struct LevelUpMove sStunfiskGalarLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MUD_SLAP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), @@ -14394,7 +14394,7 @@ static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sBraviaryHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ESPER_WING), LEVEL_UP_MOVE( 1, MOVE_HONE_CLAWS), LEVEL_UP_MOVE( 1, MOVE_SKY_ATTACK), @@ -15301,7 +15301,7 @@ static const struct LevelUpMove sFloetteLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sFloetteEternalFlowerLevelUpLearnset[] = { +static const struct LevelUpMove sFloetteEternalLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_VINE_WHIP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_FAIRY_WIND), @@ -15454,7 +15454,7 @@ static const struct LevelUpMove sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MEAN_LOOK), LEVEL_UP_MOVE( 1, MOVE_DISARMING_VOICE), LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), @@ -15477,7 +15477,7 @@ static const struct LevelUpMove sMeowsticMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMeowsticFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sMeowsticFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), LEVEL_UP_MOVE( 1, MOVE_DISARMING_VOICE), LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT), @@ -16038,7 +16038,7 @@ static const struct LevelUpMove sGoodraLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sSliggooHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELTER), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), @@ -16056,7 +16056,7 @@ static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sGoodraHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_IRON_TAIL), LEVEL_UP_MOVE( 1, MOVE_SHELTER), LEVEL_UP_MOVE( 1, MOVE_ACID_SPRAY), @@ -16228,7 +16228,7 @@ static const struct LevelUpMove sAvaluggLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sAvaluggHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW), LEVEL_UP_MOVE( 1, MOVE_RAPID_SPIN), @@ -16521,7 +16521,7 @@ static const struct LevelUpMove sDecidueyeLevelUpLearnset[] = { }; #if P_HISUIAN_FORMS -static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { +static const struct LevelUpMove sDecidueyeHisuiLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_TRIPLE_ARROWS), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), @@ -19368,7 +19368,7 @@ static const struct LevelUpMove sEiscueLevelUpLearnset[] = { #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_ENCORE), @@ -19385,7 +19385,7 @@ static const struct LevelUpMove sIndeedeeMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sIndeedeeFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sIndeedeeFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_STORED_POWER), LEVEL_UP_MOVE( 1, MOVE_PLAY_NICE), LEVEL_UP_MOVE( 5, MOVE_BATON_PASS), @@ -19707,7 +19707,7 @@ static const struct LevelUpMove sKubfuLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuSingleStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WICKED_BLOW), LEVEL_UP_MOVE( 1, MOVE_ENDURE), LEVEL_UP_MOVE( 1, MOVE_SUCKER_PUNCH), @@ -19728,7 +19728,7 @@ static const struct LevelUpMove sUrshifuSingleStrikeStyleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUrshifuRapidStrikeStyleLevelUpLearnset[] = { +static const struct LevelUpMove sUrshifuRapidStrikeLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SURGING_STRIKES), LEVEL_UP_MOVE( 1, MOVE_ENDURE), LEVEL_UP_MOVE( 1, MOVE_AQUA_JET), @@ -19876,7 +19876,7 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { }; #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexIceLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GLACIAL_LANCE), LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH), LEVEL_UP_MOVE( 1, MOVE_AVALANCHE), @@ -19913,7 +19913,7 @@ static const struct LevelUpMove sCalyrexIceRiderLevelUpLearnset[] = { #endif //P_FUSION_FORMS #if P_FUSION_FORMS -static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = { +static const struct LevelUpMove sCalyrexShadowLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTRAL_BARRAGE), LEVEL_UP_MOVE( 1, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_NASTY_PLOT), @@ -20173,7 +20173,7 @@ static const struct LevelUpMove sLechonkLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneMLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 5, MOVE_DISARMING_VOICE), @@ -20192,7 +20192,7 @@ static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sOinkologneFemaleLevelUpLearnset[] = { +static const struct LevelUpMove sOinkologneFLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), LEVEL_UP_MOVE( 3, MOVE_DISARMING_VOICE), diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index 9cbca9ba63..1b0b32c63c 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -1058,11 +1058,11 @@ const u16 gPokedexOrder_Weight[] = // 0.0 - 21.8 lbs / 0.0 - 9.9 kg NATIONAL_DEX_GASTLY, NATIONAL_DEX_HAUNTER, - NATIONAL_DEX_FLABEBE,//_RED_FLOWER, - //NATIONAL_DEX_FLABEBE_YELLOW_FLOWER, - //NATIONAL_DEX_FLABEBE_ORANGE_FLOWER, - //NATIONAL_DEX_FLABEBE_BLUE_FLOWER, - //NATIONAL_DEX_FLABEBE_WHITE_FLOWER, + NATIONAL_DEX_FLABEBE,//_RED, + //NATIONAL_DEX_FLABEBE_YELLOW, + //NATIONAL_DEX_FLABEBE_ORANGE, + //NATIONAL_DEX_FLABEBE_BLUE, + //NATIONAL_DEX_FLABEBE_WHITE, NATIONAL_DEX_COSMOG, NATIONAL_DEX_KARTANA, //NATIONAL_DEX_GIMMIGHOUL_ROAMING, @@ -1114,14 +1114,14 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_CASTFORM_RAINY, //NATIONAL_DEX_CASTFORM_SNOWY, // 2.0 lbs / 0.9 kg - NATIONAL_DEX_FLOETTE,//_RED_FLOWER, - //NATIONAL_DEX_FLOETTE_YELLOW_FLOWER, - //NATIONAL_DEX_FLOETTE_ORANGE_FLOWER, - //NATIONAL_DEX_FLOETTE_BLUE_FLOWER, - //NATIONAL_DEX_FLOETTE_WHITE_FLOWER, - //NATIONAL_DEX_FLOETTE_ETERNAL_FLOWER, + NATIONAL_DEX_FLOETTE,//_RED, + //NATIONAL_DEX_FLOETTE_YELLOW, + //NATIONAL_DEX_FLOETTE_ORANGE, + //NATIONAL_DEX_FLOETTE_BLUE, + //NATIONAL_DEX_FLOETTE_WHITE, + //NATIONAL_DEX_FLOETTE_ETERNAL, // 2.2 lbs / 1.0 kg - //NATIONAL_DEX_DIGLETT_ALOLAN, + //NATIONAL_DEX_DIGLETT_ALOLA, NATIONAL_DEX_KOFFING, NATIONAL_DEX_IGGLYBUFF, NATIONAL_DEX_SKIPLOOM, @@ -1191,7 +1191,7 @@ const u16 gPokedexOrder_Weight[] = // 5.1 lbs / 2.3 kg NATIONAL_DEX_TAILLOW, NATIONAL_DEX_SHUPPET, - NATIONAL_DEX_MAUSHOLD,//_FAMILY_OF_THREE, + NATIONAL_DEX_MAUSHOLD,//_THREE, // 5.3 lbs / 2.4 kg NATIONAL_DEX_SQUAWKABILLY,//_GREEN_PLUMAGE, //NATIONAL_DEX_SQUAWKABILLY_BLUE_PLUMAGE, @@ -1210,7 +1210,7 @@ const u16 gPokedexOrder_Weight[] = // 6.2 lbs / 2.8 kg NATIONAL_DEX_GOOMY, //NATIONAL_DEX_MIMIKYU_TOTEM_SIZED, - //NATIONAL_DEX_MAUSHOLD_FAMILY_OF_FOUR, + //NATIONAL_DEX_MAUSHOLD_FOUR, // 6.4 lbs / 2.9 kg NATIONAL_DEX_CATERPIE, // 6.6 lbs / 3.0 kg @@ -1233,7 +1233,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_TOGEDEMARU, // 7.5 lbs / 3.4 kg NATIONAL_DEX_BURMY,//_PLANT_CLOAK, - //NATIONAL_DEX_BURMY_SANDY_CLOAK, + //NATIONAL_DEX_BURMY_SANDY, //NATIONAL_DEX_BURMY_TRASH_CLOAK, NATIONAL_DEX_ORICORIO,//_BAILE, //NATIONAL_DEX_ORICORIO_POM_POM, @@ -1252,7 +1252,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_MASQUERAIN, NATIONAL_DEX_WATTREL, // 8.4 lbs / 3.8 kg - //NATIONAL_DEX_RATTATA_ALOLAN, + //NATIONAL_DEX_RATTATA_ALOLA, NATIONAL_DEX_SNOM, // 8.6 lbs / 3.9 kg NATIONAL_DEX_QWILFISH, @@ -1275,7 +1275,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_SPRIGATITO, // 9.3 lbs / 4.2 kg NATIONAL_DEX_MEOWTH, - //NATIONAL_DEX_MEOWTH_ALOLAN, + //NATIONAL_DEX_MEOWTH_ALOLA, NATIONAL_DEX_PLUSLE, NATIONAL_DEX_MINUN, // 9.5 lbs / 4.3 kg @@ -1374,7 +1374,7 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_PIKACHU_UNOVA, //NATIONAL_DEX_PIKACHU_KALOS, //NATIONAL_DEX_PIKACHU_ALOLA, - //NATIONAL_DEX_PIKACHU_PARTNER_CAP, + //NATIONAL_DEX_PIKACHU_PARTNER, //NATIONAL_DEX_PIKACHU_WORLD, NATIONAL_DEX_MAGNEMITE, NATIONAL_DEX_SENTRET, @@ -1390,7 +1390,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_CHIMCHAR, // 13.9 lbs / 6.3 kg NATIONAL_DEX_SHELLOS,//_WEST_SEA, - //NATIONAL_DEX_SHELLOS_EAST_SEA, + //NATIONAL_DEX_SHELLOS_EAST, // 14.1 lbs / 6.4 kg NATIONAL_DEX_WEEPINBELL, NATIONAL_DEX_CHIKORITA, @@ -1400,8 +1400,8 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_EEVEE, NATIONAL_DEX_SWINUB, NATIONAL_DEX_WORMADAM,//_PLANT_CLOAK, - //NATIONAL_DEX_WORMADAM_SANDY_CLOAK, - //NATIONAL_DEX_WORMADAM_TRASH_CLOAK, + //NATIONAL_DEX_WORMADAM_SANDY, + //NATIONAL_DEX_WORMADAM_TRASH, NATIONAL_DEX_MELOETTA,//_ARIA, //NATIONAL_DEX_MELOETTA_PIROUETTE, NATIONAL_DEX_PAWMO, @@ -1478,7 +1478,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_DRILBUR, NATIONAL_DEX_CUBCHOO, NATIONAL_DEX_MEOWSTIC,//_MALE, - //NATIONAL_DEX_MEOWSTIC_FEMALE, + //NATIONAL_DEX_MEOWSTIC_F, NATIONAL_DEX_CHEWTLE, // 19.0 lbs / 8.6 kg NATIONAL_DEX_GLOOM, @@ -1519,17 +1519,17 @@ const u16 gPokedexOrder_Weight[] = // 21.8 lbs / 9.9 kg NATIONAL_DEX_METAPOD, NATIONAL_DEX_VULPIX, - //NATIONAL_DEX_VULPIX_ALOLAN, + //NATIONAL_DEX_VULPIX_ALOLA, NATIONAL_DEX_TEPIG, // 22.0 lbs / 10.0 kg NATIONAL_DEX_KAKUNA, NATIONAL_DEX_MAGIKARP, NATIONAL_DEX_SILCOON, - NATIONAL_DEX_FLORGES,//_RED_FLOWER, - //NATIONAL_DEX_FLORGES_YELLOW_FLOWER, - //NATIONAL_DEX_FLORGES_ORANGE_FLOWER, - //NATIONAL_DEX_FLORGES_BLUE_FLOWER, - //NATIONAL_DEX_FLORGES_WHITE_FLOWER, + NATIONAL_DEX_FLORGES,//_RED, + //NATIONAL_DEX_FLORGES_YELLOW, + //NATIONAL_DEX_FLORGES_ORANGE, + //NATIONAL_DEX_FLORGES_BLUE, + //NATIONAL_DEX_FLORGES_WHITE, // 22.3 lbs / 10.1 kg NATIONAL_DEX_PURRLOIN, // 22.5 lbs / 10.2 kg @@ -1756,7 +1756,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_SWELLOW, // 43.9 lbs / 19.9 kg NATIONAL_DEX_NINETALES, - //NATIONAL_DEX_NINETALES_ALOLAN, + //NATIONAL_DEX_NINETALES_ALOLA, NATIONAL_DEX_KOMALA, NATIONAL_DEX_THIEVUL, // 44.1 lbs / 20.0 kg @@ -1771,7 +1771,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_KIRLIA, NATIONAL_DEX_RIOLU, // 44.8 lbs / 20.3 kg - //NATIONAL_DEX_GEODUDE_ALOLAN, + //NATIONAL_DEX_GEODUDE_ALOLA, NATIONAL_DEX_AMBIPOM, // 45.2 lbs / 20.5 kg NATIONAL_DEX_SHUCKLE, @@ -1788,7 +1788,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_TYROGUE, NATIONAL_DEX_KLINK, NATIONAL_DEX_HELIOLISK, - //NATIONAL_DEX_RAICHU_ALOLAN, + //NATIONAL_DEX_RAICHU_ALOLA, NATIONAL_DEX_BRUTE_BONNET, // 46.7 lbs / 21.2 kg NATIONAL_DEX_HOOTHOOT, @@ -1863,7 +1863,7 @@ const u16 gPokedexOrder_Weight[] = // 56.2 lbs / 25.5 kg NATIONAL_DEX_KRICKETUNE, NATIONAL_DEX_LEAFEON, - //NATIONAL_DEX_RATICATE_ALOLAN, + //NATIONAL_DEX_RATICATE_ALOLA, // 57.1 lbs / 25.5 kg NATIONAL_DEX_GLACEON, // 57.3 lbs / 26.0 kg @@ -1932,7 +1932,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_BLITZLE, // 65.9 lbs / 29.9 kg NATIONAL_DEX_GASTRODON,//_WEST_SEA, - //NATIONAL_DEX_GASTRODON_EAST_SEA, + //NATIONAL_DEX_GASTRODON_EAST, // 66.1 lbs / 30.0 kg NATIONAL_DEX_PIDGEOTTO, NATIONAL_DEX_RAICHU, @@ -1993,7 +1993,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_FRILLISH, NATIONAL_DEX_DURANT, NATIONAL_DEX_CINDERACE, - //NATIONAL_DEX_PERSIAN_ALOLAN, + //NATIONAL_DEX_PERSIAN_ALOLA, NATIONAL_DEX_TOEDSCOOL, // 73.4 lbs / 33.3 kg NATIONAL_DEX_DUGTRIO, @@ -2009,7 +2009,7 @@ const u16 gPokedexOrder_Weight[] = // 74.7 lbs / 33.9 kg NATIONAL_DEX_POLITOED, // 75.0 lbs / 34.0 kg - //NATIONAL_DEX_MAROWAK_ALOLAN, + //NATIONAL_DEX_MAROWAK_ALOLA, NATIONAL_DEX_WEAVILE, NATIONAL_DEX_PORYGON_Z, NATIONAL_DEX_BOLTUND, @@ -2076,7 +2076,7 @@ const u16 gPokedexOrder_Weight[] = // 87.7 lbs / 39.8 kg NATIONAL_DEX_OGERPON, // 88.2 lbs / 40.0 kg - //NATIONAL_DEX_SANDSHREW_ALOLAN, + //NATIONAL_DEX_SANDSHREW_ALOLA, NATIONAL_DEX_CLEFABLE, NATIONAL_DEX_LATIAS, NATIONAL_DEX_GURDURR, @@ -2118,7 +2118,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_GIRAFARIG, // 92.6 lbs / 42.0 kg //NATIONAL_DEX_FARFETCHD_GALARIAN, - //NATIONAL_DEX_GRIMER_ALOLAN, + //NATIONAL_DEX_GRIMER_ALOLA, NATIONAL_DEX_LUXRAY, NATIONAL_DEX_FROSMOTH, // 92.8 lbs / 42.1 kg @@ -2210,7 +2210,7 @@ const u16 gPokedexOrder_Weight[] = // 113.5 lbs / 51.5 kg NATIONAL_DEX_YANMEGA, // 114.6 lbs / 52.0 kg - //NATIONAL_DEX_MUK_ALOLAN, + //NATIONAL_DEX_MUK_ALOLA, NATIONAL_DEX_BLAZIKEN, //NATIONAL_DEX_LATIAS_MEGA, NATIONAL_DEX_GALLADE, @@ -2225,7 +2225,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_AEGISLASH,//_SHIELD, //NATIONAL_DEX_AEGISLASH_BLADE, // 118.2 lbs / 53.6 kg - //NATIONAL_DEX_CALYREX_SHADOW_RIDER, + //NATIONAL_DEX_CALYREX_SHADOW, // 119.0 lbs / 54.0 kg NATIONAL_DEX_POLIWRATH, NATIONAL_DEX_HERACROSS, @@ -2233,7 +2233,7 @@ const u16 gPokedexOrder_Weight[] = // 120.2 lbs / 54.5 kg NATIONAL_DEX_MR_MIME, // 121.3 lbs / 55.0 kg - //NATIONAL_DEX_SANDSLASH_ALOLAN, + //NATIONAL_DEX_SANDSLASH_ALOLA, NATIONAL_DEX_GOLBAT, NATIONAL_DEX_TENTACRUEL, NATIONAL_DEX_PINSIR, @@ -2343,7 +2343,7 @@ const u16 gPokedexOrder_Weight[] = // 146.8 lbs / 66.6 kg NATIONAL_DEX_ELECTRODE, NATIONAL_DEX_RUNERIGUS, - //NATIONAL_DEX_DUGTRIO_ALOLAN, + //NATIONAL_DEX_DUGTRIO_ALOLA, // 149.9 lbs / 68.0 kg NATIONAL_DEX_MAGMORTAR, NATIONAL_DEX_LANDORUS,//_INCARNATE, @@ -2512,7 +2512,7 @@ const u16 gPokedexOrder_Weight[] = // 214.7 lbs / 97.4 kg //NATIONAL_DEX_PALAFIN_HERO, // 216.1 lbs / 98.0 kg - //NATIONAL_DEX_MAROWAK_ALOLAN_TOTEM_SIZED, + //NATIONAL_DEX_MAROWAK_ALOLA_TOTEM_SIZED, // 219.4 lbs / 99.5 kg NATIONAL_DEX_BERGMITE, // 220.5 lbs / 100.0 kg @@ -2554,9 +2554,9 @@ const u16 gPokedexOrder_Weight[] = // 231.5 lbs / 105.0 kg NATIONAL_DEX_GRAVELER, NATIONAL_DEX_MUNCHLAX, - //NATIONAL_DEX_RATICATE_ALOLAN_TOTEM_SIZED, - NATIONAL_DEX_URSHIFU,//_SINGLE_STRIKE_STYLE, - //NATIONAL_DEX_URSHIFU_RAPID_STRIKE_STYLE, + //NATIONAL_DEX_RATICATE_ALOLA_TOTEM_SIZED, + NATIONAL_DEX_URSHIFU,//_SINGLE_STRIKE, + //NATIONAL_DEX_URSHIFU_RAPID_STRIKE, NATIONAL_DEX_NACLSTACK, // 232.6 lbs / 105.5 kg NATIONAL_DEX_HAXORUS, @@ -2569,11 +2569,11 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_SPIRITOMB, NATIONAL_DEX_GOLISOPOD, // 242.5 lbs / 110.0 kg - //NATIONAL_DEX_GRAVELER_ALOLAN, + //NATIONAL_DEX_GRAVELER_ALOLA, //NATIONAL_DEX_TAUROS_PALDEAN_AQUA_BREED, NATIONAL_DEX_FERROTHORN, NATIONAL_DEX_MUDBRAY, - NATIONAL_DEX_ZACIAN,//_HERO_OF_MANY_BATTLES, + NATIONAL_DEX_ZACIAN,//_HERO, NATIONAL_DEX_BASCULEGION,//_MALE, //NATIONAL_DEX_BASCULEGION_FEMALE, // 243.6 lbs / 110.5 kg @@ -2732,7 +2732,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_ONIX, NATIONAL_DEX_DRAGONITE, NATIONAL_DEX_DHELMISE, - NATIONAL_DEX_ZAMAZENTA,//_HERO_OF_MANY_BATTLES, + NATIONAL_DEX_ZAMAZENTA,//_HERO, NATIONAL_DEX_BAXCALIBUR, // 467.4 lbs / 212.0 kg NATIONAL_DEX_TURTONATOR, @@ -2805,7 +2805,7 @@ const u16 gPokedexOrder_Weight[] = // 684.5 lbs / 310.5 kg NATIONAL_DEX_COALOSSAL, // 696.7 lbs / 316.0 kg - //NATIONAL_DEX_GOLEM_ALOLAN, + //NATIONAL_DEX_GOLEM_ALOLA, // 705.4 lbs / 320.0 kg NATIONAL_DEX_ARCEUS,//_NORMAL, //NATIONAL_DEX_ARCEUS_FIGHTING, @@ -2869,7 +2869,7 @@ const u16 gPokedexOrder_Weight[] = // 881.8 lbs / 400.0 kg NATIONAL_DEX_STEELIX, // 916.2 lbs / 415.6 kg - //NATIONAL_DEX_EXEGGUTOR_ALOLAN, + //NATIONAL_DEX_EXEGGUTOR_ALOLA, // 925.9 lbs / 420.0 kg NATIONAL_DEX_REGIGIGAS, // 948.0 lbs / 430.0 kg @@ -2913,7 +2913,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_MELMETAL, NATIONAL_DEX_GLASTRIER, // 1783.8 lbs / 809.1 kg - //NATIONAL_DEX_CALYREX_ICE_RIDER, + //NATIONAL_DEX_CALYREX_ICE, // 1807.8 lbs / 820.0 kg NATIONAL_DEX_STAKATAKA, // 1871.0 lbs / 848.7 kg @@ -2938,11 +2938,11 @@ const u16 gPokedexOrder_Height[] = { // 0'04" / 0.1m NATIONAL_DEX_JOLTIK, - NATIONAL_DEX_FLABEBE,//_RED_FLOWER, - //NATIONAL_DEX_FLABEBE_YELLOW_FLOWER, - //NATIONAL_DEX_FLABEBE_ORANGE_FLOWER, - //NATIONAL_DEX_FLABEBE_BLUE_FLOWER, - //NATIONAL_DEX_FLABEBE_WHITE_FLOWER, + NATIONAL_DEX_FLABEBE,//_RED, + //NATIONAL_DEX_FLABEBE_YELLOW, + //NATIONAL_DEX_FLABEBE_ORANGE, + //NATIONAL_DEX_FLABEBE_BLUE, + //NATIONAL_DEX_FLABEBE_WHITE, NATIONAL_DEX_CUTIEFLY, NATIONAL_DEX_COMFEY, NATIONAL_DEX_COSMOEM, @@ -2952,23 +2952,23 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_POLTCHAGEIST, // 0'08" / 0.2m NATIONAL_DEX_DIGLETT, - //NATIONAL_DEX_DIGLETT_ALOLAN, + //NATIONAL_DEX_DIGLETT_ALOLA, NATIONAL_DEX_NATU, NATIONAL_DEX_AZURILL, NATIONAL_DEX_BUDEW, NATIONAL_DEX_BURMY,//_PLANT_CLOAK, - //NATIONAL_DEX_BURMY_SANDY_CLOAK, + //NATIONAL_DEX_BURMY_SANDY, //NATIONAL_DEX_BURMY_TRASH_CLOAK, NATIONAL_DEX_CHINGLING, NATIONAL_DEX_SHAYMIN,//_LAND, NATIONAL_DEX_FOONGUS, NATIONAL_DEX_TYNAMO, - NATIONAL_DEX_FLOETTE,//_RED_FLOWER, - //NATIONAL_DEX_FLOETTE_YELLOW_FLOWER, - //NATIONAL_DEX_FLOETTE_ORANGE_FLOWER, - //NATIONAL_DEX_FLOETTE_BLUE_FLOWER, - //NATIONAL_DEX_FLOETTE_WHITE_FLOWER, - //NATIONAL_DEX_FLOETTE_ETERNAL_FLOWER, + NATIONAL_DEX_FLOETTE,//_RED, + //NATIONAL_DEX_FLOETTE_YELLOW, + //NATIONAL_DEX_FLOETTE_ORANGE, + //NATIONAL_DEX_FLOETTE_BLUE, + //NATIONAL_DEX_FLOETTE_WHITE, + //NATIONAL_DEX_FLOETTE_ETERNAL, NATIONAL_DEX_SPRITZEE, NATIONAL_DEX_DEDENNE, NATIONAL_DEX_KLEFKI, @@ -2994,7 +2994,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_WEEDLE, NATIONAL_DEX_PIDGEY, NATIONAL_DEX_RATTATA, - //NATIONAL_DEX_RATTATA_ALOLAN, + //NATIONAL_DEX_RATTATA_ALOLA, NATIONAL_DEX_SPEAROW, NATIONAL_DEX_PARAS, NATIONAL_DEX_MAGNEMITE, @@ -3018,7 +3018,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_KRICKETOT, NATIONAL_DEX_COMBEE, NATIONAL_DEX_SHELLOS,//_WEST_SEA, - //NATIONAL_DEX_SHELLOS_EAST_SEA, + //NATIONAL_DEX_SHELLOS_EAST, NATIONAL_DEX_ROTOM, NATIONAL_DEX_UXIE, NATIONAL_DEX_MESPRIT, @@ -3066,10 +3066,10 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_PIKACHU, NATIONAL_DEX_NIDORAN_F, NATIONAL_DEX_MEOWTH, - //NATIONAL_DEX_MEOWTH_ALOLAN, + //NATIONAL_DEX_MEOWTH_ALOLA, //NATIONAL_DEX_MEOWTH_GALARIAN, NATIONAL_DEX_GEODUDE, - //NATIONAL_DEX_GEODUDE_ALOLAN, + //NATIONAL_DEX_GEODUDE_ALOLA, NATIONAL_DEX_KRABBY, NATIONAL_DEX_EXEGGCUTE, NATIONAL_DEX_CUBONE, @@ -3225,8 +3225,8 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_SHINX, NATIONAL_DEX_SHIELDON, NATIONAL_DEX_WORMADAM,//_PLANT_CLOAK, - //NATIONAL_DEX_WORMADAM_SANDY_CLOAK, - //NATIONAL_DEX_WORMADAM_TRASH_CLOAK, + //NATIONAL_DEX_WORMADAM_SANDY, + //NATIONAL_DEX_WORMADAM_TRASH, NATIONAL_DEX_CHERRIM,//_OVERCAST, //NATIONAL_DEX_CHERRIM_SUNSHINE, NATIONAL_DEX_GLAMEOW, @@ -3275,7 +3275,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_SANDSHREW, NATIONAL_DEX_CLEFAIRY, NATIONAL_DEX_VULPIX, - //NATIONAL_DEX_VULPIX_ALOLAN, + //NATIONAL_DEX_VULPIX_ALOLA, NATIONAL_DEX_POLIWAG, NATIONAL_DEX_KOFFING, NATIONAL_DEX_GOLDEEN, @@ -3343,7 +3343,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_LITLEO, NATIONAL_DEX_PANCHAM, NATIONAL_DEX_MEOWSTIC,//_MALE, - //NATIONAL_DEX_MEOWSTIC_FEMALE, + //NATIONAL_DEX_MEOWSTIC_F, NATIONAL_DEX_BRIONNE, NATIONAL_DEX_TRUMBEAK, NATIONAL_DEX_CRABRAWLER, @@ -3376,14 +3376,14 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_BULBASAUR, NATIONAL_DEX_METAPOD, NATIONAL_DEX_RATICATE, - //NATIONAL_DEX_RATICATE_ALOLAN, - //NATIONAL_DEX_RAICHU_ALOLAN, - //NATIONAL_DEX_SANDSHREW_ALOLAN, + //NATIONAL_DEX_RATICATE_ALOLA, + //NATIONAL_DEX_RAICHU_ALOLA, + //NATIONAL_DEX_SANDSHREW_ALOLA, NATIONAL_DEX_DUGTRIO, - //NATIONAL_DEX_DUGTRIO_ALOLAN, + //NATIONAL_DEX_DUGTRIO_ALOLA, NATIONAL_DEX_GROWLITHE, NATIONAL_DEX_BELLSPROUT, - //NATIONAL_DEX_GRIMER_ALOLAN, + //NATIONAL_DEX_GRIMER_ALOLA, NATIONAL_DEX_HOOTHOOT, NATIONAL_DEX_MISDREAVUS, NATIONAL_DEX_SLUGMA, @@ -3510,7 +3510,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_CRANIDOS, NATIONAL_DEX_MOTHIM, NATIONAL_DEX_GASTRODON,//_WEST_SEA, - //NATIONAL_DEX_GASTRODON_EAST_SEA, + //NATIONAL_DEX_GASTRODON_EAST, NATIONAL_DEX_MISMAGIUS, NATIONAL_DEX_HONCHKROW, NATIONAL_DEX_PORYGON_Z, @@ -3542,13 +3542,13 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_POLIWHIRL, NATIONAL_DEX_WEEPINBELL, NATIONAL_DEX_GRAVELER, - //NATIONAL_DEX_GRAVELER_ALOLAN, + //NATIONAL_DEX_GRAVELER_ALOLA, NATIONAL_DEX_PONYTA, NATIONAL_DEX_MAGNETON, - //NATIONAL_DEX_MUK_ALOLAN, + //NATIONAL_DEX_MUK_ALOLA, NATIONAL_DEX_DROWZEE, NATIONAL_DEX_MAROWAK, - //NATIONAL_DEX_MAROWAK_ALOLAN, + //NATIONAL_DEX_MAROWAK_ALOLA, NATIONAL_DEX_RHYHORN, NATIONAL_DEX_TANGELA, NATIONAL_DEX_VAPOREON, @@ -3613,8 +3613,8 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_BUTTERFREE, NATIONAL_DEX_PIDGEOTTO, NATIONAL_DEX_NINETALES, - //NATIONAL_DEX_NINETALES_ALOLAN, - //NATIONAL_DEX_PERSIAN_ALOLAN, + //NATIONAL_DEX_NINETALES_ALOLA, + //NATIONAL_DEX_PERSIAN_ALOLA, NATIONAL_DEX_SEEL, NATIONAL_DEX_CHANSEY, NATIONAL_DEX_STARMIE, @@ -3646,11 +3646,11 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_VANILLISH, NATIONAL_DEX_CRYOGONAL, NATIONAL_DEX_LARVESTA, - NATIONAL_DEX_FLORGES,//_RED_FLOWER, - //NATIONAL_DEX_FLORGES_YELLOW_FLOWER, - //NATIONAL_DEX_FLORGES_ORANGE_FLOWER, - //NATIONAL_DEX_FLORGES_BLUE_FLOWER, - //NATIONAL_DEX_FLORGES_WHITE_FLOWER, + NATIONAL_DEX_FLORGES,//_RED, + //NATIONAL_DEX_FLORGES_YELLOW, + //NATIONAL_DEX_FLORGES_ORANGE, + //NATIONAL_DEX_FLORGES_BLUE, + //NATIONAL_DEX_FLORGES_WHITE, //NATIONAL_DEX_GOURGEIST_LARGE, //NATIONAL_DEX_DIANCIE_MEGA, NATIONAL_DEX_TOUCANNON, @@ -3660,7 +3660,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_MABOSSTIFF, // 3'11" / 1.2m NATIONAL_DEX_FEAROW, - //NATIONAL_DEX_SANDSLASH_ALOLAN, + //NATIONAL_DEX_SANDSLASH_ALOLA, NATIONAL_DEX_VILEPLUME, //NATIONAL_DEX_ALAKAZAM_MEGA, NATIONAL_DEX_SLOWPOKE, @@ -3787,7 +3787,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_IRON_JUGULIS, // 4'07" / 1.4m //NATIONAL_DEX_BEEDRILL_MEGA, - //NATIONAL_DEX_RATICATE_ALOLAN_TOTEM_SIZED, + //NATIONAL_DEX_RATICATE_ALOLA_TOTEM_SIZED, NATIONAL_DEX_NIDOKING, NATIONAL_DEX_GOLEM, NATIONAL_DEX_DODUO, @@ -3952,11 +3952,11 @@ const u16 gPokedexOrder_Height[] = //NATIONAL_DEX_CHARIZARD_MEGA_Y, NATIONAL_DEX_GOLDUCK, NATIONAL_DEX_VICTREEBEL, - //NATIONAL_DEX_GOLEM_ALOLAN, + //NATIONAL_DEX_GOLEM_ALOLA, NATIONAL_DEX_RAPIDASH, //NATIONAL_DEX_RAPIDASH_GALARIAN, NATIONAL_DEX_DEWGONG, - //NATIONAL_DEX_MAROWAK_ALOLAN_TOTEM_SIZED, + //NATIONAL_DEX_MAROWAK_ALOLA_TOTEM_SIZED, //NATIONAL_DEX_PINSIR_MEGA, NATIONAL_DEX_ARTICUNO, //NATIONAL_DEX_ARTICUNO_GALARIAN, @@ -4046,8 +4046,8 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_TYPE_NULL, NATIONAL_DEX_TAPU_BULU, NATIONAL_DEX_INTELEON, - NATIONAL_DEX_URSHIFU,//_SINGLE_STRIKE_STYLE, - //NATIONAL_DEX_URSHIFU_RAPID_STRIKE_STYLE, + NATIONAL_DEX_URSHIFU,//_SINGLE_STRIKE, + //NATIONAL_DEX_URSHIFU_RAPID_STRIKE, NATIONAL_DEX_TOEDSCRUEL, NATIONAL_DEX_ESPATHRA, NATIONAL_DEX_CHIEN_PAO, @@ -4147,8 +4147,8 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_RHYPERIOR, NATIONAL_DEX_BUZZWOLE, NATIONAL_DEX_NECROZMA, - //NATIONAL_DEX_CALYREX_ICE_RIDER, - //NATIONAL_DEX_CALYREX_SHADOW_RIDER, + //NATIONAL_DEX_CALYREX_ICE, + //NATIONAL_DEX_CALYREX_SHADOW, NATIONAL_DEX_URSALUNA, // 8'02" / 2.5m NATIONAL_DEX_LAPRAS, @@ -4177,11 +4177,11 @@ const u16 gPokedexOrder_Height[] = // 9'02" / 2.8m NATIONAL_DEX_GOLURK, NATIONAL_DEX_COALOSSAL, - NATIONAL_DEX_ZACIAN,//_HERO_OF_MANY_BATTLES, + NATIONAL_DEX_ZACIAN,//_HERO, //NATIONAL_DEX_ZACIAN_CROWNED_SWORD, // 9'06" / 2.9m NATIONAL_DEX_ZEKROM, - NATIONAL_DEX_ZAMAZENTA,//_HERO_OF_MANY_BATTLES, + NATIONAL_DEX_ZAMAZENTA,//_HERO, //NATIONAL_DEX_ZAMAZENTA_CROWNED_SHIELD, // 9'10" / 3.0m //NATIONAL_DEX_WEEZING_GALARIAN, @@ -4297,7 +4297,7 @@ const u16 gPokedexOrder_Height[] = // 35'05" / 10.8m //NATIONAL_DEX_RAYQUAZA_MEGA, // 35'09" / 10.9m - //NATIONAL_DEX_EXEGGUTOR_ALOLAN, + //NATIONAL_DEX_EXEGGUTOR_ALOLA, // 12m NATIONAL_DEX_DONDOZO, // 47'07" / 14.5m diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index 6ec191412c..3aac067846 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -304,18 +304,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 388, .trainerOffset = 6, - .frontPic = gMonFrontPic_VenusaurGigantamax, + .frontPic = gMonFrontPic_VenusaurGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_VenusaurGigantamax, + .frontAnimFrames = sAnims_VenusaurGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_VenusaurGigantamax, + .backPic = gMonBackPic_VenusaurGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_VenusaurGigantamax, - .shinyPalette = gMonShinyPalette_VenusaurGigantamax, - .iconSprite = gMonIcon_VenusaurGigantamax, + .palette = gMonPalette_VenusaurGmax, + .shinyPalette = gMonShinyPalette_VenusaurGmax, + .iconSprite = gMonIcon_VenusaurGmax, .iconPalIndex = 0, SHADOW(2, 4, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Venusaur) @@ -672,18 +672,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 302, .trainerOffset = 3, - .frontPic = gMonFrontPic_CharizardGigantamax, + .frontPic = gMonFrontPic_CharizardGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_CharizardGigantamax, + .frontAnimFrames = sAnims_CharizardGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CharizardGigantamax, + .backPic = gMonBackPic_CharizardGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CharizardGigantamax, - .shinyPalette = gMonShinyPalette_CharizardGigantamax, - .iconSprite = gMonIcon_CharizardGigantamax, + .palette = gMonPalette_CharizardGmax, + .shinyPalette = gMonShinyPalette_CharizardGmax, + .iconSprite = gMonIcon_CharizardGmax, .iconPalIndex = 0, SHADOW(1, 13, SHADOW_SIZE_L) FOOTPRINT(Charizard) @@ -986,18 +986,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -1, .trainerScale = 293, .trainerOffset = 2, - .frontPic = gMonFrontPic_BlastoiseGigantamax, + .frontPic = gMonFrontPic_BlastoiseGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_BlastoiseGigantamax, + .frontAnimFrames = sAnims_BlastoiseGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_BlastoiseGigantamax, + .backPic = gMonBackPic_BlastoiseGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_BlastoiseGigantamax, - .shinyPalette = gMonShinyPalette_BlastoiseGigantamax, - .iconSprite = gMonIcon_BlastoiseGigantamax, + .palette = gMonPalette_BlastoiseGmax, + .shinyPalette = gMonShinyPalette_BlastoiseGmax, + .iconSprite = gMonIcon_BlastoiseGmax, .iconPalIndex = 0, SHADOW(-2, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Blastoise) @@ -1260,19 +1260,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_ButterfreeGigantamax, + .frontPic = gMonFrontPic_ButterfreeGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_ButterfreeGigantamax, + .frontAnimFrames = sAnims_ButterfreeGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, - .backPic = gMonBackPic_ButterfreeGigantamax, + .backPic = gMonBackPic_ButterfreeGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ButterfreeGigantamax, - .shinyPalette = gMonShinyPalette_ButterfreeGigantamax, - .iconSprite = gMonIcon_ButterfreeGigantamax, + .palette = gMonPalette_ButterfreeGmax, + .shinyPalette = gMonShinyPalette_ButterfreeGmax, + .iconSprite = gMonIcon_ButterfreeGmax, .iconPalIndex = 0, SHADOW(-4, 15, SHADOW_SIZE_S) FOOTPRINT(Butterfree) @@ -2007,33 +2007,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_RattataAlolan, + .frontPic = gMonFrontPic_RattataAlola, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_RattataAlolan, + .frontAnimFrames = sAnims_RattataAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_RattataAlolan, + .backPic = gMonBackPic_RattataAlola, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_RattataAlolan, - .shinyPalette = gMonShinyPalette_RattataAlolan, - .iconSprite = gMonIcon_RattataAlolan, + .palette = gMonPalette_RattataAlola, + .shinyPalette = gMonShinyPalette_RattataAlola, + .iconSprite = gMonIcon_RattataAlola, .iconPalIndex = 2, SHADOW(-3, 2, SHADOW_SIZE_S) FOOTPRINT(Rattata) OVERWORLD( - sPicTable_RattataAlolan, + sPicTable_RattataAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_RattataAlolan, - gShinyOverworldPalette_RattataAlolan + gOverworldPalette_RattataAlola, + gShinyOverworldPalette_RattataAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sRattataAlolanLevelUpLearnset, - .teachableLearnset = sRattataAlolanTeachableLearnset, - .eggMoveLearnset = sRattataAlolanEggMoveLearnset, + .levelUpLearnset = sRattataAlolaLevelUpLearnset, + .teachableLearnset = sRattataAlolaTeachableLearnset, + .eggMoveLearnset = sRattataAlolaEggMoveLearnset, .formSpeciesIdTable = sRattataFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_ALOLA}, {EVO_NONE, 0, SPECIES_RATICATE_ALOLA_TOTEM}), @@ -2065,37 +2065,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 7, .weight = 255, - .description = gRaticateAlolanPokedexText, + .description = gRaticateAlolaPokedexText, .pokemonScale = 459, .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_RaticateAlolan, + .frontPic = gMonFrontPic_RaticateAlola, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_RaticateAlolan, + .frontAnimFrames = sAnims_RaticateAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_RaticateAlolan, + .backPic = gMonBackPic_RaticateAlola, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_RaticateAlolan, - .shinyPalette = gMonShinyPalette_RaticateAlolan, - .iconSprite = gMonIcon_RaticateAlolan, + .palette = gMonPalette_RaticateAlola, + .shinyPalette = gMonShinyPalette_RaticateAlola, + .iconSprite = gMonIcon_RaticateAlola, .iconPalIndex = 2, SHADOW(-4, 3, SHADOW_SIZE_L) FOOTPRINT(Raticate) OVERWORLD( - sPicTable_RaticateAlolan, + sPicTable_RaticateAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_RaticateAlolan, - gShinyOverworldPalette_RaticateAlolan + gOverworldPalette_RaticateAlola, + gShinyOverworldPalette_RaticateAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sRaticateAlolanLevelUpLearnset, - .teachableLearnset = sRaticateAlolanTeachableLearnset, + .levelUpLearnset = sRaticateAlolaLevelUpLearnset, + .teachableLearnset = sRaticateAlolaTeachableLearnset, .formSpeciesIdTable = sRaticateFormSpeciesIdTable, }, @@ -2125,39 +2125,39 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Mouse"), .height = 14, .weight = 1050, - .description = gRaticateAlolanPokedexText, + .description = gRaticateAlolaPokedexText, .pokemonScale = 459, .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_RaticateAlolan, + .frontPic = gMonFrontPic_RaticateAlola, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_RaticateAlolan, + .frontAnimFrames = sAnims_RaticateAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_RaticateAlolan, + .backPic = gMonBackPic_RaticateAlola, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_RaticateAlolan, - .shinyPalette = gMonShinyPalette_RaticateAlolan, - .iconSprite = gMonIcon_RaticateAlolan, + .palette = gMonPalette_RaticateAlola, + .shinyPalette = gMonShinyPalette_RaticateAlola, + .iconSprite = gMonIcon_RaticateAlola, .iconPalIndex = 2, SHADOW(-4, 3, SHADOW_SIZE_L) FOOTPRINT(Raticate) OVERWORLD( - sPicTable_RaticateAlolan, + sPicTable_RaticateAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_RaticateAlolan, - gShinyOverworldPalette_RaticateAlolan + gOverworldPalette_RaticateAlola, + gShinyOverworldPalette_RaticateAlola ) .isTotem = TRUE, .isAlolanForm = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sRaticateAlolanLevelUpLearnset, - .teachableLearnset = sRaticateAlolanTeachableLearnset, + .levelUpLearnset = sRaticateAlolaLevelUpLearnset, + .teachableLearnset = sRaticateAlolaTeachableLearnset, .formSpeciesIdTable = sRaticateFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -2983,18 +2983,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PikachuOriginalCap, + .frontPic = gMonFrontPic_PikachuOriginal, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuOriginalCap, + .frontAnimFrames = sAnims_PikachuOriginal, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PikachuOriginalCap, + .backPic = gMonBackPic_PikachuOriginal, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PikachuOriginalCap, - .shinyPalette = gMonShinyPalette_PikachuOriginalCap, - .iconSprite = gMonIcon_PikachuOriginalCap, + .palette = gMonPalette_PikachuOriginal, + .shinyPalette = gMonShinyPalette_PikachuOriginal, + .iconSprite = gMonIcon_PikachuOriginal, .iconPalIndex = 0, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) @@ -3038,18 +3038,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PikachuHoennCap, + .frontPic = gMonFrontPic_PikachuHoenn, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuHoennCap, + .frontAnimFrames = sAnims_PikachuHoenn, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PikachuHoennCap, + .backPic = gMonBackPic_PikachuHoenn, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PikachuHoennCap, - .shinyPalette = gMonShinyPalette_PikachuHoennCap, - .iconSprite = gMonIcon_PikachuHoennCap, + .palette = gMonPalette_PikachuHoenn, + .shinyPalette = gMonShinyPalette_PikachuHoenn, + .iconSprite = gMonIcon_PikachuHoenn, .iconPalIndex = 0, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) @@ -3093,18 +3093,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PikachuSinnohCap, + .frontPic = gMonFrontPic_PikachuSinnoh, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuSinnohCap, + .frontAnimFrames = sAnims_PikachuSinnoh, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PikachuSinnohCap, + .backPic = gMonBackPic_PikachuSinnoh, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PikachuSinnohCap, - .shinyPalette = gMonShinyPalette_PikachuSinnohCap, - .iconSprite = gMonIcon_PikachuSinnohCap, + .palette = gMonPalette_PikachuSinnoh, + .shinyPalette = gMonShinyPalette_PikachuSinnoh, + .iconSprite = gMonIcon_PikachuSinnoh, .iconPalIndex = 0, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) @@ -3148,18 +3148,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PikachuUnovaCap, + .frontPic = gMonFrontPic_PikachuUnova, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuUnovaCap, + .frontAnimFrames = sAnims_PikachuUnova, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PikachuUnovaCap, + .backPic = gMonBackPic_PikachuUnova, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PikachuUnovaCap, - .shinyPalette = gMonShinyPalette_PikachuUnovaCap, - .iconSprite = gMonIcon_PikachuUnovaCap, + .palette = gMonPalette_PikachuUnova, + .shinyPalette = gMonShinyPalette_PikachuUnova, + .iconSprite = gMonIcon_PikachuUnova, .iconPalIndex = 0, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) @@ -3203,18 +3203,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PikachuKalosCap, + .frontPic = gMonFrontPic_PikachuKalos, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuKalosCap, + .frontAnimFrames = sAnims_PikachuKalos, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PikachuKalosCap, + .backPic = gMonBackPic_PikachuKalos, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PikachuKalosCap, - .shinyPalette = gMonShinyPalette_PikachuKalosCap, - .iconSprite = gMonIcon_PikachuKalosCap, + .palette = gMonPalette_PikachuKalos, + .shinyPalette = gMonShinyPalette_PikachuKalos, + .iconSprite = gMonIcon_PikachuKalos, .iconPalIndex = 0, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) @@ -3258,18 +3258,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PikachuAlolaCap, + .frontPic = gMonFrontPic_PikachuAlola, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuAlolaCap, + .frontAnimFrames = sAnims_PikachuAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PikachuAlolaCap, + .backPic = gMonBackPic_PikachuAlola, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PikachuAlolaCap, - .shinyPalette = gMonShinyPalette_PikachuAlolaCap, - .iconSprite = gMonIcon_PikachuAlolaCap, + .palette = gMonPalette_PikachuAlola, + .shinyPalette = gMonShinyPalette_PikachuAlola, + .iconSprite = gMonIcon_PikachuAlola, .iconPalIndex = 0, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) @@ -3278,7 +3278,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .formSpeciesIdTable = sPikachuFormSpeciesIdTable, }, - [SPECIES_PIKACHU_PARTNER_CAP] = + [SPECIES_PIKACHU_PARTNER] = { .baseHP = 35, .baseAttack = 55, @@ -3314,18 +3314,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PikachuPartnerCap, + .frontPic = gMonFrontPic_PikachuPartner, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuPartnerCap, + .frontAnimFrames = sAnims_PikachuPartner, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PikachuPartnerCap, + .backPic = gMonBackPic_PikachuPartner, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PikachuPartnerCap, - .shinyPalette = gMonShinyPalette_PikachuPartnerCap, - .iconSprite = gMonIcon_PikachuPartnerCap, + .palette = gMonPalette_PikachuPartner, + .shinyPalette = gMonShinyPalette_PikachuPartner, + .iconSprite = gMonIcon_PikachuPartner, .iconPalIndex = 0, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) @@ -3369,18 +3369,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PikachuWorldCap, + .frontPic = gMonFrontPic_PikachuWorld, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuWorldCap, + .frontAnimFrames = sAnims_PikachuWorld, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PikachuWorldCap, + .backPic = gMonBackPic_PikachuWorld, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PikachuWorldCap, - .shinyPalette = gMonShinyPalette_PikachuWorldCap, - .iconSprite = gMonIcon_PikachuWorldCap, + .palette = gMonPalette_PikachuWorld, + .shinyPalette = gMonShinyPalette_PikachuWorld, + .iconSprite = gMonIcon_PikachuWorld, .iconPalIndex = 0, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) @@ -3427,18 +3427,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PikachuGigantamax, + .frontPic = gMonFrontPic_PikachuGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_PikachuGigantamax, + .frontAnimFrames = sAnims_PikachuGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PikachuGigantamax, + .backPic = gMonBackPic_PikachuGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PikachuGigantamax, - .shinyPalette = gMonShinyPalette_PikachuGigantamax, - .iconSprite = gMonIcon_PikachuGigantamax, + .palette = gMonPalette_PikachuGmax, + .shinyPalette = gMonShinyPalette_PikachuGmax, + .iconSprite = gMonIcon_PikachuGmax, .iconPalIndex = 2, SHADOW(-3, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Pikachu) @@ -3497,10 +3497,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backAnimId = BACK_ANIM_SHAKE_FLASH_YELLOW, .palette = gMonPalette_Pikachu, .shinyPalette = gMonShinyPalette_Pikachu, - .iconSprite = gMonIcon_PikachuPartner, + .iconSprite = gMonIcon_PikachuStarter, .iconPalIndex = 2, #if P_CUSTOM_GENDER_DIFF_ICONS == TRUE - .iconSpriteFemale = gMonIcon_PikachuPartnerF, + .iconSpriteFemale = gMonIcon_PikachuStarterF, .iconPalIndexFemale = 2, #endif SHADOW(-3, 5, SHADOW_SIZE_M) @@ -3637,33 +3637,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_RaichuAlolan, + .frontPic = gMonFrontPic_RaichuAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_RaichuAlolan, + .frontAnimFrames = sAnims_RaichuAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, - .backPic = gMonBackPic_RaichuAlolan, + .backPic = gMonBackPic_RaichuAlola, .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_RaichuAlolan, - .shinyPalette = gMonShinyPalette_RaichuAlolan, - .iconSprite = gMonIcon_RaichuAlolan, + .palette = gMonPalette_RaichuAlola, + .shinyPalette = gMonShinyPalette_RaichuAlola, + .iconSprite = gMonIcon_RaichuAlola, .iconPalIndex = 2, SHADOW(3, 15, SHADOW_SIZE_M) FOOTPRINT(Raichu) OVERWORLD( - sPicTable_RaichuAlolan, + sPicTable_RaichuAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_RaichuAlolan, - gShinyOverworldPalette_RaichuAlolan + gOverworldPalette_RaichuAlola, + gShinyOverworldPalette_RaichuAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sRaichuAlolanLevelUpLearnset, - .teachableLearnset = sRaichuAlolanTeachableLearnset, + .levelUpLearnset = sRaichuAlolaLevelUpLearnset, + .teachableLearnset = sRaichuAlolaTeachableLearnset, .formSpeciesIdTable = sRaichuFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -3834,33 +3834,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_SandshrewAlolan, + .frontPic = gMonFrontPic_SandshrewAlola, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_SandshrewAlolan, + .frontAnimFrames = sAnims_SandshrewAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_SandshrewAlolan, + .backPic = gMonBackPic_SandshrewAlola, .backPicSize = MON_COORDS_SIZE(56, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_SandshrewAlolan, - .shinyPalette = gMonShinyPalette_SandshrewAlolan, - .iconSprite = gMonIcon_SandshrewAlolan, + .palette = gMonPalette_SandshrewAlola, + .shinyPalette = gMonShinyPalette_SandshrewAlola, + .iconSprite = gMonIcon_SandshrewAlola, .iconPalIndex = 0, SHADOW(-2, -1, SHADOW_SIZE_M) FOOTPRINT(Sandshrew) OVERWORLD( - sPicTable_SandshrewAlolan, + sPicTable_SandshrewAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_SandshrewAlolan, - gShinyOverworldPalette_SandshrewAlolan + gOverworldPalette_SandshrewAlola, + gShinyOverworldPalette_SandshrewAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sSandshrewAlolanLevelUpLearnset, - .teachableLearnset = sSandshrewAlolanTeachableLearnset, - .eggMoveLearnset = sSandshrewAlolanEggMoveLearnset, + .levelUpLearnset = sSandshrewAlolaLevelUpLearnset, + .teachableLearnset = sSandshrewAlolaTeachableLearnset, + .eggMoveLearnset = sSandshrewAlolaEggMoveLearnset, .formSpeciesIdTable = sSandshrewFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLA}), }, @@ -3900,32 +3900,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 11, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_SandslashAlolan, + .frontPic = gMonFrontPic_SandslashAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_SandslashAlolan, + .frontAnimFrames = sAnims_SandslashAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_SandslashAlolan, + .backPic = gMonBackPic_SandslashAlola, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_SandslashAlolan, - .shinyPalette = gMonShinyPalette_SandslashAlolan, - .iconSprite = gMonIcon_SandslashAlolan, + .palette = gMonPalette_SandslashAlola, + .shinyPalette = gMonShinyPalette_SandslashAlola, + .iconSprite = gMonIcon_SandslashAlola, .iconPalIndex = 0, SHADOW(0, 9, SHADOW_SIZE_L) FOOTPRINT(Sandslash) OVERWORLD( - sPicTable_SandslashAlolan, + sPicTable_SandslashAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_SandslashAlolan, - gShinyOverworldPalette_SandslashAlolan + gOverworldPalette_SandslashAlola, + gShinyOverworldPalette_SandslashAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sSandslashAlolanLevelUpLearnset, - .teachableLearnset = sSandslashAlolanTeachableLearnset, + .levelUpLearnset = sSandslashAlolaLevelUpLearnset, + .teachableLearnset = sSandslashAlolaTeachableLearnset, .formSpeciesIdTable = sSandslashFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -4735,33 +4735,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_VulpixAlolan, + .frontPic = gMonFrontPic_VulpixAlola, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_VulpixAlolan, + .frontAnimFrames = sAnims_VulpixAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_VulpixAlolan, + .backPic = gMonBackPic_VulpixAlola, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_VulpixAlolan, - .shinyPalette = gMonShinyPalette_VulpixAlolan, - .iconSprite = gMonIcon_VulpixAlolan, + .palette = gMonPalette_VulpixAlola, + .shinyPalette = gMonShinyPalette_VulpixAlola, + .iconSprite = gMonIcon_VulpixAlola, .iconPalIndex = 2, SHADOW(-2, 3, SHADOW_SIZE_M) FOOTPRINT(Vulpix) OVERWORLD( - sPicTable_VulpixAlolan, + sPicTable_VulpixAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_VulpixAlolan, - gShinyOverworldPalette_VulpixAlolan + gOverworldPalette_VulpixAlola, + gShinyOverworldPalette_VulpixAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sVulpixAlolanLevelUpLearnset, - .teachableLearnset = sVulpixAlolanTeachableLearnset, - .eggMoveLearnset = sVulpixAlolanEggMoveLearnset, + .levelUpLearnset = sVulpixAlolaLevelUpLearnset, + .teachableLearnset = sVulpixAlolaTeachableLearnset, + .eggMoveLearnset = sVulpixAlolaEggMoveLearnset, .formSpeciesIdTable = sVulpixFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLA}), }, @@ -4802,32 +4802,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_NinetalesAlolan, + .frontPic = gMonFrontPic_NinetalesAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_NinetalesAlolan, + .frontAnimFrames = sAnims_NinetalesAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_NinetalesAlolan, + .backPic = gMonBackPic_NinetalesAlola, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_NinetalesAlolan, - .shinyPalette = gMonShinyPalette_NinetalesAlolan, - .iconSprite = gMonIcon_NinetalesAlolan, + .palette = gMonPalette_NinetalesAlola, + .shinyPalette = gMonShinyPalette_NinetalesAlola, + .iconSprite = gMonIcon_NinetalesAlola, .iconPalIndex = 2, SHADOW(0, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Ninetales) OVERWORLD( - sPicTable_NinetalesAlolan, + sPicTable_NinetalesAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_NinetalesAlolan, - gShinyOverworldPalette_NinetalesAlolan + gOverworldPalette_NinetalesAlola, + gShinyOverworldPalette_NinetalesAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sNinetalesAlolanLevelUpLearnset, - .teachableLearnset = sNinetalesAlolanTeachableLearnset, + .levelUpLearnset = sNinetalesAlolaLevelUpLearnset, + .teachableLearnset = sNinetalesAlolaTeachableLearnset, .formSpeciesIdTable = sNinetalesFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -6022,33 +6022,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 25, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_DiglettAlolan, + .frontPic = gMonFrontPic_DiglettAlola, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 19, - .frontAnimFrames = sAnims_DiglettAlolan, + .frontAnimFrames = sAnims_DiglettAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_DiglettAlolan, + .backPic = gMonBackPic_DiglettAlola, .backPicSize = MON_COORDS_SIZE(40, 48), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_DiglettAlolan, - .shinyPalette = gMonShinyPalette_DiglettAlolan, - .iconSprite = gMonIcon_DiglettAlolan, + .palette = gMonPalette_DiglettAlola, + .shinyPalette = gMonShinyPalette_DiglettAlola, + .iconSprite = gMonIcon_DiglettAlola, .iconPalIndex = 2, NO_SHADOW FOOTPRINT(Diglett) OVERWORLD( - sPicTable_DiglettAlolan, + sPicTable_DiglettAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_DiglettAlolan, - gShinyOverworldPalette_DiglettAlolan + gOverworldPalette_DiglettAlola, + gShinyOverworldPalette_DiglettAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sDiglettAlolanLevelUpLearnset, - .teachableLearnset = sDiglettAlolanTeachableLearnset, - .eggMoveLearnset = sDiglettAlolanEggMoveLearnset, + .levelUpLearnset = sDiglettAlolaLevelUpLearnset, + .teachableLearnset = sDiglettAlolaTeachableLearnset, + .eggMoveLearnset = sDiglettAlolaEggMoveLearnset, .formSpeciesIdTable = sDiglettFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLA}), }, @@ -6089,32 +6089,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_DugtrioAlolan, + .frontPic = gMonFrontPic_DugtrioAlola, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_DugtrioAlolan, + .frontAnimFrames = sAnims_DugtrioAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_DugtrioAlolan, + .backPic = gMonBackPic_DugtrioAlola, .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 17, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_DugtrioAlolan, - .shinyPalette = gMonShinyPalette_DugtrioAlolan, - .iconSprite = gMonIcon_DugtrioAlolan, + .palette = gMonPalette_DugtrioAlola, + .shinyPalette = gMonShinyPalette_DugtrioAlola, + .iconSprite = gMonIcon_DugtrioAlola, .iconPalIndex = 2, NO_SHADOW FOOTPRINT(Dugtrio) OVERWORLD( - sPicTable_DugtrioAlolan, + sPicTable_DugtrioAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_DugtrioAlolan, - gShinyOverworldPalette_DugtrioAlolan + gOverworldPalette_DugtrioAlola, + gShinyOverworldPalette_DugtrioAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sDugtrioAlolanLevelUpLearnset, - .teachableLearnset = sDugtrioAlolanTeachableLearnset, + .levelUpLearnset = sDugtrioAlolaLevelUpLearnset, + .teachableLearnset = sDugtrioAlolaTeachableLearnset, .formSpeciesIdTable = sDugtrioFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -6296,33 +6296,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MeowthAlolan, + .frontPic = gMonFrontPic_MeowthAlola, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_MeowthAlolan, + .frontAnimFrames = sAnims_MeowthAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_MeowthAlolan, + .backPic = gMonBackPic_MeowthAlola, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_MeowthAlolan, - .shinyPalette = gMonShinyPalette_MeowthAlolan, - .iconSprite = gMonIcon_MeowthAlolan, + .palette = gMonPalette_MeowthAlola, + .shinyPalette = gMonShinyPalette_MeowthAlola, + .iconSprite = gMonIcon_MeowthAlola, .iconPalIndex = 2, SHADOW(-2, 5, SHADOW_SIZE_M) FOOTPRINT(Meowth) OVERWORLD( - sPicTable_MeowthAlolan, + sPicTable_MeowthAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_MeowthAlolan, - gShinyOverworldPalette_MeowthAlolan + gOverworldPalette_MeowthAlola, + gShinyOverworldPalette_MeowthAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sMeowthAlolanLevelUpLearnset, - .teachableLearnset = sMeowthAlolanTeachableLearnset, - .eggMoveLearnset = sMeowthAlolanEggMoveLearnset, + .levelUpLearnset = sMeowthAlolaLevelUpLearnset, + .teachableLearnset = sMeowthAlolaTeachableLearnset, + .eggMoveLearnset = sMeowthAlolaEggMoveLearnset, .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_FRIENDSHIP, 0, SPECIES_PERSIAN_ALOLA}), }, @@ -6362,32 +6362,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PersianAlolan, + .frontPic = gMonFrontPic_PersianAlola, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_PersianAlolan, + .frontAnimFrames = sAnims_PersianAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PersianAlolan, + .backPic = gMonBackPic_PersianAlola, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PersianAlolan, - .shinyPalette = gMonShinyPalette_PersianAlolan, - .iconSprite = gMonIcon_PersianAlolan, + .palette = gMonPalette_PersianAlola, + .shinyPalette = gMonShinyPalette_PersianAlola, + .iconSprite = gMonIcon_PersianAlola, .iconPalIndex = 2, SHADOW(-1, 9, SHADOW_SIZE_L) FOOTPRINT(Persian) OVERWORLD( - sPicTable_PersianAlolan, + sPicTable_PersianAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_PersianAlolan, - gShinyOverworldPalette_PersianAlolan + gOverworldPalette_PersianAlola, + gShinyOverworldPalette_PersianAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sPersianAlolanLevelUpLearnset, - .teachableLearnset = sPersianAlolanTeachableLearnset, + .levelUpLearnset = sPersianAlolaLevelUpLearnset, + .teachableLearnset = sPersianAlolaTeachableLearnset, .formSpeciesIdTable = sPersianFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -6427,33 +6427,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MeowthGalarian, + .frontPic = gMonFrontPic_MeowthGalar, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_MeowthGalarian, + .frontAnimFrames = sAnims_MeowthGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_MeowthGalarian, + .backPic = gMonBackPic_MeowthGalar, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_MeowthGalarian, - .shinyPalette = gMonShinyPalette_MeowthGalarian, - .iconSprite = gMonIcon_MeowthGalarian, + .palette = gMonPalette_MeowthGalar, + .shinyPalette = gMonShinyPalette_MeowthGalar, + .iconSprite = gMonIcon_MeowthGalar, .iconPalIndex = 0, SHADOW(1, 4, SHADOW_SIZE_M) FOOTPRINT(Meowth) OVERWORLD( - sPicTable_MeowthGalarian, + sPicTable_MeowthGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_MeowthGalarian, - gShinyOverworldPalette_MeowthGalarian + gOverworldPalette_MeowthGalar, + gShinyOverworldPalette_MeowthGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sMeowthGalarianLevelUpLearnset, - .teachableLearnset = sMeowthGalarianTeachableLearnset, - .eggMoveLearnset = sMeowthGalarianEggMoveLearnset, + .levelUpLearnset = sMeowthGalarLevelUpLearnset, + .teachableLearnset = sMeowthGalarTeachableLearnset, + .eggMoveLearnset = sMeowthGalarEggMoveLearnset, .formSpeciesIdTable = sMeowthFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 28, SPECIES_PERRSERKER}), }, @@ -6555,18 +6555,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 19, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MeowthGigantamax, + .frontPic = gMonFrontPic_MeowthGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_MeowthGigantamax, + .frontAnimFrames = sAnims_MeowthGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_MeowthGigantamax, + .backPic = gMonBackPic_MeowthGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_MeowthGigantamax, - .shinyPalette = gMonShinyPalette_MeowthGigantamax, - .iconSprite = gMonIcon_MeowthGigantamax, + .palette = gMonPalette_MeowthGmax, + .shinyPalette = gMonShinyPalette_MeowthGmax, + .iconSprite = gMonIcon_MeowthGmax, .iconPalIndex = 1, SHADOW(4, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Meowth) @@ -7069,32 +7069,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_GrowlitheHisuian, + .frontPic = gMonFrontPic_GrowlitheHisui, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_GrowlitheHisuian, + .frontAnimFrames = sAnims_GrowlitheHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_GrowlitheHisuian, + .backPic = gMonBackPic_GrowlitheHisui, .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_GrowlitheHisuian, - .shinyPalette = gMonShinyPalette_GrowlitheHisuian, - .iconSprite = gMonIcon_GrowlitheHisuian, + .palette = gMonPalette_GrowlitheHisui, + .shinyPalette = gMonShinyPalette_GrowlitheHisui, + .iconSprite = gMonIcon_GrowlitheHisui, .iconPalIndex = 0, SHADOW(2, -2, SHADOW_SIZE_M) FOOTPRINT(Growlithe) OVERWORLD( - sPicTable_GrowlitheHisuian, + sPicTable_GrowlitheHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_GrowlitheHisuian, - gShinyOverworldPalette_GrowlitheHisuian + gOverworldPalette_GrowlitheHisui, + gShinyOverworldPalette_GrowlitheHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sGrowlitheHisuianLevelUpLearnset, - .teachableLearnset = sGrowlitheHisuianTeachableLearnset, + .levelUpLearnset = sGrowlitheHisuiLevelUpLearnset, + .teachableLearnset = sGrowlitheHisuiTeachableLearnset, .formSpeciesIdTable = sGrowlitheFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE_HISUI}), }, @@ -7133,32 +7133,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 312, .trainerOffset = 4, - .frontPic = gMonFrontPic_ArcanineHisuian, + .frontPic = gMonFrontPic_ArcanineHisui, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_ArcanineHisuian, + .frontAnimFrames = sAnims_ArcanineHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ArcanineHisuian, + .backPic = gMonBackPic_ArcanineHisui, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ArcanineHisuian, - .shinyPalette = gMonShinyPalette_ArcanineHisuian, - .iconSprite = gMonIcon_ArcanineHisuian, + .palette = gMonPalette_ArcanineHisui, + .shinyPalette = gMonShinyPalette_ArcanineHisui, + .iconSprite = gMonIcon_ArcanineHisui, .iconPalIndex = 0, SHADOW(-1, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Arcanine) OVERWORLD( - sPicTable_ArcanineHisuian, + sPicTable_ArcanineHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ArcanineHisuian, - gShinyOverworldPalette_ArcanineHisuian + gOverworldPalette_ArcanineHisui, + gShinyOverworldPalette_ArcanineHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sArcanineHisuianLevelUpLearnset, - .teachableLearnset = sArcanineHisuianTeachableLearnset, + .levelUpLearnset = sArcanineHisuiLevelUpLearnset, + .teachableLearnset = sArcanineHisuiTeachableLearnset, .formSpeciesIdTable = sArcanineFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS @@ -8000,18 +8000,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 1, .trainerScale = 269, .trainerOffset = -1, - .frontPic = gMonFrontPic_MachampGigantamax, + .frontPic = gMonFrontPic_MachampGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_MachampGigantamax, + .frontAnimFrames = sAnims_MachampGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_MachampGigantamax, + .backPic = gMonBackPic_MachampGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_MachampGigantamax, - .shinyPalette = gMonShinyPalette_MachampGigantamax, - .iconSprite = gMonIcon_MachampGigantamax, + .palette = gMonPalette_MachampGmax, + .shinyPalette = gMonShinyPalette_MachampGmax, + .iconSprite = gMonIcon_MachampGmax, .iconPalIndex = 0, SHADOW(7, 13, SHADOW_SIZE_L) FOOTPRINT(Machamp) @@ -8601,34 +8601,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_GeodudeAlolan, + .frontPic = gMonFrontPic_GeodudeAlola, .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_GeodudeAlolan, + .frontAnimFrames = sAnims_GeodudeAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 16, - .backPic = gMonBackPic_GeodudeAlolan, + .backPic = gMonBackPic_GeodudeAlola, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_GeodudeAlolan, - .shinyPalette = gMonShinyPalette_GeodudeAlolan, - .iconSprite = gMonIcon_GeodudeAlolan, + .palette = gMonPalette_GeodudeAlola, + .shinyPalette = gMonShinyPalette_GeodudeAlola, + .iconSprite = gMonIcon_GeodudeAlola, .iconPalIndex = 2, SHADOW(-1, 10, SHADOW_SIZE_M) FOOTPRINT(Geodude) OVERWORLD( - sPicTable_GeodudeAlolan, + sPicTable_GeodudeAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_GeodudeAlolan, - gShinyOverworldPalette_GeodudeAlolan + gOverworldPalette_GeodudeAlola, + gShinyOverworldPalette_GeodudeAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sGeodudeAlolanLevelUpLearnset, - .teachableLearnset = sGeodudeAlolanTeachableLearnset, - .eggMoveLearnset = sGeodudeAlolanEggMoveLearnset, + .levelUpLearnset = sGeodudeAlolaLevelUpLearnset, + .teachableLearnset = sGeodudeAlolaTeachableLearnset, + .eggMoveLearnset = sGeodudeAlolaEggMoveLearnset, .formSpeciesIdTable = sGeodudeFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLA}), }, @@ -8668,32 +8668,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_GravelerAlolan, + .frontPic = gMonFrontPic_GravelerAlola, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_GravelerAlolan, + .frontAnimFrames = sAnims_GravelerAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_GravelerAlolan, + .backPic = gMonBackPic_GravelerAlola, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_GravelerAlolan, - .shinyPalette = gMonShinyPalette_GravelerAlolan, - .iconSprite = gMonIcon_GravelerAlolan, + .palette = gMonPalette_GravelerAlola, + .shinyPalette = gMonShinyPalette_GravelerAlola, + .iconSprite = gMonIcon_GravelerAlola, .iconPalIndex = 2, SHADOW(1, 5, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Graveler) OVERWORLD( - sPicTable_GravelerAlolan, + sPicTable_GravelerAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_GravelerAlolan, - gShinyOverworldPalette_GravelerAlolan + gOverworldPalette_GravelerAlola, + gShinyOverworldPalette_GravelerAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sGravelerAlolanLevelUpLearnset, - .teachableLearnset = sGravelerAlolanTeachableLearnset, + .levelUpLearnset = sGravelerAlolaLevelUpLearnset, + .teachableLearnset = sGravelerAlolaTeachableLearnset, .formSpeciesIdTable = sGravelerFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_GOLEM_ALOLA}, {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOLEM_ALOLA}), @@ -8734,32 +8734,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 296, .trainerOffset = 2, - .frontPic = gMonFrontPic_GolemAlolan, + .frontPic = gMonFrontPic_GolemAlola, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_GolemAlolan, + .frontAnimFrames = sAnims_GolemAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_GolemAlolan, + .backPic = gMonBackPic_GolemAlola, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_GolemAlolan, - .shinyPalette = gMonShinyPalette_GolemAlolan, - .iconSprite = gMonIcon_GolemAlolan, + .palette = gMonPalette_GolemAlola, + .shinyPalette = gMonShinyPalette_GolemAlola, + .iconSprite = gMonIcon_GolemAlola, .iconPalIndex = 2, SHADOW(2, 11, SHADOW_SIZE_L) FOOTPRINT(Golem) OVERWORLD( - sPicTable_GolemAlolan, + sPicTable_GolemAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_GolemAlolan, - gShinyOverworldPalette_GolemAlolan + gOverworldPalette_GolemAlola, + gShinyOverworldPalette_GolemAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sGolemAlolanLevelUpLearnset, - .teachableLearnset = sGolemAlolanTeachableLearnset, + .levelUpLearnset = sGolemAlolaLevelUpLearnset, + .teachableLearnset = sGolemAlolaTeachableLearnset, .formSpeciesIdTable = sGolemFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -8928,33 +8928,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_PonytaGalarian, + .frontPic = gMonFrontPic_PonytaGalar, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_PonytaGalarian, + .frontAnimFrames = sAnims_PonytaGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_PonytaGalarian, + .backPic = gMonBackPic_PonytaGalar, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_PonytaGalarian, - .shinyPalette = gMonShinyPalette_PonytaGalarian, - .iconSprite = gMonIcon_PonytaGalarian, + .palette = gMonPalette_PonytaGalar, + .shinyPalette = gMonShinyPalette_PonytaGalar, + .iconSprite = gMonIcon_PonytaGalar, .iconPalIndex = 2, SHADOW(-5, 5, SHADOW_SIZE_M) FOOTPRINT(Ponyta) OVERWORLD( - sPicTable_PonytaGalarian, + sPicTable_PonytaGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_PonytaGalarian, - gShinyOverworldPalette_PonytaGalarian + gOverworldPalette_PonytaGalar, + gShinyOverworldPalette_PonytaGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sPonytaGalarianLevelUpLearnset, - .teachableLearnset = sPonytaGalarianTeachableLearnset, - .eggMoveLearnset = sPonytaGalarianEggMoveLearnset, + .levelUpLearnset = sPonytaGalarLevelUpLearnset, + .teachableLearnset = sPonytaGalarTeachableLearnset, + .eggMoveLearnset = sPonytaGalarEggMoveLearnset, .formSpeciesIdTable = sPonytaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 40, SPECIES_RAPIDASH_GALAR}), }, @@ -8993,32 +8993,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 289, .trainerOffset = 1, - .frontPic = gMonFrontPic_RapidashGalarian, + .frontPic = gMonFrontPic_RapidashGalar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_RapidashGalarian, + .frontAnimFrames = sAnims_RapidashGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_RapidashGalarian, + .backPic = gMonBackPic_RapidashGalar, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_RapidashGalarian, - .shinyPalette = gMonShinyPalette_RapidashGalarian, - .iconSprite = gMonIcon_RapidashGalarian, + .palette = gMonPalette_RapidashGalar, + .shinyPalette = gMonShinyPalette_RapidashGalar, + .iconSprite = gMonIcon_RapidashGalar, .iconPalIndex = 2, SHADOW(0, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Rapidash) OVERWORLD( - sPicTable_RapidashGalarian, + sPicTable_RapidashGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_RapidashGalarian, - gShinyOverworldPalette_RapidashGalarian + gOverworldPalette_RapidashGalar, + gShinyOverworldPalette_RapidashGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sRapidashGalarianLevelUpLearnset, - .teachableLearnset = sRapidashGalarianTeachableLearnset, + .levelUpLearnset = sRapidashGalarLevelUpLearnset, + .teachableLearnset = sRapidashGalarTeachableLearnset, .formSpeciesIdTable = sRapidashFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS @@ -9301,7 +9301,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .abilities = { ABILITY_GLUTTONY, ABILITY_OWN_TEMPO, ABILITY_REGENERATOR }, .bodyColor = BODY_COLOR_PINK, .speciesName = _("Slowpoke"), - .cryId = CRY_SLOWPOKE_GALARIAN, + .cryId = CRY_SLOWPOKE_GALAR, .natDexNum = NATIONAL_DEX_SLOWPOKE, .categoryName = _("Dopey"), .height = 12, @@ -9315,33 +9315,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_SlowpokeGalarian, + .frontPic = gMonFrontPic_SlowpokeGalar, .frontPicSize = MON_COORDS_SIZE(56, 32), .frontPicYOffset = 19, - .frontAnimFrames = sAnims_SlowpokeGalarian, + .frontAnimFrames = sAnims_SlowpokeGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_SlowpokeGalarian, + .backPic = gMonBackPic_SlowpokeGalar, .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_SlowpokeGalarian, - .shinyPalette = gMonShinyPalette_SlowpokeGalarian, - .iconSprite = gMonIcon_SlowpokeGalarian, + .palette = gMonPalette_SlowpokeGalar, + .shinyPalette = gMonShinyPalette_SlowpokeGalar, + .iconSprite = gMonIcon_SlowpokeGalar, .iconPalIndex = 0, SHADOW(-3, -8, SHADOW_SIZE_L) FOOTPRINT(Slowpoke) OVERWORLD( - sPicTable_SlowpokeGalarian, + sPicTable_SlowpokeGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_SlowpokeGalarian, - gShinyOverworldPalette_SlowpokeGalarian + gOverworldPalette_SlowpokeGalar, + gShinyOverworldPalette_SlowpokeGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sSlowpokeGalarianLevelUpLearnset, - .teachableLearnset = sSlowpokeGalarianTeachableLearnset, - .eggMoveLearnset = sSlowpokeGalarianEggMoveLearnset, + .levelUpLearnset = sSlowpokeGalarLevelUpLearnset, + .teachableLearnset = sSlowpokeGalarTeachableLearnset, + .eggMoveLearnset = sSlowpokeGalarEggMoveLearnset, .formSpeciesIdTable = sSlowpokeFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALAR}, {EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALAR}), @@ -9382,33 +9382,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 296, .trainerOffset = 2, - .frontPic = gMonFrontPic_SlowbroGalarian, + .frontPic = gMonFrontPic_SlowbroGalar, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_SlowbroGalarian, + .frontAnimFrames = sAnims_SlowbroGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_SlowbroGalarian, + .backPic = gMonBackPic_SlowbroGalar, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_SlowbroGalarian, - .shinyPalette = gMonShinyPalette_SlowbroGalarian, - .iconSprite = gMonIcon_SlowbroGalarian, + .palette = gMonPalette_SlowbroGalar, + .shinyPalette = gMonShinyPalette_SlowbroGalar, + .iconSprite = gMonIcon_SlowbroGalar, .iconPalIndex = 0, SHADOW(-5, 9, SHADOW_SIZE_L) FOOTPRINT(Slowbro) OVERWORLD_SET_ANIM( - sPicTable_SlowbroGalarian, + sPicTable_SlowbroGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, sAnimTable_Following_Asym, - gOverworldPalette_SlowbroGalarian, - gShinyOverworldPalette_SlowbroGalarian + gOverworldPalette_SlowbroGalar, + gShinyOverworldPalette_SlowbroGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sSlowbroGalarianLevelUpLearnset, - .teachableLearnset = sSlowbroGalarianTeachableLearnset, + .levelUpLearnset = sSlowbroGalarLevelUpLearnset, + .teachableLearnset = sSlowbroGalarTeachableLearnset, .formSpeciesIdTable = sSlowbroFormSpeciesIdTable, }, @@ -9447,32 +9447,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 5, - .frontPic = gMonFrontPic_SlowkingGalarian, + .frontPic = gMonFrontPic_SlowkingGalar, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SlowkingGalarian, + .frontAnimFrames = sAnims_SlowkingGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_SlowkingGalarian, + .backPic = gMonBackPic_SlowkingGalar, .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_SlowkingGalarian, - .shinyPalette = gMonShinyPalette_SlowkingGalarian, - .iconSprite = gMonIcon_SlowkingGalarian, + .palette = gMonPalette_SlowkingGalar, + .shinyPalette = gMonShinyPalette_SlowkingGalar, + .iconSprite = gMonIcon_SlowkingGalar, .iconPalIndex = 0, SHADOW(-2, 12, SHADOW_SIZE_M) FOOTPRINT(Slowking) OVERWORLD( - sPicTable_SlowkingGalarian, + sPicTable_SlowkingGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_SlowkingGalarian, - gShinyOverworldPalette_SlowkingGalarian + gOverworldPalette_SlowkingGalar, + gShinyOverworldPalette_SlowkingGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sSlowkingGalarianLevelUpLearnset, - .teachableLearnset = sSlowkingGalarianTeachableLearnset, + .levelUpLearnset = sSlowkingGalarLevelUpLearnset, + .teachableLearnset = sSlowkingGalarTeachableLearnset, .formSpeciesIdTable = sSlowkingFormSpeciesIdTable, }, #endif //P_GEN_2_CROSS_EVOS @@ -9793,33 +9793,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 293, .trainerOffset = 2, - .frontPic = gMonFrontPic_FarfetchdGalarian, + .frontPic = gMonFrontPic_FarfetchdGalar, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_FarfetchdGalarian, + .frontAnimFrames = sAnims_FarfetchdGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_FarfetchdGalarian, + .backPic = gMonBackPic_FarfetchdGalar, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_FarfetchdGalarian, - .shinyPalette = gMonShinyPalette_FarfetchdGalarian, - .iconSprite = gMonIcon_FarfetchdGalarian, + .palette = gMonPalette_FarfetchdGalar, + .shinyPalette = gMonShinyPalette_FarfetchdGalar, + .iconSprite = gMonIcon_FarfetchdGalar, .iconPalIndex = 1, SHADOW(-7, 2, SHADOW_SIZE_L) FOOTPRINT(Farfetchd) OVERWORLD( - sPicTable_FarfetchdGalarian, + sPicTable_FarfetchdGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_FarfetchdGalarian, - gShinyOverworldPalette_FarfetchdGalarian + gOverworldPalette_FarfetchdGalar, + gShinyOverworldPalette_FarfetchdGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sFarfetchdGalarianLevelUpLearnset, - .teachableLearnset = sFarfetchdGalarianTeachableLearnset, - .eggMoveLearnset = sFarfetchdGalarianEggMoveLearnset, + .levelUpLearnset = sFarfetchdGalarLevelUpLearnset, + .teachableLearnset = sFarfetchdGalarTeachableLearnset, + .eggMoveLearnset = sFarfetchdGalarEggMoveLearnset, .formSpeciesIdTable = sFarfetchdFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_CRITICAL_HITS, 3, SPECIES_SIRFETCHD}), }, @@ -10343,33 +10343,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_GrimerAlolan, + .frontPic = gMonFrontPic_GrimerAlola, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_GrimerAlolan, + .frontAnimFrames = sAnims_GrimerAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_GrimerAlolan, + .backPic = gMonBackPic_GrimerAlola, .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_GrimerAlolan, - .shinyPalette = gMonShinyPalette_GrimerAlolan, - .iconSprite = gMonIcon_GrimerAlolan, + .palette = gMonPalette_GrimerAlola, + .shinyPalette = gMonShinyPalette_GrimerAlola, + .iconSprite = gMonIcon_GrimerAlola, .iconPalIndex = 1, SHADOW(2, 1, SHADOW_SIZE_M) FOOTPRINT(Grimer) OVERWORLD( - sPicTable_GrimerAlolan, + sPicTable_GrimerAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_GrimerAlolan, - gShinyOverworldPalette_GrimerAlolan + gOverworldPalette_GrimerAlola, + gShinyOverworldPalette_GrimerAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sGrimerAlolanLevelUpLearnset, - .teachableLearnset = sGrimerAlolanTeachableLearnset, - .eggMoveLearnset = sGrimerAlolanEggMoveLearnset, + .levelUpLearnset = sGrimerAlolaLevelUpLearnset, + .teachableLearnset = sGrimerAlolaTeachableLearnset, + .eggMoveLearnset = sGrimerAlolaEggMoveLearnset, .formSpeciesIdTable = sGrimerFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_MUK_ALOLA}), }, @@ -10411,32 +10411,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MukAlolan, + .frontPic = gMonFrontPic_MukAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_MukAlolan, + .frontAnimFrames = sAnims_MukAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_MukAlolan, + .backPic = gMonBackPic_MukAlola, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_MukAlolan, - .shinyPalette = gMonShinyPalette_MukAlolan, - .iconSprite = gMonIcon_MukAlolan, + .palette = gMonPalette_MukAlola, + .shinyPalette = gMonShinyPalette_MukAlola, + .iconSprite = gMonIcon_MukAlola, .iconPalIndex = 0, SHADOW(-1, 7, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Muk) OVERWORLD( - sPicTable_MukAlolan, + sPicTable_MukAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_MukAlolan, - gShinyOverworldPalette_MukAlolan + gOverworldPalette_MukAlola, + gShinyOverworldPalette_MukAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sMukAlolanLevelUpLearnset, - .teachableLearnset = sMukAlolanTeachableLearnset, + .levelUpLearnset = sMukAlolaLevelUpLearnset, + .teachableLearnset = sMukAlolaTeachableLearnset, .formSpeciesIdTable = sMukFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -10879,18 +10879,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 302, .trainerOffset = 2, - .frontPic = gMonFrontPic_GengarGigantamax, + .frontPic = gMonFrontPic_GengarGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_GengarGigantamax, + .frontAnimFrames = sAnims_GengarGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_GengarGigantamax, + .backPic = gMonBackPic_GengarGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_GengarGigantamax, - .shinyPalette = gMonShinyPalette_GengarGigantamax, - .iconSprite = gMonIcon_GengarGigantamax, + .palette = gMonPalette_GengarGmax, + .shinyPalette = gMonShinyPalette_GengarGmax, + .iconSprite = gMonIcon_GengarGmax, .iconPalIndex = 2, NO_SHADOW FOOTPRINT(Gengar) @@ -11416,18 +11416,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 2, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_KinglerGigantamax, + .frontPic = gMonFrontPic_KinglerGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_KinglerGigantamax, + .frontAnimFrames = sAnims_KinglerGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_KinglerGigantamax, + .backPic = gMonBackPic_KinglerGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_KinglerGigantamax, - .shinyPalette = gMonShinyPalette_KinglerGigantamax, - .iconSprite = gMonIcon_KinglerGigantamax, + .palette = gMonPalette_KinglerGmax, + .shinyPalette = gMonShinyPalette_KinglerGmax, + .iconSprite = gMonIcon_KinglerGmax, .iconPalIndex = 0, SHADOW(-3, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Kingler) @@ -11609,32 +11609,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = -8, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_VoltorbHisuian, + .frontPic = gMonFrontPic_VoltorbHisui, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_VoltorbHisuian, + .frontAnimFrames = sAnims_VoltorbHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_VoltorbHisuian, + .backPic = gMonBackPic_VoltorbHisui, .backPicSize = MON_COORDS_SIZE(48, 32), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_VoltorbHisuian, - .shinyPalette = gMonShinyPalette_VoltorbHisuian, - .iconSprite = gMonIcon_VoltorbHisuian, + .palette = gMonPalette_VoltorbHisui, + .shinyPalette = gMonShinyPalette_VoltorbHisui, + .iconSprite = gMonIcon_VoltorbHisui, .iconPalIndex = 0, SHADOW(1, -4, SHADOW_SIZE_S) FOOTPRINT(Voltorb) OVERWORLD( - sPicTable_VoltorbHisuian, + sPicTable_VoltorbHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_VoltorbHisuian, - gShinyOverworldPalette_VoltorbHisuian + gOverworldPalette_VoltorbHisui, + gShinyOverworldPalette_VoltorbHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sVoltorbHisuianLevelUpLearnset, - .teachableLearnset = sVoltorbHisuianTeachableLearnset, + .levelUpLearnset = sVoltorbHisuiLevelUpLearnset, + .teachableLearnset = sVoltorbHisuiTeachableLearnset, .formSpeciesIdTable = sVoltorbFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_ELECTRODE_HISUI}), }, @@ -11673,32 +11673,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_ElectrodeHisuian, + .frontPic = gMonFrontPic_ElectrodeHisui, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_ElectrodeHisuian, + .frontAnimFrames = sAnims_ElectrodeHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ElectrodeHisuian, + .backPic = gMonBackPic_ElectrodeHisui, .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ElectrodeHisuian, - .shinyPalette = gMonShinyPalette_ElectrodeHisuian, - .iconSprite = gMonIcon_ElectrodeHisuian, + .palette = gMonPalette_ElectrodeHisui, + .shinyPalette = gMonShinyPalette_ElectrodeHisui, + .iconSprite = gMonIcon_ElectrodeHisui, .iconPalIndex = 1, SHADOW(-1, 4, SHADOW_SIZE_M) FOOTPRINT(Electrode) OVERWORLD( - sPicTable_ElectrodeHisuian, + sPicTable_ElectrodeHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ElectrodeHisuian, - gShinyOverworldPalette_ElectrodeHisuian + gOverworldPalette_ElectrodeHisui, + gShinyOverworldPalette_ElectrodeHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sElectrodeHisuianLevelUpLearnset, - .teachableLearnset = sElectrodeHisuianTeachableLearnset, + .levelUpLearnset = sElectrodeHisuiLevelUpLearnset, + .teachableLearnset = sElectrodeHisuiTeachableLearnset, .formSpeciesIdTable = sElectrodeFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS @@ -11877,32 +11877,32 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 5, - .frontPic = gMonFrontPic_ExeggutorAlolan, + .frontPic = gMonFrontPic_ExeggutorAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_ExeggutorAlolan, + .frontAnimFrames = sAnims_ExeggutorAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ExeggutorAlolan, + .backPic = gMonBackPic_ExeggutorAlola, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ExeggutorAlolan, - .shinyPalette = gMonShinyPalette_ExeggutorAlolan, - .iconSprite = gMonIcon_ExeggutorAlolan, + .palette = gMonPalette_ExeggutorAlola, + .shinyPalette = gMonShinyPalette_ExeggutorAlola, + .iconSprite = gMonIcon_ExeggutorAlola, .iconPalIndex = 1, SHADOW(6, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Exeggutor) OVERWORLD( - sPicTable_ExeggutorAlolan, + sPicTable_ExeggutorAlola, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ExeggutorAlolan, - gShinyOverworldPalette_ExeggutorAlolan + gOverworldPalette_ExeggutorAlola, + gShinyOverworldPalette_ExeggutorAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sExeggutorAlolanLevelUpLearnset, - .teachableLearnset = sExeggutorAlolanTeachableLearnset, + .levelUpLearnset = sExeggutorAlolaLevelUpLearnset, + .teachableLearnset = sExeggutorAlolaTeachableLearnset, .formSpeciesIdTable = sExeggutorFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -12066,37 +12066,37 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Bone Keeper"), .height = 10, .weight = 340, - .description = gMarowakAlolanPokedexText, + .description = gMarowakAlolaPokedexText, .pokemonScale = 293, .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MarowakAlolan, + .frontPic = gMonFrontPic_MarowakAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_MarowakAlolan, + .frontAnimFrames = sAnims_MarowakAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_MarowakAlolan, + .backPic = gMonBackPic_MarowakAlola, .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_MarowakAlolan, - .shinyPalette = gMonShinyPalette_MarowakAlolan, - .iconSprite = gMonIcon_MarowakAlolan, + .palette = gMonPalette_MarowakAlola, + .shinyPalette = gMonShinyPalette_MarowakAlola, + .iconSprite = gMonIcon_MarowakAlola, .iconPalIndex = 1, SHADOW(-2, 11, SHADOW_SIZE_M) FOOTPRINT(Marowak) OVERWORLD( - sPicTable_MarowakAlolan, + sPicTable_MarowakAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_MarowakAlolan, - gShinyOverworldPalette_MarowakAlolan + gOverworldPalette_MarowakAlola, + gShinyOverworldPalette_MarowakAlola ) .isAlolanForm = TRUE, - .levelUpLearnset = sMarowakAlolanLevelUpLearnset, - .teachableLearnset = sMarowakAlolanTeachableLearnset, + .levelUpLearnset = sMarowakAlolaLevelUpLearnset, + .teachableLearnset = sMarowakAlolaTeachableLearnset, .formSpeciesIdTable = sMarowakFormSpeciesIdTable, }, @@ -12126,39 +12126,39 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .categoryName = _("Bone Keeper"), .height = 17, .weight = 980, - .description = gMarowakAlolanPokedexText, + .description = gMarowakAlolaPokedexText, .pokemonScale = 293, .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MarowakAlolan, + .frontPic = gMonFrontPic_MarowakAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_MarowakAlolan, + .frontAnimFrames = sAnims_MarowakAlola, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_MarowakAlolan, + .backPic = gMonBackPic_MarowakAlola, .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_MarowakAlolan, - .shinyPalette = gMonShinyPalette_MarowakAlolan, - .iconSprite = gMonIcon_MarowakAlolan, + .palette = gMonPalette_MarowakAlola, + .shinyPalette = gMonShinyPalette_MarowakAlola, + .iconSprite = gMonIcon_MarowakAlola, .iconPalIndex = 1, SHADOW(-2, 11, SHADOW_SIZE_M) FOOTPRINT(Marowak) OVERWORLD( - sPicTable_MarowakAlolan, + sPicTable_MarowakAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_MarowakAlolan, - gShinyOverworldPalette_MarowakAlolan + gOverworldPalette_MarowakAlola, + gShinyOverworldPalette_MarowakAlola ) .isTotem = TRUE, .isAlolanForm = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sMarowakAlolanLevelUpLearnset, - .teachableLearnset = sMarowakAlolanTeachableLearnset, + .levelUpLearnset = sMarowakAlolaLevelUpLearnset, + .teachableLearnset = sMarowakAlolaTeachableLearnset, .formSpeciesIdTable = sMarowakFormSpeciesIdTable, }, #endif //P_ALOLAN_FORMS @@ -12741,33 +12741,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_WeezingGalarian, + .frontPic = gMonFrontPic_WeezingGalar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_WeezingGalarian, + .frontAnimFrames = sAnims_WeezingGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, - .backPic = gMonBackPic_WeezingGalarian, + .backPic = gMonBackPic_WeezingGalar, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_WeezingGalarian, - .shinyPalette = gMonShinyPalette_WeezingGalarian, - .iconSprite = gMonIcon_WeezingGalarian, + .palette = gMonPalette_WeezingGalar, + .shinyPalette = gMonShinyPalette_WeezingGalar, + .iconSprite = gMonIcon_WeezingGalar, .iconPalIndex = 1, SHADOW(7, 17, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Weezing) OVERWORLD( - sPicTable_WeezingGalarian, + sPicTable_WeezingGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_WeezingGalarian, - gShinyOverworldPalette_WeezingGalarian + gOverworldPalette_WeezingGalar, + gShinyOverworldPalette_WeezingGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sWeezingGalarianLevelUpLearnset, - .teachableLearnset = sWeezingGalarianTeachableLearnset, + .levelUpLearnset = sWeezingGalarLevelUpLearnset, + .teachableLearnset = sWeezingGalarTeachableLearnset, .formSpeciesIdTable = sWeezingFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS @@ -14132,33 +14132,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 6, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MrMimeGalarian, + .frontPic = gMonFrontPic_MrMimeGalar, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_MrMimeGalarian, + .frontAnimFrames = sAnims_MrMimeGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_MrMimeGalarian, + .backPic = gMonBackPic_MrMimeGalar, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_MrMimeGalarian, - .shinyPalette = gMonShinyPalette_MrMimeGalarian, - .iconSprite = gMonIcon_MrMimeGalarian, + .palette = gMonPalette_MrMimeGalar, + .shinyPalette = gMonShinyPalette_MrMimeGalar, + .iconSprite = gMonIcon_MrMimeGalar, .iconPalIndex = 0, SHADOW(-1, 6, SHADOW_SIZE_M) FOOTPRINT(MrMime) OVERWORLD( - sPicTable_MrMimeGalarian, + sPicTable_MrMimeGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_MrMimeGalarian, - gShinyOverworldPalette_MrMimeGalarian + gOverworldPalette_MrMimeGalar, + gShinyOverworldPalette_MrMimeGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sMrMimeGalarianLevelUpLearnset, - .teachableLearnset = sMrMimeGalarianTeachableLearnset, - .eggMoveLearnset = sMrMimeGalarianEggMoveLearnset, + .levelUpLearnset = sMrMimeGalarLevelUpLearnset, + .teachableLearnset = sMrMimeGalarTeachableLearnset, + .eggMoveLearnset = sMrMimeGalarEggMoveLearnset, .formSpeciesIdTable = sMrMimeFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_MR_RIME}), }, @@ -15283,33 +15283,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_TaurosPaldeanCombatBreed, + .frontPic = gMonFrontPic_TaurosPaldeaCombat, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_TaurosPaldean, + .frontAnimFrames = sAnims_TaurosPaldea, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPic = gMonBackPic_TaurosPaldeanCombatBreed, + .backPic = gMonBackPic_TaurosPaldeaCombat, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - .palette = gMonPalette_TaurosPaldeanCombatBreed, - .shinyPalette = gMonShinyPalette_TaurosPaldeanCombatBreed, - .iconSprite = gMonIcon_TaurosPaldeanCombatBreed, + .palette = gMonPalette_TaurosPaldeaCombat, + .shinyPalette = gMonShinyPalette_TaurosPaldeaCombat, + .iconSprite = gMonIcon_TaurosPaldeaCombat, .iconPalIndex = 0, SHADOW(1, 7, SHADOW_SIZE_L) FOOTPRINT(Tauros) OVERWORLD( - sPicTable_TaurosPaldeanCombatBreed, + sPicTable_TaurosPaldeaCombat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_TaurosPaldeanCombatBreed, - gShinyOverworldPalette_TaurosPaldeanCombatBreed + gOverworldPalette_TaurosPaldeaCombat, + gShinyOverworldPalette_TaurosPaldeaCombat ) .isPaldeanForm = TRUE, - .levelUpLearnset = sTaurosPaldeanCombatBreedLevelUpLearnset, - .teachableLearnset = sTaurosPaldeanCombatBreedTeachableLearnset, - .eggMoveLearnset = sTaurosPaldeanCombatBreedEggMoveLearnset, + .levelUpLearnset = sTaurosPaldeaCombatLevelUpLearnset, + .teachableLearnset = sTaurosPaldeaCombatTeachableLearnset, + .eggMoveLearnset = sTaurosPaldeaCombatEggMoveLearnset, .formSpeciesIdTable = sTaurosFormSpeciesIdTable, }, @@ -15347,33 +15347,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_TaurosPaldeanBlazeBreed, + .frontPic = gMonFrontPic_TaurosPaldeaBlaze, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_TaurosPaldean, + .frontAnimFrames = sAnims_TaurosPaldea, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPic = gMonBackPic_TaurosPaldeanBlazeBreed, + .backPic = gMonBackPic_TaurosPaldeaBlaze, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - .palette = gMonPalette_TaurosPaldeanBlazeBreed, - .shinyPalette = gMonShinyPalette_TaurosPaldeanBlazeBreed, - .iconSprite = gMonIcon_TaurosPaldeanBlazeBreed, + .palette = gMonPalette_TaurosPaldeaBlaze, + .shinyPalette = gMonShinyPalette_TaurosPaldeaBlaze, + .iconSprite = gMonIcon_TaurosPaldeaBlaze, .iconPalIndex = 0, SHADOW(1, 7, SHADOW_SIZE_L) FOOTPRINT(Tauros) OVERWORLD( - sPicTable_TaurosPaldeanBlazeBreed, + sPicTable_TaurosPaldeaBlaze, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_TaurosPaldeanBlazeBreed, - gShinyOverworldPalette_TaurosPaldeanBlazeBreed + gOverworldPalette_TaurosPaldeaBlaze, + gShinyOverworldPalette_TaurosPaldeaBlaze ) .isPaldeanForm = TRUE, - .levelUpLearnset = sTaurosPaldeanBlazeBreedLevelUpLearnset, - .teachableLearnset = sTaurosPaldeanBlazeBreedTeachableLearnset, - .eggMoveLearnset = sTaurosPaldeanBlazeBreedEggMoveLearnset, + .levelUpLearnset = sTaurosPaldeaBlazeLevelUpLearnset, + .teachableLearnset = sTaurosPaldeaBlazeTeachableLearnset, + .eggMoveLearnset = sTaurosPaldeaBlazeEggMoveLearnset, .formSpeciesIdTable = sTaurosFormSpeciesIdTable, }, @@ -15411,33 +15411,33 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_TaurosPaldeanAquaBreed, + .frontPic = gMonFrontPic_TaurosPaldeaAqua, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_TaurosPaldean, + .frontAnimFrames = sAnims_TaurosPaldea, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPic = gMonBackPic_TaurosPaldeanAquaBreed, + .backPic = gMonBackPic_TaurosPaldeaAqua, .backPicSize = MON_COORDS_SIZE(64, 48), .backPicYOffset = 9, .backAnimId = BACK_ANIM_V_SHAKE_LOW, - .palette = gMonPalette_TaurosPaldeanAquaBreed, - .shinyPalette = gMonShinyPalette_TaurosPaldeanAquaBreed, - .iconSprite = gMonIcon_TaurosPaldeanAquaBreed, + .palette = gMonPalette_TaurosPaldeaAqua, + .shinyPalette = gMonShinyPalette_TaurosPaldeaAqua, + .iconSprite = gMonIcon_TaurosPaldeaAqua, .iconPalIndex = 0, SHADOW(1, 7, SHADOW_SIZE_L) FOOTPRINT(Tauros) OVERWORLD( - sPicTable_TaurosPaldeanAquaBreed, + sPicTable_TaurosPaldeaAqua, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_TaurosPaldeanAquaBreed, - gShinyOverworldPalette_TaurosPaldeanAquaBreed + gOverworldPalette_TaurosPaldeaAqua, + gShinyOverworldPalette_TaurosPaldeaAqua ) .isPaldeanForm = TRUE, - .levelUpLearnset = sTaurosPaldeanAquaBreedLevelUpLearnset, - .teachableLearnset = sTaurosPaldeanAquaBreedTeachableLearnset, - .eggMoveLearnset = sTaurosPaldeanAquaBreedEggMoveLearnset, + .levelUpLearnset = sTaurosPaldeaAquaLevelUpLearnset, + .teachableLearnset = sTaurosPaldeaAquaTeachableLearnset, + .eggMoveLearnset = sTaurosPaldeaAquaEggMoveLearnset, .formSpeciesIdTable = sTaurosFormSpeciesIdTable, }, #endif //P_PALDEAN_FORMS @@ -15754,18 +15754,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 10, .trainerScale = 423, .trainerOffset = 8, - .frontPic = gMonFrontPic_LaprasGigantamax, + .frontPic = gMonFrontPic_LaprasGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_LaprasGigantamax, + .frontAnimFrames = sAnims_LaprasGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_LaprasGigantamax, + .backPic = gMonBackPic_LaprasGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_LaprasGigantamax, - .shinyPalette = gMonShinyPalette_LaprasGigantamax, - .iconSprite = gMonIcon_LaprasGigantamax, + .palette = gMonPalette_LaprasGmax, + .shinyPalette = gMonShinyPalette_LaprasGmax, + .iconSprite = gMonIcon_LaprasGmax, .iconPalIndex = 2, SHADOW(2, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Lapras) @@ -15965,18 +15965,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 18, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_EeveeGigantamax, + .frontPic = gMonFrontPic_EeveeGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_EeveeGigantamax, + .frontAnimFrames = sAnims_EeveeGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_EeveeGigantamax, + .backPic = gMonBackPic_EeveeGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_EeveeGigantamax, - .shinyPalette = gMonShinyPalette_EeveeGigantamax, - .iconSprite = gMonIcon_EeveeGigantamax, + .palette = gMonPalette_EeveeGmax, + .shinyPalette = gMonShinyPalette_EeveeGmax, + .iconSprite = gMonIcon_EeveeGmax, .iconPalIndex = 2, SHADOW(0, 4, SHADOW_SIZE_L) FOOTPRINT(Eevee) @@ -17330,18 +17330,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 4, .trainerScale = 423, .trainerOffset = 11, - .frontPic = gMonFrontPic_SnorlaxGigantamax, + .frontPic = gMonFrontPic_SnorlaxGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SnorlaxGigantamax, + .frontAnimFrames = sAnims_SnorlaxGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_SnorlaxGigantamax, + .backPic = gMonBackPic_SnorlaxGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_SnorlaxGigantamax, - .shinyPalette = gMonShinyPalette_SnorlaxGigantamax, - .iconSprite = gMonIcon_SnorlaxGigantamax, + .palette = gMonPalette_SnorlaxGmax, + .shinyPalette = gMonShinyPalette_SnorlaxGmax, + .iconSprite = gMonIcon_SnorlaxGmax, .iconPalIndex = 3, SHADOW(0, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Snorlax) @@ -17461,35 +17461,35 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 309, .trainerOffset = 2, - .frontPic = gMonFrontPic_ArticunoGalarian, + .frontPic = gMonFrontPic_ArticunoGalar, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_ArticunoGalarian, + .frontAnimFrames = sAnims_ArticunoGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, - .backPic = gMonBackPic_ArticunoGalarian, + .backPic = gMonBackPic_ArticunoGalar, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ArticunoGalarian, - .shinyPalette = gMonShinyPalette_ArticunoGalarian, - .iconSprite = gMonIcon_ArticunoGalarian, + .palette = gMonPalette_ArticunoGalar, + .shinyPalette = gMonShinyPalette_ArticunoGalar, + .iconSprite = gMonIcon_ArticunoGalar, .iconPalIndex = 2, SHADOW(3, 14, SHADOW_SIZE_M) FOOTPRINT(Articuno) OVERWORLD( - sPicTable_ArticunoGalarian, + sPicTable_ArticunoGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ArticunoGalarian, - gShinyOverworldPalette_ArticunoGalarian + gOverworldPalette_ArticunoGalar, + gShinyOverworldPalette_ArticunoGalar ) .isLegendary = TRUE, .isGalarianForm = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sArticunoGalarianLevelUpLearnset, - .teachableLearnset = sArticunoGalarianTeachableLearnset, + .levelUpLearnset = sArticunoGalarLevelUpLearnset, + .teachableLearnset = sArticunoGalarTeachableLearnset, .formSpeciesIdTable = sArticunoFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS @@ -17606,34 +17606,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 318, .trainerOffset = 3, - .frontPic = gMonFrontPic_ZapdosGalarian, + .frontPic = gMonFrontPic_ZapdosGalar, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_ZapdosGalarian, + .frontAnimFrames = sAnims_ZapdosGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ZapdosGalarian, + .backPic = gMonBackPic_ZapdosGalar, .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ZapdosGalarian, - .shinyPalette = gMonShinyPalette_ZapdosGalarian, - .iconSprite = gMonIcon_ZapdosGalarian, + .palette = gMonPalette_ZapdosGalar, + .shinyPalette = gMonShinyPalette_ZapdosGalar, + .iconSprite = gMonIcon_ZapdosGalar, .iconPalIndex = 0, SHADOW(-2, 11, SHADOW_SIZE_M) FOOTPRINT(Zapdos) OVERWORLD( - sPicTable_ZapdosGalarian, + sPicTable_ZapdosGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ZapdosGalarian, - gShinyOverworldPalette_ZapdosGalarian + gOverworldPalette_ZapdosGalar, + gShinyOverworldPalette_ZapdosGalar ) .isLegendary = TRUE, .isGalarianForm = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sZapdosGalarianLevelUpLearnset, - .teachableLearnset = sZapdosGalarianTeachableLearnset, + .levelUpLearnset = sZapdosGalarLevelUpLearnset, + .teachableLearnset = sZapdosGalarTeachableLearnset, .formSpeciesIdTable = sZapdosFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS @@ -17745,34 +17745,34 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .pokemonOffset = 0, .trainerScale = 387, .trainerOffset = 8, - .frontPic = gMonFrontPic_MoltresGalarian, + .frontPic = gMonFrontPic_MoltresGalar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_MoltresGalarian, + .frontAnimFrames = sAnims_MoltresGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_MoltresGalarian, + .backPic = gMonBackPic_MoltresGalar, .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_MoltresGalarian, - .shinyPalette = gMonShinyPalette_MoltresGalarian, - .iconSprite = gMonIcon_MoltresGalarian, + .palette = gMonPalette_MoltresGalar, + .shinyPalette = gMonShinyPalette_MoltresGalar, + .iconSprite = gMonIcon_MoltresGalar, .iconPalIndex = 0, SHADOW(0, 12, SHADOW_SIZE_M) FOOTPRINT(Moltres) OVERWORLD( - sPicTable_MoltresGalarian, + sPicTable_MoltresGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_MoltresGalarian, - gShinyOverworldPalette_MoltresGalarian + gOverworldPalette_MoltresGalar, + gShinyOverworldPalette_MoltresGalar ) .isLegendary = TRUE, .isGalarianForm = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sMoltresGalarianLevelUpLearnset, - .teachableLearnset = sMoltresGalarianTeachableLearnset, + .levelUpLearnset = sMoltresGalarLevelUpLearnset, + .teachableLearnset = sMoltresGalarTeachableLearnset, .formSpeciesIdTable = sMoltresFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index ce3e806348..ca74ee28de 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -443,32 +443,32 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 268, .trainerOffset = 1, - .frontPic = gMonFrontPic_TyphlosionHisuian, + .frontPic = gMonFrontPic_TyphlosionHisui, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_TyphlosionHisuian, + .frontAnimFrames = sAnims_TyphlosionHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_TyphlosionHisuian, + .backPic = gMonBackPic_TyphlosionHisui, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_TyphlosionHisuian, - .shinyPalette = gMonShinyPalette_TyphlosionHisuian, - .iconSprite = gMonIcon_TyphlosionHisuian, + .palette = gMonPalette_TyphlosionHisui, + .shinyPalette = gMonShinyPalette_TyphlosionHisui, + .iconSprite = gMonIcon_TyphlosionHisui, .iconPalIndex = 1, SHADOW(2, 14, SHADOW_SIZE_L) FOOTPRINT(Typhlosion) OVERWORLD( - sPicTable_TyphlosionHisuian, + sPicTable_TyphlosionHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_TyphlosionHisuian, - gShinyOverworldPalette_TyphlosionHisuian + gOverworldPalette_TyphlosionHisui, + gShinyOverworldPalette_TyphlosionHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sTyphlosionHisuianLevelUpLearnset, - .teachableLearnset = sTyphlosionHisuianTeachableLearnset, + .levelUpLearnset = sTyphlosionHisuiLevelUpLearnset, + .teachableLearnset = sTyphlosionHisuiTeachableLearnset, .formSpeciesIdTable = sTyphlosionFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS @@ -3090,33 +3090,33 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 21, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_WooperPaldean, + .frontPic = gMonFrontPic_WooperPaldea, .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_WooperPaldean, + .frontAnimFrames = sAnims_WooperPaldea, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_WooperPaldean, + .backPic = gMonBackPic_WooperPaldea, .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 12, .backAnimId = BACK_ANIM_V_STRETCH, - .palette = gMonPalette_WooperPaldean, - .shinyPalette = gMonShinyPalette_WooperPaldean, - .iconSprite = gMonIcon_WooperPaldean, + .palette = gMonPalette_WooperPaldea, + .shinyPalette = gMonShinyPalette_WooperPaldea, + .iconSprite = gMonIcon_WooperPaldea, .iconPalIndex = 2, SHADOW(-1, -2, SHADOW_SIZE_S) FOOTPRINT(Wooper) OVERWORLD( - sPicTable_WooperPaldean, + sPicTable_WooperPaldea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_WooperPaldean, - gShinyOverworldPalette_WooperPaldean + gOverworldPalette_WooperPaldea, + gShinyOverworldPalette_WooperPaldea ) .isPaldeanForm = TRUE, - .levelUpLearnset = sWooperPaldeanLevelUpLearnset, - .teachableLearnset = sWooperPaldeanTeachableLearnset, - .eggMoveLearnset = sWooperPaldeanEggMoveLearnset, + .levelUpLearnset = sWooperPaldeaLevelUpLearnset, + .teachableLearnset = sWooperPaldeaTeachableLearnset, + .eggMoveLearnset = sWooperPaldeaEggMoveLearnset, .formSpeciesIdTable = sWooperFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_CLODSIRE}), }, @@ -3522,34 +3522,34 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .formSpeciesIdTable = sUnownFormSpeciesIdTable, \ } - [SPECIES_UNOWN] = UNOWN_MISC_INFO(A, FALSE, 24, 40, 24, 48, 8 ), - [SPECIES_UNOWN_B] = UNOWN_MISC_INFO(B, TRUE, 24, 32, 40, 48, 9 ), - [SPECIES_UNOWN_C] = UNOWN_MISC_INFO(C, TRUE, 32, 32, 48, 56, 6 ), - [SPECIES_UNOWN_D] = UNOWN_MISC_INFO(D, TRUE, 32, 32, 40, 48, 8 ), - [SPECIES_UNOWN_E] = UNOWN_MISC_INFO(E, TRUE, 32, 32, 40, 48, 10 ), - [SPECIES_UNOWN_F] = UNOWN_MISC_INFO(F, TRUE, 32, 32, 48, 48, 10 ), - [SPECIES_UNOWN_G] = UNOWN_MISC_INFO(G, TRUE, 24, 40, 40, 56, 5 ), - [SPECIES_UNOWN_H] = UNOWN_MISC_INFO(H, TRUE, 32, 32, 48, 48, 8 ), - [SPECIES_UNOWN_I] = UNOWN_MISC_INFO(I, FALSE, 24, 32, 24, 56, 7 ), - [SPECIES_UNOWN_J] = UNOWN_MISC_INFO(J, TRUE, 24, 32, 32, 48, 9 ), - [SPECIES_UNOWN_K] = UNOWN_MISC_INFO(K, TRUE, 32, 32, 40, 56, 7 ), - [SPECIES_UNOWN_L] = UNOWN_MISC_INFO(L, TRUE, 24, 32, 32, 48, 10 ), - [SPECIES_UNOWN_M] = UNOWN_MISC_INFO(M, FALSE, 32, 32, 48, 40, 13 ), - [SPECIES_UNOWN_N] = UNOWN_MISC_INFO(N, TRUE, 32, 24, 48, 40, 13 ), - [SPECIES_UNOWN_O] = UNOWN_MISC_INFO(O, FALSE, 32, 32, 48, 48, 8 ), - [SPECIES_UNOWN_P] = UNOWN_MISC_INFO(P, TRUE, 24, 32, 32, 48, 10 ), - [SPECIES_UNOWN_Q] = UNOWN_MISC_INFO(Q, TRUE, 32, 24, 40, 40, 15 ), - [SPECIES_UNOWN_R] = UNOWN_MISC_INFO(R, TRUE, 24, 32, 32, 40, 12 ), - [SPECIES_UNOWN_S] = UNOWN_MISC_INFO(S, TRUE, 32, 40, 40, 56, 4 ), - [SPECIES_UNOWN_T] = UNOWN_MISC_INFO(T, FALSE, 24, 32, 32, 40, 13 ), - [SPECIES_UNOWN_U] = UNOWN_MISC_INFO(U, FALSE, 32, 32, 48, 40, 13 ), - [SPECIES_UNOWN_V] = UNOWN_MISC_INFO(V, TRUE, 32, 32, 40, 48, 11 ), - [SPECIES_UNOWN_W] = UNOWN_MISC_INFO(W, FALSE, 32, 32, 40, 40, 13 ), - [SPECIES_UNOWN_X] = UNOWN_MISC_INFO(X, FALSE, 24, 24, 40, 40, 15 ), - [SPECIES_UNOWN_Y] = UNOWN_MISC_INFO(Y, FALSE, 24, 32, 32, 48, 10 ), - [SPECIES_UNOWN_Z] = UNOWN_MISC_INFO(Z, TRUE, 24, 32, 32, 48, 10 ), - [SPECIES_UNOWN_EXCLAMATION] = UNOWN_MISC_INFO(ExclamationMark, FALSE, 24, 40, 24, 56, 6 ), - [SPECIES_UNOWN_QUESTION] = UNOWN_MISC_INFO(QuestionMark, TRUE, 24, 40, 32, 56, 6 ), + [SPECIES_UNOWN] = UNOWN_MISC_INFO(A, FALSE, 24, 40, 24, 48, 8 ), + [SPECIES_UNOWN_B] = UNOWN_MISC_INFO(B, TRUE, 24, 32, 40, 48, 9 ), + [SPECIES_UNOWN_C] = UNOWN_MISC_INFO(C, TRUE, 32, 32, 48, 56, 6 ), + [SPECIES_UNOWN_D] = UNOWN_MISC_INFO(D, TRUE, 32, 32, 40, 48, 8 ), + [SPECIES_UNOWN_E] = UNOWN_MISC_INFO(E, TRUE, 32, 32, 40, 48, 10 ), + [SPECIES_UNOWN_F] = UNOWN_MISC_INFO(F, TRUE, 32, 32, 48, 48, 10 ), + [SPECIES_UNOWN_G] = UNOWN_MISC_INFO(G, TRUE, 24, 40, 40, 56, 5 ), + [SPECIES_UNOWN_H] = UNOWN_MISC_INFO(H, TRUE, 32, 32, 48, 48, 8 ), + [SPECIES_UNOWN_I] = UNOWN_MISC_INFO(I, FALSE, 24, 32, 24, 56, 7 ), + [SPECIES_UNOWN_J] = UNOWN_MISC_INFO(J, TRUE, 24, 32, 32, 48, 9 ), + [SPECIES_UNOWN_K] = UNOWN_MISC_INFO(K, TRUE, 32, 32, 40, 56, 7 ), + [SPECIES_UNOWN_L] = UNOWN_MISC_INFO(L, TRUE, 24, 32, 32, 48, 10 ), + [SPECIES_UNOWN_M] = UNOWN_MISC_INFO(M, FALSE, 32, 32, 48, 40, 13 ), + [SPECIES_UNOWN_N] = UNOWN_MISC_INFO(N, TRUE, 32, 24, 48, 40, 13 ), + [SPECIES_UNOWN_O] = UNOWN_MISC_INFO(O, FALSE, 32, 32, 48, 48, 8 ), + [SPECIES_UNOWN_P] = UNOWN_MISC_INFO(P, TRUE, 24, 32, 32, 48, 10 ), + [SPECIES_UNOWN_Q] = UNOWN_MISC_INFO(Q, TRUE, 32, 24, 40, 40, 15 ), + [SPECIES_UNOWN_R] = UNOWN_MISC_INFO(R, TRUE, 24, 32, 32, 40, 12 ), + [SPECIES_UNOWN_S] = UNOWN_MISC_INFO(S, TRUE, 32, 40, 40, 56, 4 ), + [SPECIES_UNOWN_T] = UNOWN_MISC_INFO(T, FALSE, 24, 32, 32, 40, 13 ), + [SPECIES_UNOWN_U] = UNOWN_MISC_INFO(U, FALSE, 32, 32, 48, 40, 13 ), + [SPECIES_UNOWN_V] = UNOWN_MISC_INFO(V, TRUE, 32, 32, 40, 48, 11 ), + [SPECIES_UNOWN_W] = UNOWN_MISC_INFO(W, FALSE, 32, 32, 40, 40, 13 ), + [SPECIES_UNOWN_X] = UNOWN_MISC_INFO(X, FALSE, 24, 24, 40, 40, 15 ), + [SPECIES_UNOWN_Y] = UNOWN_MISC_INFO(Y, FALSE, 24, 32, 32, 48, 10 ), + [SPECIES_UNOWN_Z] = UNOWN_MISC_INFO(Z, TRUE, 24, 32, 32, 48, 10 ), + [SPECIES_UNOWN_EXCLAMATION] = UNOWN_MISC_INFO(Exclamation, FALSE, 24, 40, 24, 56, 6 ), + [SPECIES_UNOWN_QUESTION] = UNOWN_MISC_INFO(Question, TRUE, 24, 40, 32, 56, 6 ), #endif //P_FAMILY_UNOWN #if P_FAMILY_WOBBUFFET @@ -4549,33 +4549,33 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 0, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_QwilfishHisuian, + .frontPic = gMonFrontPic_QwilfishHisui, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_QwilfishHisuian, + .frontAnimFrames = sAnims_QwilfishHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 9, - .backPic = gMonBackPic_QwilfishHisuian, + .backPic = gMonBackPic_QwilfishHisui, .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_QwilfishHisuian, - .shinyPalette = gMonShinyPalette_QwilfishHisuian, - .iconSprite = gMonIcon_QwilfishHisuian, + .palette = gMonPalette_QwilfishHisui, + .shinyPalette = gMonShinyPalette_QwilfishHisui, + .iconSprite = gMonIcon_QwilfishHisui, .iconPalIndex = 1, SHADOW(-5, 4, SHADOW_SIZE_S) FOOTPRINT(Qwilfish) OVERWORLD( - sPicTable_QwilfishHisuian, + sPicTable_QwilfishHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_QwilfishHisuian, - gShinyOverworldPalette_QwilfishHisuian + gOverworldPalette_QwilfishHisui, + gShinyOverworldPalette_QwilfishHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sQwilfishHisuianLevelUpLearnset, - .teachableLearnset = sQwilfishHisuianTeachableLearnset, + .levelUpLearnset = sQwilfishHisuiLevelUpLearnset, + .teachableLearnset = sQwilfishHisuiTeachableLearnset, .formSpeciesIdTable = sQwilfishFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_MOVE, MOVE_BARB_BARRAGE, SPECIES_OVERQWIL}), }, @@ -5039,42 +5039,42 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = -3, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_SneaselHisuian, - .frontPicFemale = gMonFrontPic_SneaselHisuianF, + .frontPic = gMonFrontPic_SneaselHisui, + .frontPicFemale = gMonFrontPic_SneaselHisuiF, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicSizeFemale = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_SneaselHisuian, + .frontAnimFrames = sAnims_SneaselHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_SneaselHisuian, - .backPicFemale = gMonBackPic_SneaselHisuianF, + .backPic = gMonBackPic_SneaselHisui, + .backPicFemale = gMonBackPic_SneaselHisuiF, .backPicSize = MON_COORDS_SIZE(56, 64), .backPicSizeFemale = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_SneaselHisuian, - .shinyPalette = gMonShinyPalette_SneaselHisuian, - .iconSprite = gMonIcon_SneaselHisuian, + .palette = gMonPalette_SneaselHisui, + .shinyPalette = gMonShinyPalette_SneaselHisui, + .iconSprite = gMonIcon_SneaselHisui, .iconPalIndex = 0, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Sneasel) OVERWORLD( - sPicTable_SneaselHisuian, + sPicTable_SneaselHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_SneaselHisuian, - gShinyOverworldPalette_SneaselHisuian + gOverworldPalette_SneaselHisui, + gShinyOverworldPalette_SneaselHisui ) OVERWORLD_FEMALE( - sPicTable_SneaselHisuianF, + sPicTable_SneaselHisuiF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT ) .isHisuianForm = TRUE, - .levelUpLearnset = sSneaselHisuianLevelUpLearnset, - .teachableLearnset = sSneaselHisuianTeachableLearnset, + .levelUpLearnset = sSneaselHisuiLevelUpLearnset, + .teachableLearnset = sSneaselHisuiTeachableLearnset, .formSpeciesIdTable = sSneaselFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM_HOLD_DAY, ITEM_RAZOR_CLAW, SPECIES_SNEASLER}, {EVO_ITEM_DAY, ITEM_RAZOR_CLAW, SPECIES_SNEASLER}), @@ -5875,33 +5875,33 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .pokemonOffset = 15, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_CorsolaGalarian, + .frontPic = gMonFrontPic_CorsolaGalar, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_CorsolaGalarian, + .frontAnimFrames = sAnims_CorsolaGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CorsolaGalarian, + .backPic = gMonBackPic_CorsolaGalar, .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CorsolaGalarian, - .shinyPalette = gMonShinyPalette_CorsolaGalarian, - .iconSprite = gMonIcon_CorsolaGalarian, + .palette = gMonPalette_CorsolaGalar, + .shinyPalette = gMonShinyPalette_CorsolaGalar, + .iconSprite = gMonIcon_CorsolaGalar, .iconPalIndex = 0, SHADOW(0, 2, SHADOW_SIZE_M) FOOTPRINT(Corsola) OVERWORLD( - sPicTable_CorsolaGalarian, + sPicTable_CorsolaGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_CorsolaGalarian, - gShinyOverworldPalette_CorsolaGalarian + gOverworldPalette_CorsolaGalar, + gShinyOverworldPalette_CorsolaGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sCorsolaGalarianLevelUpLearnset, - .teachableLearnset = sCorsolaGalarianTeachableLearnset, - .eggMoveLearnset = sCorsolaGalarianEggMoveLearnset, + .levelUpLearnset = sCorsolaGalarLevelUpLearnset, + .teachableLearnset = sCorsolaGalarTeachableLearnset, + .eggMoveLearnset = sCorsolaGalarEggMoveLearnset, .formSpeciesIdTable = sCorsolaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 38, SPECIES_CURSOLA}), }, diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h index 0129f087b1..d4e6d00975 100644 --- a/src/data/pokemon/species_info/gen_3_families.h +++ b/src/data/pokemon/species_info/gen_3_families.h @@ -1116,33 +1116,33 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 22, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_ZigzagoonGalarian, + .frontPic = gMonFrontPic_ZigzagoonGalar, .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_ZigzagoonGalarian, + .frontAnimFrames = sAnims_ZigzagoonGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ZigzagoonGalarian, + .backPic = gMonBackPic_ZigzagoonGalar, .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ZigzagoonGalarian, - .shinyPalette = gMonShinyPalette_ZigzagoonGalarian, - .iconSprite = gMonIcon_ZigzagoonGalarian, + .palette = gMonPalette_ZigzagoonGalar, + .shinyPalette = gMonShinyPalette_ZigzagoonGalar, + .iconSprite = gMonIcon_ZigzagoonGalar, .iconPalIndex = 0, SHADOW(-5, 0, SHADOW_SIZE_M) FOOTPRINT(Zigzagoon) OVERWORLD( - sPicTable_ZigzagoonGalarian, + sPicTable_ZigzagoonGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ZigzagoonGalarian, - gShinyOverworldPalette_ZigzagoonGalarian + gOverworldPalette_ZigzagoonGalar, + gShinyOverworldPalette_ZigzagoonGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sZigzagoonGalarianLevelUpLearnset, - .teachableLearnset = sZigzagoonGalarianTeachableLearnset, - .eggMoveLearnset = sZigzagoonGalarianEggMoveLearnset, + .levelUpLearnset = sZigzagoonGalarLevelUpLearnset, + .teachableLearnset = sZigzagoonGalarTeachableLearnset, + .eggMoveLearnset = sZigzagoonGalarEggMoveLearnset, .formSpeciesIdTable = sZigzagoonFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 20, SPECIES_LINOONE_GALAR}), }, @@ -1181,32 +1181,32 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_LinooneGalarian, + .frontPic = gMonFrontPic_LinooneGalar, .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_LinooneGalarian, + .frontAnimFrames = sAnims_LinooneGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_LinooneGalarian, + .backPic = gMonBackPic_LinooneGalar, .backPicSize = MON_COORDS_SIZE(64, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_LinooneGalarian, - .shinyPalette = gMonShinyPalette_LinooneGalarian, - .iconSprite = gMonIcon_LinooneGalarian, + .palette = gMonPalette_LinooneGalar, + .shinyPalette = gMonShinyPalette_LinooneGalar, + .iconSprite = gMonIcon_LinooneGalar, .iconPalIndex = 0, SHADOW(-4, 0, SHADOW_SIZE_L) FOOTPRINT(Linoone) OVERWORLD( - sPicTable_LinooneGalarian, + sPicTable_LinooneGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_LinooneGalarian, - gShinyOverworldPalette_LinooneGalarian + gOverworldPalette_LinooneGalar, + gShinyOverworldPalette_LinooneGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sLinooneGalarianLevelUpLearnset, - .teachableLearnset = sLinooneGalarianTeachableLearnset, + .levelUpLearnset = sLinooneGalarLevelUpLearnset, + .teachableLearnset = sLinooneGalarTeachableLearnset, .formSpeciesIdTable = sLinooneFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON}), }, diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h index f35e74c151..302c182cd5 100644 --- a/src/data/pokemon/species_info/gen_4_families.h +++ b/src/data/pokemon/species_info/gen_4_families.h @@ -1703,29 +1703,29 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_BurmySandyCloak, + .frontPic = gMonFrontPic_BurmySandy, .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 12, .frontAnimFrames = sAnims_Burmy, .frontAnimId = ANIM_V_STRETCH, .enemyMonElevation = 10, - .backPic = gMonBackPic_BurmySandyCloak, + .backPic = gMonBackPic_BurmySandy, .backPicSize = MON_COORDS_SIZE(32, 56), .backPicYOffset = 7, .backAnimId = BACK_ANIM_H_SHAKE, - .palette = gMonPalette_BurmySandyCloak, - .shinyPalette = gMonShinyPalette_BurmySandyCloak, - .iconSprite = gMonIcon_BurmySandyCloak, + .palette = gMonPalette_BurmySandy, + .shinyPalette = gMonShinyPalette_BurmySandy, + .iconSprite = gMonIcon_BurmySandy, .iconPalIndex = 1, SHADOW(-1, 9, SHADOW_SIZE_S) FOOTPRINT(Burmy) OVERWORLD( - sPicTable_BurmySandyCloak, + sPicTable_BurmySandy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_BurmySandyCloak, - gShinyOverworldPalette_BurmySandyCloak + gOverworldPalette_BurmySandy, + gShinyOverworldPalette_BurmySandy ) .tmIlliterate = TRUE, .levelUpLearnset = sBurmyLevelUpLearnset, @@ -1770,29 +1770,29 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 24, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_BurmyTrashCloak, + .frontPic = gMonFrontPic_BurmyTrash, .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Burmy, .frontAnimId = ANIM_V_STRETCH, .enemyMonElevation = 10, - .backPic = gMonBackPic_BurmyTrashCloak, + .backPic = gMonBackPic_BurmyTrash, .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 0, .backAnimId = BACK_ANIM_H_SHAKE, - .palette = gMonPalette_BurmyTrashCloak, - .shinyPalette = gMonShinyPalette_BurmyTrashCloak, - .iconSprite = gMonIcon_BurmyTrashCloak, + .palette = gMonPalette_BurmyTrash, + .shinyPalette = gMonShinyPalette_BurmyTrash, + .iconSprite = gMonIcon_BurmyTrash, .iconPalIndex = 0, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Burmy) OVERWORLD( - sPicTable_BurmyTrashCloak, + sPicTable_BurmyTrash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_BurmyTrashCloak, - gShinyOverworldPalette_BurmyTrashCloak + gOverworldPalette_BurmyTrash, + gShinyOverworldPalette_BurmyTrash ) .tmIlliterate = TRUE, .levelUpLearnset = sBurmyLevelUpLearnset, @@ -1902,32 +1902,32 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_WormadamSandyCloak, + .frontPic = gMonFrontPic_WormadamSandy, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Wormadam, .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, .enemyMonElevation = 8, - .backPic = gMonBackPic_WormadamSandyCloak, + .backPic = gMonBackPic_WormadamSandy, .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - .palette = gMonPalette_WormadamSandyCloak, - .shinyPalette = gMonShinyPalette_WormadamSandyCloak, - .iconSprite = gMonIcon_WormadamSandyCloak, + .palette = gMonPalette_WormadamSandy, + .shinyPalette = gMonShinyPalette_WormadamSandy, + .iconSprite = gMonIcon_WormadamSandy, .iconPalIndex = 1, SHADOW(-1, 9, SHADOW_SIZE_S) FOOTPRINT(Wormadam) OVERWORLD( - sPicTable_WormadamSandyCloak, + sPicTable_WormadamSandy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_WormadamSandyCloak, - gShinyOverworldPalette_WormadamSandyCloak + gOverworldPalette_WormadamSandy, + gShinyOverworldPalette_WormadamSandy ) - .levelUpLearnset = sWormadamSandyCloakLevelUpLearnset, - .teachableLearnset = sWormadamSandyCloakTeachableLearnset, + .levelUpLearnset = sWormadamSandyLevelUpLearnset, + .teachableLearnset = sWormadamSandyTeachableLearnset, .formSpeciesIdTable = sWormadamFormSpeciesIdTable, }, @@ -1967,32 +1967,32 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_WormadamTrashCloak, + .frontPic = gMonFrontPic_WormadamTrash, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 10, .frontAnimFrames = sAnims_Wormadam, .frontAnimId = ANIM_SWING_CONVEX_FAST_SHORT, .enemyMonElevation = 8, - .backPic = gMonBackPic_WormadamTrashCloak, + .backPic = gMonBackPic_WormadamTrash, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE, - .palette = gMonPalette_WormadamTrashCloak, - .shinyPalette = gMonShinyPalette_WormadamTrashCloak, - .iconSprite = gMonIcon_WormadamTrashCloak, + .palette = gMonPalette_WormadamTrash, + .shinyPalette = gMonShinyPalette_WormadamTrash, + .iconSprite = gMonIcon_WormadamTrash, .iconPalIndex = 0, SHADOW(0, 9, SHADOW_SIZE_S) FOOTPRINT(Wormadam) OVERWORLD( - sPicTable_WormadamTrashCloak, + sPicTable_WormadamTrash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_WormadamTrashCloak, - gShinyOverworldPalette_WormadamTrashCloak + gOverworldPalette_WormadamTrash, + gShinyOverworldPalette_WormadamTrash ) - .levelUpLearnset = sWormadamTrashCloakLevelUpLearnset, - .teachableLearnset = sWormadamTrashCloakTeachableLearnset, + .levelUpLearnset = sWormadamTrashLevelUpLearnset, + .teachableLearnset = sWormadamTrashTeachableLearnset, .formSpeciesIdTable = sWormadamFormSpeciesIdTable, }, @@ -2700,28 +2700,28 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_ShellosEastSea, + .frontPic = gMonFrontPic_ShellosEast, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, .frontAnimFrames = sAnims_Shellos, .frontAnimId = ANIM_V_STRETCH, - .backPic = gMonBackPic_ShellosEastSea, + .backPic = gMonBackPic_ShellosEast, .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 8, .backAnimId = BACK_ANIM_H_SPRING, - .palette = gMonPalette_ShellosEastSea, - .shinyPalette = gMonShinyPalette_ShellosEastSea, - .iconSprite = gMonIcon_ShellosEastSea, + .palette = gMonPalette_ShellosEast, + .shinyPalette = gMonShinyPalette_ShellosEast, + .iconSprite = gMonIcon_ShellosEast, .iconPalIndex = 0, SHADOW(2, -1, SHADOW_SIZE_S) FOOTPRINT(Shellos) OVERWORLD( - sPicTable_ShellosEastSea, + sPicTable_ShellosEast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ShellosEastSea, - gShinyOverworldPalette_ShellosEastSea + gOverworldPalette_ShellosEast, + gShinyOverworldPalette_ShellosEast ) .levelUpLearnset = sShellosLevelUpLearnset, .teachableLearnset = sShellosTeachableLearnset, @@ -2826,28 +2826,28 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_GastrodonEastSea, + .frontPic = gMonFrontPic_GastrodonEast, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, .frontAnimFrames = sAnims_Gastrodon, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - .backPic = gMonBackPic_GastrodonEastSea, + .backPic = gMonBackPic_GastrodonEast, .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 3, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, - .palette = gMonPalette_GastrodonEastSea, - .shinyPalette = gMonShinyPalette_GastrodonEastSea, - .iconSprite = gMonIcon_GastrodonEastSea, + .palette = gMonPalette_GastrodonEast, + .shinyPalette = gMonShinyPalette_GastrodonEast, + .iconSprite = gMonIcon_GastrodonEast, .iconPalIndex = 0, SHADOW(2, 4, SHADOW_SIZE_M) FOOTPRINT(Gastrodon) OVERWORLD( - sPicTable_GastrodonEastSea, + sPicTable_GastrodonEast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_GastrodonEastSea, - gShinyOverworldPalette_GastrodonEastSea + gOverworldPalette_GastrodonEast, + gShinyOverworldPalette_GastrodonEast ) .levelUpLearnset = sGastrodonLevelUpLearnset, .teachableLearnset = sGastrodonTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index 5c76dd0716..7fe2a5008f 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -670,32 +670,32 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - .frontPic = gMonFrontPic_SamurottHisuian, + .frontPic = gMonFrontPic_SamurottHisui, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SamurottHisuian, + .frontAnimFrames = sAnims_SamurottHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_SamurottHisuian, + .backPic = gMonBackPic_SamurottHisui, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_SamurottHisuian, - .shinyPalette = gMonShinyPalette_SamurottHisuian, - .iconSprite = gMonIcon_SamurottHisuian, + .palette = gMonPalette_SamurottHisui, + .shinyPalette = gMonShinyPalette_SamurottHisui, + .iconSprite = gMonIcon_SamurottHisui, .iconPalIndex = 0, SHADOW(-2, 13, SHADOW_SIZE_L) FOOTPRINT(Samurott) OVERWORLD( - sPicTable_SamurottHisuian, + sPicTable_SamurottHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_SamurottHisuian, - gShinyOverworldPalette_SamurottHisuian + gOverworldPalette_SamurottHisui, + gShinyOverworldPalette_SamurottHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sSamurottHisuianLevelUpLearnset, - .teachableLearnset = sSamurottHisuianTeachableLearnset, + .levelUpLearnset = sSamurottHisuiLevelUpLearnset, + .teachableLearnset = sSamurottHisuiTeachableLearnset, .formSpeciesIdTable = sSamurottFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS @@ -3811,32 +3811,32 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_LilligantHisuian, + .frontPic = gMonFrontPic_LilligantHisui, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_LilligantHisuian, + .frontAnimFrames = sAnims_LilligantHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_LilligantHisuian, + .backPic = gMonBackPic_LilligantHisui, .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_LilligantHisuian, - .shinyPalette = gMonShinyPalette_LilligantHisuian, - .iconSprite = gMonIcon_LilligantHisuian, + .palette = gMonPalette_LilligantHisui, + .shinyPalette = gMonShinyPalette_LilligantHisui, + .iconSprite = gMonIcon_LilligantHisui, .iconPalIndex = 1, SHADOW(-3, 13, SHADOW_SIZE_S) FOOTPRINT(Lilligant) OVERWORLD( - sPicTable_LilligantHisuian, + sPicTable_LilligantHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_LilligantHisuian, - gShinyOverworldPalette_LilligantHisuian + gOverworldPalette_LilligantHisui, + gShinyOverworldPalette_LilligantHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sLilligantHisuianLevelUpLearnset, - .teachableLearnset = sLilligantHisuianTeachableLearnset, + .levelUpLearnset = sLilligantHisuiLevelUpLearnset, + .teachableLearnset = sLilligantHisuiTeachableLearnset, .formSpeciesIdTable = sLilligantFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS @@ -4074,29 +4074,29 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_BasculegionMale, + .frontPic = gMonFrontPic_BasculegionM, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Basculegion, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - .backPic = gMonBackPic_BasculegionMale, + .backPic = gMonBackPic_BasculegionM, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_BasculegionMale, - .shinyPalette = gMonShinyPalette_BasculegionMale, - .iconSprite = gMonIcon_BasculegionMale, + .palette = gMonPalette_BasculegionM, + .shinyPalette = gMonShinyPalette_BasculegionM, + .iconSprite = gMonIcon_BasculegionM, .iconPalIndex = 1, SHADOW(0, 16, SHADOW_SIZE_M) FOOTPRINT(Basculegion) OVERWORLD( - sPicTable_BasculegionMale, + sPicTable_BasculegionM, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_BasculegionMale, - gShinyOverworldPalette_BasculegionMale + gOverworldPalette_BasculegionM, + gShinyOverworldPalette_BasculegionM ) .levelUpLearnset = sBasculegionLevelUpLearnset, .teachableLearnset = sBasculegionTeachableLearnset, @@ -4136,29 +4136,29 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_BasculegionFemale, + .frontPic = gMonFrontPic_BasculegionF, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Basculegion, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, - .backPic = gMonBackPic_BasculegionFemale, + .backPic = gMonBackPic_BasculegionF, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_BasculegionFemale, - .shinyPalette = gMonShinyPalette_BasculegionFemale, - .iconSprite = gMonIcon_BasculegionFemale, + .palette = gMonPalette_BasculegionF, + .shinyPalette = gMonShinyPalette_BasculegionF, + .iconSprite = gMonIcon_BasculegionF, .iconPalIndex = 0, SHADOW(0, 16, SHADOW_SIZE_M) FOOTPRINT(Basculegion) OVERWORLD( - sPicTable_BasculegionFemale, + sPicTable_BasculegionF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_BasculegionFemale, - gShinyOverworldPalette_BasculegionFemale + gOverworldPalette_BasculegionF, + gShinyOverworldPalette_BasculegionF ) .levelUpLearnset = sBasculegionLevelUpLearnset, .teachableLearnset = sBasculegionTeachableLearnset, @@ -4463,28 +4463,28 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_DarmanitanStandardMode, + .frontPic = gMonFrontPic_DarmanitanStandard, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_DarmanitanStandardMode, + .frontAnimFrames = sAnims_DarmanitanStandard, .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, - .backPic = gMonBackPic_DarmanitanStandardMode, + .backPic = gMonBackPic_DarmanitanStandard, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE, - .palette = gMonPalette_DarmanitanStandardMode, - .shinyPalette = gMonShinyPalette_DarmanitanStandardMode, - .iconSprite = gMonIcon_DarmanitanStandardMode, + .palette = gMonPalette_DarmanitanStandard, + .shinyPalette = gMonShinyPalette_DarmanitanStandard, + .iconSprite = gMonIcon_DarmanitanStandard, .iconPalIndex = 0, SHADOW(3, 5, SHADOW_SIZE_L) FOOTPRINT(Darmanitan) OVERWORLD( - sPicTable_DarmanitanStandardMode, + sPicTable_DarmanitanStandard, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_DarmanitanStandardMode, - gShinyOverworldPalette_DarmanitanStandardMode + gOverworldPalette_DarmanitanStandard, + gShinyOverworldPalette_DarmanitanStandard ) .levelUpLearnset = sDarmanitanLevelUpLearnset, .teachableLearnset = sDarmanitanTeachableLearnset, @@ -4525,18 +4525,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_DarmanitanZenMode, + .frontPic = gMonFrontPic_DarmanitanZen, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_DarmanitanZenMode, + .frontAnimFrames = sAnims_DarmanitanZen, .frontAnimId = ANIM_GROW_VIBRATE, - .backPic = gMonBackPic_DarmanitanZenMode, + .backPic = gMonBackPic_DarmanitanZen, .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, .backAnimId = BACK_ANIM_H_SHAKE, - .palette = gMonPalette_DarmanitanZenMode, - .shinyPalette = gMonShinyPalette_DarmanitanZenMode, - .iconSprite = gMonIcon_DarmanitanZenMode, + .palette = gMonPalette_DarmanitanZen, + .shinyPalette = gMonShinyPalette_DarmanitanZen, + .iconSprite = gMonIcon_DarmanitanZen, .iconPalIndex = 0, SHADOW(-1, -1, SHADOW_SIZE_S) FOOTPRINT(Darmanitan) @@ -4581,33 +4581,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_DarumakaGalarian, + .frontPic = gMonFrontPic_DarumakaGalar, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_DarumakaGalarian, + .frontAnimFrames = sAnims_DarumakaGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_DarumakaGalarian, + .backPic = gMonBackPic_DarumakaGalar, .backPicSize = MON_COORDS_SIZE(56, 48), .backPicYOffset = 11, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_DarumakaGalarian, - .shinyPalette = gMonShinyPalette_DarumakaGalarian, - .iconSprite = gMonIcon_DarumakaGalarian, + .palette = gMonPalette_DarumakaGalar, + .shinyPalette = gMonShinyPalette_DarumakaGalar, + .iconSprite = gMonIcon_DarumakaGalar, .iconPalIndex = 0, SHADOW(-3, -1, SHADOW_SIZE_S) FOOTPRINT(Darumaka) OVERWORLD( - sPicTable_DarumakaGalarian, + sPicTable_DarumakaGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_DarumakaGalarian, - gShinyOverworldPalette_DarumakaGalarian + gOverworldPalette_DarumakaGalar, + gShinyOverworldPalette_DarumakaGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sDarumakaGalarianLevelUpLearnset, - .teachableLearnset = sDarumakaGalarianTeachableLearnset, - .eggMoveLearnset = sDarumakaGalarianEggMoveLearnset, + .levelUpLearnset = sDarumakaGalarLevelUpLearnset, + .teachableLearnset = sDarumakaGalarTeachableLearnset, + .eggMoveLearnset = sDarumakaGalarEggMoveLearnset, .formSpeciesIdTable = sDarumakaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_GALAR_STANDARD}), }, @@ -4646,34 +4646,34 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_DarmanitanGalarianStandardMode, + .frontPic = gMonFrontPic_DarmanitanGalarStandard, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DarmanitanGalarianStandardMode, + .frontAnimFrames = sAnims_DarmanitanGalarStandard, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_DarmanitanGalarianStandardMode, + .backPic = gMonBackPic_DarmanitanGalarStandard, .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_DarmanitanGalarianStandardMode, - .shinyPalette = gMonShinyPalette_DarmanitanGalarianStandardMode, - .iconSprite = gMonIcon_DarmanitanGalarianStandardMode, + .palette = gMonPalette_DarmanitanGalarStandard, + .shinyPalette = gMonShinyPalette_DarmanitanGalarStandard, + .iconSprite = gMonIcon_DarmanitanGalarStandard, .iconPalIndex = 0, SHADOW(4, 8, SHADOW_SIZE_L) FOOTPRINT(Darmanitan) OVERWORLD( - sPicTable_DarmanitanGalarianStandardMode, + sPicTable_DarmanitanGalarStandard, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_DarmanitanGalarianStandardMode, - gShinyOverworldPalette_DarmanitanGalarianStandardMode + gOverworldPalette_DarmanitanGalarStandard, + gShinyOverworldPalette_DarmanitanGalarStandard ) .isGalarianForm = TRUE, - .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, - .teachableLearnset = sDarmanitanGalarianTeachableLearnset, + .levelUpLearnset = sDarmanitanGalarLevelUpLearnset, + .teachableLearnset = sDarmanitanGalarTeachableLearnset, .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, - .formChangeTable = sDarmanitanGalarianFormChangeTable, + .formChangeTable = sDarmanitanGalarFormChangeTable, }, [SPECIES_DARMANITAN_GALAR_ZEN] = @@ -4710,26 +4710,26 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 3, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_DarmanitanGalarianZenMode, + .frontPic = gMonFrontPic_DarmanitanGalarZen, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_DarmanitanGalarianZenMode, + .frontAnimFrames = sAnims_DarmanitanGalarZen, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_DarmanitanGalarianZenMode, + .backPic = gMonBackPic_DarmanitanGalarZen, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_DarmanitanGalarianZenMode, - .shinyPalette = gMonShinyPalette_DarmanitanGalarianZenMode, - .iconSprite = gMonIcon_DarmanitanGalarianZenMode, + .palette = gMonPalette_DarmanitanGalarZen, + .shinyPalette = gMonShinyPalette_DarmanitanGalarZen, + .iconSprite = gMonIcon_DarmanitanGalarZen, .iconPalIndex = 0, SHADOW(0, 11, SHADOW_SIZE_S) FOOTPRINT(Darmanitan) .isGalarianForm = TRUE, - .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, - .teachableLearnset = sDarmanitanGalarianTeachableLearnset, + .levelUpLearnset = sDarmanitanGalarLevelUpLearnset, + .teachableLearnset = sDarmanitanGalarTeachableLearnset, .formSpeciesIdTable = sDarmanitanFormSpeciesIdTable, - .formChangeTable = sDarmanitanGalarianFormChangeTable, + .formChangeTable = sDarmanitanGalarFormChangeTable, }, #endif //P_GALARIAN_FORMS #endif //P_FAMILY_DARUMAKA @@ -5285,34 +5285,34 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_YamaskGalarian, + .frontPic = gMonFrontPic_YamaskGalar, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_YamaskGalarian, + .frontAnimFrames = sAnims_YamaskGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, - .backPic = gMonBackPic_YamaskGalarian, + .backPic = gMonBackPic_YamaskGalar, .backPicSize = MON_COORDS_SIZE(40, 40), .backPicYOffset = 13, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_YamaskGalarian, - .shinyPalette = gMonShinyPalette_YamaskGalarian, - .iconSprite = gMonIcon_YamaskGalarian, + .palette = gMonPalette_YamaskGalar, + .shinyPalette = gMonShinyPalette_YamaskGalar, + .iconSprite = gMonIcon_YamaskGalar, .iconPalIndex = 2, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Yamask) OVERWORLD( - sPicTable_YamaskGalarian, + sPicTable_YamaskGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_YamaskGalarian, - gShinyOverworldPalette_YamaskGalarian + gOverworldPalette_YamaskGalar, + gShinyOverworldPalette_YamaskGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sYamaskGalarianLevelUpLearnset, - .teachableLearnset = sYamaskGalarianTeachableLearnset, - .eggMoveLearnset = sYamaskGalarianEggMoveLearnset, + .levelUpLearnset = sYamaskGalarLevelUpLearnset, + .teachableLearnset = sYamaskGalarTeachableLearnset, + .eggMoveLearnset = sYamaskGalarEggMoveLearnset, .formSpeciesIdTable = sYamaskFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_SCRIPT_TRIGGER_DMG, 49, SPECIES_RUNERIGUS}), }, @@ -5802,18 +5802,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - .frontPic = gMonFrontPic_GarbodorGigantamax, + .frontPic = gMonFrontPic_GarbodorGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_GarbodorGigantamax, + .frontAnimFrames = sAnims_GarbodorGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_GarbodorGigantamax, + .backPic = gMonBackPic_GarbodorGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_GarbodorGigantamax, - .shinyPalette = gMonShinyPalette_GarbodorGigantamax, - .iconSprite = gMonIcon_GarbodorGigantamax, + .palette = gMonPalette_GarbodorGmax, + .shinyPalette = gMonShinyPalette_GarbodorGmax, + .iconSprite = gMonIcon_GarbodorGmax, .iconPalIndex = 0, NO_SHADOW FOOTPRINT(Garbodor) @@ -5988,32 +5988,32 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_ZoruaHisuian, + .frontPic = gMonFrontPic_ZoruaHisui, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_ZoruaHisuian, + .frontAnimFrames = sAnims_ZoruaHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ZoruaHisuian, + .backPic = gMonBackPic_ZoruaHisui, .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ZoruaHisuian, - .shinyPalette = gMonShinyPalette_ZoruaHisuian, - .iconSprite = gMonIcon_ZoruaHisuian, + .palette = gMonPalette_ZoruaHisui, + .shinyPalette = gMonShinyPalette_ZoruaHisui, + .iconSprite = gMonIcon_ZoruaHisui, .iconPalIndex = 0, SHADOW(2, 12, SHADOW_SIZE_S) FOOTPRINT(Zorua) OVERWORLD( - sPicTable_ZoruaHisuian, + sPicTable_ZoruaHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ZoruaHisuian, - gShinyOverworldPalette_ZoruaHisuian + gOverworldPalette_ZoruaHisui, + gShinyOverworldPalette_ZoruaHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sZoruaHisuianLevelUpLearnset, - .teachableLearnset = sZoruaHisuianTeachableLearnset, + .levelUpLearnset = sZoruaHisuiLevelUpLearnset, + .teachableLearnset = sZoruaHisuiTeachableLearnset, .formSpeciesIdTable = sZoruaFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_ZOROARK_HISUI}), }, @@ -6052,32 +6052,32 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - .frontPic = gMonFrontPic_ZoroarkHisuian, + .frontPic = gMonFrontPic_ZoroarkHisui, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_ZoroarkHisuian, + .frontAnimFrames = sAnims_ZoroarkHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ZoroarkHisuian, + .backPic = gMonBackPic_ZoroarkHisui, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ZoroarkHisuian, - .shinyPalette = gMonShinyPalette_ZoroarkHisuian, - .iconSprite = gMonIcon_ZoroarkHisuian, + .palette = gMonPalette_ZoroarkHisui, + .shinyPalette = gMonShinyPalette_ZoroarkHisui, + .iconSprite = gMonIcon_ZoroarkHisui, .iconPalIndex = 0, SHADOW(11, 13, SHADOW_SIZE_L) FOOTPRINT(Zoroark) OVERWORLD( - sPicTable_ZoroarkHisuian, + sPicTable_ZoroarkHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ZoroarkHisuian, - gShinyOverworldPalette_ZoroarkHisuian + gOverworldPalette_ZoroarkHisui, + gShinyOverworldPalette_ZoroarkHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sZoroarkHisuianLevelUpLearnset, - .teachableLearnset = sZoroarkHisuianTeachableLearnset, + .levelUpLearnset = sZoroarkHisuiLevelUpLearnset, + .teachableLearnset = sZoroarkHisuiTeachableLearnset, .formSpeciesIdTable = sZoroarkFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS @@ -9567,33 +9567,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 14, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_StunfiskGalarian, + .frontPic = gMonFrontPic_StunfiskGalar, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_StunfiskGalarian, + .frontAnimFrames = sAnims_StunfiskGalar, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_StunfiskGalarian, + .backPic = gMonBackPic_StunfiskGalar, .backPicSize = MON_COORDS_SIZE(64, 24), .backPicYOffset = 23, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_StunfiskGalarian, - .shinyPalette = gMonShinyPalette_StunfiskGalarian, - .iconSprite = gMonIcon_StunfiskGalarian, + .palette = gMonPalette_StunfiskGalar, + .shinyPalette = gMonShinyPalette_StunfiskGalar, + .iconSprite = gMonIcon_StunfiskGalar, .iconPalIndex = 1, SHADOW(0, -1, SHADOW_SIZE_M) FOOTPRINT(Stunfisk) OVERWORLD( - sPicTable_StunfiskGalarian, + sPicTable_StunfiskGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_StunfiskGalarian, - gShinyOverworldPalette_StunfiskGalarian + gOverworldPalette_StunfiskGalar, + gShinyOverworldPalette_StunfiskGalar ) .isGalarianForm = TRUE, - .levelUpLearnset = sStunfiskGalarianLevelUpLearnset, - .teachableLearnset = sStunfiskGalarianTeachableLearnset, - .eggMoveLearnset = sStunfiskGalarianEggMoveLearnset, + .levelUpLearnset = sStunfiskGalarLevelUpLearnset, + .teachableLearnset = sStunfiskGalarTeachableLearnset, + .eggMoveLearnset = sStunfiskGalarEggMoveLearnset, .formSpeciesIdTable = sStunfiskFormSpeciesIdTable, }, #endif //P_GALARIAN_FORMS @@ -10335,33 +10335,33 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - .frontPic = gMonFrontPic_BraviaryHisuian, + .frontPic = gMonFrontPic_BraviaryHisui, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_BraviaryHisuian, + .frontAnimFrames = sAnims_BraviaryHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 3, - .backPic = gMonBackPic_BraviaryHisuian, + .backPic = gMonBackPic_BraviaryHisui, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_BraviaryHisuian, - .shinyPalette = gMonShinyPalette_BraviaryHisuian, - .iconSprite = gMonIcon_BraviaryHisuian, + .palette = gMonPalette_BraviaryHisui, + .shinyPalette = gMonShinyPalette_BraviaryHisui, + .iconSprite = gMonIcon_BraviaryHisui, .iconPalIndex = 2, SHADOW(0, 14, SHADOW_SIZE_M) FOOTPRINT(Braviary) OVERWORLD( - sPicTable_BraviaryHisuian, + sPicTable_BraviaryHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_BraviaryHisuian, - gShinyOverworldPalette_BraviaryHisuian + gOverworldPalette_BraviaryHisui, + gShinyOverworldPalette_BraviaryHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sBraviaryHisuianLevelUpLearnset, - .teachableLearnset = sBraviaryHisuianTeachableLearnset, + .levelUpLearnset = sBraviaryHisuiLevelUpLearnset, + .teachableLearnset = sBraviaryHisuiTeachableLearnset, .formSpeciesIdTable = sBraviaryFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index befac86c5c..36ea31e75e 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -1574,19 +1574,19 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backPicSize = MON_COORDS_SIZE(64, 40), \ .backPicYOffset = 12, \ .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, \ - .palette = gMonPalette_Flabebe##Form##Flower, \ - .shinyPalette = gMonShinyPalette_Flabebe##Form##Flower, \ - .iconSprite = gMonIcon_Flabebe##Form##Flower, \ + .palette = gMonPalette_Flabebe##Form, \ + .shinyPalette = gMonShinyPalette_Flabebe##Form, \ + .iconSprite = gMonIcon_Flabebe##Form, \ .iconPalIndex = iconPal, \ - SHADOW(0, 11, SHADOW_SIZE_S) \ + SHADOW(0, 11, SHADOW_SIZE_S) \ FOOTPRINT(Flabebe) \ OVERWORLD( \ - sPicTable_Flabebe##Form##Flower, \ + sPicTable_Flabebe##Form, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gOverworldPalette_Flabebe##Form##Flower, \ - gShinyOverworldPalette_Flabebe##Form##Flower \ + gOverworldPalette_Flabebe##Form, \ + gShinyOverworldPalette_Flabebe##Form \ ) \ .levelUpLearnset = sFlabebeLevelUpLearnset, \ .teachableLearnset = sFlabebeTeachableLearnset, \ @@ -1662,19 +1662,19 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .frontAnimFrames = sAnims_Floette, \ .frontAnimId = ANIM_V_SLIDE_WOBBLE, \ .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, \ - .palette = gMonPalette_Floette ##form##Flower, \ - .shinyPalette = gMonShinyPalette_Floette ##form##Flower, \ - .iconSprite = gMonIcon_Floette##form##Flower, \ + .palette = gMonPalette_Floette ##form, \ + .shinyPalette = gMonShinyPalette_Floette ##form, \ + .iconSprite = gMonIcon_Floette##form, \ .iconPalIndex = iconPal, \ - SHADOW(-3, 12, SHADOW_SIZE_S) \ + SHADOW(-3, 12, SHADOW_SIZE_S) \ FOOTPRINT(Floette) \ OVERWORLD( \ - sPicTable_Floette ##form##Flower, \ + sPicTable_Floette ##form, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gOverworldPalette_Floette ##form##Flower, \ - gShinyOverworldPalette_Floette ##form##Flower \ + gOverworldPalette_Floette ##form, \ + gShinyOverworldPalette_Floette ##form \ ) \ .formSpeciesIdTable = sFloetteFormSpeciesIdTable @@ -1762,15 +1762,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "longer be found blooming anywhere. It's\n" "also thought to contain terrifying\n" "power."), - .frontPic = gMonFrontPic_FloetteEternalFlower, + .frontPic = gMonFrontPic_FloetteEternal, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .enemyMonElevation = 4, - .backPic = gMonBackPic_FloetteEternalFlower, + .backPic = gMonBackPic_FloetteEternal, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, - .levelUpLearnset = sFloetteEternalFlowerLevelUpLearnset, - .teachableLearnset = sFloetteEternalFlowerTeachableLearnset, + .levelUpLearnset = sFloetteEternalLevelUpLearnset, + .teachableLearnset = sFloetteEternalTeachableLearnset, }, #define FLORGES_MISC_INFO(Form, iconPal) \ @@ -1810,19 +1810,19 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .backPicSize = MON_COORDS_SIZE(64, 48), \ .backPicYOffset = 9, \ .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, \ - .palette = gMonPalette_Florges##Form##Flower, \ - .shinyPalette = gMonShinyPalette_Florges##Form##Flower, \ - .iconSprite = gMonIcon_Florges##Form##Flower, \ + .palette = gMonPalette_Florges##Form, \ + .shinyPalette = gMonShinyPalette_Florges##Form, \ + .iconSprite = gMonIcon_Florges##Form, \ .iconPalIndex = iconPal, \ - SHADOW(-5, 15, SHADOW_SIZE_M) \ + SHADOW(-5, 15, SHADOW_SIZE_M) \ FOOTPRINT(Florges) \ OVERWORLD( \ - sPicTable_Florges ##Form##Flower, \ + sPicTable_Florges ##Form, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gOverworldPalette_Florges ##Form##Flower, \ - gShinyOverworldPalette_Florges ##Form##Flower \ + gOverworldPalette_Florges ##Form, \ + gShinyOverworldPalette_Florges ##Form \ ) \ .levelUpLearnset = sFlorgesLevelUpLearnset, \ .teachableLearnset = sFlorgesTeachableLearnset, \ @@ -2301,31 +2301,31 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MeowsticMale, + .frontPic = gMonFrontPic_MeowsticM, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Meowstic, .frontAnimId = ANIM_GROW_VIBRATE, - .backPic = gMonBackPic_MeowsticMale, + .backPic = gMonBackPic_MeowsticM, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - .palette = gMonPalette_MeowsticMale, - .shinyPalette = gMonShinyPalette_MeowsticMale, - .iconSprite = gMonIcon_MeowsticMale, + .palette = gMonPalette_MeowsticM, + .shinyPalette = gMonShinyPalette_MeowsticM, + .iconSprite = gMonIcon_MeowsticM, .iconPalIndex = 0, SHADOW(-2, 11, SHADOW_SIZE_S) FOOTPRINT(Meowstic) OVERWORLD( - sPicTable_MeowsticMale, + sPicTable_MeowsticM, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_MeowsticMale, - gShinyOverworldPalette_MeowsticMale + gOverworldPalette_MeowsticM, + gShinyOverworldPalette_MeowsticM ) - .levelUpLearnset = sMeowsticMaleLevelUpLearnset, - .teachableLearnset = sMeowsticMaleTeachableLearnset, + .levelUpLearnset = sMeowsticMLevelUpLearnset, + .teachableLearnset = sMeowsticMTeachableLearnset, .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, }, @@ -2363,31 +2363,31 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MeowsticFemale, + .frontPic = gMonFrontPic_MeowsticF, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, .frontAnimFrames = sAnims_Meowstic, .frontAnimId = ANIM_GROW_VIBRATE, - .backPic = gMonBackPic_MeowsticFemale, + .backPic = gMonBackPic_MeowsticF, .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 9, .backAnimId = BACK_ANIM_CONCAVE_ARC_LARGE, - .palette = gMonPalette_MeowsticFemale, - .shinyPalette = gMonShinyPalette_MeowsticFemale, - .iconSprite = gMonIcon_MeowsticFemale, + .palette = gMonPalette_MeowsticF, + .shinyPalette = gMonShinyPalette_MeowsticF, + .iconSprite = gMonIcon_MeowsticF, .iconPalIndex = 0, SHADOW(-2, 12, SHADOW_SIZE_S) FOOTPRINT(Meowstic) OVERWORLD( - sPicTable_MeowsticFemale, + sPicTable_MeowsticF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_MeowsticFemale, - gShinyOverworldPalette_MeowsticFemale + gOverworldPalette_MeowsticF, + gShinyOverworldPalette_MeowsticF ) - .levelUpLearnset = sMeowsticFemaleLevelUpLearnset, - .teachableLearnset = sMeowsticFemaleTeachableLearnset, + .levelUpLearnset = sMeowsticFLevelUpLearnset, + .teachableLearnset = sMeowsticFTeachableLearnset, .formSpeciesIdTable = sMeowsticFormSpeciesIdTable, }, #endif //P_FAMILY_ESPURR @@ -4219,32 +4219,32 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - .frontPic = gMonFrontPic_SliggooHisuian, + .frontPic = gMonFrontPic_SliggooHisui, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_SliggooHisuian, + .frontAnimFrames = sAnims_SliggooHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_SliggooHisuian, + .backPic = gMonBackPic_SliggooHisui, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_SliggooHisuian, - .shinyPalette = gMonShinyPalette_SliggooHisuian, - .iconSprite = gMonIcon_SliggooHisuian, + .palette = gMonPalette_SliggooHisui, + .shinyPalette = gMonShinyPalette_SliggooHisui, + .iconSprite = gMonIcon_SliggooHisui, .iconPalIndex = 2, SHADOW(2, 6, SHADOW_SIZE_M) FOOTPRINT(Sliggoo) OVERWORLD( - sPicTable_SliggooHisuian, + sPicTable_SliggooHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_SliggooHisuian, - gShinyOverworldPalette_SliggooHisuian + gOverworldPalette_SliggooHisui, + gShinyOverworldPalette_SliggooHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sSliggooHisuianLevelUpLearnset, - .teachableLearnset = sSliggooHisuianTeachableLearnset, + .levelUpLearnset = sSliggooHisuiLevelUpLearnset, + .teachableLearnset = sSliggooHisuiTeachableLearnset, .formSpeciesIdTable = sSliggooFormSpeciesIdTable, .evolutions = EVOLUTION({EVO_LEVEL_RAIN, 50, SPECIES_GOODRA_HISUI}, {EVO_LEVEL_FOG, 50, SPECIES_GOODRA_HISUI}), @@ -4284,32 +4284,32 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - .frontPic = gMonFrontPic_GoodraHisuian, + .frontPic = gMonFrontPic_GoodraHisui, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_GoodraHisuian, + .frontAnimFrames = sAnims_GoodraHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_GoodraHisuian, + .backPic = gMonBackPic_GoodraHisui, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_GoodraHisuian, - .shinyPalette = gMonShinyPalette_GoodraHisuian, - .iconSprite = gMonIcon_GoodraHisuian, + .palette = gMonPalette_GoodraHisui, + .shinyPalette = gMonShinyPalette_GoodraHisui, + .iconSprite = gMonIcon_GoodraHisui, .iconPalIndex = 2, SHADOW(1, 12, SHADOW_SIZE_M) FOOTPRINT(Goodra) OVERWORLD( - sPicTable_GoodraHisuian, + sPicTable_GoodraHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_GoodraHisuian, - gShinyOverworldPalette_GoodraHisuian + gOverworldPalette_GoodraHisui, + gShinyOverworldPalette_GoodraHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sGoodraHisuianLevelUpLearnset, - .teachableLearnset = sGoodraHisuianTeachableLearnset, + .levelUpLearnset = sGoodraHisuiLevelUpLearnset, + .teachableLearnset = sGoodraHisuiTeachableLearnset, .formSpeciesIdTable = sGoodraFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS @@ -5187,32 +5187,32 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .pokemonOffset = 1, .trainerScale = 334, .trainerOffset = 4, - .frontPic = gMonFrontPic_AvaluggHisuian, + .frontPic = gMonFrontPic_AvaluggHisui, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_AvaluggHisuian, + .frontAnimFrames = sAnims_AvaluggHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_AvaluggHisuian, + .backPic = gMonBackPic_AvaluggHisui, .backPicSize = MON_COORDS_SIZE(64, 32), .backPicYOffset = 16, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_AvaluggHisuian, - .shinyPalette = gMonShinyPalette_AvaluggHisuian, - .iconSprite = gMonIcon_AvaluggHisuian, + .palette = gMonPalette_AvaluggHisui, + .shinyPalette = gMonShinyPalette_AvaluggHisui, + .iconSprite = gMonIcon_AvaluggHisui, .iconPalIndex = 5, SHADOW(2, -2, SHADOW_SIZE_L) FOOTPRINT(Avalugg) OVERWORLD( - sPicTable_AvaluggHisuian, + sPicTable_AvaluggHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_AvaluggHisuian, - gShinyOverworldPalette_AvaluggHisuian + gOverworldPalette_AvaluggHisui, + gShinyOverworldPalette_AvaluggHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sAvaluggHisuianLevelUpLearnset, - .teachableLearnset = sAvaluggHisuianTeachableLearnset, + .levelUpLearnset = sAvaluggHisuiLevelUpLearnset, + .teachableLearnset = sAvaluggHisuiTeachableLearnset, .formSpeciesIdTable = sAvaluggFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS diff --git a/src/data/pokemon/species_info/gen_7_families.h b/src/data/pokemon/species_info/gen_7_families.h index 3dba85be85..d42167b883 100644 --- a/src/data/pokemon/species_info/gen_7_families.h +++ b/src/data/pokemon/species_info/gen_7_families.h @@ -228,32 +228,32 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - .frontPic = gMonFrontPic_DecidueyeHisuian, + .frontPic = gMonFrontPic_DecidueyeHisui, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DecidueyeHisuian, + .frontAnimFrames = sAnims_DecidueyeHisui, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_DecidueyeHisuian, + .backPic = gMonBackPic_DecidueyeHisui, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_DecidueyeHisuian, - .shinyPalette = gMonShinyPalette_DecidueyeHisuian, - .iconSprite = gMonIcon_DecidueyeHisuian, + .palette = gMonPalette_DecidueyeHisui, + .shinyPalette = gMonShinyPalette_DecidueyeHisui, + .iconSprite = gMonIcon_DecidueyeHisui, .iconPalIndex = 0, SHADOW(-1, 14, SHADOW_SIZE_L) FOOTPRINT(Decidueye) OVERWORLD( - sPicTable_DecidueyeHisuian, + sPicTable_DecidueyeHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_DecidueyeHisuian, - gShinyOverworldPalette_DecidueyeHisuian + gOverworldPalette_DecidueyeHisui, + gShinyOverworldPalette_DecidueyeHisui ) .isHisuianForm = TRUE, - .levelUpLearnset = sDecidueyeHisuianLevelUpLearnset, - .teachableLearnset = sDecidueyeHisuianTeachableLearnset, + .levelUpLearnset = sDecidueyeHisuiLevelUpLearnset, + .teachableLearnset = sDecidueyeHisuiTeachableLearnset, .formSpeciesIdTable = sDecidueyeFormSpeciesIdTable, }, #endif //P_HISUIAN_FORMS @@ -6611,28 +6611,28 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - .frontPic = gMonFrontPic_MagearnaOriginalColor, + .frontPic = gMonFrontPic_MagearnaOriginal, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Magearna, .frontAnimId = ANIM_H_SLIDE_SLOW, - .backPic = gMonBackPic_MagearnaOriginalColor, + .backPic = gMonBackPic_MagearnaOriginal, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - .palette = gMonPalette_MagearnaOriginalColor, - .shinyPalette = gMonShinyPalette_MagearnaOriginalColor, - .iconSprite = gMonIcon_MagearnaOriginalColor, + .palette = gMonPalette_MagearnaOriginal, + .shinyPalette = gMonShinyPalette_MagearnaOriginal, + .iconSprite = gMonIcon_MagearnaOriginal, .iconPalIndex = 0, SHADOW(-2, 14, SHADOW_SIZE_M) FOOTPRINT(Magearna) OVERWORLD( - sPicTable_MagearnaOriginalColor, + sPicTable_MagearnaOriginal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_MagearnaOriginalColor, - gShinyOverworldPalette_MagearnaOriginalColor + gOverworldPalette_MagearnaOriginal, + gShinyOverworldPalette_MagearnaOriginal ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -7199,18 +7199,18 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .pokemonOffset = 10, .trainerScale = 423, .trainerOffset = 8, - .frontPic = gMonFrontPic_MelmetalGigantamax, + .frontPic = gMonFrontPic_MelmetalGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_MelmetalGigantamax, + .frontAnimFrames = sAnims_MelmetalGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_MelmetalGigantamax, + .backPic = gMonBackPic_MelmetalGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 14, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_MelmetalGigantamax, - .shinyPalette = gMonShinyPalette_MelmetalGigantamax, - .iconSprite = gMonIcon_MelmetalGigantamax, + .palette = gMonPalette_MelmetalGmax, + .shinyPalette = gMonShinyPalette_MelmetalGmax, + .iconSprite = gMonIcon_MelmetalGmax, .iconPalIndex = 0, SHADOW(2, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Melmetal) diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index 7df9c777e7..37eefda7f9 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -224,18 +224,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - .frontPic = gMonFrontPic_RillaboomGigantamax, + .frontPic = gMonFrontPic_RillaboomGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_RillaboomGigantamax, + .frontAnimFrames = sAnims_RillaboomGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_RillaboomGigantamax, + .backPic = gMonBackPic_RillaboomGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_RillaboomGigantamax, - .shinyPalette = gMonShinyPalette_RillaboomGigantamax, - .iconSprite = gMonIcon_RillaboomGigantamax, + .palette = gMonPalette_RillaboomGmax, + .shinyPalette = gMonShinyPalette_RillaboomGmax, + .iconSprite = gMonIcon_RillaboomGmax, .iconPalIndex = 1, SHADOW(0, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Rillaboom) @@ -471,18 +471,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - .frontPic = gMonFrontPic_CinderaceGigantamax, + .frontPic = gMonFrontPic_CinderaceGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_CinderaceGigantamax, + .frontAnimFrames = sAnims_CinderaceGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CinderaceGigantamax, + .backPic = gMonBackPic_CinderaceGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CinderaceGigantamax, - .shinyPalette = gMonShinyPalette_CinderaceGigantamax, - .iconSprite = gMonIcon_CinderaceGigantamax, + .palette = gMonPalette_CinderaceGmax, + .shinyPalette = gMonShinyPalette_CinderaceGmax, + .iconSprite = gMonIcon_CinderaceGmax, .iconPalIndex = 0, SHADOW(-3, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Cinderace) @@ -719,18 +719,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - .frontPic = gMonFrontPic_InteleonGigantamax, + .frontPic = gMonFrontPic_InteleonGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_InteleonGigantamax, + .frontAnimFrames = sAnims_InteleonGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_InteleonGigantamax, + .backPic = gMonBackPic_InteleonGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_InteleonGigantamax, - .shinyPalette = gMonShinyPalette_InteleonGigantamax, - .iconSprite = gMonIcon_InteleonGigantamax, + .palette = gMonPalette_InteleonGmax, + .shinyPalette = gMonShinyPalette_InteleonGmax, + .iconSprite = gMonIcon_InteleonGmax, .iconPalIndex = 0, SHADOW(-5, 12, SHADOW_SIZE_L) FOOTPRINT(Inteleon) @@ -1095,18 +1095,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 348, .trainerOffset = 6, - .frontPic = gMonFrontPic_CorviknightGigantamax, + .frontPic = gMonFrontPic_CorviknightGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_CorviknightGigantamax, + .frontAnimFrames = sAnims_CorviknightGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CorviknightGigantamax, + .backPic = gMonBackPic_CorviknightGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CorviknightGigantamax, - .shinyPalette = gMonShinyPalette_CorviknightGigantamax, - .iconSprite = gMonIcon_CorviknightGigantamax, + .palette = gMonPalette_CorviknightGmax, + .shinyPalette = gMonShinyPalette_CorviknightGmax, + .iconSprite = gMonIcon_CorviknightGmax, .iconPalIndex = 0, SHADOW(2, 8, SHADOW_SIZE_L) FOOTPRINT(Corviknight) @@ -1347,18 +1347,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_OrbeetleGigantamax, + .frontPic = gMonFrontPic_OrbeetleGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_OrbeetleGigantamax, + .frontAnimFrames = sAnims_OrbeetleGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_OrbeetleGigantamax, + .backPic = gMonBackPic_OrbeetleGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_OrbeetleGigantamax, - .shinyPalette = gMonShinyPalette_OrbeetleGigantamax, - .iconSprite = gMonIcon_OrbeetleGigantamax, + .palette = gMonPalette_OrbeetleGmax, + .shinyPalette = gMonShinyPalette_OrbeetleGmax, + .iconSprite = gMonIcon_OrbeetleGmax, .iconPalIndex = 0, SHADOW(0, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Orbeetle) @@ -1909,18 +1909,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 257, .trainerOffset = 0, - .frontPic = gMonFrontPic_DrednawGigantamax, + .frontPic = gMonFrontPic_DrednawGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DrednawGigantamax, + .frontAnimFrames = sAnims_DrednawGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_DrednawGigantamax, + .backPic = gMonBackPic_DrednawGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 12, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_DrednawGigantamax, - .shinyPalette = gMonShinyPalette_DrednawGigantamax, - .iconSprite = gMonIcon_DrednawGigantamax, + .palette = gMonPalette_DrednawGmax, + .shinyPalette = gMonShinyPalette_DrednawGmax, + .iconSprite = gMonIcon_DrednawGmax, .iconPalIndex = 0, SHADOW(2, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Drednaw) @@ -2282,18 +2282,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_CoalossalGigantamax, + .frontPic = gMonFrontPic_CoalossalGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_CoalossalGigantamax, + .frontAnimFrames = sAnims_CoalossalGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CoalossalGigantamax, + .backPic = gMonBackPic_CoalossalGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CoalossalGigantamax, - .shinyPalette = gMonShinyPalette_CoalossalGigantamax, - .iconSprite = gMonIcon_CoalossalGigantamax, + .palette = gMonPalette_CoalossalGmax, + .shinyPalette = gMonShinyPalette_CoalossalGmax, + .iconSprite = gMonIcon_CoalossalGmax, .iconPalIndex = 0, SHADOW(1, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Coalossal) @@ -2471,18 +2471,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_FlappleGigantamax, + .frontPic = gMonFrontPic_FlappleGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_FlappleGigantamax, + .frontAnimFrames = sAnims_FlappleGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_FlappleGigantamax, + .backPic = gMonBackPic_FlappleGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_FlappleGigantamax, - .shinyPalette = gMonShinyPalette_FlappleGigantamax, - .iconSprite = gMonIcon_FlappleGigantamax, + .palette = gMonPalette_FlappleGmax, + .shinyPalette = gMonShinyPalette_FlappleGmax, + .iconSprite = gMonIcon_FlappleGmax, .iconPalIndex = 1, SHADOW(0, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Flapple) @@ -2591,18 +2591,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 12, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_AppletunGigantamax, + .frontPic = gMonFrontPic_AppletunGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_AppletunGigantamax, + .frontAnimFrames = sAnims_AppletunGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_AppletunGigantamax, + .backPic = gMonBackPic_AppletunGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 2, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_AppletunGigantamax, - .shinyPalette = gMonShinyPalette_AppletunGigantamax, - .iconSprite = gMonIcon_AppletunGigantamax, + .palette = gMonPalette_AppletunGmax, + .shinyPalette = gMonShinyPalette_AppletunGmax, + .iconSprite = gMonIcon_AppletunGmax, .iconPalIndex = 1, SHADOW(0, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Appletun) @@ -2900,18 +2900,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 610, .trainerOffset = 17, - .frontPic = gMonFrontPic_SandacondaGigantamax, + .frontPic = gMonFrontPic_SandacondaGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_SandacondaGigantamax, + .frontAnimFrames = sAnims_SandacondaGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_SandacondaGigantamax, + .backPic = gMonBackPic_SandacondaGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_SandacondaGigantamax, - .shinyPalette = gMonShinyPalette_SandacondaGigantamax, - .iconSprite = gMonIcon_SandacondaGigantamax, + .palette = gMonPalette_SandacondaGmax, + .shinyPalette = gMonShinyPalette_SandacondaGmax, + .iconSprite = gMonIcon_SandacondaGmax, .iconPalIndex = 1, SHADOW(0, 14, SHADOW_SIZE_M) FOOTPRINT(Sandaconda) @@ -3386,18 +3386,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - .frontPic = gMonFrontPic_ToxtricityGigantamax, + .frontPic = gMonFrontPic_ToxtricityGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_ToxtricityGigantamax, + .frontAnimFrames = sAnims_ToxtricityGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ToxtricityGigantamax, + .backPic = gMonBackPic_ToxtricityGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ToxtricityGigantamax, - .shinyPalette = gMonShinyPalette_ToxtricityGigantamax, - .iconSprite = gMonIcon_ToxtricityGigantamax, + .palette = gMonPalette_ToxtricityGmax, + .shinyPalette = gMonShinyPalette_ToxtricityGmax, + .iconSprite = gMonIcon_ToxtricityGmax, .iconPalIndex = 0, SHADOW(1, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Toxtricity) @@ -3502,18 +3502,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 296, .trainerOffset = 1, - .frontPic = gMonFrontPic_ToxtricityGigantamax, + .frontPic = gMonFrontPic_ToxtricityGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_ToxtricityGigantamax, + .frontAnimFrames = sAnims_ToxtricityGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ToxtricityGigantamax, + .backPic = gMonBackPic_ToxtricityGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ToxtricityGigantamax, - .shinyPalette = gMonShinyPalette_ToxtricityGigantamax, - .iconSprite = gMonIcon_ToxtricityGigantamax, + .palette = gMonPalette_ToxtricityGmax, + .shinyPalette = gMonShinyPalette_ToxtricityGmax, + .iconSprite = gMonIcon_ToxtricityGmax, .iconPalIndex = 0, SHADOW(1, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Toxtricity) @@ -3687,18 +3687,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_CentiskorchGigantamax, + .frontPic = gMonFrontPic_CentiskorchGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_CentiskorchGigantamax, + .frontAnimFrames = sAnims_CentiskorchGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CentiskorchGigantamax, + .backPic = gMonBackPic_CentiskorchGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 1, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CentiskorchGigantamax, - .shinyPalette = gMonShinyPalette_CentiskorchGigantamax, - .iconSprite = gMonIcon_CentiskorchGigantamax, + .palette = gMonPalette_CentiskorchGmax, + .shinyPalette = gMonShinyPalette_CentiskorchGmax, + .iconSprite = gMonIcon_CentiskorchGmax, .iconPalIndex = 0, SHADOW(6, 9, SHADOW_SIZE_L) FOOTPRINT(Centiskorch) @@ -4312,18 +4312,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 0, .trainerScale = 365, .trainerOffset = 7, - .frontPic = gMonFrontPic_HattereneGigantamax, + .frontPic = gMonFrontPic_HattereneGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_HattereneGigantamax, + .frontAnimFrames = sAnims_HattereneGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_HattereneGigantamax, + .backPic = gMonBackPic_HattereneGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_HattereneGigantamax, - .shinyPalette = gMonShinyPalette_HattereneGigantamax, - .iconSprite = gMonIcon_HattereneGigantamax, + .palette = gMonPalette_HattereneGmax, + .shinyPalette = gMonShinyPalette_HattereneGmax, + .iconSprite = gMonIcon_HattereneGmax, .iconPalIndex = 0, SHADOW(-3, 13, SHADOW_SIZE_S) FOOTPRINT(Hatterene) @@ -4559,18 +4559,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 271, .trainerOffset = 0, - .frontPic = gMonFrontPic_GrimmsnarlGigantamax, + .frontPic = gMonFrontPic_GrimmsnarlGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_GrimmsnarlGigantamax, + .frontAnimFrames = sAnims_GrimmsnarlGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_GrimmsnarlGigantamax, + .backPic = gMonBackPic_GrimmsnarlGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 10, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_GrimmsnarlGigantamax, - .shinyPalette = gMonShinyPalette_GrimmsnarlGigantamax, - .iconSprite = gMonIcon_GrimmsnarlGigantamax, + .palette = gMonPalette_GrimmsnarlGmax, + .shinyPalette = gMonShinyPalette_GrimmsnarlGmax, + .iconSprite = gMonIcon_GrimmsnarlGmax, .iconPalIndex = 0, SHADOW(0, 14, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Grimmsnarl) @@ -4799,18 +4799,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 13, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_AlcremieGigantamax, + .frontPic = gMonFrontPic_AlcremieGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_AlcremieGigantamax, + .frontAnimFrames = sAnims_AlcremieGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_AlcremieGigantamax, + .backPic = gMonBackPic_AlcremieGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 9, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_AlcremieGigantamax, - .shinyPalette = gMonShinyPalette_AlcremieGigantamax, - .iconSprite = gMonIcon_AlcremieGigantamax, + .palette = gMonPalette_AlcremieGmax, + .shinyPalette = gMonShinyPalette_AlcremieGmax, + .iconSprite = gMonIcon_AlcremieGmax, .iconPalIndex = 1, SHADOW(0, 10, SHADOW_SIZE_L) FOOTPRINT(Alcremie) @@ -5175,28 +5175,28 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - .frontPic = gMonFrontPic_EiscueIceFace, + .frontPic = gMonFrontPic_EiscueIce, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Eiscue, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_EiscueIceFace, + .backPic = gMonBackPic_EiscueIce, .backPicSize = MON_COORDS_SIZE(48, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_EiscueIceFace, - .shinyPalette = gMonShinyPalette_EiscueIceFace, - .iconSprite = gMonIcon_EiscueIceFace, + .palette = gMonPalette_EiscueIce, + .shinyPalette = gMonShinyPalette_EiscueIce, + .iconSprite = gMonIcon_EiscueIce, .iconPalIndex = 0, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Eiscue) OVERWORLD( - sPicTable_EiscueIceFace, + sPicTable_EiscueIce, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_EiscueIceFace, - gShinyOverworldPalette_EiscueIceFace + gOverworldPalette_EiscueIce, + gShinyOverworldPalette_EiscueIce ) .levelUpLearnset = sEiscueLevelUpLearnset, .teachableLearnset = sEiscueTeachableLearnset, @@ -5239,18 +5239,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 262, .trainerOffset = 0, - .frontPic = gMonFrontPic_EiscueNoiceFace, + .frontPic = gMonFrontPic_EiscueNoice, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Eiscue, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_EiscueNoiceFace, + .backPic = gMonBackPic_EiscueNoice, .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_EiscueNoiceFace, - .shinyPalette = gMonShinyPalette_EiscueNoiceFace, - .iconSprite = gMonIcon_EiscueNoiceFace, + .palette = gMonPalette_EiscueNoice, + .shinyPalette = gMonShinyPalette_EiscueNoice, + .iconSprite = gMonIcon_EiscueNoice, .iconPalIndex = 0, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Eiscue) @@ -5297,31 +5297,31 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_IndeedeeMale, + .frontPic = gMonFrontPic_IndeedeeM, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Indeedee, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_IndeedeeMale, + .backPic = gMonBackPic_IndeedeeM, .backPicSize = MON_COORDS_SIZE(56, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_IndeedeeMale, - .shinyPalette = gMonShinyPalette_IndeedeeMale, - .iconSprite = gMonIcon_IndeedeeMale, + .palette = gMonPalette_IndeedeeM, + .shinyPalette = gMonShinyPalette_IndeedeeM, + .iconSprite = gMonIcon_IndeedeeM, .iconPalIndex = 2, SHADOW(2, 4, SHADOW_SIZE_S) FOOTPRINT(Indeedee) OVERWORLD( - sPicTable_IndeedeeMale, + sPicTable_IndeedeeM, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_IndeedeeMale, - gShinyOverworldPalette_IndeedeeMale + gOverworldPalette_IndeedeeM, + gShinyOverworldPalette_IndeedeeM ) - .levelUpLearnset = sIndeedeeMaleLevelUpLearnset, - .teachableLearnset = sIndeedeeMaleTeachableLearnset, + .levelUpLearnset = sIndeedeeMLevelUpLearnset, + .teachableLearnset = sIndeedeeMTeachableLearnset, .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, }, @@ -5359,32 +5359,32 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 8, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_IndeedeeFemale, + .frontPic = gMonFrontPic_IndeedeeF, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, .frontAnimFrames = sAnims_Indeedee, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_IndeedeeFemale, + .backPic = gMonBackPic_IndeedeeF, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_IndeedeeFemale, - .shinyPalette = gMonShinyPalette_IndeedeeFemale, - .iconSprite = gMonIcon_IndeedeeFemale, + .palette = gMonPalette_IndeedeeF, + .shinyPalette = gMonShinyPalette_IndeedeeF, + .iconSprite = gMonIcon_IndeedeeF, .iconPalIndex = 2, SHADOW(2, 4, SHADOW_SIZE_S) FOOTPRINT(Indeedee) OVERWORLD( - sPicTable_IndeedeeFemale, + sPicTable_IndeedeeF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_IndeedeeFemale, - gShinyOverworldPalette_IndeedeeFemale + gOverworldPalette_IndeedeeF, + gShinyOverworldPalette_IndeedeeF ) - .levelUpLearnset = sIndeedeeFemaleLevelUpLearnset, - .teachableLearnset = sIndeedeeFemaleTeachableLearnset, - .eggMoveLearnset = sIndeedeeFemaleEggMoveLearnset, + .levelUpLearnset = sIndeedeeFLevelUpLearnset, + .teachableLearnset = sIndeedeeFTeachableLearnset, + .eggMoveLearnset = sIndeedeeFEggMoveLearnset, .formSpeciesIdTable = sIndeedeeFormSpeciesIdTable, }, #endif //P_FAMILY_INDEEDEE @@ -5675,18 +5675,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_CopperajahGigantamax, + .frontPic = gMonFrontPic_CopperajahGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_CopperajahGigantamax, + .frontAnimFrames = sAnims_CopperajahGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CopperajahGigantamax, + .backPic = gMonBackPic_CopperajahGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CopperajahGigantamax, - .shinyPalette = gMonShinyPalette_CopperajahGigantamax, - .iconSprite = gMonIcon_CopperajahGigantamax, + .palette = gMonPalette_CopperajahGmax, + .shinyPalette = gMonShinyPalette_CopperajahGmax, + .iconSprite = gMonIcon_CopperajahGmax, .iconPalIndex = 0, SHADOW(0, 11, SHADOW_SIZE_L) FOOTPRINT(Copperajah) @@ -6050,18 +6050,18 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 2, .trainerScale = 286, .trainerOffset = 1, - .frontPic = gMonFrontPic_DuraludonGigantamax, + .frontPic = gMonFrontPic_DuraludonGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DuraludonGigantamax, + .frontAnimFrames = sAnims_DuraludonGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_DuraludonGigantamax, + .backPic = gMonBackPic_DuraludonGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 0, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_DuraludonGigantamax, - .shinyPalette = gMonShinyPalette_DuraludonGigantamax, - .iconSprite = gMonIcon_DuraludonGigantamax, + .palette = gMonPalette_DuraludonGmax, + .shinyPalette = gMonShinyPalette_DuraludonGmax, + .iconSprite = gMonIcon_DuraludonGmax, .iconPalIndex = 0, SHADOW(3, 12, SHADOW_SIZE_L) FOOTPRINT(Duraludon) @@ -6362,28 +6362,28 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_ZacianHeroOfManyBattles, + .frontPic = gMonFrontPic_ZacianHero, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, .frontAnimFrames = sAnims_Zacian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ZacianHeroOfManyBattles, + .backPic = gMonBackPic_ZacianHero, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ZacianHeroOfManyBattles, - .shinyPalette = gMonShinyPalette_ZacianHeroOfManyBattles, - .iconSprite = gMonIcon_ZacianHeroOfManyBattles, + .palette = gMonPalette_ZacianHero, + .shinyPalette = gMonShinyPalette_ZacianHero, + .iconSprite = gMonIcon_ZacianHero, .iconPalIndex = 2, SHADOW(-1, 9, SHADOW_SIZE_L) FOOTPRINT(Zacian) OVERWORLD( - sPicTable_ZacianHeroOfManyBattles, + sPicTable_ZacianHero, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ZacianHeroOfManyBattles, - gShinyOverworldPalette_ZacianHeroOfManyBattles + gOverworldPalette_ZacianHero, + gShinyOverworldPalette_ZacianHero ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -6414,7 +6414,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_INTREPID_SWORD, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Zacian"), - .cryId = CRY_ZACIAN_CROWNED_SWORD, + .cryId = CRY_ZACIAN_CROWNED, .natDexNum = NATIONAL_DEX_ZACIAN, .categoryName = _("Warrior"), .height = 28, @@ -6428,28 +6428,28 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_ZacianCrownedSword, + .frontPic = gMonFrontPic_ZacianCrowned, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Zacian, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ZacianCrownedSword, + .backPic = gMonBackPic_ZacianCrowned, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 6, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ZacianCrownedSword, - .shinyPalette = gMonShinyPalette_ZacianCrownedSword, - .iconSprite = gMonIcon_ZacianCrownedSword, + .palette = gMonPalette_ZacianCrowned, + .shinyPalette = gMonShinyPalette_ZacianCrowned, + .iconSprite = gMonIcon_ZacianCrowned, .iconPalIndex = 2, SHADOW(-3, 12, SHADOW_SIZE_L) FOOTPRINT(Zacian) OVERWORLD( - sPicTable_ZacianCrownedSword, + sPicTable_ZacianCrowned, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ZacianCrownedSword, - gShinyOverworldPalette_ZacianCrownedSword + gOverworldPalette_ZacianCrowned, + gShinyOverworldPalette_ZacianCrowned ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -6496,28 +6496,28 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_ZamazentaHeroOfManyBattles, + .frontPic = gMonFrontPic_ZamazentaHero, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Zamazenta, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ZamazentaHeroOfManyBattles, + .backPic = gMonBackPic_ZamazentaHero, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 5, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ZamazentaHeroOfManyBattles, - .shinyPalette = gMonShinyPalette_ZamazentaHeroOfManyBattles, - .iconSprite = gMonIcon_ZamazentaHeroOfManyBattles, + .palette = gMonPalette_ZamazentaHero, + .shinyPalette = gMonShinyPalette_ZamazentaHero, + .iconSprite = gMonIcon_ZamazentaHero, .iconPalIndex = 2, SHADOW(-1, 12, SHADOW_SIZE_L) FOOTPRINT(Zamazenta) OVERWORLD( - sPicTable_ZamazentaHeroOfManyBattles, + sPicTable_ZamazentaHero, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ZamazentaHeroOfManyBattles, - gShinyOverworldPalette_ZamazentaHeroOfManyBattles + gOverworldPalette_ZamazentaHero, + gShinyOverworldPalette_ZamazentaHero ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -6548,7 +6548,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_DAUNTLESS_SHIELD, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_RED, .speciesName = _("Zamazenta"), - .cryId = CRY_ZAMAZENTA_CROWNED_SHIELD, + .cryId = CRY_ZAMAZENTA_CROWNED, .natDexNum = NATIONAL_DEX_ZAMAZENTA, .categoryName = _("Warrior"), .height = 29, @@ -6562,28 +6562,28 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_ZamazentaCrownedShield, + .frontPic = gMonFrontPic_ZamazentaCrowned, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Zamazenta, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_ZamazentaCrownedShield, + .backPic = gMonBackPic_ZamazentaCrowned, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 3, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_ZamazentaCrownedShield, - .shinyPalette = gMonShinyPalette_ZamazentaCrownedShield, - .iconSprite = gMonIcon_ZamazentaCrownedShield, + .palette = gMonPalette_ZamazentaCrowned, + .shinyPalette = gMonShinyPalette_ZamazentaCrowned, + .iconSprite = gMonIcon_ZamazentaCrowned, .iconPalIndex = 2, SHADOW(0, 12, SHADOW_SIZE_L) FOOTPRINT(Zamazenta) OVERWORLD( - sPicTable_ZamazentaCrownedShield, + sPicTable_ZamazentaCrowned, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_ZamazentaCrownedShield, - gShinyOverworldPalette_ZamazentaCrownedShield + gOverworldPalette_ZamazentaCrowned, + gShinyOverworldPalette_ZamazentaCrowned ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -6808,7 +6808,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Urshifu"), - .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, + .cryId = CRY_URSHIFU_SINGLE_STRIKE, .natDexNum = NATIONAL_DEX_URSHIFU, .categoryName = _("Wushu"), .height = 19, @@ -6822,17 +6822,17 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - .frontPic = gMonFrontPic_UrshifuSingleStrikeStyle, + .frontPic = gMonFrontPic_UrshifuSingleStrike, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Urshifu, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_UrshifuSingleStrikeStyle, + .backPic = gMonBackPic_UrshifuSingleStrike, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_UrshifuSingleStrikeStyle, - .shinyPalette = gMonShinyPalette_UrshifuSingleStrikeStyle, + .palette = gMonPalette_UrshifuSingleStrike, + .shinyPalette = gMonShinyPalette_UrshifuSingleStrike, .iconSprite = gMonIcon_Urshifu, .iconPalIndex = 2, SHADOW(0, 14, SHADOW_SIZE_L) @@ -6847,8 +6847,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = ) .isLegendary = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, + .levelUpLearnset = sUrshifuSingleStrikeLevelUpLearnset, + .teachableLearnset = sUrshifuSingleStrikeTeachableLearnset, .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .formChangeTable = sUrshifuSingleStrikeFormChangeTable, }, @@ -6874,7 +6874,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Urshifu"), - .cryId = CRY_URSHIFU_SINGLE_STRIKE_STYLE, + .cryId = CRY_URSHIFU_SINGLE_STRIKE, .natDexNum = NATIONAL_DEX_URSHIFU, .categoryName = _("Wushu"), .height = 290, @@ -6888,26 +6888,26 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - .frontPic = gMonFrontPic_UrshifuSingleStrikeStyleGigantamax, + .frontPic = gMonFrontPic_UrshifuSingleStrikeGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_UrshifuSingleStrikeStyleGigantamax, + .frontAnimFrames = sAnims_UrshifuSingleStrikeGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_UrshifuSingleStrikeStyleGigantamax, + .backPic = gMonBackPic_UrshifuSingleStrikeGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_UrshifuSingleStrikeStyleGigantamax, - .shinyPalette = gMonShinyPalette_UrshifuSingleStrikeStyleGigantamax, - .iconSprite = gMonIcon_UrshifuSingleStrikeStyleGigantamax, + .palette = gMonPalette_UrshifuSingleStrikeGmax, + .shinyPalette = gMonShinyPalette_UrshifuSingleStrikeGmax, + .iconSprite = gMonIcon_UrshifuSingleStrikeGmax, .iconPalIndex = 0, SHADOW(1, 13, SHADOW_SIZE_L) FOOTPRINT(Urshifu) .isLegendary = TRUE, .isGigantamax = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuSingleStrikeStyleTeachableLearnset, + .levelUpLearnset = sUrshifuSingleStrikeLevelUpLearnset, + .teachableLearnset = sUrshifuSingleStrikeTeachableLearnset, .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, }, #endif //P_GIGANTAMAX_FORMS @@ -6932,7 +6932,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Urshifu"), - .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, + .cryId = CRY_URSHIFU_RAPID_STRIKE, .natDexNum = NATIONAL_DEX_URSHIFU, .categoryName = _("Wushu"), .height = 19, @@ -6946,17 +6946,17 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - .frontPic = gMonFrontPic_UrshifuRapidStrikeStyle, + .frontPic = gMonFrontPic_UrshifuRapidStrike, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Urshifu, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_UrshifuRapidStrikeStyle, + .backPic = gMonBackPic_UrshifuRapidStrike, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_UrshifuRapidStrikeStyle, - .shinyPalette = gMonShinyPalette_UrshifuRapidStrikeStyle, + .palette = gMonPalette_UrshifuRapidStrike, + .shinyPalette = gMonShinyPalette_UrshifuRapidStrike, .iconSprite = gMonIcon_Urshifu, .iconPalIndex = 2, SHADOW(4, 14, SHADOW_SIZE_M) @@ -6971,8 +6971,8 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = ) .isLegendary = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, + .levelUpLearnset = sUrshifuRapidStrikeLevelUpLearnset, + .teachableLearnset = sUrshifuRapidStrikeTeachableLearnset, .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, .formChangeTable = sUrshifuRapidStrikeFormChangeTable, }, @@ -6998,7 +6998,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_UNSEEN_FIST, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_GRAY, .speciesName = _("Urshifu"), - .cryId = CRY_URSHIFU_RAPID_STRIKE_STYLE, + .cryId = CRY_URSHIFU_RAPID_STRIKE, .natDexNum = NATIONAL_DEX_URSHIFU, .categoryName = _("Wushu"), .height = 260, @@ -7012,26 +7012,26 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 1, .trainerScale = 326, .trainerOffset = 4, - .frontPic = gMonFrontPic_UrshifuRapidStrikeStyleGigantamax, + .frontPic = gMonFrontPic_UrshifuRapidStrikeGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_UrshifuRapidStrikeStyleGigantamax, + .frontAnimFrames = sAnims_UrshifuRapidStrikeGmax, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_UrshifuRapidStrikeStyleGigantamax, + .backPic = gMonBackPic_UrshifuRapidStrikeGmax, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_UrshifuRapidStrikeStyleGigantamax, - .shinyPalette = gMonShinyPalette_UrshifuRapidStrikeStyleGigantamax, - .iconSprite = gMonIcon_UrshifuRapidStrikeStyleGigantamax, + .palette = gMonPalette_UrshifuRapidStrikeGmax, + .shinyPalette = gMonShinyPalette_UrshifuRapidStrikeGmax, + .iconSprite = gMonIcon_UrshifuRapidStrikeGmax, .iconPalIndex = 0, SHADOW(2, 13, SHADOW_SIZE_M) FOOTPRINT(Urshifu) .isLegendary = TRUE, .isGigantamax = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, - .teachableLearnset = sUrshifuRapidStrikeStyleTeachableLearnset, + .levelUpLearnset = sUrshifuRapidStrikeLevelUpLearnset, + .teachableLearnset = sUrshifuRapidStrikeTeachableLearnset, .formSpeciesIdTable = sUrshifuFormSpeciesIdTable, }, #endif //P_GIGANTAMAX_FORMS @@ -7509,7 +7509,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_AS_ONE_ICE_RIDER, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Calyrex"), - .cryId = CRY_CALYREX_ICE_RIDER, + .cryId = CRY_CALYREX_ICE, .natDexNum = NATIONAL_DEX_CALYREX, .categoryName = _("High King"), .height = 24, @@ -7523,35 +7523,35 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_CalyrexIceRider, + .frontPic = gMonFrontPic_CalyrexIce, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Calyrex, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CalyrexIceRider, + .backPic = gMonBackPic_CalyrexIce, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CalyrexIceRider, - .shinyPalette = gMonShinyPalette_CalyrexIceRider, - .iconSprite = gMonIcon_CalyrexIceRider, + .palette = gMonPalette_CalyrexIce, + .shinyPalette = gMonShinyPalette_CalyrexIce, + .iconSprite = gMonIcon_CalyrexIce, .iconPalIndex = 0, SHADOW(-5, 11, SHADOW_SIZE_L) FOOTPRINT(Calyrex) OVERWORLD( - sPicTable_CalyrexIceRider, + sPicTable_CalyrexIce, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_CalyrexIceRider, - gShinyOverworldPalette_CalyrexIceRider + gOverworldPalette_CalyrexIce, + gShinyOverworldPalette_CalyrexIce ) .isLegendary = TRUE, .cannotBeTraded = TRUE, .isFrontierBanned = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sCalyrexIceRiderLevelUpLearnset, - .teachableLearnset = sCalyrexIceRiderTeachableLearnset, + .levelUpLearnset = sCalyrexIceLevelUpLearnset, + .teachableLearnset = sCalyrexIceTeachableLearnset, .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, }, @@ -7575,7 +7575,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_AS_ONE_SHADOW_RIDER, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLACK, .speciesName = _("Calyrex"), - .cryId = CRY_CALYREX_SHADOW_RIDER, + .cryId = CRY_CALYREX_SHADOW, .natDexNum = NATIONAL_DEX_CALYREX, .categoryName = _("High King"), .height = 24, @@ -7589,35 +7589,35 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .pokemonOffset = 7, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_CalyrexShadowRider, + .frontPic = gMonFrontPic_CalyrexShadow, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, .frontAnimFrames = sAnims_Calyrex, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CalyrexShadowRider, + .backPic = gMonBackPic_CalyrexShadow, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CalyrexShadowRider, - .shinyPalette = gMonShinyPalette_CalyrexShadowRider, - .iconSprite = gMonIcon_CalyrexShadowRider, + .palette = gMonPalette_CalyrexShadow, + .shinyPalette = gMonShinyPalette_CalyrexShadow, + .iconSprite = gMonIcon_CalyrexShadow, .iconPalIndex = 0, SHADOW(-5, 12, SHADOW_SIZE_L) FOOTPRINT(Calyrex) OVERWORLD( - sPicTable_CalyrexShadowRider, + sPicTable_CalyrexShadow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_CalyrexShadowRider, - gShinyOverworldPalette_CalyrexShadowRider + gOverworldPalette_CalyrexShadow, + gShinyOverworldPalette_CalyrexShadow ) .isLegendary = TRUE, .cannotBeTraded = TRUE, .isFrontierBanned = TRUE, .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, - .levelUpLearnset = sCalyrexShadowRiderLevelUpLearnset, - .teachableLearnset = sCalyrexShadowRiderTeachableLearnset, + .levelUpLearnset = sCalyrexShadowLevelUpLearnset, + .teachableLearnset = sCalyrexShadowTeachableLearnset, .formSpeciesIdTable = sCalyrexFormSpeciesIdTable, }, #endif //P_FUSION_FORMS diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index ae99f198a6..7b5fcdd3d1 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -665,30 +665,30 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_OinkologneMale, + .frontPic = gMonFrontPic_OinkologneM, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Oinkologne, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_OinkologneMale, + .backPic = gMonBackPic_OinkologneM, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 8, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_OinkologneMale, - .shinyPalette = gMonShinyPalette_OinkologneMale, - .iconSprite = gMonIcon_OinkologneMale, + .palette = gMonPalette_OinkologneM, + .shinyPalette = gMonShinyPalette_OinkologneM, + .iconSprite = gMonIcon_OinkologneM, .iconPalIndex = 1, SHADOW(-2, 6, SHADOW_SIZE_M) FOOTPRINT(Oinkologne) OVERWORLD( - sPicTable_OinkologneMale, + sPicTable_OinkologneM, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_OinkologneMale, - gShinyOverworldPalette_OinkologneMale + gOverworldPalette_OinkologneM, + gShinyOverworldPalette_OinkologneM ) - .levelUpLearnset = sOinkologneMaleLevelUpLearnset, + .levelUpLearnset = sOinkologneMLevelUpLearnset, .teachableLearnset = sOinkologneTeachableLearnset, .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, }, @@ -727,30 +727,30 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_OinkologneFemale, + .frontPic = gMonFrontPic_OinkologneF, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, .frontAnimFrames = sAnims_Oinkologne, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_OinkologneFemale, + .backPic = gMonBackPic_OinkologneF, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 7, //.backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_OinkologneFemale, - .shinyPalette = gMonShinyPalette_OinkologneFemale, - .iconSprite = gMonIcon_OinkologneFemale, + .palette = gMonPalette_OinkologneF, + .shinyPalette = gMonShinyPalette_OinkologneF, + .iconSprite = gMonIcon_OinkologneF, .iconPalIndex = 0, SHADOW(3, 7, SHADOW_SIZE_M) FOOTPRINT(Oinkologne) OVERWORLD( - sPicTable_OinkologneFemale, + sPicTable_OinkologneF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gOverworldPalette_OinkologneFemale, - gShinyOverworldPalette_OinkologneFemale + gOverworldPalette_OinkologneF, + gShinyOverworldPalette_OinkologneF ) - .levelUpLearnset = sOinkologneFemaleLevelUpLearnset, + .levelUpLearnset = sOinkologneFLevelUpLearnset, .teachableLearnset = sOinkologneTeachableLearnset, .formSpeciesIdTable = sOinkologneFormSpeciesIdTable, }, @@ -1281,7 +1281,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .abilities = { ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Maushold"), - .cryId = CRY_MAUSHOLD_FAMILY_OF_THREE, + .cryId = CRY_MAUSHOLD_THREE, .natDexNum = NATIONAL_DEX_MAUSHOLD, .categoryName = _("Family"), .height = 3, @@ -1295,28 +1295,28 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MausholdFamilyOfThree, + .frontPic = gMonFrontPic_MausholdThree, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Maushold, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPic = gMonBackPic_MausholdFamilyOfThree, + .backPic = gMonBackPic_MausholdThree, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, /*.backAnimId = BACK_ANIM_NONE,*/ .palette = gMonPalette_Maushold, .shinyPalette = gMonShinyPalette_Maushold, - .iconSprite = gMonIcon_MausholdFamilyOfThree, + .iconSprite = gMonIcon_MausholdThree, .iconPalIndex = 1, SHADOW(4, -1, SHADOW_SIZE_L) - FOOTPRINT(MausholdFamilyOfThree) + FOOTPRINT(MausholdThree) OVERWORLD( - sPicTable_MausholdFamilyOfThree, + sPicTable_MausholdThree, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, - gOverworldPalette_MausholdFamilyOfThree, - gShinyOverworldPalette_MausholdFamilyOfThree + gOverworldPalette_MausholdThree, + gShinyOverworldPalette_MausholdThree ) .levelUpLearnset = sMausholdLevelUpLearnset, .teachableLearnset = sMausholdTeachableLearnset, @@ -1342,7 +1342,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .abilities = { ABILITY_FRIEND_GUARD, ABILITY_CHEEK_POUCH, ABILITY_TECHNICIAN }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Maushold"), - .cryId = CRY_MAUSHOLD_FAMILY_OF_FOUR, + .cryId = CRY_MAUSHOLD_FOUR, .natDexNum = NATIONAL_DEX_MAUSHOLD, .categoryName = _("Family"), .height = 3, @@ -1356,28 +1356,28 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, .trainerScale = 256, .trainerOffset = 0, - .frontPic = gMonFrontPic_MausholdFamilyOfFour, + .frontPic = gMonFrontPic_MausholdFour, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 15, .frontAnimFrames = sAnims_Maushold, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ - .backPic = gMonBackPic_MausholdFamilyOfFour, + .backPic = gMonBackPic_MausholdFour, .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 15, /*.backAnimId = BACK_ANIM_NONE,*/ .palette = gMonPalette_Maushold, .shinyPalette = gMonShinyPalette_Maushold, - .iconSprite = gMonIcon_MausholdFamilyOfFour, + .iconSprite = gMonIcon_MausholdFour, .iconPalIndex = 1, SHADOW(0, -1, SHADOW_SIZE_L) - FOOTPRINT(MausholdFamilyOfFour) + FOOTPRINT(MausholdFour) OVERWORLD( - sPicTable_MausholdFamilyOfFour, + sPicTable_MausholdFour, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, - gOverworldPalette_MausholdFamilyOfFour, - gShinyOverworldPalette_MausholdFamilyOfFour + gOverworldPalette_MausholdFour, + gShinyOverworldPalette_MausholdFour ) .levelUpLearnset = sMausholdLevelUpLearnset, .teachableLearnset = sMausholdTeachableLearnset, @@ -1743,19 +1743,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - .palette = gMonPalette_SquawkabillyGreenPlumage, - .shinyPalette = gMonShinyPalette_SquawkabillyGreenPlumage, - .iconSprite = gMonIcon_SquawkabillyGreenPlumage, + .palette = gMonPalette_SquawkabillyGreen, + .shinyPalette = gMonShinyPalette_SquawkabillyGreen, + .iconSprite = gMonIcon_SquawkabillyGreen, .iconPalIndex = 1, SHADOW(-6, 9, SHADOW_SIZE_M) FOOTPRINT(Squawkabilly) OVERWORLD( - sPicTable_SquawkabillyGreenPlumage, + sPicTable_SquawkabillyGreen, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, - gOverworldPalette_SquawkabillyGreenPlumage, - gShinyOverworldPalette_SquawkabillyGreenPlumage + gOverworldPalette_SquawkabillyGreen, + gShinyOverworldPalette_SquawkabillyGreen ) .levelUpLearnset = sSquawkabillyLevelUpLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset, @@ -1806,19 +1806,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - .palette = gMonPalette_SquawkabillyBluePlumage, - .shinyPalette = gMonShinyPalette_SquawkabillyBluePlumage, - .iconSprite = gMonIcon_SquawkabillyBluePlumage, + .palette = gMonPalette_SquawkabillyBlue, + .shinyPalette = gMonShinyPalette_SquawkabillyBlue, + .iconSprite = gMonIcon_SquawkabillyBlue, .iconPalIndex = 0, SHADOW(-6, 9, SHADOW_SIZE_M) FOOTPRINT(Squawkabilly) OVERWORLD( - sPicTable_SquawkabillyBluePlumage, + sPicTable_SquawkabillyBlue, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, - gOverworldPalette_SquawkabillyBluePlumage, - gShinyOverworldPalette_SquawkabillyBluePlumage + gOverworldPalette_SquawkabillyBlue, + gShinyOverworldPalette_SquawkabillyBlue ) .levelUpLearnset = sSquawkabillyLevelUpLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset, @@ -1869,19 +1869,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - .palette = gMonPalette_SquawkabillyYellowPlumage, - .shinyPalette = gMonShinyPalette_SquawkabillyYellowPlumage, - .iconSprite = gMonIcon_SquawkabillyYellowPlumage, + .palette = gMonPalette_SquawkabillyYellow, + .shinyPalette = gMonShinyPalette_SquawkabillyYellow, + .iconSprite = gMonIcon_SquawkabillyYellow, .iconPalIndex = 1, SHADOW(-6, 9, SHADOW_SIZE_M) FOOTPRINT(Squawkabilly) OVERWORLD( - sPicTable_SquawkabillyYellowPlumage, + sPicTable_SquawkabillyYellow, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, - gOverworldPalette_SquawkabillyYellowPlumage, - gShinyOverworldPalette_SquawkabillyYellowPlumage + gOverworldPalette_SquawkabillyYellow, + gShinyOverworldPalette_SquawkabillyYellow ) .levelUpLearnset = sSquawkabillyLevelUpLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset, @@ -1932,19 +1932,19 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .backPicSize = MON_COORDS_SIZE(64, 64), .backPicYOffset = 4, /*.backAnimId = BACK_ANIM_NONE,*/ - .palette = gMonPalette_SquawkabillyWhitePlumage, - .shinyPalette = gMonShinyPalette_SquawkabillyWhitePlumage, - .iconSprite = gMonIcon_SquawkabillyWhitePlumage, + .palette = gMonPalette_SquawkabillyWhite, + .shinyPalette = gMonShinyPalette_SquawkabillyWhite, + .iconSprite = gMonIcon_SquawkabillyWhite, .iconPalIndex = 0, SHADOW(-6, 9, SHADOW_SIZE_M) FOOTPRINT(Squawkabilly) OVERWORLD( - sPicTable_SquawkabillyWhitePlumage, + sPicTable_SquawkabillyWhite, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, - gOverworldPalette_SquawkabillyWhitePlumage, - gShinyOverworldPalette_SquawkabillyWhitePlumage + gOverworldPalette_SquawkabillyWhite, + gShinyOverworldPalette_SquawkabillyWhite ) .levelUpLearnset = sSquawkabillyLevelUpLearnset, .teachableLearnset = sSquawkabillyTeachableLearnset, @@ -7401,28 +7401,28 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .pokemonOffset = 17, \ .trainerScale = 256, \ .trainerOffset = 0, \ - .frontPic = gMonFrontPic_Ogerpon##Form1##Form2, \ + .frontPic = gMonFrontPic_Ogerpon##Form2, \ .frontPicSize = MON_COORDS_SIZE(64, 64), \ .frontPicYOffset = 0, \ .frontAnimFrames = sAnims_Ogerpon, \ /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ - .backPic = gMonBackPic_Ogerpon##Form1##Form2, \ + .backPic = gMonBackPic_Ogerpon##Form2, \ .backPicSize = MON_COORDS_SIZE(64, 64), \ .backPicYOffset = 0, \ /*.backAnimId = BACK_ANIM_NONE,*/ \ - .palette = gMonPalette_Ogerpon##Form1##Form2, \ - .shinyPalette = gMonShinyPalette_Ogerpon##Form1##Form2, \ - .iconSprite = gMonIcon_Ogerpon##Form1##Mask, \ + .palette = gMonPalette_Ogerpon##Form2, \ + .shinyPalette = gMonShinyPalette_Ogerpon##Form2, \ + .iconSprite = gMonIcon_Ogerpon##Form1, \ .iconPalIndex = iconpalette, \ SHADOW(7, 13, SHADOW_SIZE_L) \ FOOTPRINT(Ogerpon) \ OVERWORLD( \ - sPicTable_Ogerpon##Form1##Form2, \ + sPicTable_Ogerpon##Form2, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gOverworldPalette_Ogerpon##Form1##Form2, \ - gShinyOverworldPalette_Ogerpon##Form1##Form2 \ + gOverworldPalette_Ogerpon##Form2, \ + gShinyOverworldPalette_Ogerpon##Form2 \ ) \ .levelUpLearnset = sOgerponLevelUpLearnset, \ .teachableLearnset = sOgerponTeachableLearnset, \ @@ -7433,15 +7433,15 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, \ } - [SPECIES_OGERPON_TEAL] = OGERPON_SPECIES_INFO(Teal, Mask, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, 1, FALSE), - [SPECIES_OGERPON_WELLSPRING] = OGERPON_SPECIES_INFO(Wellspring, Mask, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, 0, FALSE), - [SPECIES_OGERPON_HEARTHFLAME] = OGERPON_SPECIES_INFO(Hearthflame, Mask, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED, 0, FALSE), - [SPECIES_OGERPON_CORNERSTONE] = OGERPON_SPECIES_INFO(Cornerstone, Mask, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY, 0, FALSE), + [SPECIES_OGERPON_TEAL] = OGERPON_SPECIES_INFO(Teal, Teal, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, 1, FALSE), + [SPECIES_OGERPON_WELLSPRING] = OGERPON_SPECIES_INFO(Wellspring, Wellspring, TYPE_WATER, ABILITY_WATER_ABSORB, BODY_COLOR_BLUE, 0, FALSE), + [SPECIES_OGERPON_HEARTHFLAME] = OGERPON_SPECIES_INFO(Hearthflame, Hearthflame, TYPE_FIRE, ABILITY_MOLD_BREAKER, BODY_COLOR_RED, 0, FALSE), + [SPECIES_OGERPON_CORNERSTONE] = OGERPON_SPECIES_INFO(Cornerstone, Cornerstone, TYPE_ROCK, ABILITY_STURDY, BODY_COLOR_GRAY, 0, FALSE), #if P_TERA_FORMS - [SPECIES_OGERPON_TEAL_TERA] = OGERPON_SPECIES_INFO(Teal, MaskTera, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL_MASK, BODY_COLOR_GREEN, 1, TRUE), - [SPECIES_OGERPON_WELLSPRING_TERA] = OGERPON_SPECIES_INFO(Wellspring, MaskTera, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING_MASK, BODY_COLOR_BLUE, 0, TRUE), - [SPECIES_OGERPON_HEARTHFLAME_TERA] = OGERPON_SPECIES_INFO(Hearthflame, MaskTera, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK, BODY_COLOR_RED, 0, TRUE), - [SPECIES_OGERPON_CORNERSTONE_TERA] = OGERPON_SPECIES_INFO(Cornerstone, MaskTera, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK, BODY_COLOR_GRAY, 0, TRUE), + [SPECIES_OGERPON_TEAL_TERA] = OGERPON_SPECIES_INFO(Teal, TealTera, TYPE_GRASS, ABILITY_EMBODY_ASPECT_TEAL_MASK, BODY_COLOR_GREEN, 1, TRUE), + [SPECIES_OGERPON_WELLSPRING_TERA] = OGERPON_SPECIES_INFO(Wellspring, WellspringTera, TYPE_WATER, ABILITY_EMBODY_ASPECT_WELLSPRING_MASK, BODY_COLOR_BLUE, 0, TRUE), + [SPECIES_OGERPON_HEARTHFLAME_TERA] = OGERPON_SPECIES_INFO(Hearthflame, HearthflameTera, TYPE_FIRE, ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK, BODY_COLOR_RED, 0, TRUE), + [SPECIES_OGERPON_CORNERSTONE_TERA] = OGERPON_SPECIES_INFO(Cornerstone, CornerstoneTera, TYPE_ROCK, ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK, BODY_COLOR_GRAY, 0, TRUE), #endif //P_TERA_FORMS #endif //P_FAMILY_OGERPON diff --git a/src/data/pokemon/species_info/shared_dex_text.h b/src/data/pokemon/species_info/shared_dex_text.h index bf7e12aefb..370b004097 100644 --- a/src/data/pokemon/species_info/shared_dex_text.h +++ b/src/data/pokemon/species_info/shared_dex_text.h @@ -6,7 +6,7 @@ const u8 gFallbackPokedexText[] = _( "at this time."); // Gen 1 families -const u8 gRaticateAlolanPokedexText[] = _( +const u8 gRaticateAlolaPokedexText[] = _( "It forms a group of Rattata, which it \n" "assumes command of. Each group\n" "has its own territory, and disputes\n" @@ -24,7 +24,7 @@ const u8 gPikachuPokedexText[] = _( "energy in a burst, the electric power is\n" "equal to a lightning bolt."); -const u8 gMarowakAlolanPokedexText[] = _( +const u8 gMarowakAlolaPokedexText[] = _( "The cursed flames that light up the bone\n" "carried by this Pokémon are said\n" "to cause both mental and physical\n" diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index a8f6605588..46354db5a0 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -728,7 +728,7 @@ static const u16 sRaticateTeachableLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sRattataAlolanTeachableLearnset[] = { +static const u16 sRattataAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_DIG, @@ -757,7 +757,7 @@ static const u16 sRattataAlolanTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sRaticateAlolanTeachableLearnset[] = { +static const u16 sRaticateAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_BULK_UP, @@ -1031,7 +1031,7 @@ static const u16 sRaichuTeachableLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sRaichuAlolanTeachableLearnset[] = { +static const u16 sRaichuAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, MOVE_CALM_MIND, @@ -1155,7 +1155,7 @@ static const u16 sSandslashTeachableLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sSandshrewAlolanTeachableLearnset[] = { +static const u16 sSandshrewAlolaTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_BLIZZARD, @@ -1194,7 +1194,7 @@ static const u16 sSandshrewAlolanTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sSandslashAlolanTeachableLearnset[] = { +static const u16 sSandslashAlolaTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_BLIZZARD, @@ -1731,7 +1731,7 @@ static const u16 sNinetalesTeachableLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sVulpixAlolanTeachableLearnset[] = { +static const u16 sVulpixAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_DIG, @@ -1759,7 +1759,7 @@ static const u16 sVulpixAlolanTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sNinetalesAlolanTeachableLearnset[] = { +static const u16 sNinetalesAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_CALM_MIND, @@ -2339,7 +2339,7 @@ static const u16 sDugtrioTeachableLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sDiglettAlolanTeachableLearnset[] = { +static const u16 sDiglettAlolaTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_DIG, @@ -2365,7 +2365,7 @@ static const u16 sDiglettAlolanTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sDugtrioAlolanTeachableLearnset[] = { +static const u16 sDugtrioAlolaTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_DIG, @@ -2477,7 +2477,7 @@ static const u16 sPersianTeachableLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sMeowthAlolanTeachableLearnset[] = { +static const u16 sMeowthAlolaTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_DIG, @@ -2512,7 +2512,7 @@ static const u16 sMeowthAlolanTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sPersianAlolanTeachableLearnset[] = { +static const u16 sPersianAlolaTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_DIG, @@ -2551,7 +2551,7 @@ static const u16 sPersianAlolanTeachableLearnset[] = { #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -static const u16 sMeowthGalarianTeachableLearnset[] = { +static const u16 sMeowthGalarTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_BRICK_BREAK, @@ -2910,7 +2910,7 @@ static const u16 sArcanineTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sGrowlitheHisuianTeachableLearnset[] = { +static const u16 sGrowlitheHisuiTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_DIG, MOVE_FACADE, @@ -2934,7 +2934,7 @@ static const u16 sGrowlitheHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sArcanineHisuianTeachableLearnset[] = { +static const u16 sArcanineHisuiTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_DIG, MOVE_FACADE, @@ -3677,7 +3677,7 @@ static const u16 sGolemTeachableLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sGeodudeAlolanTeachableLearnset[] = { +static const u16 sGeodudeAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, MOVE_DIG, @@ -3715,7 +3715,7 @@ static const u16 sGeodudeAlolanTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sGravelerAlolanTeachableLearnset[] = { +static const u16 sGravelerAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, MOVE_DIG, @@ -3755,7 +3755,7 @@ static const u16 sGravelerAlolanTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sGolemAlolanTeachableLearnset[] = { +static const u16 sGolemAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, MOVE_DIG, @@ -3854,7 +3854,7 @@ static const u16 sRapidashTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sPonytaGalarianTeachableLearnset[] = { +static const u16 sPonytaGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_FACADE, @@ -3873,7 +3873,7 @@ static const u16 sPonytaGalarianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sRapidashGalarianTeachableLearnset[] = { +static const u16 sRapidashGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_FACADE, @@ -4064,7 +4064,7 @@ static const u16 sSlowkingTeachableLearnset[] = { #endif //P_GEN_2_CROSS_EVOS #if P_GALARIAN_FORMS -static const u16 sSlowpokeGalarianTeachableLearnset[] = { +static const u16 sSlowpokeGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_CALM_MIND, @@ -4100,7 +4100,7 @@ static const u16 sSlowpokeGalarianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sSlowbroGalarianTeachableLearnset[] = { +static const u16 sSlowbroGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_BRICK_BREAK, @@ -4147,7 +4147,7 @@ static const u16 sSlowbroGalarianTeachableLearnset[] = { }; #if P_GEN_2_CROSS_EVOS -static const u16 sSlowkingGalarianTeachableLearnset[] = { +static const u16 sSlowkingGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_BRICK_BREAK, @@ -4320,7 +4320,7 @@ static const u16 sFarfetchdTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sFarfetchdGalarianTeachableLearnset[] = { +static const u16 sFarfetchdGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, MOVE_FACADE, @@ -4567,7 +4567,7 @@ static const u16 sMukTeachableLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sGrimerAlolanTeachableLearnset[] = { +static const u16 sGrimerAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, MOVE_DIG, @@ -4608,7 +4608,7 @@ static const u16 sGrimerAlolanTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sMukAlolanTeachableLearnset[] = { +static const u16 sMukAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, MOVE_DIG, @@ -5128,7 +5128,7 @@ static const u16 sElectrodeTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sVoltorbHisuianTeachableLearnset[] = { +static const u16 sVoltorbHisuiTeachableLearnset[] = { MOVE_BULLET_SEED, MOVE_FACADE, MOVE_GIGA_DRAIN, @@ -5151,7 +5151,7 @@ static const u16 sVoltorbHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sElectrodeHisuianTeachableLearnset[] = { +static const u16 sElectrodeHisuiTeachableLearnset[] = { MOVE_BULLET_SEED, MOVE_FACADE, MOVE_GIGA_DRAIN, @@ -5247,7 +5247,7 @@ static const u16 sExeggutorTeachableLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sExeggutorAlolanTeachableLearnset[] = { +static const u16 sExeggutorAlolaTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BRICK_BREAK, MOVE_BULLET_SEED, @@ -5378,7 +5378,7 @@ static const u16 sMarowakTeachableLearnset[] = { }; #if P_ALOLAN_FORMS -static const u16 sMarowakAlolanTeachableLearnset[] = { +static const u16 sMarowakAlolaTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_BLIZZARD, @@ -5754,7 +5754,7 @@ static const u16 sWeezingTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sWeezingGalarianTeachableLearnset[] = { +static const u16 sWeezingGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_FACADE, MOVE_FIRE_BLAST, @@ -6548,7 +6548,7 @@ static const u16 sMrMimeTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sMrMimeGalarianTeachableLearnset[] = { +static const u16 sMrMimeGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_BRICK_BREAK, @@ -7148,7 +7148,7 @@ static const u16 sTaurosTeachableLearnset[] = { }; #if P_PALDEAN_FORMS -static const u16 sTaurosPaldeanCombatBreedTeachableLearnset[] = { +static const u16 sTaurosPaldeaCombatTeachableLearnset[] = { MOVE_BULK_UP, MOVE_DIG, MOVE_EARTHQUAKE, @@ -7171,7 +7171,7 @@ static const u16 sTaurosPaldeanCombatBreedTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sTaurosPaldeanBlazeBreedTeachableLearnset[] = { +static const u16 sTaurosPaldeaBlazeTeachableLearnset[] = { MOVE_BULK_UP, MOVE_DIG, MOVE_EARTHQUAKE, @@ -7196,7 +7196,7 @@ static const u16 sTaurosPaldeanBlazeBreedTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sTaurosPaldeanAquaBreedTeachableLearnset[] = { +static const u16 sTaurosPaldeaAquaTeachableLearnset[] = { MOVE_BULK_UP, MOVE_DIG, MOVE_EARTHQUAKE, @@ -8075,7 +8075,7 @@ static const u16 sArticunoTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sArticunoGalarianTeachableLearnset[] = { +static const u16 sArticunoGalarTeachableLearnset[] = { MOVE_CALM_MIND, MOVE_DOUBLE_TEAM, MOVE_FACADE, @@ -8136,7 +8136,7 @@ static const u16 sZapdosTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sZapdosGalarianTeachableLearnset[] = { +static const u16 sZapdosGalarTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_BULK_UP, @@ -8197,7 +8197,7 @@ static const u16 sMoltresTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sMoltresGalarianTeachableLearnset[] = { +static const u16 sMoltresGalarTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_FACADE, MOVE_FLY, @@ -8643,7 +8643,7 @@ static const u16 sTyphlosionTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sTyphlosionHisuianTeachableLearnset[] = { +static const u16 sTyphlosionHisuiTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_CALM_MIND, @@ -10091,7 +10091,7 @@ static const u16 sQuagsireTeachableLearnset[] = { }; #if P_PALDEAN_FORMS -static const u16 sWooperPaldeanTeachableLearnset[] = { +static const u16 sWooperPaldeaTeachableLearnset[] = { MOVE_DIG, MOVE_EARTHQUAKE, MOVE_FACADE, @@ -10767,7 +10767,7 @@ static const u16 sQwilfishTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sQwilfishHisuianTeachableLearnset[] = { +static const u16 sQwilfishHisuiTeachableLearnset[] = { MOVE_BLIZZARD, MOVE_FACADE, MOVE_ICE_BEAM, @@ -10990,7 +10990,7 @@ static const u16 sWeavileTeachableLearnset[] = { #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -static const u16 sSneaselHisuianTeachableLearnset[] = { +static const u16 sSneaselHisuiTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_BULK_UP, @@ -11434,7 +11434,7 @@ static const u16 sCorsolaTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sCorsolaGalarianTeachableLearnset[] = { +static const u16 sCorsolaGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_CALM_MIND, @@ -12904,7 +12904,7 @@ static const u16 sLinooneTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sZigzagoonGalarianTeachableLearnset[] = { +static const u16 sZigzagoonGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_DIG, @@ -12933,7 +12933,7 @@ static const u16 sZigzagoonGalarianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sLinooneGalarianTeachableLearnset[] = { +static const u16 sLinooneGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_DIG, @@ -18932,7 +18932,7 @@ static const u16 sWormadamPlantCloakTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sWormadamSandyCloakTeachableLearnset[] = { +static const u16 sWormadamSandyTeachableLearnset[] = { MOVE_ATTRACT, MOVE_DIG, MOVE_DOUBLE_TEAM, @@ -18965,7 +18965,7 @@ static const u16 sWormadamSandyCloakTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sWormadamTrashCloakTeachableLearnset[] = { +static const u16 sWormadamTrashTeachableLearnset[] = { MOVE_ATTRACT, MOVE_DIG, MOVE_DOUBLE_TEAM, @@ -21335,7 +21335,7 @@ static const u16 sSamurottTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sSamurottHisuianTeachableLearnset[] = { +static const u16 sSamurottHisuiTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_BLIZZARD, MOVE_BRICK_BREAK, @@ -22725,7 +22725,7 @@ static const u16 sLilligantTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sLilligantHisuianTeachableLearnset[] = { +static const u16 sLilligantHisuiTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_BULLET_SEED, @@ -23011,7 +23011,7 @@ static const u16 sDarmanitanTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sDarumakaGalarianTeachableLearnset[] = { +static const u16 sDarumakaGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_BRICK_BREAK, @@ -23040,7 +23040,7 @@ static const u16 sDarumakaGalarianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sDarmanitanGalarianTeachableLearnset[] = { +static const u16 sDarmanitanGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_BLIZZARD, MOVE_BRICK_BREAK, @@ -23333,7 +23333,7 @@ static const u16 sCofagrigusTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sYamaskGalarianTeachableLearnset[] = { +static const u16 sYamaskGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_EARTHQUAKE, @@ -23631,7 +23631,7 @@ static const u16 sZoroarkTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sZoruaHisuianTeachableLearnset[] = { +static const u16 sZoruaHisuiTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_CALM_MIND, MOVE_DIG, @@ -23655,7 +23655,7 @@ static const u16 sZoruaHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sZoroarkHisuianTeachableLearnset[] = { +static const u16 sZoroarkHisuiTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_CALM_MIND, @@ -25087,7 +25087,7 @@ static const u16 sStunfiskTeachableLearnset[] = { }; #if P_GALARIAN_FORMS -static const u16 sStunfiskGalarianTeachableLearnset[] = { +static const u16 sStunfiskGalarTeachableLearnset[] = { MOVE_ATTRACT, MOVE_DIG, MOVE_EARTHQUAKE, @@ -25492,7 +25492,7 @@ static const u16 sBraviaryTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sBraviaryHisuianTeachableLearnset[] = { +static const u16 sBraviaryHisuiTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_BULK_UP, MOVE_CALM_MIND, @@ -26918,7 +26918,7 @@ static const u16 sFloetteTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sFloetteEternalFlowerTeachableLearnset[] = { +static const u16 sFloetteEternalTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_DOUBLE_TEAM, @@ -27188,7 +27188,7 @@ static const u16 sEspurrTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sMeowsticMaleTeachableLearnset[] = { +static const u16 sMeowsticMTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_CUT, @@ -27224,7 +27224,7 @@ static const u16 sMeowsticMaleTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sMeowsticFemaleTeachableLearnset[] = { +static const u16 sMeowsticFTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_CUT, @@ -28137,7 +28137,7 @@ static const u16 sGoodraTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sSliggooHisuianTeachableLearnset[] = { +static const u16 sSliggooHisuiTeachableLearnset[] = { MOVE_BLIZZARD, MOVE_FACADE, MOVE_ICE_BEAM, @@ -28160,7 +28160,7 @@ static const u16 sSliggooHisuianTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sGoodraHisuianTeachableLearnset[] = { +static const u16 sGoodraHisuiTeachableLearnset[] = { MOVE_BLIZZARD, MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, @@ -28422,7 +28422,7 @@ static const u16 sAvaluggTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sAvaluggHisuianTeachableLearnset[] = { +static const u16 sAvaluggHisuiTeachableLearnset[] = { MOVE_BLIZZARD, MOVE_DIG, MOVE_EARTHQUAKE, @@ -28846,7 +28846,7 @@ static const u16 sDecidueyeTeachableLearnset[] = { }; #if P_HISUIAN_FORMS -static const u16 sDecidueyeHisuianTeachableLearnset[] = { +static const u16 sDecidueyeHisuiTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_BULK_UP, @@ -32722,7 +32722,7 @@ static const u16 sEiscueTeachableLearnset[] = { #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE -static const u16 sIndeedeeMaleTeachableLearnset[] = { +static const u16 sIndeedeeMTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_FACADE, @@ -32741,7 +32741,7 @@ static const u16 sIndeedeeMaleTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sIndeedeeFemaleTeachableLearnset[] = { +static const u16 sIndeedeeFTeachableLearnset[] = { MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_FACADE, @@ -33180,7 +33180,7 @@ static const u16 sKubfuTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sUrshifuSingleStrikeStyleTeachableLearnset[] = { +static const u16 sUrshifuSingleStrikeTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_BRICK_BREAK, @@ -33212,7 +33212,7 @@ static const u16 sUrshifuSingleStrikeStyleTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sUrshifuRapidStrikeStyleTeachableLearnset[] = { +static const u16 sUrshifuRapidStrikeTeachableLearnset[] = { MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_BRICK_BREAK, @@ -33394,7 +33394,7 @@ static const u16 sCalyrexTeachableLearnset[] = { }; #if P_FUSION_FORMS -static const u16 sCalyrexIceRiderTeachableLearnset[] = { +static const u16 sCalyrexIceTeachableLearnset[] = { MOVE_BLIZZARD, MOVE_BULLET_SEED, MOVE_CALM_MIND, @@ -33428,7 +33428,7 @@ static const u16 sCalyrexIceRiderTeachableLearnset[] = { MOVE_UNAVAILABLE, }; -static const u16 sCalyrexShadowRiderTeachableLearnset[] = { +static const u16 sCalyrexShadowTeachableLearnset[] = { MOVE_BULLET_SEED, MOVE_CALM_MIND, MOVE_FACADE, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index d802521afe..8452e24732 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -52,7 +52,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(VenusaurMega); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(VenusaurGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(VenusaurGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BULBASAUR @@ -89,7 +89,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(CharizardMegaY); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CharizardGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(CharizardGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHARMANDER @@ -125,7 +125,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(BlastoiseMega); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(BlastoiseGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(BlastoiseGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SQUIRTLE @@ -169,7 +169,7 @@ static const union AnimCmd sAnim_Butterfree_1[] = }; #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ButterfreeGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(ButterfreeGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CATERPIE @@ -278,8 +278,8 @@ static const union AnimCmd sAnim_Raticate_1[] = }; #if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(RattataAlolan); -PLACEHOLDER_ANIM_SINGLE_FRAME(RaticateAlolan); +PLACEHOLDER_ANIM_SINGLE_FRAME(RattataAlola); +PLACEHOLDER_ANIM_SINGLE_FRAME(RaticateAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_RATTATA @@ -361,18 +361,18 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuPhD); PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuLibre); #endif //P_COSPLAY_PIKACHU_FORMS #if P_CAP_PIKACHU_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuOriginalCap); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuHoennCap); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuSinnohCap); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuUnovaCap); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuKalosCap); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuAlolaCap); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuPartnerCap); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuWorldCap); +PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuOriginal); +PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuHoenn); +PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuSinnoh); +PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuUnova); +PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuKalos); +PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuAlola); +PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuPartner); +PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuWorld); #endif //P_CAP_PIKACHU_FORMS #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuGmax); #endif //P_GIGANTAMAX_FORMS static const union AnimCmd sAnim_Raichu_1[] = @@ -386,7 +386,7 @@ static const union AnimCmd sAnim_Raichu_1[] = }; #if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(RaichuAlolan); +PLACEHOLDER_ANIM_SINGLE_FRAME(RaichuAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_PIKACHU @@ -412,8 +412,8 @@ static const union AnimCmd sAnim_Sandslash_1[] = }; #if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SandshrewAlolan); -PLACEHOLDER_ANIM_SINGLE_FRAME(SandslashAlolan); +PLACEHOLDER_ANIM_SINGLE_FRAME(SandshrewAlola); +PLACEHOLDER_ANIM_SINGLE_FRAME(SandslashAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_SANDSHREW @@ -523,8 +523,8 @@ static const union AnimCmd sAnim_Ninetales_1[] = }; #if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(VulpixAlolan); -PLACEHOLDER_ANIM_SINGLE_FRAME(NinetalesAlolan); +PLACEHOLDER_ANIM_SINGLE_FRAME(VulpixAlola); +PLACEHOLDER_ANIM_SINGLE_FRAME(NinetalesAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_VULPIX @@ -782,8 +782,8 @@ static const union AnimCmd sAnim_Dugtrio_1[] = }; #if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(DiglettAlolan); -PLACEHOLDER_ANIM_SINGLE_FRAME(DugtrioAlolan); +PLACEHOLDER_ANIM_SINGLE_FRAME(DiglettAlola); +PLACEHOLDER_ANIM_SINGLE_FRAME(DugtrioAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_DIGLETT @@ -807,17 +807,17 @@ static const union AnimCmd sAnim_Persian_1[] = }; #if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MeowthAlolan); -PLACEHOLDER_ANIM_SINGLE_FRAME(PersianAlolan); +PLACEHOLDER_ANIM_SINGLE_FRAME(MeowthAlola); +PLACEHOLDER_ANIM_SINGLE_FRAME(PersianAlola); #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MeowthGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(MeowthGalar); PLACEHOLDER_ANIM_SINGLE_FRAME(Perrserker); #endif //P_GALARIAN_FORMS #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MeowthGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(MeowthGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MEOWTH @@ -892,8 +892,8 @@ static const union AnimCmd sAnim_Arcanine_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GrowlitheHisuian); -PLACEHOLDER_ANIM_SINGLE_FRAME(ArcanineHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(GrowlitheHisui); +PLACEHOLDER_ANIM_SINGLE_FRAME(ArcanineHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GROWLITHE @@ -1001,7 +1001,7 @@ static const union AnimCmd sAnim_Machamp_1[] = }; #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MachampGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(MachampGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MACHOP @@ -1091,9 +1091,9 @@ static const union AnimCmd sAnim_Golem_1[] = }; #if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GeodudeAlolan); -PLACEHOLDER_ANIM_SINGLE_FRAME(GravelerAlolan); -PLACEHOLDER_ANIM_SINGLE_FRAME(GolemAlolan); +PLACEHOLDER_ANIM_SINGLE_FRAME(GeodudeAlola); +PLACEHOLDER_ANIM_SINGLE_FRAME(GravelerAlola); +PLACEHOLDER_ANIM_SINGLE_FRAME(GolemAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GEODUDE @@ -1114,8 +1114,8 @@ static const union AnimCmd sAnim_Rapidash_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(PonytaGalarian); -PLACEHOLDER_ANIM_SINGLE_FRAME(RapidashGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(PonytaGalar); +PLACEHOLDER_ANIM_SINGLE_FRAME(RapidashGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_PONYTA @@ -1150,10 +1150,10 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(SlowbroMega); #endif //P_MEGA_EVOLUTIONS #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SlowpokeGalarian); -PLACEHOLDER_ANIM_SINGLE_FRAME(SlowbroGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(SlowpokeGalar); +PLACEHOLDER_ANIM_SINGLE_FRAME(SlowbroGalar); #if P_GEN_2_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(SlowkingGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(SlowkingGalar); #endif //P_GEN_2_CROSS_EVOS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_SLOWPOKE @@ -1213,7 +1213,7 @@ static const union AnimCmd sAnim_Farfetchd_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(FarfetchdGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(FarfetchdGalar); PLACEHOLDER_ANIM_SINGLE_FRAME(Sirfetchd); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_FARFETCHD @@ -1283,8 +1283,8 @@ static const union AnimCmd sAnim_Muk_1[] = }; #if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GrimerAlolan); -PLACEHOLDER_ANIM_SINGLE_FRAME(MukAlolan); +PLACEHOLDER_ANIM_SINGLE_FRAME(GrimerAlola); +PLACEHOLDER_ANIM_SINGLE_FRAME(MukAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GRIMER @@ -1344,7 +1344,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(GengarMega); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GengarGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(GengarGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GASTLY @@ -1418,7 +1418,7 @@ static const union AnimCmd sAnim_Kingler_1[] = }; #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(KinglerGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(KinglerGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KRABBY @@ -1443,8 +1443,8 @@ static const union AnimCmd sAnim_Electrode_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(VoltorbHisuian); -PLACEHOLDER_ANIM_SINGLE_FRAME(ElectrodeHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(VoltorbHisui); +PLACEHOLDER_ANIM_SINGLE_FRAME(ElectrodeHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_VOLTORB @@ -1471,7 +1471,7 @@ static const union AnimCmd sAnim_Exeggutor_1[] = }; #if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_TWO_FRAMES(ExeggutorAlolan); +PLACEHOLDER_ANIM_TWO_FRAMES(ExeggutorAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_EXEGGCUTE @@ -1499,7 +1499,7 @@ static const union AnimCmd sAnim_Marowak_1[] = }; #if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MarowakAlolan); +PLACEHOLDER_ANIM_SINGLE_FRAME(MarowakAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_CUBONE @@ -1597,7 +1597,7 @@ static const union AnimCmd sAnim_Weezing_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(WeezingGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(WeezingGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_KOFFING @@ -1809,7 +1809,7 @@ static const union AnimCmd sAnim_MrMime_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MrMimeGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(MrMimeGalar); PLACEHOLDER_ANIM_SINGLE_FRAME(MrRime); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MR_MIME @@ -1955,7 +1955,7 @@ static const union AnimCmd sAnim_Tauros_1[] = }; #if P_PALDEAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(TaurosPaldean); +PLACEHOLDER_ANIM_SINGLE_FRAME(TaurosPaldea); #endif //P_PALDEAN_FORMS #endif //P_FAMILY_TAUROS @@ -1996,7 +1996,7 @@ static const union AnimCmd sAnim_Lapras_1[] = }; #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(LaprasGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(LaprasGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_LAPRAS @@ -2020,7 +2020,7 @@ static const union AnimCmd sAnim_Eevee_1[] = }; #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(EeveeGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(EeveeGmax); #endif //P_GIGANTAMAX_FORMS static const union AnimCmd sAnim_Vaporeon_1[] = @@ -2207,7 +2207,7 @@ static const union AnimCmd sAnim_Snorlax_1[] = }; #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SnorlaxGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(SnorlaxGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SNORLAX @@ -2222,7 +2222,7 @@ static const union AnimCmd sAnim_Articuno_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ArticunoGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(ArticunoGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ARTICUNO @@ -2237,7 +2237,7 @@ static const union AnimCmd sAnim_Zapdos_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ZapdosGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(ZapdosGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZAPDOS @@ -2280,7 +2280,7 @@ static const union AnimCmd sAnim_Moltres_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MoltresGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(MoltresGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MOLTRES @@ -2387,7 +2387,7 @@ static const union AnimCmd sAnim_Typhlosion_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(TyphlosionHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(TyphlosionHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_CYNDAQUIL @@ -2834,7 +2834,7 @@ static const union AnimCmd sAnim_Quagsire_1[] = }; #if P_PALDEAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(WooperPaldean); +PLACEHOLDER_ANIM_SINGLE_FRAME(WooperPaldea); PLACEHOLDER_ANIM_SINGLE_FRAME(Clodsire); #endif //P_PALDEAN_FORMS #endif //P_FAMILY_WOOPER @@ -3024,7 +3024,7 @@ static const union AnimCmd sAnim_Qwilfish_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(QwilfishHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(QwilfishHisui); PLACEHOLDER_ANIM_SINGLE_FRAME(Overqwil); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_QWILFISH @@ -3077,7 +3077,7 @@ static const union AnimCmd sAnim_Weavile_1[] = #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SneaselHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(SneaselHisui); PLACEHOLDER_ANIM_SINGLE_FRAME(Sneasler); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_SNEASEL @@ -3167,7 +3167,7 @@ static const union AnimCmd sAnim_Corsola_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CorsolaGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(CorsolaGalar); PLACEHOLDER_ANIM_SINGLE_FRAME(Cursola); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_CORSOLA @@ -3555,8 +3555,8 @@ static const union AnimCmd sAnim_Linoone_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ZigzagoonGalarian); -PLACEHOLDER_ANIM_SINGLE_FRAME(LinooneGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(ZigzagoonGalar); +PLACEHOLDER_ANIM_SINGLE_FRAME(LinooneGalar); PLACEHOLDER_ANIM_SINGLE_FRAME(Obstagoon); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZIGZAGOON @@ -6340,7 +6340,7 @@ static const union AnimCmd sAnim_Samurott_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SamurottHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(SamurottHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_OSHAWOTT @@ -6832,7 +6832,7 @@ static const union AnimCmd sAnim_Lilligant_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(LilligantHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(LilligantHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_PETILIL @@ -6889,7 +6889,7 @@ static const union AnimCmd sAnim_Darumaka_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_DarmanitanStandardMode_1[] = +static const union AnimCmd sAnim_DarmanitanStandard_1[] = { ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(0, 10), @@ -6898,7 +6898,7 @@ static const union AnimCmd sAnim_DarmanitanStandardMode_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_DarmanitanZenMode_1[] = +static const union AnimCmd sAnim_DarmanitanZen_1[] = { ANIMCMD_FRAME(1, 15), ANIMCMD_FRAME(0, 20), @@ -6906,9 +6906,9 @@ static const union AnimCmd sAnim_DarmanitanZenMode_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(DarumakaGalarian); -PLACEHOLDER_ANIM_SINGLE_FRAME(DarmanitanGalarianStandardMode); -PLACEHOLDER_ANIM_SINGLE_FRAME(DarmanitanGalarianZenMode); +PLACEHOLDER_ANIM_SINGLE_FRAME(DarumakaGalar); +PLACEHOLDER_ANIM_SINGLE_FRAME(DarmanitanGalarStandard); +PLACEHOLDER_ANIM_SINGLE_FRAME(DarmanitanGalarZen); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_DARUMAKA @@ -7006,7 +7006,7 @@ static const union AnimCmd sAnim_Cofagrigus_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(YamaskGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(YamaskGalar); PLACEHOLDER_ANIM_SINGLE_FRAME(Runerigus); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_YAMASK @@ -7078,7 +7078,7 @@ static const union AnimCmd sAnim_Garbodor_1[] = }; #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GarbodorGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(GarbodorGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TRUBBISH @@ -7104,8 +7104,8 @@ static const union AnimCmd sAnim_Zoroark_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ZoruaHisuian); -PLACEHOLDER_ANIM_SINGLE_FRAME(ZoroarkHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(ZoruaHisui); +PLACEHOLDER_ANIM_SINGLE_FRAME(ZoroarkHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ZORUA @@ -7591,7 +7591,7 @@ static const union AnimCmd sAnim_Stunfisk_1[] = }; #if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(StunfiskGalarian); +PLACEHOLDER_ANIM_SINGLE_FRAME(StunfiskGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_STUNFISK @@ -7703,7 +7703,7 @@ static const union AnimCmd sAnim_Braviary_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(BraviaryHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(BraviaryHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_RUFFLET @@ -8679,8 +8679,8 @@ static const union AnimCmd sAnim_Goodra_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SliggooHisuian); -PLACEHOLDER_ANIM_SINGLE_FRAME(GoodraHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(SliggooHisui); +PLACEHOLDER_ANIM_SINGLE_FRAME(GoodraHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GOOMY @@ -8765,7 +8765,7 @@ static const union AnimCmd sAnim_Avalugg_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(AvaluggHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(AvaluggHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BERGMITE @@ -8907,7 +8907,7 @@ static const union AnimCmd sAnim_Decidueye_1[] = }; #if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(DecidueyeHisuian); +PLACEHOLDER_ANIM_SINGLE_FRAME(DecidueyeHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ROWLET @@ -9426,7 +9426,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Meltan); PLACEHOLDER_ANIM_SINGLE_FRAME(Melmetal); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MelmetalGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(MelmetalGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MELTAN @@ -9436,7 +9436,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Thwackey); PLACEHOLDER_ANIM_SINGLE_FRAME(Rillaboom); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(RillaboomGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(RillaboomGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GROOKEY @@ -9446,7 +9446,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Raboot); PLACEHOLDER_ANIM_SINGLE_FRAME(Cinderace); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CinderaceGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(CinderaceGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SCORBUNNY @@ -9456,7 +9456,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Drizzile); PLACEHOLDER_ANIM_SINGLE_FRAME(Inteleon); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(InteleonGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(InteleonGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SOBBLE @@ -9499,7 +9499,7 @@ static const union AnimCmd sAnim_Corviknight_1[] = }; #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CorviknightGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(CorviknightGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROOKIDEE @@ -9509,7 +9509,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Dottler); PLACEHOLDER_ANIM_SINGLE_FRAME(Orbeetle); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(OrbeetleGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(OrbeetleGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BLIPBUG @@ -9546,7 +9546,7 @@ static const union AnimCmd sAnim_Drednaw_1[] = }; #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(DrednawGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(DrednawGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHEWTLE @@ -9561,7 +9561,7 @@ PLACEHOLDER_ANIM_TWO_FRAMES(Carkol); PLACEHOLDER_ANIM_TWO_FRAMES(Coalossal); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CoalossalGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(CoalossalGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROLYCOLY @@ -9570,13 +9570,13 @@ PLACEHOLDER_ANIM_TWO_FRAMES(Applin); PLACEHOLDER_ANIM_TWO_FRAMES(Flapple); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(FlappleGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(FlappleGmax); #endif //P_GIGANTAMAX_FORMS PLACEHOLDER_ANIM_TWO_FRAMES(Appletun); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(AppletunGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(AppletunGmax); #endif //P_GIGANTAMAX_FORMS #if P_GEN_9_CROSS_EVOS @@ -9590,7 +9590,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Silicobra); PLACEHOLDER_ANIM_SINGLE_FRAME(Sandaconda); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SandacondaGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(SandacondaGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SILICOBRA @@ -9608,7 +9608,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Toxel); PLACEHOLDER_ANIM_SINGLE_FRAME(Toxtricity); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ToxtricityGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(ToxtricityGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TOXEL @@ -9630,7 +9630,7 @@ static const union AnimCmd sAnim_Centiskorch_1[] = }; #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CentiskorchGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(CentiskorchGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SIZZLIPEDE @@ -9650,7 +9650,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Hattrem); PLACEHOLDER_ANIM_SINGLE_FRAME(Hatterene); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(HattereneGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(HattereneGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_HATENNA @@ -9660,7 +9660,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Morgrem); PLACEHOLDER_ANIM_SINGLE_FRAME(Grimmsnarl); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GrimmsnarlGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(GrimmsnarlGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_IMPIDIMP @@ -9669,7 +9669,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Milcery); PLACEHOLDER_ANIM_SINGLE_FRAME(Alcremie); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(AlcremieGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(AlcremieGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MILCERY @@ -9707,7 +9707,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Cufant); PLACEHOLDER_ANIM_SINGLE_FRAME(Copperajah); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CopperajahGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(CopperajahGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CUFANT @@ -9731,7 +9731,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Arctovish); PLACEHOLDER_ANIM_SINGLE_FRAME(Duraludon); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(DuraludonGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(DuraludonGmax); #endif //P_GIGANTAMAX_FORMS #if P_GEN_9_CROSS_EVOS @@ -9762,11 +9762,11 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Kubfu); PLACEHOLDER_ANIM_SINGLE_FRAME(Urshifu); #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(UrshifuSingleStrikeStyleGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(UrshifuSingleStrikeGmax); #endif //P_GIGANTAMAX_FORMS #if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(UrshifuRapidStrikeStyleGigantamax); +PLACEHOLDER_ANIM_SINGLE_FRAME(UrshifuRapidStrikeGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KUBFU @@ -10167,7 +10167,7 @@ SINGLE_ANIMATION(Venusaur); SINGLE_ANIMATION(VenusaurMega); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(VenusaurGigantamax); +SINGLE_ANIMATION(VenusaurGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BULBASAUR #if P_FAMILY_CHARMANDER @@ -10179,7 +10179,7 @@ SINGLE_ANIMATION(CharizardMegaX); SINGLE_ANIMATION(CharizardMegaY); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CharizardGigantamax); +SINGLE_ANIMATION(CharizardGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHARMANDER #if P_FAMILY_SQUIRTLE @@ -10190,7 +10190,7 @@ SINGLE_ANIMATION(Blastoise); SINGLE_ANIMATION(BlastoiseMega); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(BlastoiseGigantamax); +SINGLE_ANIMATION(BlastoiseGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SQUIRTLE #if P_FAMILY_CATERPIE @@ -10198,7 +10198,7 @@ SINGLE_ANIMATION(Caterpie); SINGLE_ANIMATION(Metapod); SINGLE_ANIMATION(Butterfree); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(ButterfreeGigantamax); +SINGLE_ANIMATION(ButterfreeGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CATERPIE #if P_FAMILY_WEEDLE @@ -10221,8 +10221,8 @@ SINGLE_ANIMATION(PidgeotMega); SINGLE_ANIMATION(Rattata); SINGLE_ANIMATION(Raticate); #if P_ALOLAN_FORMS -SINGLE_ANIMATION(RattataAlolan); -SINGLE_ANIMATION(RaticateAlolan); +SINGLE_ANIMATION(RattataAlola); +SINGLE_ANIMATION(RaticateAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_RATTATA #if P_FAMILY_SPEAROW @@ -10248,29 +10248,29 @@ SINGLE_ANIMATION(PikachuPhD); SINGLE_ANIMATION(PikachuLibre); #endif //P_COSPLAY_PIKACHU_FORMS #if P_CAP_PIKACHU_FORMS -SINGLE_ANIMATION(PikachuOriginalCap); -SINGLE_ANIMATION(PikachuHoennCap); -SINGLE_ANIMATION(PikachuSinnohCap); -SINGLE_ANIMATION(PikachuUnovaCap); -SINGLE_ANIMATION(PikachuKalosCap); -SINGLE_ANIMATION(PikachuAlolaCap); -SINGLE_ANIMATION(PikachuPartnerCap); -SINGLE_ANIMATION(PikachuWorldCap); +SINGLE_ANIMATION(PikachuOriginal); +SINGLE_ANIMATION(PikachuHoenn); +SINGLE_ANIMATION(PikachuSinnoh); +SINGLE_ANIMATION(PikachuUnova); +SINGLE_ANIMATION(PikachuKalos); +SINGLE_ANIMATION(PikachuAlola); +SINGLE_ANIMATION(PikachuPartner); +SINGLE_ANIMATION(PikachuWorld); #endif //P_CAP_PIKACHU_FORMS #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(PikachuGigantamax); +SINGLE_ANIMATION(PikachuGmax); #endif //P_GIGANTAMAX_FORMS SINGLE_ANIMATION(Raichu); #if P_ALOLAN_FORMS -SINGLE_ANIMATION(RaichuAlolan); +SINGLE_ANIMATION(RaichuAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_PIKACHU #if P_FAMILY_SANDSHREW SINGLE_ANIMATION(Sandshrew); SINGLE_ANIMATION(Sandslash); #if P_ALOLAN_FORMS -SINGLE_ANIMATION(SandshrewAlolan); -SINGLE_ANIMATION(SandslashAlolan); +SINGLE_ANIMATION(SandshrewAlola); +SINGLE_ANIMATION(SandslashAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_SANDSHREW #if P_FAMILY_NIDORAN @@ -10292,8 +10292,8 @@ SINGLE_ANIMATION(Clefable); SINGLE_ANIMATION(Vulpix); SINGLE_ANIMATION(Ninetales); #if P_ALOLAN_FORMS -SINGLE_ANIMATION(VulpixAlolan); -SINGLE_ANIMATION(NinetalesAlolan); +SINGLE_ANIMATION(VulpixAlola); +SINGLE_ANIMATION(NinetalesAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_VULPIX #if P_FAMILY_JIGGLYPUFF @@ -10330,23 +10330,23 @@ SINGLE_ANIMATION(Venomoth); SINGLE_ANIMATION(Diglett); SINGLE_ANIMATION(Dugtrio); #if P_ALOLAN_FORMS -SINGLE_ANIMATION(DiglettAlolan); -SINGLE_ANIMATION(DugtrioAlolan); +SINGLE_ANIMATION(DiglettAlola); +SINGLE_ANIMATION(DugtrioAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_DIGLETT #if P_FAMILY_MEOWTH SINGLE_ANIMATION(Meowth); SINGLE_ANIMATION(Persian); #if P_ALOLAN_FORMS -SINGLE_ANIMATION(MeowthAlolan); -SINGLE_ANIMATION(PersianAlolan); +SINGLE_ANIMATION(MeowthAlola); +SINGLE_ANIMATION(PersianAlola); #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS -SINGLE_ANIMATION(MeowthGalarian); +SINGLE_ANIMATION(MeowthGalar); SINGLE_ANIMATION(Perrserker); #endif //P_GALARIAN_FORMS #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(MeowthGigantamax); +SINGLE_ANIMATION(MeowthGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MEOWTH #if P_FAMILY_PSYDUCK @@ -10364,8 +10364,8 @@ SINGLE_ANIMATION(Annihilape); SINGLE_ANIMATION(Growlithe); SINGLE_ANIMATION(Arcanine); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(GrowlitheHisuian); -SINGLE_ANIMATION(ArcanineHisuian); +SINGLE_ANIMATION(GrowlitheHisui); +SINGLE_ANIMATION(ArcanineHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GROWLITHE #if P_FAMILY_POLIWAG @@ -10389,7 +10389,7 @@ SINGLE_ANIMATION(Machop); SINGLE_ANIMATION(Machoke); SINGLE_ANIMATION(Machamp); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(MachampGigantamax); +SINGLE_ANIMATION(MachampGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MACHOP #if P_FAMILY_BELLSPROUT @@ -10406,17 +10406,17 @@ SINGLE_ANIMATION(Geodude); SINGLE_ANIMATION(Graveler); SINGLE_ANIMATION(Golem); #if P_ALOLAN_FORMS -SINGLE_ANIMATION(GeodudeAlolan); -SINGLE_ANIMATION(GravelerAlolan); -SINGLE_ANIMATION(GolemAlolan); +SINGLE_ANIMATION(GeodudeAlola); +SINGLE_ANIMATION(GravelerAlola); +SINGLE_ANIMATION(GolemAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GEODUDE #if P_FAMILY_PONYTA SINGLE_ANIMATION(Ponyta); SINGLE_ANIMATION(Rapidash); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(PonytaGalarian); -SINGLE_ANIMATION(RapidashGalarian); +SINGLE_ANIMATION(PonytaGalar); +SINGLE_ANIMATION(RapidashGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_PONYTA #if P_FAMILY_SLOWPOKE @@ -10429,10 +10429,10 @@ SINGLE_ANIMATION(Slowking); SINGLE_ANIMATION(SlowbroMega); #endif //P_MEGA_EVOLUTIONS #if P_GALARIAN_FORMS -SINGLE_ANIMATION(SlowpokeGalarian); -SINGLE_ANIMATION(SlowbroGalarian); +SINGLE_ANIMATION(SlowpokeGalar); +SINGLE_ANIMATION(SlowbroGalar); #if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(SlowkingGalarian); +SINGLE_ANIMATION(SlowkingGalar); #endif //P_GEN_2_CROSS_EVOS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_SLOWPOKE @@ -10446,7 +10446,7 @@ SINGLE_ANIMATION(Magnezone); #if P_FAMILY_FARFETCHD SINGLE_ANIMATION(Farfetchd); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(FarfetchdGalarian); +SINGLE_ANIMATION(FarfetchdGalar); SINGLE_ANIMATION(Sirfetchd); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_FARFETCHD @@ -10462,8 +10462,8 @@ SINGLE_ANIMATION(Dewgong); SINGLE_ANIMATION(Grimer); SINGLE_ANIMATION(Muk); #if P_ALOLAN_FORMS -SINGLE_ANIMATION(GrimerAlolan); -SINGLE_ANIMATION(MukAlolan); +SINGLE_ANIMATION(GrimerAlola); +SINGLE_ANIMATION(MukAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GRIMER #if P_FAMILY_SHELLDER @@ -10478,7 +10478,7 @@ SINGLE_ANIMATION(Gengar); SINGLE_ANIMATION(GengarMega); #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(GengarGigantamax); +SINGLE_ANIMATION(GengarGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GASTLY #if P_FAMILY_ONIX @@ -10498,29 +10498,29 @@ SINGLE_ANIMATION(Hypno); SINGLE_ANIMATION(Krabby); SINGLE_ANIMATION(Kingler); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(KinglerGigantamax); +SINGLE_ANIMATION(KinglerGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KRABBY #if P_FAMILY_VOLTORB SINGLE_ANIMATION(Voltorb); SINGLE_ANIMATION(Electrode); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(VoltorbHisuian); -SINGLE_ANIMATION(ElectrodeHisuian); +SINGLE_ANIMATION(VoltorbHisui); +SINGLE_ANIMATION(ElectrodeHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_VOLTORB #if P_FAMILY_EXEGGCUTE SINGLE_ANIMATION(Exeggcute); SINGLE_ANIMATION(Exeggutor); #if P_ALOLAN_FORMS -SINGLE_ANIMATION(ExeggutorAlolan); +SINGLE_ANIMATION(ExeggutorAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_EXEGGCUTE #if P_FAMILY_CUBONE SINGLE_ANIMATION(Cubone); SINGLE_ANIMATION(Marowak); #if P_ALOLAN_FORMS -SINGLE_ANIMATION(MarowakAlolan); +SINGLE_ANIMATION(MarowakAlola); #endif //P_ALOLAN_FORMS #endif //P_FAMILY_CUBONE #if P_FAMILY_HITMONS @@ -10543,7 +10543,7 @@ SINGLE_ANIMATION(Lickilicky); SINGLE_ANIMATION(Koffing); SINGLE_ANIMATION(Weezing); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(WeezingGalarian); +SINGLE_ANIMATION(WeezingGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_KOFFING #if P_FAMILY_RHYHORN @@ -10595,7 +10595,7 @@ SINGLE_ANIMATION(MimeJr); #endif //P_GEN_4_CROSS_EVOS SINGLE_ANIMATION(MrMime); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(MrMimeGalarian); +SINGLE_ANIMATION(MrMimeGalar); SINGLE_ANIMATION(MrRime); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MR_MIME @@ -10644,7 +10644,7 @@ SINGLE_ANIMATION(PinsirMega); #if P_FAMILY_TAUROS SINGLE_ANIMATION(Tauros); #if P_PALDEAN_FORMS -SINGLE_ANIMATION(TaurosPaldean); +SINGLE_ANIMATION(TaurosPaldea); #endif //P_PALDEAN_FORMS #endif //P_FAMILY_TAUROS #if P_FAMILY_MAGIKARP @@ -10657,7 +10657,7 @@ SINGLE_ANIMATION(GyaradosMega); #if P_FAMILY_LAPRAS SINGLE_ANIMATION(Lapras); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(LaprasGigantamax); +SINGLE_ANIMATION(LaprasGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_LAPRAS #if P_FAMILY_DITTO @@ -10666,7 +10666,7 @@ SINGLE_ANIMATION(Ditto); #if P_FAMILY_EEVEE SINGLE_ANIMATION(Eevee); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(EeveeGigantamax); +SINGLE_ANIMATION(EeveeGmax); #endif //P_GIGANTAMAX_FORMS SINGLE_ANIMATION(Vaporeon); SINGLE_ANIMATION(Jolteon); @@ -10712,25 +10712,25 @@ SINGLE_ANIMATION(Munchlax); #endif //P_GEN_4_CROSS_EVOS SINGLE_ANIMATION(Snorlax); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(SnorlaxGigantamax); +SINGLE_ANIMATION(SnorlaxGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SNORLAX #if P_FAMILY_ARTICUNO SINGLE_ANIMATION(Articuno); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(ArticunoGalarian); +SINGLE_ANIMATION(ArticunoGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ARTICUNO #if P_FAMILY_ZAPDOS SINGLE_ANIMATION(Zapdos); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(ZapdosGalarian); +SINGLE_ANIMATION(ZapdosGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZAPDOS #if P_FAMILY_MOLTRES SINGLE_ANIMATION(Moltres); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(MoltresGalarian); +SINGLE_ANIMATION(MoltresGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MOLTRES #if P_FAMILY_DRATINI @@ -10758,7 +10758,7 @@ SINGLE_ANIMATION(Cyndaquil); SINGLE_ANIMATION(Quilava); SINGLE_ANIMATION(Typhlosion); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(TyphlosionHisuian); +SINGLE_ANIMATION(TyphlosionHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_CYNDAQUIL #if P_FAMILY_TOTODILE @@ -10843,7 +10843,7 @@ SINGLE_ANIMATION(Yanmega); SINGLE_ANIMATION(Wooper); SINGLE_ANIMATION(Quagsire); #if P_PALDEAN_FORMS -SINGLE_ANIMATION(WooperPaldean); +SINGLE_ANIMATION(WooperPaldea); SINGLE_ANIMATION(Clodsire); #endif //P_PALDEAN_FORMS #endif //P_FAMILY_WOOPER @@ -10897,7 +10897,7 @@ SINGLE_ANIMATION(Granbull); #if P_FAMILY_QWILFISH SINGLE_ANIMATION(Qwilfish); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(QwilfishHisuian); +SINGLE_ANIMATION(QwilfishHisui); SINGLE_ANIMATION(Overqwil); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_QWILFISH @@ -10916,7 +10916,7 @@ SINGLE_ANIMATION(Sneasel); SINGLE_ANIMATION(Weavile); #endif //P_GEN_4_CROSS_EVOS #if P_HISUIAN_FORMS -SINGLE_ANIMATION(SneaselHisuian); +SINGLE_ANIMATION(SneaselHisui); SINGLE_ANIMATION(Sneasler); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_SNEASEL @@ -10942,7 +10942,7 @@ SINGLE_ANIMATION(Mamoswine); #if P_FAMILY_CORSOLA SINGLE_ANIMATION(Corsola); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(CorsolaGalarian); +SINGLE_ANIMATION(CorsolaGalar); SINGLE_ANIMATION(Cursola); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_CORSOLA @@ -11043,8 +11043,8 @@ SINGLE_ANIMATION(Mightyena); SINGLE_ANIMATION(Zigzagoon); SINGLE_ANIMATION(Linoone); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(ZigzagoonGalarian); -SINGLE_ANIMATION(LinooneGalarian); +SINGLE_ANIMATION(ZigzagoonGalar); +SINGLE_ANIMATION(LinooneGalar); SINGLE_ANIMATION(Obstagoon); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZIGZAGOON @@ -11595,7 +11595,7 @@ SINGLE_ANIMATION(Oshawott); SINGLE_ANIMATION(Dewott); SINGLE_ANIMATION(Samurott); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(SamurottHisuian); +SINGLE_ANIMATION(SamurottHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_OSHAWOTT #if P_FAMILY_PATRAT @@ -11689,7 +11689,7 @@ SINGLE_ANIMATION(Whimsicott); SINGLE_ANIMATION(Petilil); SINGLE_ANIMATION(Lilligant); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(LilligantHisuian); +SINGLE_ANIMATION(LilligantHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_PETILIL #if P_FAMILY_BASCULIN @@ -11705,12 +11705,12 @@ SINGLE_ANIMATION(Krookodile); #endif //P_FAMILY_SANDILE #if P_FAMILY_DARUMAKA SINGLE_ANIMATION(Darumaka); -SINGLE_ANIMATION(DarmanitanStandardMode); -SINGLE_ANIMATION(DarmanitanZenMode); +SINGLE_ANIMATION(DarmanitanStandard); +SINGLE_ANIMATION(DarmanitanZen); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(DarumakaGalarian); -SINGLE_ANIMATION(DarmanitanGalarianStandardMode); -SINGLE_ANIMATION(DarmanitanGalarianZenMode); +SINGLE_ANIMATION(DarumakaGalar); +SINGLE_ANIMATION(DarmanitanGalarStandard); +SINGLE_ANIMATION(DarmanitanGalarZen); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_DARUMAKA #if P_FAMILY_MARACTUS @@ -11731,7 +11731,7 @@ SINGLE_ANIMATION(Sigilyph); SINGLE_ANIMATION(Yamask); SINGLE_ANIMATION(Cofagrigus); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(YamaskGalarian); +SINGLE_ANIMATION(YamaskGalar); SINGLE_ANIMATION(Runerigus); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_YAMASK @@ -11747,15 +11747,15 @@ SINGLE_ANIMATION(Archeops); SINGLE_ANIMATION(Trubbish); SINGLE_ANIMATION(Garbodor); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(GarbodorGigantamax); +SINGLE_ANIMATION(GarbodorGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TRUBBISH #if P_FAMILY_ZORUA SINGLE_ANIMATION(Zorua); SINGLE_ANIMATION(Zoroark); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(ZoruaHisuian); -SINGLE_ANIMATION(ZoroarkHisuian); +SINGLE_ANIMATION(ZoruaHisui); +SINGLE_ANIMATION(ZoroarkHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ZORUA #if P_FAMILY_MINCCINO @@ -11849,7 +11849,7 @@ SINGLE_ANIMATION(Accelgor); #if P_FAMILY_STUNFISK SINGLE_ANIMATION(Stunfisk); #if P_GALARIAN_FORMS -SINGLE_ANIMATION(StunfiskGalarian); +SINGLE_ANIMATION(StunfiskGalar); #endif //P_GALARIAN_FORMS #endif //P_FAMILY_STUNFISK #if P_FAMILY_MIENFOO @@ -11877,7 +11877,7 @@ SINGLE_ANIMATION(Bouffalant); SINGLE_ANIMATION(Rufflet); SINGLE_ANIMATION(Braviary); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(BraviaryHisuian); +SINGLE_ANIMATION(BraviaryHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_RUFFLET #if P_FAMILY_VULLABY @@ -12054,8 +12054,8 @@ SINGLE_ANIMATION(Goomy); SINGLE_ANIMATION(Sliggoo); SINGLE_ANIMATION(Goodra); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(SliggooHisuian); -SINGLE_ANIMATION(GoodraHisuian); +SINGLE_ANIMATION(SliggooHisui); +SINGLE_ANIMATION(GoodraHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GOOMY #if P_FAMILY_KLEFKI @@ -12073,7 +12073,7 @@ SINGLE_ANIMATION(Gourgeist); SINGLE_ANIMATION(Bergmite); SINGLE_ANIMATION(Avalugg); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(AvaluggHisuian); +SINGLE_ANIMATION(AvaluggHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BERGMITE #if P_FAMILY_NOIBAT @@ -12109,7 +12109,7 @@ SINGLE_ANIMATION(Rowlet); SINGLE_ANIMATION(Dartrix); SINGLE_ANIMATION(Decidueye); #if P_HISUIAN_FORMS -SINGLE_ANIMATION(DecidueyeHisuian); +SINGLE_ANIMATION(DecidueyeHisui); #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ROWLET #if P_FAMILY_LITTEN @@ -12310,7 +12310,7 @@ SINGLE_ANIMATION(Zeraora); SINGLE_ANIMATION(Meltan); SINGLE_ANIMATION(Melmetal); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(MelmetalGigantamax); +SINGLE_ANIMATION(MelmetalGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MELTAN #if P_FAMILY_GROOKEY @@ -12318,7 +12318,7 @@ SINGLE_ANIMATION(Grookey); SINGLE_ANIMATION(Thwackey); SINGLE_ANIMATION(Rillaboom); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(RillaboomGigantamax); +SINGLE_ANIMATION(RillaboomGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GROOKEY #if P_FAMILY_SCORBUNNY @@ -12326,7 +12326,7 @@ SINGLE_ANIMATION(Scorbunny); SINGLE_ANIMATION(Raboot); SINGLE_ANIMATION(Cinderace); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CinderaceGigantamax); +SINGLE_ANIMATION(CinderaceGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SCORBUNNY #if P_FAMILY_SOBBLE @@ -12334,7 +12334,7 @@ SINGLE_ANIMATION(Sobble); SINGLE_ANIMATION(Drizzile); SINGLE_ANIMATION(Inteleon); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(InteleonGigantamax); +SINGLE_ANIMATION(InteleonGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SOBBLE #if P_FAMILY_SKWOVET @@ -12346,7 +12346,7 @@ SINGLE_ANIMATION(Rookidee); SINGLE_ANIMATION(Corvisquire); SINGLE_ANIMATION(Corviknight); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CorviknightGigantamax); +SINGLE_ANIMATION(CorviknightGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROOKIDEE #if P_FAMILY_BLIPBUG @@ -12354,7 +12354,7 @@ SINGLE_ANIMATION(Blipbug); SINGLE_ANIMATION(Dottler); SINGLE_ANIMATION(Orbeetle); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(OrbeetleGigantamax); +SINGLE_ANIMATION(OrbeetleGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BLIPBUG #if P_FAMILY_NICKIT @@ -12373,7 +12373,7 @@ SINGLE_ANIMATION(Dubwool); SINGLE_ANIMATION(Chewtle); SINGLE_ANIMATION(Drednaw); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(DrednawGigantamax); +SINGLE_ANIMATION(DrednawGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHEWTLE #if P_FAMILY_YAMPER @@ -12385,18 +12385,18 @@ SINGLE_ANIMATION(Rolycoly); SINGLE_ANIMATION(Carkol); SINGLE_ANIMATION(Coalossal); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CoalossalGigantamax); +SINGLE_ANIMATION(CoalossalGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROLYCOLY #if P_FAMILY_APPLIN SINGLE_ANIMATION(Applin); SINGLE_ANIMATION(Flapple); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(FlappleGigantamax); +SINGLE_ANIMATION(FlappleGmax); #endif //P_GIGANTAMAX_FORMS SINGLE_ANIMATION(Appletun); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(AppletunGigantamax); +SINGLE_ANIMATION(AppletunGmax); #endif //P_GIGANTAMAX_FORMS #if P_GEN_9_CROSS_EVOS SINGLE_ANIMATION(Dipplin); @@ -12407,7 +12407,7 @@ SINGLE_ANIMATION(Hydrapple); SINGLE_ANIMATION(Silicobra); SINGLE_ANIMATION(Sandaconda); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(SandacondaGigantamax); +SINGLE_ANIMATION(SandacondaGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SILICOBRA #if P_FAMILY_CRAMORANT @@ -12421,14 +12421,14 @@ SINGLE_ANIMATION(Barraskewda); SINGLE_ANIMATION(Toxel); SINGLE_ANIMATION(Toxtricity); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(ToxtricityGigantamax); +SINGLE_ANIMATION(ToxtricityGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TOXEL #if P_FAMILY_SIZZLIPEDE SINGLE_ANIMATION(Sizzlipede); SINGLE_ANIMATION(Centiskorch); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CentiskorchGigantamax); +SINGLE_ANIMATION(CentiskorchGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SIZZLIPEDE #if P_FAMILY_CLOBBOPUS @@ -12444,7 +12444,7 @@ SINGLE_ANIMATION(Hatenna); SINGLE_ANIMATION(Hattrem); SINGLE_ANIMATION(Hatterene); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(HattereneGigantamax); +SINGLE_ANIMATION(HattereneGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_HATENNA #if P_FAMILY_IMPIDIMP @@ -12452,14 +12452,14 @@ SINGLE_ANIMATION(Impidimp); SINGLE_ANIMATION(Morgrem); SINGLE_ANIMATION(Grimmsnarl); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(GrimmsnarlGigantamax); +SINGLE_ANIMATION(GrimmsnarlGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_IMPIDIMP #if P_FAMILY_MILCERY SINGLE_ANIMATION(Milcery); SINGLE_ANIMATION(Alcremie); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(AlcremieGigantamax); +SINGLE_ANIMATION(AlcremieGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MILCERY #if P_FAMILY_FALINKS @@ -12488,7 +12488,7 @@ SINGLE_ANIMATION(Morpeko); SINGLE_ANIMATION(Cufant); SINGLE_ANIMATION(Copperajah); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CopperajahGigantamax); +SINGLE_ANIMATION(CopperajahGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CUFANT #if P_FAMILY_DRACOZOLT @@ -12506,7 +12506,7 @@ SINGLE_ANIMATION(Arctovish); #if P_FAMILY_DURALUDON SINGLE_ANIMATION(Duraludon); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(DuraludonGigantamax); +SINGLE_ANIMATION(DuraludonGmax); #endif //P_GIGANTAMAX_FORMS #if P_GEN_9_CROSS_EVOS SINGLE_ANIMATION(Archaludon); @@ -12530,8 +12530,8 @@ SINGLE_ANIMATION(Eternatus); SINGLE_ANIMATION(Kubfu); SINGLE_ANIMATION(Urshifu); #if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(UrshifuSingleStrikeStyleGigantamax); -SINGLE_ANIMATION(UrshifuRapidStrikeStyleGigantamax); +SINGLE_ANIMATION(UrshifuSingleStrikeGmax); +SINGLE_ANIMATION(UrshifuRapidStrikeGmax); #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KUBFU #if P_FAMILY_ZARUDE diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 85eb98f5c1..9492a4a9f8 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -435,38 +435,38 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_WEEDLE, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_KAKUNA, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_RATTATA, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_RATTATA_ALOLA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RATTATA_ALOLA, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_RATICATE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_RATICATE_ALOLA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RATICATE_ALOLA, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_PIKACHU, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_PIKACHU_COSPLAY, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_PIKACHU_ROCK_STAR, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_PIKACHU_BELLE, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_PIKACHU_POP_STAR, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_PHD, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_PHD, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_PIKACHU_LIBRE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_ORIGINAL, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_HOENN, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_SINNOH, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_UNOVA, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_KALOS, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_ALOLA, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_PARTNER_CAP, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_PIKACHU_WORLD, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_ORIGINAL, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_HOENN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_SINNOH, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_UNOVA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_KALOS, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_ALOLA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_PARTNER, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_WORLD, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_PIKACHU_STARTER, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_SANDSHREW, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_SANDSHREW_ALOLA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SANDSHREW_ALOLA, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_NIDORAN_F, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_NIDORAN_M, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_CLEFAIRY, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_VULPIX, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_VULPIX_ALOLA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_VULPIX_ALOLA, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_JIGGLYPUFF, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_ODDISH, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_PARAS, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_MEOWTH, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MEOWTH_ALOLA, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_MEOWTH_GALAR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWTH_ALOLA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWTH_GALAR, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_PSYDUCK, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_MANKEY, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_GROWLITHE, .jumpType = JUMP_TYPE_FAST, }, @@ -495,7 +495,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_MARILL, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_SUNKERN, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_WOOPER, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_WOOPER_PALDEA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_WOOPER_PALDEA, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_PINECO, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_SNUBBULL, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_SHUCKLE, .jumpType = JUMP_TYPE_SLOW, }, @@ -516,9 +516,9 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_MARSHTOMP, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_POOCHYENA, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_ZIGZAGOON, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_ZIGZAGOON_GALAR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ZIGZAGOON_GALAR, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_LINOONE, .jumpType = JUMP_TYPE_NORMAL, }, - { .species = SPECIES_LINOONE_GALAR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_LINOONE_GALAR, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_WURMPLE, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_SILCOON, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_CASCOON, .jumpType = JUMP_TYPE_SLOW, }, @@ -567,8 +567,8 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_CHERUBI, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_CHERRIM_OVERCAST, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_CHERRIM_SUNSHINE, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_SHELLOS_WEST, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_SHELLOS_EAST, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SHELLOS_WEST, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SHELLOS_EAST, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_BUNEARY, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_GLAMEOW, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_STUNKY, .jumpType = JUMP_TYPE_NORMAL, }, @@ -599,7 +599,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_PETILIL, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_SANDILE, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_DARUMAKA, .jumpType = JUMP_TYPE_FAST, }, - { .species = SPECIES_DARUMAKA_GALAR, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DARUMAKA_GALAR, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_DWEBBLE, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_SCRAGGY, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_ARCHEN, .jumpType = JUMP_TYPE_NORMAL, }, @@ -622,7 +622,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_CUBCHOO, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_SHELMET, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_STUNFISK, .jumpType = JUMP_TYPE_SLOW, }, - { .species = SPECIES_STUNFISK_GALAR, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_STUNFISK_GALAR, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_PAWNIARD, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_DURANT, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_CHESPIN, .jumpType = JUMP_TYPE_SLOW, }, diff --git a/test/battle/gimmick/zmove.c b/test/battle/gimmick/zmove.c index 073b6ef04d..eb44184e5a 100644 --- a/test/battle/gimmick/zmove.c +++ b/test/battle/gimmick/zmove.c @@ -522,7 +522,7 @@ SINGLE_BATTLE_TEST("(Z-MOVE) 10,000,000 Volt Thunderbolt has an increased critic GIVEN { ASSUME(B_CRIT_CHANCE >= 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,