diff --git a/dev_scripts/followers/rename_files_of_same_name.py b/dev_scripts/followers/rename_files_of_same_name.py new file mode 100644 index 0000000000..5c963b6a80 --- /dev/null +++ b/dev_scripts/followers/rename_files_of_same_name.py @@ -0,0 +1,24 @@ +import glob +import re +import json +import os +import subprocess + +# THIS IS A TEMPORARY SCRIPT MADE TO RENAME FILES WITH THE "FOLLOWER" NAME TO "OVERWORLD", +# AS THESE GRAPHICS CAN ALSO BE USED OUTSIDE THE FOLLOWER FEATURE. +# +# I'M SAVING IT HERE IN CASE IT'S NEEDED SOMEWHERE IN THE FUTURE, THOUGH TWEAKING MIGHT BE NEEDED. +# - AsparagusEduardo + +def rename_files(dir, old, new): + for root, dirs, files in os.walk(dir): + for name in files: + if name.endswith(old): + originalName = os.path.join(root, name) + newName = originalName.replace(old, new) + print(originalName + " -> " + newName) + os.rename(originalName, newName) + +rename_files("graphics/pokemon", 'follower.png', "overworld.png") +rename_files("graphics/pokemon", 'follow_normal.pal', "overworld_normal.pal") +rename_files("graphics/pokemon", 'follow_shiny.pal', "overworld_shiny.pal") diff --git a/graphics/pokemon/abomasnow/follower.png b/graphics/pokemon/abomasnow/overworld.png similarity index 100% rename from graphics/pokemon/abomasnow/follower.png rename to graphics/pokemon/abomasnow/overworld.png diff --git a/graphics/pokemon/abomasnow/follow_normal.pal b/graphics/pokemon/abomasnow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/abomasnow/follow_normal.pal rename to graphics/pokemon/abomasnow/overworld_normal.pal diff --git a/graphics/pokemon/abomasnow/follow_shiny.pal b/graphics/pokemon/abomasnow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/abomasnow/follow_shiny.pal rename to graphics/pokemon/abomasnow/overworld_shiny.pal diff --git a/graphics/pokemon/abra/follower.png b/graphics/pokemon/abra/overworld.png similarity index 100% rename from graphics/pokemon/abra/follower.png rename to graphics/pokemon/abra/overworld.png diff --git a/graphics/pokemon/abra/follow_normal.pal b/graphics/pokemon/abra/overworld_normal.pal similarity index 100% rename from graphics/pokemon/abra/follow_normal.pal rename to graphics/pokemon/abra/overworld_normal.pal diff --git a/graphics/pokemon/abra/follow_shiny.pal b/graphics/pokemon/abra/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/abra/follow_shiny.pal rename to graphics/pokemon/abra/overworld_shiny.pal diff --git a/graphics/pokemon/absol/follower.png b/graphics/pokemon/absol/overworld.png similarity index 100% rename from graphics/pokemon/absol/follower.png rename to graphics/pokemon/absol/overworld.png diff --git a/graphics/pokemon/absol/follow_normal.pal b/graphics/pokemon/absol/overworld_normal.pal similarity index 100% rename from graphics/pokemon/absol/follow_normal.pal rename to graphics/pokemon/absol/overworld_normal.pal diff --git a/graphics/pokemon/absol/follow_shiny.pal b/graphics/pokemon/absol/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/absol/follow_shiny.pal rename to graphics/pokemon/absol/overworld_shiny.pal diff --git a/graphics/pokemon/accelgor/follower.png b/graphics/pokemon/accelgor/overworld.png similarity index 100% rename from graphics/pokemon/accelgor/follower.png rename to graphics/pokemon/accelgor/overworld.png diff --git a/graphics/pokemon/accelgor/follow_normal.pal b/graphics/pokemon/accelgor/overworld_normal.pal similarity index 100% rename from graphics/pokemon/accelgor/follow_normal.pal rename to graphics/pokemon/accelgor/overworld_normal.pal diff --git a/graphics/pokemon/accelgor/follow_shiny.pal b/graphics/pokemon/accelgor/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/accelgor/follow_shiny.pal rename to graphics/pokemon/accelgor/overworld_shiny.pal diff --git a/graphics/pokemon/aegislash/follower.png b/graphics/pokemon/aegislash/overworld.png similarity index 100% rename from graphics/pokemon/aegislash/follower.png rename to graphics/pokemon/aegislash/overworld.png diff --git a/graphics/pokemon/aegislash/follow_normal.pal b/graphics/pokemon/aegislash/overworld_normal.pal similarity index 100% rename from graphics/pokemon/aegislash/follow_normal.pal rename to graphics/pokemon/aegislash/overworld_normal.pal diff --git a/graphics/pokemon/aegislash/follow_shiny.pal b/graphics/pokemon/aegislash/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/aegislash/follow_shiny.pal rename to graphics/pokemon/aegislash/overworld_shiny.pal diff --git a/graphics/pokemon/aerodactyl/follower.png b/graphics/pokemon/aerodactyl/overworld.png similarity index 100% rename from graphics/pokemon/aerodactyl/follower.png rename to graphics/pokemon/aerodactyl/overworld.png diff --git a/graphics/pokemon/aerodactyl/follow_normal.pal b/graphics/pokemon/aerodactyl/overworld_normal.pal similarity index 100% rename from graphics/pokemon/aerodactyl/follow_normal.pal rename to graphics/pokemon/aerodactyl/overworld_normal.pal diff --git a/graphics/pokemon/aerodactyl/follow_shiny.pal b/graphics/pokemon/aerodactyl/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/aerodactyl/follow_shiny.pal rename to graphics/pokemon/aerodactyl/overworld_shiny.pal diff --git a/graphics/pokemon/aggron/follower.png b/graphics/pokemon/aggron/overworld.png similarity index 100% rename from graphics/pokemon/aggron/follower.png rename to graphics/pokemon/aggron/overworld.png diff --git a/graphics/pokemon/aggron/follow_normal.pal b/graphics/pokemon/aggron/overworld_normal.pal similarity index 100% rename from graphics/pokemon/aggron/follow_normal.pal rename to graphics/pokemon/aggron/overworld_normal.pal diff --git a/graphics/pokemon/aggron/follow_shiny.pal b/graphics/pokemon/aggron/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/aggron/follow_shiny.pal rename to graphics/pokemon/aggron/overworld_shiny.pal diff --git a/graphics/pokemon/aipom/follower.png b/graphics/pokemon/aipom/overworld.png similarity index 100% rename from graphics/pokemon/aipom/follower.png rename to graphics/pokemon/aipom/overworld.png diff --git a/graphics/pokemon/aipom/follow_normal.pal b/graphics/pokemon/aipom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/aipom/follow_normal.pal rename to graphics/pokemon/aipom/overworld_normal.pal diff --git a/graphics/pokemon/aipom/follow_shiny.pal b/graphics/pokemon/aipom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/aipom/follow_shiny.pal rename to graphics/pokemon/aipom/overworld_shiny.pal diff --git a/graphics/pokemon/alakazam/follower.png b/graphics/pokemon/alakazam/overworld.png similarity index 100% rename from graphics/pokemon/alakazam/follower.png rename to graphics/pokemon/alakazam/overworld.png diff --git a/graphics/pokemon/alakazam/follow_normal.pal b/graphics/pokemon/alakazam/overworld_normal.pal similarity index 100% rename from graphics/pokemon/alakazam/follow_normal.pal rename to graphics/pokemon/alakazam/overworld_normal.pal diff --git a/graphics/pokemon/alakazam/follow_shiny.pal b/graphics/pokemon/alakazam/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/alakazam/follow_shiny.pal rename to graphics/pokemon/alakazam/overworld_shiny.pal diff --git a/graphics/pokemon/alcremie/strawberry/follower.png b/graphics/pokemon/alcremie/strawberry/overworld.png similarity index 100% rename from graphics/pokemon/alcremie/strawberry/follower.png rename to graphics/pokemon/alcremie/strawberry/overworld.png diff --git a/graphics/pokemon/alcremie/strawberry/follow_normal.pal b/graphics/pokemon/alcremie/strawberry/overworld_normal.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/follow_normal.pal rename to graphics/pokemon/alcremie/strawberry/overworld_normal.pal diff --git a/graphics/pokemon/alcremie/strawberry/follow_shiny.pal b/graphics/pokemon/alcremie/strawberry/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/alcremie/strawberry/follow_shiny.pal rename to graphics/pokemon/alcremie/strawberry/overworld_shiny.pal diff --git a/graphics/pokemon/alomomola/follower.png b/graphics/pokemon/alomomola/overworld.png similarity index 100% rename from graphics/pokemon/alomomola/follower.png rename to graphics/pokemon/alomomola/overworld.png diff --git a/graphics/pokemon/alomomola/follow_normal.pal b/graphics/pokemon/alomomola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/alomomola/follow_normal.pal rename to graphics/pokemon/alomomola/overworld_normal.pal diff --git a/graphics/pokemon/alomomola/follow_shiny.pal b/graphics/pokemon/alomomola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/alomomola/follow_shiny.pal rename to graphics/pokemon/alomomola/overworld_shiny.pal diff --git a/graphics/pokemon/altaria/follower.png b/graphics/pokemon/altaria/overworld.png similarity index 100% rename from graphics/pokemon/altaria/follower.png rename to graphics/pokemon/altaria/overworld.png diff --git a/graphics/pokemon/altaria/follow_normal.pal b/graphics/pokemon/altaria/overworld_normal.pal similarity index 100% rename from graphics/pokemon/altaria/follow_normal.pal rename to graphics/pokemon/altaria/overworld_normal.pal diff --git a/graphics/pokemon/altaria/follow_shiny.pal b/graphics/pokemon/altaria/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/altaria/follow_shiny.pal rename to graphics/pokemon/altaria/overworld_shiny.pal diff --git a/graphics/pokemon/amaura/follower.png b/graphics/pokemon/amaura/overworld.png similarity index 100% rename from graphics/pokemon/amaura/follower.png rename to graphics/pokemon/amaura/overworld.png diff --git a/graphics/pokemon/amaura/follow_normal.pal b/graphics/pokemon/amaura/overworld_normal.pal similarity index 100% rename from graphics/pokemon/amaura/follow_normal.pal rename to graphics/pokemon/amaura/overworld_normal.pal diff --git a/graphics/pokemon/amaura/follow_shiny.pal b/graphics/pokemon/amaura/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/amaura/follow_shiny.pal rename to graphics/pokemon/amaura/overworld_shiny.pal diff --git a/graphics/pokemon/ambipom/follower.png b/graphics/pokemon/ambipom/overworld.png similarity index 100% rename from graphics/pokemon/ambipom/follower.png rename to graphics/pokemon/ambipom/overworld.png diff --git a/graphics/pokemon/ambipom/follow_normal.pal b/graphics/pokemon/ambipom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ambipom/follow_normal.pal rename to graphics/pokemon/ambipom/overworld_normal.pal diff --git a/graphics/pokemon/ambipom/follow_shiny.pal b/graphics/pokemon/ambipom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ambipom/follow_shiny.pal rename to graphics/pokemon/ambipom/overworld_shiny.pal diff --git a/graphics/pokemon/amoonguss/follower.png b/graphics/pokemon/amoonguss/overworld.png similarity index 100% rename from graphics/pokemon/amoonguss/follower.png rename to graphics/pokemon/amoonguss/overworld.png diff --git a/graphics/pokemon/amoonguss/follow_normal.pal b/graphics/pokemon/amoonguss/overworld_normal.pal similarity index 100% rename from graphics/pokemon/amoonguss/follow_normal.pal rename to graphics/pokemon/amoonguss/overworld_normal.pal diff --git a/graphics/pokemon/amoonguss/follow_shiny.pal b/graphics/pokemon/amoonguss/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/amoonguss/follow_shiny.pal rename to graphics/pokemon/amoonguss/overworld_shiny.pal diff --git a/graphics/pokemon/ampharos/follower.png b/graphics/pokemon/ampharos/overworld.png similarity index 100% rename from graphics/pokemon/ampharos/follower.png rename to graphics/pokemon/ampharos/overworld.png diff --git a/graphics/pokemon/ampharos/follow_normal.pal b/graphics/pokemon/ampharos/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ampharos/follow_normal.pal rename to graphics/pokemon/ampharos/overworld_normal.pal diff --git a/graphics/pokemon/ampharos/follow_shiny.pal b/graphics/pokemon/ampharos/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ampharos/follow_shiny.pal rename to graphics/pokemon/ampharos/overworld_shiny.pal diff --git a/graphics/pokemon/anorith/follower.png b/graphics/pokemon/anorith/overworld.png similarity index 100% rename from graphics/pokemon/anorith/follower.png rename to graphics/pokemon/anorith/overworld.png diff --git a/graphics/pokemon/anorith/follow_normal.pal b/graphics/pokemon/anorith/overworld_normal.pal similarity index 100% rename from graphics/pokemon/anorith/follow_normal.pal rename to graphics/pokemon/anorith/overworld_normal.pal diff --git a/graphics/pokemon/anorith/follow_shiny.pal b/graphics/pokemon/anorith/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/anorith/follow_shiny.pal rename to graphics/pokemon/anorith/overworld_shiny.pal diff --git a/graphics/pokemon/appletun/follower.png b/graphics/pokemon/appletun/overworld.png similarity index 100% rename from graphics/pokemon/appletun/follower.png rename to graphics/pokemon/appletun/overworld.png diff --git a/graphics/pokemon/appletun/follow_normal.pal b/graphics/pokemon/appletun/overworld_normal.pal similarity index 100% rename from graphics/pokemon/appletun/follow_normal.pal rename to graphics/pokemon/appletun/overworld_normal.pal diff --git a/graphics/pokemon/appletun/follow_shiny.pal b/graphics/pokemon/appletun/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/appletun/follow_shiny.pal rename to graphics/pokemon/appletun/overworld_shiny.pal diff --git a/graphics/pokemon/applin/follower.png b/graphics/pokemon/applin/overworld.png similarity index 100% rename from graphics/pokemon/applin/follower.png rename to graphics/pokemon/applin/overworld.png diff --git a/graphics/pokemon/applin/follow_normal.pal b/graphics/pokemon/applin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/applin/follow_normal.pal rename to graphics/pokemon/applin/overworld_normal.pal diff --git a/graphics/pokemon/applin/follow_shiny.pal b/graphics/pokemon/applin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/applin/follow_shiny.pal rename to graphics/pokemon/applin/overworld_shiny.pal diff --git a/graphics/pokemon/araquanid/follower.png b/graphics/pokemon/araquanid/overworld.png similarity index 100% rename from graphics/pokemon/araquanid/follower.png rename to graphics/pokemon/araquanid/overworld.png diff --git a/graphics/pokemon/araquanid/follow_normal.pal b/graphics/pokemon/araquanid/overworld_normal.pal similarity index 100% rename from graphics/pokemon/araquanid/follow_normal.pal rename to graphics/pokemon/araquanid/overworld_normal.pal diff --git a/graphics/pokemon/araquanid/follow_shiny.pal b/graphics/pokemon/araquanid/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/araquanid/follow_shiny.pal rename to graphics/pokemon/araquanid/overworld_shiny.pal diff --git a/graphics/pokemon/arbok/follower.png b/graphics/pokemon/arbok/overworld.png similarity index 100% rename from graphics/pokemon/arbok/follower.png rename to graphics/pokemon/arbok/overworld.png diff --git a/graphics/pokemon/arbok/follow_normal.pal b/graphics/pokemon/arbok/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arbok/follow_normal.pal rename to graphics/pokemon/arbok/overworld_normal.pal diff --git a/graphics/pokemon/arbok/follow_shiny.pal b/graphics/pokemon/arbok/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arbok/follow_shiny.pal rename to graphics/pokemon/arbok/overworld_shiny.pal diff --git a/graphics/pokemon/arcanine/hisuian/follower.png b/graphics/pokemon/arcanine/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/arcanine/hisuian/follower.png rename to graphics/pokemon/arcanine/hisuian/overworld.png diff --git a/graphics/pokemon/arcanine/hisuian/follow_normal.pal b/graphics/pokemon/arcanine/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arcanine/hisuian/follow_normal.pal rename to graphics/pokemon/arcanine/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/arcanine/hisuian/follow_shiny.pal b/graphics/pokemon/arcanine/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arcanine/hisuian/follow_shiny.pal rename to graphics/pokemon/arcanine/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/arcanine/follower.png b/graphics/pokemon/arcanine/overworld.png similarity index 100% rename from graphics/pokemon/arcanine/follower.png rename to graphics/pokemon/arcanine/overworld.png diff --git a/graphics/pokemon/arcanine/follow_normal.pal b/graphics/pokemon/arcanine/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arcanine/follow_normal.pal rename to graphics/pokemon/arcanine/overworld_normal.pal diff --git a/graphics/pokemon/arcanine/follow_shiny.pal b/graphics/pokemon/arcanine/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arcanine/follow_shiny.pal rename to graphics/pokemon/arcanine/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/bug/follower.png b/graphics/pokemon/arceus/bug/overworld.png similarity index 100% rename from graphics/pokemon/arceus/bug/follower.png rename to graphics/pokemon/arceus/bug/overworld.png diff --git a/graphics/pokemon/arceus/bug/follow_normal.pal b/graphics/pokemon/arceus/bug/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/bug/follow_normal.pal rename to graphics/pokemon/arceus/bug/overworld_normal.pal diff --git a/graphics/pokemon/arceus/bug/follow_shiny.pal b/graphics/pokemon/arceus/bug/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/bug/follow_shiny.pal rename to graphics/pokemon/arceus/bug/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/dark/follower.png b/graphics/pokemon/arceus/dark/overworld.png similarity index 100% rename from graphics/pokemon/arceus/dark/follower.png rename to graphics/pokemon/arceus/dark/overworld.png diff --git a/graphics/pokemon/arceus/dark/follow_normal.pal b/graphics/pokemon/arceus/dark/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/dark/follow_normal.pal rename to graphics/pokemon/arceus/dark/overworld_normal.pal diff --git a/graphics/pokemon/arceus/dark/follow_shiny.pal b/graphics/pokemon/arceus/dark/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/dark/follow_shiny.pal rename to graphics/pokemon/arceus/dark/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/dragon/follower.png b/graphics/pokemon/arceus/dragon/overworld.png similarity index 100% rename from graphics/pokemon/arceus/dragon/follower.png rename to graphics/pokemon/arceus/dragon/overworld.png diff --git a/graphics/pokemon/arceus/dragon/follow_normal.pal b/graphics/pokemon/arceus/dragon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/dragon/follow_normal.pal rename to graphics/pokemon/arceus/dragon/overworld_normal.pal diff --git a/graphics/pokemon/arceus/dragon/follow_shiny.pal b/graphics/pokemon/arceus/dragon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/dragon/follow_shiny.pal rename to graphics/pokemon/arceus/dragon/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/electric/follower.png b/graphics/pokemon/arceus/electric/overworld.png similarity index 100% rename from graphics/pokemon/arceus/electric/follower.png rename to graphics/pokemon/arceus/electric/overworld.png diff --git a/graphics/pokemon/arceus/electric/follow_normal.pal b/graphics/pokemon/arceus/electric/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/electric/follow_normal.pal rename to graphics/pokemon/arceus/electric/overworld_normal.pal diff --git a/graphics/pokemon/arceus/electric/follow_shiny.pal b/graphics/pokemon/arceus/electric/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/electric/follow_shiny.pal rename to graphics/pokemon/arceus/electric/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/fairy/follower.png b/graphics/pokemon/arceus/fairy/overworld.png similarity index 100% rename from graphics/pokemon/arceus/fairy/follower.png rename to graphics/pokemon/arceus/fairy/overworld.png diff --git a/graphics/pokemon/arceus/fairy/follow_normal.pal b/graphics/pokemon/arceus/fairy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/fairy/follow_normal.pal rename to graphics/pokemon/arceus/fairy/overworld_normal.pal diff --git a/graphics/pokemon/arceus/fairy/follow_shiny.pal b/graphics/pokemon/arceus/fairy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/fairy/follow_shiny.pal rename to graphics/pokemon/arceus/fairy/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/fighting/follower.png b/graphics/pokemon/arceus/fighting/overworld.png similarity index 100% rename from graphics/pokemon/arceus/fighting/follower.png rename to graphics/pokemon/arceus/fighting/overworld.png diff --git a/graphics/pokemon/arceus/fighting/follow_normal.pal b/graphics/pokemon/arceus/fighting/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/fighting/follow_normal.pal rename to graphics/pokemon/arceus/fighting/overworld_normal.pal diff --git a/graphics/pokemon/arceus/fighting/follow_shiny.pal b/graphics/pokemon/arceus/fighting/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/fighting/follow_shiny.pal rename to graphics/pokemon/arceus/fighting/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/fire/follower.png b/graphics/pokemon/arceus/fire/overworld.png similarity index 100% rename from graphics/pokemon/arceus/fire/follower.png rename to graphics/pokemon/arceus/fire/overworld.png diff --git a/graphics/pokemon/arceus/fire/follow_normal.pal b/graphics/pokemon/arceus/fire/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/fire/follow_normal.pal rename to graphics/pokemon/arceus/fire/overworld_normal.pal diff --git a/graphics/pokemon/arceus/fire/follow_shiny.pal b/graphics/pokemon/arceus/fire/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/fire/follow_shiny.pal rename to graphics/pokemon/arceus/fire/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/flying/follower.png b/graphics/pokemon/arceus/flying/overworld.png similarity index 100% rename from graphics/pokemon/arceus/flying/follower.png rename to graphics/pokemon/arceus/flying/overworld.png diff --git a/graphics/pokemon/arceus/flying/follow_normal.pal b/graphics/pokemon/arceus/flying/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/flying/follow_normal.pal rename to graphics/pokemon/arceus/flying/overworld_normal.pal diff --git a/graphics/pokemon/arceus/flying/follow_shiny.pal b/graphics/pokemon/arceus/flying/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/flying/follow_shiny.pal rename to graphics/pokemon/arceus/flying/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/ghost/follower.png b/graphics/pokemon/arceus/ghost/overworld.png similarity index 100% rename from graphics/pokemon/arceus/ghost/follower.png rename to graphics/pokemon/arceus/ghost/overworld.png diff --git a/graphics/pokemon/arceus/ghost/follow_normal.pal b/graphics/pokemon/arceus/ghost/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/ghost/follow_normal.pal rename to graphics/pokemon/arceus/ghost/overworld_normal.pal diff --git a/graphics/pokemon/arceus/ghost/follow_shiny.pal b/graphics/pokemon/arceus/ghost/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/ghost/follow_shiny.pal rename to graphics/pokemon/arceus/ghost/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/grass/follower.png b/graphics/pokemon/arceus/grass/overworld.png similarity index 100% rename from graphics/pokemon/arceus/grass/follower.png rename to graphics/pokemon/arceus/grass/overworld.png diff --git a/graphics/pokemon/arceus/grass/follow_normal.pal b/graphics/pokemon/arceus/grass/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/grass/follow_normal.pal rename to graphics/pokemon/arceus/grass/overworld_normal.pal diff --git a/graphics/pokemon/arceus/grass/follow_shiny.pal b/graphics/pokemon/arceus/grass/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/grass/follow_shiny.pal rename to graphics/pokemon/arceus/grass/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/ground/follower.png b/graphics/pokemon/arceus/ground/overworld.png similarity index 100% rename from graphics/pokemon/arceus/ground/follower.png rename to graphics/pokemon/arceus/ground/overworld.png diff --git a/graphics/pokemon/arceus/ground/follow_normal.pal b/graphics/pokemon/arceus/ground/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/ground/follow_normal.pal rename to graphics/pokemon/arceus/ground/overworld_normal.pal diff --git a/graphics/pokemon/arceus/ground/follow_shiny.pal b/graphics/pokemon/arceus/ground/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/ground/follow_shiny.pal rename to graphics/pokemon/arceus/ground/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/ice/follower.png b/graphics/pokemon/arceus/ice/overworld.png similarity index 100% rename from graphics/pokemon/arceus/ice/follower.png rename to graphics/pokemon/arceus/ice/overworld.png diff --git a/graphics/pokemon/arceus/ice/follow_normal.pal b/graphics/pokemon/arceus/ice/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/ice/follow_normal.pal rename to graphics/pokemon/arceus/ice/overworld_normal.pal diff --git a/graphics/pokemon/arceus/ice/follow_shiny.pal b/graphics/pokemon/arceus/ice/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/ice/follow_shiny.pal rename to graphics/pokemon/arceus/ice/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/follower.png b/graphics/pokemon/arceus/overworld.png similarity index 100% rename from graphics/pokemon/arceus/follower.png rename to graphics/pokemon/arceus/overworld.png diff --git a/graphics/pokemon/arceus/follow_normal.pal b/graphics/pokemon/arceus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/follow_normal.pal rename to graphics/pokemon/arceus/overworld_normal.pal diff --git a/graphics/pokemon/arceus/follow_shiny.pal b/graphics/pokemon/arceus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/follow_shiny.pal rename to graphics/pokemon/arceus/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/poison/follower.png b/graphics/pokemon/arceus/poison/overworld.png similarity index 100% rename from graphics/pokemon/arceus/poison/follower.png rename to graphics/pokemon/arceus/poison/overworld.png diff --git a/graphics/pokemon/arceus/poison/follow_normal.pal b/graphics/pokemon/arceus/poison/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/poison/follow_normal.pal rename to graphics/pokemon/arceus/poison/overworld_normal.pal diff --git a/graphics/pokemon/arceus/poison/follow_shiny.pal b/graphics/pokemon/arceus/poison/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/poison/follow_shiny.pal rename to graphics/pokemon/arceus/poison/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/psychic/follower.png b/graphics/pokemon/arceus/psychic/overworld.png similarity index 100% rename from graphics/pokemon/arceus/psychic/follower.png rename to graphics/pokemon/arceus/psychic/overworld.png diff --git a/graphics/pokemon/arceus/psychic/follow_normal.pal b/graphics/pokemon/arceus/psychic/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/psychic/follow_normal.pal rename to graphics/pokemon/arceus/psychic/overworld_normal.pal diff --git a/graphics/pokemon/arceus/psychic/follow_shiny.pal b/graphics/pokemon/arceus/psychic/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/psychic/follow_shiny.pal rename to graphics/pokemon/arceus/psychic/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/rock/follower.png b/graphics/pokemon/arceus/rock/overworld.png similarity index 100% rename from graphics/pokemon/arceus/rock/follower.png rename to graphics/pokemon/arceus/rock/overworld.png diff --git a/graphics/pokemon/arceus/rock/follow_normal.pal b/graphics/pokemon/arceus/rock/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/rock/follow_normal.pal rename to graphics/pokemon/arceus/rock/overworld_normal.pal diff --git a/graphics/pokemon/arceus/rock/follow_shiny.pal b/graphics/pokemon/arceus/rock/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/rock/follow_shiny.pal rename to graphics/pokemon/arceus/rock/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/steel/follower.png b/graphics/pokemon/arceus/steel/overworld.png similarity index 100% rename from graphics/pokemon/arceus/steel/follower.png rename to graphics/pokemon/arceus/steel/overworld.png diff --git a/graphics/pokemon/arceus/steel/follow_normal.pal b/graphics/pokemon/arceus/steel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/steel/follow_normal.pal rename to graphics/pokemon/arceus/steel/overworld_normal.pal diff --git a/graphics/pokemon/arceus/steel/follow_shiny.pal b/graphics/pokemon/arceus/steel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/steel/follow_shiny.pal rename to graphics/pokemon/arceus/steel/overworld_shiny.pal diff --git a/graphics/pokemon/arceus/water/follower.png b/graphics/pokemon/arceus/water/overworld.png similarity index 100% rename from graphics/pokemon/arceus/water/follower.png rename to graphics/pokemon/arceus/water/overworld.png diff --git a/graphics/pokemon/arceus/water/follow_normal.pal b/graphics/pokemon/arceus/water/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arceus/water/follow_normal.pal rename to graphics/pokemon/arceus/water/overworld_normal.pal diff --git a/graphics/pokemon/arceus/water/follow_shiny.pal b/graphics/pokemon/arceus/water/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arceus/water/follow_shiny.pal rename to graphics/pokemon/arceus/water/overworld_shiny.pal diff --git a/graphics/pokemon/archen/follower.png b/graphics/pokemon/archen/overworld.png similarity index 100% rename from graphics/pokemon/archen/follower.png rename to graphics/pokemon/archen/overworld.png diff --git a/graphics/pokemon/archen/follow_normal.pal b/graphics/pokemon/archen/overworld_normal.pal similarity index 100% rename from graphics/pokemon/archen/follow_normal.pal rename to graphics/pokemon/archen/overworld_normal.pal diff --git a/graphics/pokemon/archen/follow_shiny.pal b/graphics/pokemon/archen/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/archen/follow_shiny.pal rename to graphics/pokemon/archen/overworld_shiny.pal diff --git a/graphics/pokemon/archeops/follower.png b/graphics/pokemon/archeops/overworld.png similarity index 100% rename from graphics/pokemon/archeops/follower.png rename to graphics/pokemon/archeops/overworld.png diff --git a/graphics/pokemon/archeops/follow_normal.pal b/graphics/pokemon/archeops/overworld_normal.pal similarity index 100% rename from graphics/pokemon/archeops/follow_normal.pal rename to graphics/pokemon/archeops/overworld_normal.pal diff --git a/graphics/pokemon/archeops/follow_shiny.pal b/graphics/pokemon/archeops/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/archeops/follow_shiny.pal rename to graphics/pokemon/archeops/overworld_shiny.pal diff --git a/graphics/pokemon/arctovish/follower.png b/graphics/pokemon/arctovish/overworld.png similarity index 100% rename from graphics/pokemon/arctovish/follower.png rename to graphics/pokemon/arctovish/overworld.png diff --git a/graphics/pokemon/arctovish/follow_normal.pal b/graphics/pokemon/arctovish/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arctovish/follow_normal.pal rename to graphics/pokemon/arctovish/overworld_normal.pal diff --git a/graphics/pokemon/arctovish/follow_shiny.pal b/graphics/pokemon/arctovish/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arctovish/follow_shiny.pal rename to graphics/pokemon/arctovish/overworld_shiny.pal diff --git a/graphics/pokemon/arctozolt/follower.png b/graphics/pokemon/arctozolt/overworld.png similarity index 100% rename from graphics/pokemon/arctozolt/follower.png rename to graphics/pokemon/arctozolt/overworld.png diff --git a/graphics/pokemon/arctozolt/follow_normal.pal b/graphics/pokemon/arctozolt/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arctozolt/follow_normal.pal rename to graphics/pokemon/arctozolt/overworld_normal.pal diff --git a/graphics/pokemon/arctozolt/follow_shiny.pal b/graphics/pokemon/arctozolt/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arctozolt/follow_shiny.pal rename to graphics/pokemon/arctozolt/overworld_shiny.pal diff --git a/graphics/pokemon/ariados/follower.png b/graphics/pokemon/ariados/overworld.png similarity index 100% rename from graphics/pokemon/ariados/follower.png rename to graphics/pokemon/ariados/overworld.png diff --git a/graphics/pokemon/ariados/follow_normal.pal b/graphics/pokemon/ariados/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ariados/follow_normal.pal rename to graphics/pokemon/ariados/overworld_normal.pal diff --git a/graphics/pokemon/ariados/follow_shiny.pal b/graphics/pokemon/ariados/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ariados/follow_shiny.pal rename to graphics/pokemon/ariados/overworld_shiny.pal diff --git a/graphics/pokemon/armaldo/follower.png b/graphics/pokemon/armaldo/overworld.png similarity index 100% rename from graphics/pokemon/armaldo/follower.png rename to graphics/pokemon/armaldo/overworld.png diff --git a/graphics/pokemon/armaldo/follow_normal.pal b/graphics/pokemon/armaldo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/armaldo/follow_normal.pal rename to graphics/pokemon/armaldo/overworld_normal.pal diff --git a/graphics/pokemon/armaldo/follow_shiny.pal b/graphics/pokemon/armaldo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/armaldo/follow_shiny.pal rename to graphics/pokemon/armaldo/overworld_shiny.pal diff --git a/graphics/pokemon/aromatisse/follower.png b/graphics/pokemon/aromatisse/overworld.png similarity index 100% rename from graphics/pokemon/aromatisse/follower.png rename to graphics/pokemon/aromatisse/overworld.png diff --git a/graphics/pokemon/aromatisse/follow_normal.pal b/graphics/pokemon/aromatisse/overworld_normal.pal similarity index 100% rename from graphics/pokemon/aromatisse/follow_normal.pal rename to graphics/pokemon/aromatisse/overworld_normal.pal diff --git a/graphics/pokemon/aromatisse/follow_shiny.pal b/graphics/pokemon/aromatisse/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/aromatisse/follow_shiny.pal rename to graphics/pokemon/aromatisse/overworld_shiny.pal diff --git a/graphics/pokemon/aron/follower.png b/graphics/pokemon/aron/overworld.png similarity index 100% rename from graphics/pokemon/aron/follower.png rename to graphics/pokemon/aron/overworld.png diff --git a/graphics/pokemon/aron/follow_normal.pal b/graphics/pokemon/aron/overworld_normal.pal similarity index 100% rename from graphics/pokemon/aron/follow_normal.pal rename to graphics/pokemon/aron/overworld_normal.pal diff --git a/graphics/pokemon/aron/follow_shiny.pal b/graphics/pokemon/aron/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/aron/follow_shiny.pal rename to graphics/pokemon/aron/overworld_shiny.pal diff --git a/graphics/pokemon/arrokuda/follower.png b/graphics/pokemon/arrokuda/overworld.png similarity index 100% rename from graphics/pokemon/arrokuda/follower.png rename to graphics/pokemon/arrokuda/overworld.png diff --git a/graphics/pokemon/arrokuda/follow_normal.pal b/graphics/pokemon/arrokuda/overworld_normal.pal similarity index 100% rename from graphics/pokemon/arrokuda/follow_normal.pal rename to graphics/pokemon/arrokuda/overworld_normal.pal diff --git a/graphics/pokemon/arrokuda/follow_shiny.pal b/graphics/pokemon/arrokuda/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/arrokuda/follow_shiny.pal rename to graphics/pokemon/arrokuda/overworld_shiny.pal diff --git a/graphics/pokemon/articuno/galarian/follower.png b/graphics/pokemon/articuno/galarian/overworld.png similarity index 100% rename from graphics/pokemon/articuno/galarian/follower.png rename to graphics/pokemon/articuno/galarian/overworld.png diff --git a/graphics/pokemon/articuno/galarian/follow_normal.pal b/graphics/pokemon/articuno/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/articuno/galarian/follow_normal.pal rename to graphics/pokemon/articuno/galarian/overworld_normal.pal diff --git a/graphics/pokemon/articuno/galarian/follow_shiny.pal b/graphics/pokemon/articuno/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/articuno/galarian/follow_shiny.pal rename to graphics/pokemon/articuno/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/articuno/follower.png b/graphics/pokemon/articuno/overworld.png similarity index 100% rename from graphics/pokemon/articuno/follower.png rename to graphics/pokemon/articuno/overworld.png diff --git a/graphics/pokemon/articuno/follow_normal.pal b/graphics/pokemon/articuno/overworld_normal.pal similarity index 100% rename from graphics/pokemon/articuno/follow_normal.pal rename to graphics/pokemon/articuno/overworld_normal.pal diff --git a/graphics/pokemon/articuno/follow_shiny.pal b/graphics/pokemon/articuno/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/articuno/follow_shiny.pal rename to graphics/pokemon/articuno/overworld_shiny.pal diff --git a/graphics/pokemon/audino/follower.png b/graphics/pokemon/audino/overworld.png similarity index 100% rename from graphics/pokemon/audino/follower.png rename to graphics/pokemon/audino/overworld.png diff --git a/graphics/pokemon/audino/follow_normal.pal b/graphics/pokemon/audino/overworld_normal.pal similarity index 100% rename from graphics/pokemon/audino/follow_normal.pal rename to graphics/pokemon/audino/overworld_normal.pal diff --git a/graphics/pokemon/audino/follow_shiny.pal b/graphics/pokemon/audino/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/audino/follow_shiny.pal rename to graphics/pokemon/audino/overworld_shiny.pal diff --git a/graphics/pokemon/aurorus/follower.png b/graphics/pokemon/aurorus/overworld.png similarity index 100% rename from graphics/pokemon/aurorus/follower.png rename to graphics/pokemon/aurorus/overworld.png diff --git a/graphics/pokemon/aurorus/follow_normal.pal b/graphics/pokemon/aurorus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/aurorus/follow_normal.pal rename to graphics/pokemon/aurorus/overworld_normal.pal diff --git a/graphics/pokemon/aurorus/follow_shiny.pal b/graphics/pokemon/aurorus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/aurorus/follow_shiny.pal rename to graphics/pokemon/aurorus/overworld_shiny.pal diff --git a/graphics/pokemon/avalugg/hisuian/follower.png b/graphics/pokemon/avalugg/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/avalugg/hisuian/follower.png rename to graphics/pokemon/avalugg/hisuian/overworld.png diff --git a/graphics/pokemon/avalugg/hisuian/follow_normal.pal b/graphics/pokemon/avalugg/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/avalugg/hisuian/follow_normal.pal rename to graphics/pokemon/avalugg/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/avalugg/hisuian/follow_shiny.pal b/graphics/pokemon/avalugg/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/avalugg/hisuian/follow_shiny.pal rename to graphics/pokemon/avalugg/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/avalugg/follower.png b/graphics/pokemon/avalugg/overworld.png similarity index 100% rename from graphics/pokemon/avalugg/follower.png rename to graphics/pokemon/avalugg/overworld.png diff --git a/graphics/pokemon/avalugg/follow_normal.pal b/graphics/pokemon/avalugg/overworld_normal.pal similarity index 100% rename from graphics/pokemon/avalugg/follow_normal.pal rename to graphics/pokemon/avalugg/overworld_normal.pal diff --git a/graphics/pokemon/avalugg/follow_shiny.pal b/graphics/pokemon/avalugg/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/avalugg/follow_shiny.pal rename to graphics/pokemon/avalugg/overworld_shiny.pal diff --git a/graphics/pokemon/axew/follower.png b/graphics/pokemon/axew/overworld.png similarity index 100% rename from graphics/pokemon/axew/follower.png rename to graphics/pokemon/axew/overworld.png diff --git a/graphics/pokemon/axew/follow_normal.pal b/graphics/pokemon/axew/overworld_normal.pal similarity index 100% rename from graphics/pokemon/axew/follow_normal.pal rename to graphics/pokemon/axew/overworld_normal.pal diff --git a/graphics/pokemon/axew/follow_shiny.pal b/graphics/pokemon/axew/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/axew/follow_shiny.pal rename to graphics/pokemon/axew/overworld_shiny.pal diff --git a/graphics/pokemon/azelf/follower.png b/graphics/pokemon/azelf/overworld.png similarity index 100% rename from graphics/pokemon/azelf/follower.png rename to graphics/pokemon/azelf/overworld.png diff --git a/graphics/pokemon/azelf/follow_normal.pal b/graphics/pokemon/azelf/overworld_normal.pal similarity index 100% rename from graphics/pokemon/azelf/follow_normal.pal rename to graphics/pokemon/azelf/overworld_normal.pal diff --git a/graphics/pokemon/azelf/follow_shiny.pal b/graphics/pokemon/azelf/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/azelf/follow_shiny.pal rename to graphics/pokemon/azelf/overworld_shiny.pal diff --git a/graphics/pokemon/azumarill/follower.png b/graphics/pokemon/azumarill/overworld.png similarity index 100% rename from graphics/pokemon/azumarill/follower.png rename to graphics/pokemon/azumarill/overworld.png diff --git a/graphics/pokemon/azumarill/follow_normal.pal b/graphics/pokemon/azumarill/overworld_normal.pal similarity index 100% rename from graphics/pokemon/azumarill/follow_normal.pal rename to graphics/pokemon/azumarill/overworld_normal.pal diff --git a/graphics/pokemon/azumarill/follow_shiny.pal b/graphics/pokemon/azumarill/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/azumarill/follow_shiny.pal rename to graphics/pokemon/azumarill/overworld_shiny.pal diff --git a/graphics/pokemon/azurill/follower.png b/graphics/pokemon/azurill/overworld.png similarity index 100% rename from graphics/pokemon/azurill/follower.png rename to graphics/pokemon/azurill/overworld.png diff --git a/graphics/pokemon/azurill/follow_normal.pal b/graphics/pokemon/azurill/overworld_normal.pal similarity index 100% rename from graphics/pokemon/azurill/follow_normal.pal rename to graphics/pokemon/azurill/overworld_normal.pal diff --git a/graphics/pokemon/azurill/follow_shiny.pal b/graphics/pokemon/azurill/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/azurill/follow_shiny.pal rename to graphics/pokemon/azurill/overworld_shiny.pal diff --git a/graphics/pokemon/bagon/follower.png b/graphics/pokemon/bagon/overworld.png similarity index 100% rename from graphics/pokemon/bagon/follower.png rename to graphics/pokemon/bagon/overworld.png diff --git a/graphics/pokemon/bagon/follow_normal.pal b/graphics/pokemon/bagon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bagon/follow_normal.pal rename to graphics/pokemon/bagon/overworld_normal.pal diff --git a/graphics/pokemon/bagon/follow_shiny.pal b/graphics/pokemon/bagon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bagon/follow_shiny.pal rename to graphics/pokemon/bagon/overworld_shiny.pal diff --git a/graphics/pokemon/baltoy/follower.png b/graphics/pokemon/baltoy/overworld.png similarity index 100% rename from graphics/pokemon/baltoy/follower.png rename to graphics/pokemon/baltoy/overworld.png diff --git a/graphics/pokemon/baltoy/follow_normal.pal b/graphics/pokemon/baltoy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/baltoy/follow_normal.pal rename to graphics/pokemon/baltoy/overworld_normal.pal diff --git a/graphics/pokemon/baltoy/follow_shiny.pal b/graphics/pokemon/baltoy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/baltoy/follow_shiny.pal rename to graphics/pokemon/baltoy/overworld_shiny.pal diff --git a/graphics/pokemon/banette/follower.png b/graphics/pokemon/banette/overworld.png similarity index 100% rename from graphics/pokemon/banette/follower.png rename to graphics/pokemon/banette/overworld.png diff --git a/graphics/pokemon/banette/follow_normal.pal b/graphics/pokemon/banette/overworld_normal.pal similarity index 100% rename from graphics/pokemon/banette/follow_normal.pal rename to graphics/pokemon/banette/overworld_normal.pal diff --git a/graphics/pokemon/banette/follow_shiny.pal b/graphics/pokemon/banette/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/banette/follow_shiny.pal rename to graphics/pokemon/banette/overworld_shiny.pal diff --git a/graphics/pokemon/barbaracle/follower.png b/graphics/pokemon/barbaracle/overworld.png similarity index 100% rename from graphics/pokemon/barbaracle/follower.png rename to graphics/pokemon/barbaracle/overworld.png diff --git a/graphics/pokemon/barbaracle/follow_normal.pal b/graphics/pokemon/barbaracle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/barbaracle/follow_normal.pal rename to graphics/pokemon/barbaracle/overworld_normal.pal diff --git a/graphics/pokemon/barbaracle/follow_shiny.pal b/graphics/pokemon/barbaracle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/barbaracle/follow_shiny.pal rename to graphics/pokemon/barbaracle/overworld_shiny.pal diff --git a/graphics/pokemon/barboach/follower.png b/graphics/pokemon/barboach/overworld.png similarity index 100% rename from graphics/pokemon/barboach/follower.png rename to graphics/pokemon/barboach/overworld.png diff --git a/graphics/pokemon/barboach/follow_normal.pal b/graphics/pokemon/barboach/overworld_normal.pal similarity index 100% rename from graphics/pokemon/barboach/follow_normal.pal rename to graphics/pokemon/barboach/overworld_normal.pal diff --git a/graphics/pokemon/barboach/follow_shiny.pal b/graphics/pokemon/barboach/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/barboach/follow_shiny.pal rename to graphics/pokemon/barboach/overworld_shiny.pal diff --git a/graphics/pokemon/barraskewda/follower.png b/graphics/pokemon/barraskewda/overworld.png similarity index 100% rename from graphics/pokemon/barraskewda/follower.png rename to graphics/pokemon/barraskewda/overworld.png diff --git a/graphics/pokemon/barraskewda/follow_normal.pal b/graphics/pokemon/barraskewda/overworld_normal.pal similarity index 100% rename from graphics/pokemon/barraskewda/follow_normal.pal rename to graphics/pokemon/barraskewda/overworld_normal.pal diff --git a/graphics/pokemon/barraskewda/follow_shiny.pal b/graphics/pokemon/barraskewda/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/barraskewda/follow_shiny.pal rename to graphics/pokemon/barraskewda/overworld_shiny.pal diff --git a/graphics/pokemon/basculegion/female/follower.png b/graphics/pokemon/basculegion/female/overworld.png similarity index 100% rename from graphics/pokemon/basculegion/female/follower.png rename to graphics/pokemon/basculegion/female/overworld.png diff --git a/graphics/pokemon/basculegion/female/follow_normal.pal b/graphics/pokemon/basculegion/female/overworld_normal.pal similarity index 100% rename from graphics/pokemon/basculegion/female/follow_normal.pal rename to graphics/pokemon/basculegion/female/overworld_normal.pal diff --git a/graphics/pokemon/basculegion/female/follow_shiny.pal b/graphics/pokemon/basculegion/female/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/basculegion/female/follow_shiny.pal rename to graphics/pokemon/basculegion/female/overworld_shiny.pal diff --git a/graphics/pokemon/basculegion/follower.png b/graphics/pokemon/basculegion/overworld.png similarity index 100% rename from graphics/pokemon/basculegion/follower.png rename to graphics/pokemon/basculegion/overworld.png diff --git a/graphics/pokemon/basculegion/follow_normal.pal b/graphics/pokemon/basculegion/overworld_normal.pal similarity index 100% rename from graphics/pokemon/basculegion/follow_normal.pal rename to graphics/pokemon/basculegion/overworld_normal.pal diff --git a/graphics/pokemon/basculegion/follow_shiny.pal b/graphics/pokemon/basculegion/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/basculegion/follow_shiny.pal rename to graphics/pokemon/basculegion/overworld_shiny.pal diff --git a/graphics/pokemon/basculin/blue_striped/follower.png b/graphics/pokemon/basculin/blue_striped/overworld.png similarity index 100% rename from graphics/pokemon/basculin/blue_striped/follower.png rename to graphics/pokemon/basculin/blue_striped/overworld.png diff --git a/graphics/pokemon/basculin/blue_striped/follow_normal.pal b/graphics/pokemon/basculin/blue_striped/overworld_normal.pal similarity index 100% rename from graphics/pokemon/basculin/blue_striped/follow_normal.pal rename to graphics/pokemon/basculin/blue_striped/overworld_normal.pal diff --git a/graphics/pokemon/basculin/blue_striped/follow_shiny.pal b/graphics/pokemon/basculin/blue_striped/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/basculin/blue_striped/follow_shiny.pal rename to graphics/pokemon/basculin/blue_striped/overworld_shiny.pal diff --git a/graphics/pokemon/basculin/hisuian/follower.png b/graphics/pokemon/basculin/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/basculin/hisuian/follower.png rename to graphics/pokemon/basculin/hisuian/overworld.png diff --git a/graphics/pokemon/basculin/hisuian/follow_normal.pal b/graphics/pokemon/basculin/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/basculin/hisuian/follow_normal.pal rename to graphics/pokemon/basculin/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/basculin/follower.png b/graphics/pokemon/basculin/overworld.png similarity index 100% rename from graphics/pokemon/basculin/follower.png rename to graphics/pokemon/basculin/overworld.png diff --git a/graphics/pokemon/basculin/follow_normal.pal b/graphics/pokemon/basculin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/basculin/follow_normal.pal rename to graphics/pokemon/basculin/overworld_normal.pal diff --git a/graphics/pokemon/basculin/follow_shiny.pal b/graphics/pokemon/basculin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/basculin/follow_shiny.pal rename to graphics/pokemon/basculin/overworld_shiny.pal diff --git a/graphics/pokemon/basculin/white_striped/follower.png b/graphics/pokemon/basculin/white_striped/overworld.png similarity index 100% rename from graphics/pokemon/basculin/white_striped/follower.png rename to graphics/pokemon/basculin/white_striped/overworld.png diff --git a/graphics/pokemon/basculin/white_striped/follow_normal.pal b/graphics/pokemon/basculin/white_striped/overworld_normal.pal similarity index 100% rename from graphics/pokemon/basculin/white_striped/follow_normal.pal rename to graphics/pokemon/basculin/white_striped/overworld_normal.pal diff --git a/graphics/pokemon/basculin/white_striped/follow_shiny.pal b/graphics/pokemon/basculin/white_striped/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/basculin/white_striped/follow_shiny.pal rename to graphics/pokemon/basculin/white_striped/overworld_shiny.pal diff --git a/graphics/pokemon/bastiodon/follower.png b/graphics/pokemon/bastiodon/overworld.png similarity index 100% rename from graphics/pokemon/bastiodon/follower.png rename to graphics/pokemon/bastiodon/overworld.png diff --git a/graphics/pokemon/bastiodon/follow_normal.pal b/graphics/pokemon/bastiodon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bastiodon/follow_normal.pal rename to graphics/pokemon/bastiodon/overworld_normal.pal diff --git a/graphics/pokemon/bastiodon/follow_shiny.pal b/graphics/pokemon/bastiodon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bastiodon/follow_shiny.pal rename to graphics/pokemon/bastiodon/overworld_shiny.pal diff --git a/graphics/pokemon/bayleef/follower.png b/graphics/pokemon/bayleef/overworld.png similarity index 100% rename from graphics/pokemon/bayleef/follower.png rename to graphics/pokemon/bayleef/overworld.png diff --git a/graphics/pokemon/bayleef/follow_normal.pal b/graphics/pokemon/bayleef/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bayleef/follow_normal.pal rename to graphics/pokemon/bayleef/overworld_normal.pal diff --git a/graphics/pokemon/bayleef/follow_shiny.pal b/graphics/pokemon/bayleef/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bayleef/follow_shiny.pal rename to graphics/pokemon/bayleef/overworld_shiny.pal diff --git a/graphics/pokemon/beartic/follower.png b/graphics/pokemon/beartic/overworld.png similarity index 100% rename from graphics/pokemon/beartic/follower.png rename to graphics/pokemon/beartic/overworld.png diff --git a/graphics/pokemon/beartic/follow_normal.pal b/graphics/pokemon/beartic/overworld_normal.pal similarity index 100% rename from graphics/pokemon/beartic/follow_normal.pal rename to graphics/pokemon/beartic/overworld_normal.pal diff --git a/graphics/pokemon/beartic/follow_shiny.pal b/graphics/pokemon/beartic/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/beartic/follow_shiny.pal rename to graphics/pokemon/beartic/overworld_shiny.pal diff --git a/graphics/pokemon/beautifly/follower.png b/graphics/pokemon/beautifly/overworld.png similarity index 100% rename from graphics/pokemon/beautifly/follower.png rename to graphics/pokemon/beautifly/overworld.png diff --git a/graphics/pokemon/beautifly/follow_normal.pal b/graphics/pokemon/beautifly/overworld_normal.pal similarity index 100% rename from graphics/pokemon/beautifly/follow_normal.pal rename to graphics/pokemon/beautifly/overworld_normal.pal diff --git a/graphics/pokemon/beautifly/follow_shiny.pal b/graphics/pokemon/beautifly/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/beautifly/follow_shiny.pal rename to graphics/pokemon/beautifly/overworld_shiny.pal diff --git a/graphics/pokemon/beedrill/follower.png b/graphics/pokemon/beedrill/overworld.png similarity index 100% rename from graphics/pokemon/beedrill/follower.png rename to graphics/pokemon/beedrill/overworld.png diff --git a/graphics/pokemon/beedrill/follow_normal.pal b/graphics/pokemon/beedrill/overworld_normal.pal similarity index 100% rename from graphics/pokemon/beedrill/follow_normal.pal rename to graphics/pokemon/beedrill/overworld_normal.pal diff --git a/graphics/pokemon/beedrill/follow_shiny.pal b/graphics/pokemon/beedrill/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/beedrill/follow_shiny.pal rename to graphics/pokemon/beedrill/overworld_shiny.pal diff --git a/graphics/pokemon/beheeyem/follower.png b/graphics/pokemon/beheeyem/overworld.png similarity index 100% rename from graphics/pokemon/beheeyem/follower.png rename to graphics/pokemon/beheeyem/overworld.png diff --git a/graphics/pokemon/beheeyem/follow_normal.pal b/graphics/pokemon/beheeyem/overworld_normal.pal similarity index 100% rename from graphics/pokemon/beheeyem/follow_normal.pal rename to graphics/pokemon/beheeyem/overworld_normal.pal diff --git a/graphics/pokemon/beheeyem/follow_shiny.pal b/graphics/pokemon/beheeyem/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/beheeyem/follow_shiny.pal rename to graphics/pokemon/beheeyem/overworld_shiny.pal diff --git a/graphics/pokemon/beldum/follower.png b/graphics/pokemon/beldum/overworld.png similarity index 100% rename from graphics/pokemon/beldum/follower.png rename to graphics/pokemon/beldum/overworld.png diff --git a/graphics/pokemon/beldum/follow_normal.pal b/graphics/pokemon/beldum/overworld_normal.pal similarity index 100% rename from graphics/pokemon/beldum/follow_normal.pal rename to graphics/pokemon/beldum/overworld_normal.pal diff --git a/graphics/pokemon/beldum/follow_shiny.pal b/graphics/pokemon/beldum/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/beldum/follow_shiny.pal rename to graphics/pokemon/beldum/overworld_shiny.pal diff --git a/graphics/pokemon/bellossom/follower.png b/graphics/pokemon/bellossom/overworld.png similarity index 100% rename from graphics/pokemon/bellossom/follower.png rename to graphics/pokemon/bellossom/overworld.png diff --git a/graphics/pokemon/bellossom/follow_normal.pal b/graphics/pokemon/bellossom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bellossom/follow_normal.pal rename to graphics/pokemon/bellossom/overworld_normal.pal diff --git a/graphics/pokemon/bellossom/follow_shiny.pal b/graphics/pokemon/bellossom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bellossom/follow_shiny.pal rename to graphics/pokemon/bellossom/overworld_shiny.pal diff --git a/graphics/pokemon/bellsprout/follower.png b/graphics/pokemon/bellsprout/overworld.png similarity index 100% rename from graphics/pokemon/bellsprout/follower.png rename to graphics/pokemon/bellsprout/overworld.png diff --git a/graphics/pokemon/bellsprout/follow_normal.pal b/graphics/pokemon/bellsprout/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bellsprout/follow_normal.pal rename to graphics/pokemon/bellsprout/overworld_normal.pal diff --git a/graphics/pokemon/bellsprout/follow_shiny.pal b/graphics/pokemon/bellsprout/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bellsprout/follow_shiny.pal rename to graphics/pokemon/bellsprout/overworld_shiny.pal diff --git a/graphics/pokemon/bergmite/follower.png b/graphics/pokemon/bergmite/overworld.png similarity index 100% rename from graphics/pokemon/bergmite/follower.png rename to graphics/pokemon/bergmite/overworld.png diff --git a/graphics/pokemon/bergmite/follow_normal.pal b/graphics/pokemon/bergmite/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bergmite/follow_normal.pal rename to graphics/pokemon/bergmite/overworld_normal.pal diff --git a/graphics/pokemon/bergmite/follow_shiny.pal b/graphics/pokemon/bergmite/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bergmite/follow_shiny.pal rename to graphics/pokemon/bergmite/overworld_shiny.pal diff --git a/graphics/pokemon/bewear/follower.png b/graphics/pokemon/bewear/overworld.png similarity index 100% rename from graphics/pokemon/bewear/follower.png rename to graphics/pokemon/bewear/overworld.png diff --git a/graphics/pokemon/bewear/follow_normal.pal b/graphics/pokemon/bewear/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bewear/follow_normal.pal rename to graphics/pokemon/bewear/overworld_normal.pal diff --git a/graphics/pokemon/bewear/follow_shiny.pal b/graphics/pokemon/bewear/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bewear/follow_shiny.pal rename to graphics/pokemon/bewear/overworld_shiny.pal diff --git a/graphics/pokemon/bibarel/follower.png b/graphics/pokemon/bibarel/overworld.png similarity index 100% rename from graphics/pokemon/bibarel/follower.png rename to graphics/pokemon/bibarel/overworld.png diff --git a/graphics/pokemon/bibarel/follow_normal.pal b/graphics/pokemon/bibarel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bibarel/follow_normal.pal rename to graphics/pokemon/bibarel/overworld_normal.pal diff --git a/graphics/pokemon/bibarel/follow_shiny.pal b/graphics/pokemon/bibarel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bibarel/follow_shiny.pal rename to graphics/pokemon/bibarel/overworld_shiny.pal diff --git a/graphics/pokemon/bidoof/follower.png b/graphics/pokemon/bidoof/overworld.png similarity index 100% rename from graphics/pokemon/bidoof/follower.png rename to graphics/pokemon/bidoof/overworld.png diff --git a/graphics/pokemon/bidoof/follow_normal.pal b/graphics/pokemon/bidoof/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bidoof/follow_normal.pal rename to graphics/pokemon/bidoof/overworld_normal.pal diff --git a/graphics/pokemon/bidoof/follow_shiny.pal b/graphics/pokemon/bidoof/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bidoof/follow_shiny.pal rename to graphics/pokemon/bidoof/overworld_shiny.pal diff --git a/graphics/pokemon/binacle/follower.png b/graphics/pokemon/binacle/overworld.png similarity index 100% rename from graphics/pokemon/binacle/follower.png rename to graphics/pokemon/binacle/overworld.png diff --git a/graphics/pokemon/binacle/follow_normal.pal b/graphics/pokemon/binacle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/binacle/follow_normal.pal rename to graphics/pokemon/binacle/overworld_normal.pal diff --git a/graphics/pokemon/binacle/follow_shiny.pal b/graphics/pokemon/binacle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/binacle/follow_shiny.pal rename to graphics/pokemon/binacle/overworld_shiny.pal diff --git a/graphics/pokemon/bisharp/follower.png b/graphics/pokemon/bisharp/overworld.png similarity index 100% rename from graphics/pokemon/bisharp/follower.png rename to graphics/pokemon/bisharp/overworld.png diff --git a/graphics/pokemon/bisharp/follow_normal.pal b/graphics/pokemon/bisharp/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bisharp/follow_normal.pal rename to graphics/pokemon/bisharp/overworld_normal.pal diff --git a/graphics/pokemon/bisharp/follow_shiny.pal b/graphics/pokemon/bisharp/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bisharp/follow_shiny.pal rename to graphics/pokemon/bisharp/overworld_shiny.pal diff --git a/graphics/pokemon/blacephalon/follower.png b/graphics/pokemon/blacephalon/overworld.png similarity index 100% rename from graphics/pokemon/blacephalon/follower.png rename to graphics/pokemon/blacephalon/overworld.png diff --git a/graphics/pokemon/blacephalon/follow_normal.pal b/graphics/pokemon/blacephalon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/blacephalon/follow_normal.pal rename to graphics/pokemon/blacephalon/overworld_normal.pal diff --git a/graphics/pokemon/blacephalon/follow_shiny.pal b/graphics/pokemon/blacephalon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/blacephalon/follow_shiny.pal rename to graphics/pokemon/blacephalon/overworld_shiny.pal diff --git a/graphics/pokemon/blastoise/follower.png b/graphics/pokemon/blastoise/overworld.png similarity index 100% rename from graphics/pokemon/blastoise/follower.png rename to graphics/pokemon/blastoise/overworld.png diff --git a/graphics/pokemon/blastoise/follow_normal.pal b/graphics/pokemon/blastoise/overworld_normal.pal similarity index 100% rename from graphics/pokemon/blastoise/follow_normal.pal rename to graphics/pokemon/blastoise/overworld_normal.pal diff --git a/graphics/pokemon/blastoise/follow_shiny.pal b/graphics/pokemon/blastoise/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/blastoise/follow_shiny.pal rename to graphics/pokemon/blastoise/overworld_shiny.pal diff --git a/graphics/pokemon/blaziken/follower.png b/graphics/pokemon/blaziken/overworld.png similarity index 100% rename from graphics/pokemon/blaziken/follower.png rename to graphics/pokemon/blaziken/overworld.png diff --git a/graphics/pokemon/blaziken/follow_normal.pal b/graphics/pokemon/blaziken/overworld_normal.pal similarity index 100% rename from graphics/pokemon/blaziken/follow_normal.pal rename to graphics/pokemon/blaziken/overworld_normal.pal diff --git a/graphics/pokemon/blaziken/follow_shiny.pal b/graphics/pokemon/blaziken/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/blaziken/follow_shiny.pal rename to graphics/pokemon/blaziken/overworld_shiny.pal diff --git a/graphics/pokemon/blipbug/follower.png b/graphics/pokemon/blipbug/overworld.png similarity index 100% rename from graphics/pokemon/blipbug/follower.png rename to graphics/pokemon/blipbug/overworld.png diff --git a/graphics/pokemon/blipbug/follow_normal.pal b/graphics/pokemon/blipbug/overworld_normal.pal similarity index 100% rename from graphics/pokemon/blipbug/follow_normal.pal rename to graphics/pokemon/blipbug/overworld_normal.pal diff --git a/graphics/pokemon/blipbug/follow_shiny.pal b/graphics/pokemon/blipbug/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/blipbug/follow_shiny.pal rename to graphics/pokemon/blipbug/overworld_shiny.pal diff --git a/graphics/pokemon/blissey/follower.png b/graphics/pokemon/blissey/overworld.png similarity index 100% rename from graphics/pokemon/blissey/follower.png rename to graphics/pokemon/blissey/overworld.png diff --git a/graphics/pokemon/blissey/follow_normal.pal b/graphics/pokemon/blissey/overworld_normal.pal similarity index 100% rename from graphics/pokemon/blissey/follow_normal.pal rename to graphics/pokemon/blissey/overworld_normal.pal diff --git a/graphics/pokemon/blissey/follow_shiny.pal b/graphics/pokemon/blissey/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/blissey/follow_shiny.pal rename to graphics/pokemon/blissey/overworld_shiny.pal diff --git a/graphics/pokemon/blitzle/follower.png b/graphics/pokemon/blitzle/overworld.png similarity index 100% rename from graphics/pokemon/blitzle/follower.png rename to graphics/pokemon/blitzle/overworld.png diff --git a/graphics/pokemon/blitzle/follow_normal.pal b/graphics/pokemon/blitzle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/blitzle/follow_normal.pal rename to graphics/pokemon/blitzle/overworld_normal.pal diff --git a/graphics/pokemon/blitzle/follow_shiny.pal b/graphics/pokemon/blitzle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/blitzle/follow_shiny.pal rename to graphics/pokemon/blitzle/overworld_shiny.pal diff --git a/graphics/pokemon/boldore/follower.png b/graphics/pokemon/boldore/overworld.png similarity index 100% rename from graphics/pokemon/boldore/follower.png rename to graphics/pokemon/boldore/overworld.png diff --git a/graphics/pokemon/boldore/follow_normal.pal b/graphics/pokemon/boldore/overworld_normal.pal similarity index 100% rename from graphics/pokemon/boldore/follow_normal.pal rename to graphics/pokemon/boldore/overworld_normal.pal diff --git a/graphics/pokemon/boldore/follow_shiny.pal b/graphics/pokemon/boldore/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/boldore/follow_shiny.pal rename to graphics/pokemon/boldore/overworld_shiny.pal diff --git a/graphics/pokemon/boltund/follower.png b/graphics/pokemon/boltund/overworld.png similarity index 100% rename from graphics/pokemon/boltund/follower.png rename to graphics/pokemon/boltund/overworld.png diff --git a/graphics/pokemon/boltund/follow_normal.pal b/graphics/pokemon/boltund/overworld_normal.pal similarity index 100% rename from graphics/pokemon/boltund/follow_normal.pal rename to graphics/pokemon/boltund/overworld_normal.pal diff --git a/graphics/pokemon/boltund/follow_shiny.pal b/graphics/pokemon/boltund/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/boltund/follow_shiny.pal rename to graphics/pokemon/boltund/overworld_shiny.pal diff --git a/graphics/pokemon/bonsly/follower.png b/graphics/pokemon/bonsly/overworld.png similarity index 100% rename from graphics/pokemon/bonsly/follower.png rename to graphics/pokemon/bonsly/overworld.png diff --git a/graphics/pokemon/bonsly/follow_normal.pal b/graphics/pokemon/bonsly/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bonsly/follow_normal.pal rename to graphics/pokemon/bonsly/overworld_normal.pal diff --git a/graphics/pokemon/bonsly/follow_shiny.pal b/graphics/pokemon/bonsly/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bonsly/follow_shiny.pal rename to graphics/pokemon/bonsly/overworld_shiny.pal diff --git a/graphics/pokemon/bouffalant/follower.png b/graphics/pokemon/bouffalant/overworld.png similarity index 100% rename from graphics/pokemon/bouffalant/follower.png rename to graphics/pokemon/bouffalant/overworld.png diff --git a/graphics/pokemon/bouffalant/follow_normal.pal b/graphics/pokemon/bouffalant/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bouffalant/follow_normal.pal rename to graphics/pokemon/bouffalant/overworld_normal.pal diff --git a/graphics/pokemon/bouffalant/follow_shiny.pal b/graphics/pokemon/bouffalant/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bouffalant/follow_shiny.pal rename to graphics/pokemon/bouffalant/overworld_shiny.pal diff --git a/graphics/pokemon/bounsweet/follower.png b/graphics/pokemon/bounsweet/overworld.png similarity index 100% rename from graphics/pokemon/bounsweet/follower.png rename to graphics/pokemon/bounsweet/overworld.png diff --git a/graphics/pokemon/bounsweet/follow_normal.pal b/graphics/pokemon/bounsweet/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bounsweet/follow_normal.pal rename to graphics/pokemon/bounsweet/overworld_normal.pal diff --git a/graphics/pokemon/bounsweet/follow_shiny.pal b/graphics/pokemon/bounsweet/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bounsweet/follow_shiny.pal rename to graphics/pokemon/bounsweet/overworld_shiny.pal diff --git a/graphics/pokemon/braixen/follower.png b/graphics/pokemon/braixen/overworld.png similarity index 100% rename from graphics/pokemon/braixen/follower.png rename to graphics/pokemon/braixen/overworld.png diff --git a/graphics/pokemon/braixen/follow_normal.pal b/graphics/pokemon/braixen/overworld_normal.pal similarity index 100% rename from graphics/pokemon/braixen/follow_normal.pal rename to graphics/pokemon/braixen/overworld_normal.pal diff --git a/graphics/pokemon/braixen/follow_shiny.pal b/graphics/pokemon/braixen/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/braixen/follow_shiny.pal rename to graphics/pokemon/braixen/overworld_shiny.pal diff --git a/graphics/pokemon/braviary/hisuian/follower.png b/graphics/pokemon/braviary/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/braviary/hisuian/follower.png rename to graphics/pokemon/braviary/hisuian/overworld.png diff --git a/graphics/pokemon/braviary/hisuian/follow_normal.pal b/graphics/pokemon/braviary/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/braviary/hisuian/follow_normal.pal rename to graphics/pokemon/braviary/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/braviary/hisuian/follow_shiny.pal b/graphics/pokemon/braviary/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/braviary/hisuian/follow_shiny.pal rename to graphics/pokemon/braviary/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/braviary/follower.png b/graphics/pokemon/braviary/overworld.png similarity index 100% rename from graphics/pokemon/braviary/follower.png rename to graphics/pokemon/braviary/overworld.png diff --git a/graphics/pokemon/braviary/follow_normal.pal b/graphics/pokemon/braviary/overworld_normal.pal similarity index 100% rename from graphics/pokemon/braviary/follow_normal.pal rename to graphics/pokemon/braviary/overworld_normal.pal diff --git a/graphics/pokemon/braviary/follow_shiny.pal b/graphics/pokemon/braviary/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/braviary/follow_shiny.pal rename to graphics/pokemon/braviary/overworld_shiny.pal diff --git a/graphics/pokemon/breloom/follower.png b/graphics/pokemon/breloom/overworld.png similarity index 100% rename from graphics/pokemon/breloom/follower.png rename to graphics/pokemon/breloom/overworld.png diff --git a/graphics/pokemon/breloom/follow_normal.pal b/graphics/pokemon/breloom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/breloom/follow_normal.pal rename to graphics/pokemon/breloom/overworld_normal.pal diff --git a/graphics/pokemon/breloom/follow_shiny.pal b/graphics/pokemon/breloom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/breloom/follow_shiny.pal rename to graphics/pokemon/breloom/overworld_shiny.pal diff --git a/graphics/pokemon/brionne/follower.png b/graphics/pokemon/brionne/overworld.png similarity index 100% rename from graphics/pokemon/brionne/follower.png rename to graphics/pokemon/brionne/overworld.png diff --git a/graphics/pokemon/brionne/follow_normal.pal b/graphics/pokemon/brionne/overworld_normal.pal similarity index 100% rename from graphics/pokemon/brionne/follow_normal.pal rename to graphics/pokemon/brionne/overworld_normal.pal diff --git a/graphics/pokemon/brionne/follow_shiny.pal b/graphics/pokemon/brionne/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/brionne/follow_shiny.pal rename to graphics/pokemon/brionne/overworld_shiny.pal diff --git a/graphics/pokemon/bronzong/follower.png b/graphics/pokemon/bronzong/overworld.png similarity index 100% rename from graphics/pokemon/bronzong/follower.png rename to graphics/pokemon/bronzong/overworld.png diff --git a/graphics/pokemon/bronzong/follow_normal.pal b/graphics/pokemon/bronzong/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bronzong/follow_normal.pal rename to graphics/pokemon/bronzong/overworld_normal.pal diff --git a/graphics/pokemon/bronzong/follow_shiny.pal b/graphics/pokemon/bronzong/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bronzong/follow_shiny.pal rename to graphics/pokemon/bronzong/overworld_shiny.pal diff --git a/graphics/pokemon/bronzor/follower.png b/graphics/pokemon/bronzor/overworld.png similarity index 100% rename from graphics/pokemon/bronzor/follower.png rename to graphics/pokemon/bronzor/overworld.png diff --git a/graphics/pokemon/bronzor/follow_normal.pal b/graphics/pokemon/bronzor/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bronzor/follow_normal.pal rename to graphics/pokemon/bronzor/overworld_normal.pal diff --git a/graphics/pokemon/bronzor/follow_shiny.pal b/graphics/pokemon/bronzor/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bronzor/follow_shiny.pal rename to graphics/pokemon/bronzor/overworld_shiny.pal diff --git a/graphics/pokemon/bruxish/follower.png b/graphics/pokemon/bruxish/overworld.png similarity index 100% rename from graphics/pokemon/bruxish/follower.png rename to graphics/pokemon/bruxish/overworld.png diff --git a/graphics/pokemon/bruxish/follow_normal.pal b/graphics/pokemon/bruxish/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bruxish/follow_normal.pal rename to graphics/pokemon/bruxish/overworld_normal.pal diff --git a/graphics/pokemon/bruxish/follow_shiny.pal b/graphics/pokemon/bruxish/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bruxish/follow_shiny.pal rename to graphics/pokemon/bruxish/overworld_shiny.pal diff --git a/graphics/pokemon/budew/follower.png b/graphics/pokemon/budew/overworld.png similarity index 100% rename from graphics/pokemon/budew/follower.png rename to graphics/pokemon/budew/overworld.png diff --git a/graphics/pokemon/budew/follow_normal.pal b/graphics/pokemon/budew/overworld_normal.pal similarity index 100% rename from graphics/pokemon/budew/follow_normal.pal rename to graphics/pokemon/budew/overworld_normal.pal diff --git a/graphics/pokemon/budew/follow_shiny.pal b/graphics/pokemon/budew/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/budew/follow_shiny.pal rename to graphics/pokemon/budew/overworld_shiny.pal diff --git a/graphics/pokemon/buizel/follower.png b/graphics/pokemon/buizel/overworld.png similarity index 100% rename from graphics/pokemon/buizel/follower.png rename to graphics/pokemon/buizel/overworld.png diff --git a/graphics/pokemon/buizel/follow_normal.pal b/graphics/pokemon/buizel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/buizel/follow_normal.pal rename to graphics/pokemon/buizel/overworld_normal.pal diff --git a/graphics/pokemon/buizel/follow_shiny.pal b/graphics/pokemon/buizel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/buizel/follow_shiny.pal rename to graphics/pokemon/buizel/overworld_shiny.pal diff --git a/graphics/pokemon/bulbasaur/follower.png b/graphics/pokemon/bulbasaur/overworld.png similarity index 100% rename from graphics/pokemon/bulbasaur/follower.png rename to graphics/pokemon/bulbasaur/overworld.png diff --git a/graphics/pokemon/bulbasaur/follow_normal.pal b/graphics/pokemon/bulbasaur/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bulbasaur/follow_normal.pal rename to graphics/pokemon/bulbasaur/overworld_normal.pal diff --git a/graphics/pokemon/bulbasaur/follow_shiny.pal b/graphics/pokemon/bulbasaur/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bulbasaur/follow_shiny.pal rename to graphics/pokemon/bulbasaur/overworld_shiny.pal diff --git a/graphics/pokemon/buneary/follower.png b/graphics/pokemon/buneary/overworld.png similarity index 100% rename from graphics/pokemon/buneary/follower.png rename to graphics/pokemon/buneary/overworld.png diff --git a/graphics/pokemon/buneary/follow_normal.pal b/graphics/pokemon/buneary/overworld_normal.pal similarity index 100% rename from graphics/pokemon/buneary/follow_normal.pal rename to graphics/pokemon/buneary/overworld_normal.pal diff --git a/graphics/pokemon/buneary/follow_shiny.pal b/graphics/pokemon/buneary/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/buneary/follow_shiny.pal rename to graphics/pokemon/buneary/overworld_shiny.pal diff --git a/graphics/pokemon/bunnelby/follower.png b/graphics/pokemon/bunnelby/overworld.png similarity index 100% rename from graphics/pokemon/bunnelby/follower.png rename to graphics/pokemon/bunnelby/overworld.png diff --git a/graphics/pokemon/bunnelby/follow_normal.pal b/graphics/pokemon/bunnelby/overworld_normal.pal similarity index 100% rename from graphics/pokemon/bunnelby/follow_normal.pal rename to graphics/pokemon/bunnelby/overworld_normal.pal diff --git a/graphics/pokemon/bunnelby/follow_shiny.pal b/graphics/pokemon/bunnelby/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/bunnelby/follow_shiny.pal rename to graphics/pokemon/bunnelby/overworld_shiny.pal diff --git a/graphics/pokemon/burmy/follower.png b/graphics/pokemon/burmy/overworld.png similarity index 100% rename from graphics/pokemon/burmy/follower.png rename to graphics/pokemon/burmy/overworld.png diff --git a/graphics/pokemon/burmy/follow_normal.pal b/graphics/pokemon/burmy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/burmy/follow_normal.pal rename to graphics/pokemon/burmy/overworld_normal.pal diff --git a/graphics/pokemon/burmy/follow_shiny.pal b/graphics/pokemon/burmy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/burmy/follow_shiny.pal rename to graphics/pokemon/burmy/overworld_shiny.pal diff --git a/graphics/pokemon/burmy/sandy_cloak/follower.png b/graphics/pokemon/burmy/sandy_cloak/overworld.png similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/follower.png rename to graphics/pokemon/burmy/sandy_cloak/overworld.png diff --git a/graphics/pokemon/burmy/sandy_cloak/follow_normal.pal b/graphics/pokemon/burmy/sandy_cloak/overworld_normal.pal similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/follow_normal.pal rename to graphics/pokemon/burmy/sandy_cloak/overworld_normal.pal diff --git a/graphics/pokemon/burmy/sandy_cloak/follow_shiny.pal b/graphics/pokemon/burmy/sandy_cloak/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/burmy/sandy_cloak/follow_shiny.pal rename to graphics/pokemon/burmy/sandy_cloak/overworld_shiny.pal diff --git a/graphics/pokemon/burmy/trash_cloak/follower.png b/graphics/pokemon/burmy/trash_cloak/overworld.png similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/follower.png rename to graphics/pokemon/burmy/trash_cloak/overworld.png diff --git a/graphics/pokemon/burmy/trash_cloak/follow_normal.pal b/graphics/pokemon/burmy/trash_cloak/overworld_normal.pal similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/follow_normal.pal rename to graphics/pokemon/burmy/trash_cloak/overworld_normal.pal diff --git a/graphics/pokemon/burmy/trash_cloak/follow_shiny.pal b/graphics/pokemon/burmy/trash_cloak/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/burmy/trash_cloak/follow_shiny.pal rename to graphics/pokemon/burmy/trash_cloak/overworld_shiny.pal diff --git a/graphics/pokemon/butterfree/follower.png b/graphics/pokemon/butterfree/overworld.png similarity index 100% rename from graphics/pokemon/butterfree/follower.png rename to graphics/pokemon/butterfree/overworld.png diff --git a/graphics/pokemon/butterfree/follow_normal.pal b/graphics/pokemon/butterfree/overworld_normal.pal similarity index 100% rename from graphics/pokemon/butterfree/follow_normal.pal rename to graphics/pokemon/butterfree/overworld_normal.pal diff --git a/graphics/pokemon/butterfree/follow_shiny.pal b/graphics/pokemon/butterfree/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/butterfree/follow_shiny.pal rename to graphics/pokemon/butterfree/overworld_shiny.pal diff --git a/graphics/pokemon/buzzwole/follower.png b/graphics/pokemon/buzzwole/overworld.png similarity index 100% rename from graphics/pokemon/buzzwole/follower.png rename to graphics/pokemon/buzzwole/overworld.png diff --git a/graphics/pokemon/buzzwole/follow_normal.pal b/graphics/pokemon/buzzwole/overworld_normal.pal similarity index 100% rename from graphics/pokemon/buzzwole/follow_normal.pal rename to graphics/pokemon/buzzwole/overworld_normal.pal diff --git a/graphics/pokemon/buzzwole/follow_shiny.pal b/graphics/pokemon/buzzwole/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/buzzwole/follow_shiny.pal rename to graphics/pokemon/buzzwole/overworld_shiny.pal diff --git a/graphics/pokemon/cacnea/follower.png b/graphics/pokemon/cacnea/overworld.png similarity index 100% rename from graphics/pokemon/cacnea/follower.png rename to graphics/pokemon/cacnea/overworld.png diff --git a/graphics/pokemon/cacnea/follow_normal.pal b/graphics/pokemon/cacnea/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cacnea/follow_normal.pal rename to graphics/pokemon/cacnea/overworld_normal.pal diff --git a/graphics/pokemon/cacnea/follow_shiny.pal b/graphics/pokemon/cacnea/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cacnea/follow_shiny.pal rename to graphics/pokemon/cacnea/overworld_shiny.pal diff --git a/graphics/pokemon/cacturne/follower.png b/graphics/pokemon/cacturne/overworld.png similarity index 100% rename from graphics/pokemon/cacturne/follower.png rename to graphics/pokemon/cacturne/overworld.png diff --git a/graphics/pokemon/cacturne/follow_normal.pal b/graphics/pokemon/cacturne/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cacturne/follow_normal.pal rename to graphics/pokemon/cacturne/overworld_normal.pal diff --git a/graphics/pokemon/cacturne/follow_shiny.pal b/graphics/pokemon/cacturne/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cacturne/follow_shiny.pal rename to graphics/pokemon/cacturne/overworld_shiny.pal diff --git a/graphics/pokemon/calyrex/ice_rider/follower.png b/graphics/pokemon/calyrex/ice_rider/overworld.png similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/follower.png rename to graphics/pokemon/calyrex/ice_rider/overworld.png diff --git a/graphics/pokemon/calyrex/ice_rider/follow_normal.pal b/graphics/pokemon/calyrex/ice_rider/overworld_normal.pal similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/follow_normal.pal rename to graphics/pokemon/calyrex/ice_rider/overworld_normal.pal diff --git a/graphics/pokemon/calyrex/ice_rider/follow_shiny.pal b/graphics/pokemon/calyrex/ice_rider/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/calyrex/ice_rider/follow_shiny.pal rename to graphics/pokemon/calyrex/ice_rider/overworld_shiny.pal diff --git a/graphics/pokemon/calyrex/follower.png b/graphics/pokemon/calyrex/overworld.png similarity index 100% rename from graphics/pokemon/calyrex/follower.png rename to graphics/pokemon/calyrex/overworld.png diff --git a/graphics/pokemon/calyrex/follow_normal.pal b/graphics/pokemon/calyrex/overworld_normal.pal similarity index 100% rename from graphics/pokemon/calyrex/follow_normal.pal rename to graphics/pokemon/calyrex/overworld_normal.pal diff --git a/graphics/pokemon/calyrex/follow_shiny.pal b/graphics/pokemon/calyrex/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/calyrex/follow_shiny.pal rename to graphics/pokemon/calyrex/overworld_shiny.pal diff --git a/graphics/pokemon/calyrex/shadow_rider/follower.png b/graphics/pokemon/calyrex/shadow_rider/overworld.png similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/follower.png rename to graphics/pokemon/calyrex/shadow_rider/overworld.png diff --git a/graphics/pokemon/calyrex/shadow_rider/follow_normal.pal b/graphics/pokemon/calyrex/shadow_rider/overworld_normal.pal similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/follow_normal.pal rename to graphics/pokemon/calyrex/shadow_rider/overworld_normal.pal diff --git a/graphics/pokemon/calyrex/shadow_rider/follow_shiny.pal b/graphics/pokemon/calyrex/shadow_rider/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/calyrex/shadow_rider/follow_shiny.pal rename to graphics/pokemon/calyrex/shadow_rider/overworld_shiny.pal diff --git a/graphics/pokemon/camerupt/follower.png b/graphics/pokemon/camerupt/overworld.png similarity index 100% rename from graphics/pokemon/camerupt/follower.png rename to graphics/pokemon/camerupt/overworld.png diff --git a/graphics/pokemon/camerupt/follow_normal.pal b/graphics/pokemon/camerupt/overworld_normal.pal similarity index 100% rename from graphics/pokemon/camerupt/follow_normal.pal rename to graphics/pokemon/camerupt/overworld_normal.pal diff --git a/graphics/pokemon/camerupt/follow_shiny.pal b/graphics/pokemon/camerupt/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/camerupt/follow_shiny.pal rename to graphics/pokemon/camerupt/overworld_shiny.pal diff --git a/graphics/pokemon/carbink/follower.png b/graphics/pokemon/carbink/overworld.png similarity index 100% rename from graphics/pokemon/carbink/follower.png rename to graphics/pokemon/carbink/overworld.png diff --git a/graphics/pokemon/carbink/follow_normal.pal b/graphics/pokemon/carbink/overworld_normal.pal similarity index 100% rename from graphics/pokemon/carbink/follow_normal.pal rename to graphics/pokemon/carbink/overworld_normal.pal diff --git a/graphics/pokemon/carbink/follow_shiny.pal b/graphics/pokemon/carbink/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/carbink/follow_shiny.pal rename to graphics/pokemon/carbink/overworld_shiny.pal diff --git a/graphics/pokemon/carkol/follower.png b/graphics/pokemon/carkol/overworld.png similarity index 100% rename from graphics/pokemon/carkol/follower.png rename to graphics/pokemon/carkol/overworld.png diff --git a/graphics/pokemon/carkol/follow_normal.pal b/graphics/pokemon/carkol/overworld_normal.pal similarity index 100% rename from graphics/pokemon/carkol/follow_normal.pal rename to graphics/pokemon/carkol/overworld_normal.pal diff --git a/graphics/pokemon/carkol/follow_shiny.pal b/graphics/pokemon/carkol/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/carkol/follow_shiny.pal rename to graphics/pokemon/carkol/overworld_shiny.pal diff --git a/graphics/pokemon/carnivine/follower.png b/graphics/pokemon/carnivine/overworld.png similarity index 100% rename from graphics/pokemon/carnivine/follower.png rename to graphics/pokemon/carnivine/overworld.png diff --git a/graphics/pokemon/carnivine/follow_normal.pal b/graphics/pokemon/carnivine/overworld_normal.pal similarity index 100% rename from graphics/pokemon/carnivine/follow_normal.pal rename to graphics/pokemon/carnivine/overworld_normal.pal diff --git a/graphics/pokemon/carnivine/follow_shiny.pal b/graphics/pokemon/carnivine/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/carnivine/follow_shiny.pal rename to graphics/pokemon/carnivine/overworld_shiny.pal diff --git a/graphics/pokemon/carracosta/follower.png b/graphics/pokemon/carracosta/overworld.png similarity index 100% rename from graphics/pokemon/carracosta/follower.png rename to graphics/pokemon/carracosta/overworld.png diff --git a/graphics/pokemon/carracosta/follow_normal.pal b/graphics/pokemon/carracosta/overworld_normal.pal similarity index 100% rename from graphics/pokemon/carracosta/follow_normal.pal rename to graphics/pokemon/carracosta/overworld_normal.pal diff --git a/graphics/pokemon/carracosta/follow_shiny.pal b/graphics/pokemon/carracosta/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/carracosta/follow_shiny.pal rename to graphics/pokemon/carracosta/overworld_shiny.pal diff --git a/graphics/pokemon/carvanha/follower.png b/graphics/pokemon/carvanha/overworld.png similarity index 100% rename from graphics/pokemon/carvanha/follower.png rename to graphics/pokemon/carvanha/overworld.png diff --git a/graphics/pokemon/carvanha/follow_normal.pal b/graphics/pokemon/carvanha/overworld_normal.pal similarity index 100% rename from graphics/pokemon/carvanha/follow_normal.pal rename to graphics/pokemon/carvanha/overworld_normal.pal diff --git a/graphics/pokemon/carvanha/follow_shiny.pal b/graphics/pokemon/carvanha/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/carvanha/follow_shiny.pal rename to graphics/pokemon/carvanha/overworld_shiny.pal diff --git a/graphics/pokemon/cascoon/follower.png b/graphics/pokemon/cascoon/overworld.png similarity index 100% rename from graphics/pokemon/cascoon/follower.png rename to graphics/pokemon/cascoon/overworld.png diff --git a/graphics/pokemon/cascoon/follow_normal.pal b/graphics/pokemon/cascoon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cascoon/follow_normal.pal rename to graphics/pokemon/cascoon/overworld_normal.pal diff --git a/graphics/pokemon/cascoon/follow_shiny.pal b/graphics/pokemon/cascoon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cascoon/follow_shiny.pal rename to graphics/pokemon/cascoon/overworld_shiny.pal diff --git a/graphics/pokemon/castform/follower.png b/graphics/pokemon/castform/overworld.png similarity index 100% rename from graphics/pokemon/castform/follower.png rename to graphics/pokemon/castform/overworld.png diff --git a/graphics/pokemon/castform/follow_normal.pal b/graphics/pokemon/castform/overworld_normal.pal similarity index 100% rename from graphics/pokemon/castform/follow_normal.pal rename to graphics/pokemon/castform/overworld_normal.pal diff --git a/graphics/pokemon/castform/follow_shiny.pal b/graphics/pokemon/castform/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/castform/follow_shiny.pal rename to graphics/pokemon/castform/overworld_shiny.pal diff --git a/graphics/pokemon/castform/rainy/follower.png b/graphics/pokemon/castform/rainy/overworld.png similarity index 100% rename from graphics/pokemon/castform/rainy/follower.png rename to graphics/pokemon/castform/rainy/overworld.png diff --git a/graphics/pokemon/castform/rainy/follow_normal.pal b/graphics/pokemon/castform/rainy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/castform/rainy/follow_normal.pal rename to graphics/pokemon/castform/rainy/overworld_normal.pal diff --git a/graphics/pokemon/castform/rainy/follow_shiny.pal b/graphics/pokemon/castform/rainy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/castform/rainy/follow_shiny.pal rename to graphics/pokemon/castform/rainy/overworld_shiny.pal diff --git a/graphics/pokemon/castform/snowy/follower.png b/graphics/pokemon/castform/snowy/overworld.png similarity index 100% rename from graphics/pokemon/castform/snowy/follower.png rename to graphics/pokemon/castform/snowy/overworld.png diff --git a/graphics/pokemon/castform/snowy/follow_normal.pal b/graphics/pokemon/castform/snowy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/castform/snowy/follow_normal.pal rename to graphics/pokemon/castform/snowy/overworld_normal.pal diff --git a/graphics/pokemon/castform/snowy/follow_shiny.pal b/graphics/pokemon/castform/snowy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/castform/snowy/follow_shiny.pal rename to graphics/pokemon/castform/snowy/overworld_shiny.pal diff --git a/graphics/pokemon/castform/sunny/follower.png b/graphics/pokemon/castform/sunny/overworld.png similarity index 100% rename from graphics/pokemon/castform/sunny/follower.png rename to graphics/pokemon/castform/sunny/overworld.png diff --git a/graphics/pokemon/castform/sunny/follow_normal.pal b/graphics/pokemon/castform/sunny/overworld_normal.pal similarity index 100% rename from graphics/pokemon/castform/sunny/follow_normal.pal rename to graphics/pokemon/castform/sunny/overworld_normal.pal diff --git a/graphics/pokemon/castform/sunny/follow_shiny.pal b/graphics/pokemon/castform/sunny/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/castform/sunny/follow_shiny.pal rename to graphics/pokemon/castform/sunny/overworld_shiny.pal diff --git a/graphics/pokemon/caterpie/follower.png b/graphics/pokemon/caterpie/overworld.png similarity index 100% rename from graphics/pokemon/caterpie/follower.png rename to graphics/pokemon/caterpie/overworld.png diff --git a/graphics/pokemon/caterpie/follow_normal.pal b/graphics/pokemon/caterpie/overworld_normal.pal similarity index 100% rename from graphics/pokemon/caterpie/follow_normal.pal rename to graphics/pokemon/caterpie/overworld_normal.pal diff --git a/graphics/pokemon/caterpie/follow_shiny.pal b/graphics/pokemon/caterpie/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/caterpie/follow_shiny.pal rename to graphics/pokemon/caterpie/overworld_shiny.pal diff --git a/graphics/pokemon/celebi/follower.png b/graphics/pokemon/celebi/overworld.png similarity index 100% rename from graphics/pokemon/celebi/follower.png rename to graphics/pokemon/celebi/overworld.png diff --git a/graphics/pokemon/celebi/follow_normal.pal b/graphics/pokemon/celebi/overworld_normal.pal similarity index 100% rename from graphics/pokemon/celebi/follow_normal.pal rename to graphics/pokemon/celebi/overworld_normal.pal diff --git a/graphics/pokemon/celebi/follow_shiny.pal b/graphics/pokemon/celebi/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/celebi/follow_shiny.pal rename to graphics/pokemon/celebi/overworld_shiny.pal diff --git a/graphics/pokemon/celesteela/follower.png b/graphics/pokemon/celesteela/overworld.png similarity index 100% rename from graphics/pokemon/celesteela/follower.png rename to graphics/pokemon/celesteela/overworld.png diff --git a/graphics/pokemon/celesteela/follow_normal.pal b/graphics/pokemon/celesteela/overworld_normal.pal similarity index 100% rename from graphics/pokemon/celesteela/follow_normal.pal rename to graphics/pokemon/celesteela/overworld_normal.pal diff --git a/graphics/pokemon/celesteela/follow_shiny.pal b/graphics/pokemon/celesteela/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/celesteela/follow_shiny.pal rename to graphics/pokemon/celesteela/overworld_shiny.pal diff --git a/graphics/pokemon/centiskorch/follower.png b/graphics/pokemon/centiskorch/overworld.png similarity index 100% rename from graphics/pokemon/centiskorch/follower.png rename to graphics/pokemon/centiskorch/overworld.png diff --git a/graphics/pokemon/centiskorch/follow_normal.pal b/graphics/pokemon/centiskorch/overworld_normal.pal similarity index 100% rename from graphics/pokemon/centiskorch/follow_normal.pal rename to graphics/pokemon/centiskorch/overworld_normal.pal diff --git a/graphics/pokemon/centiskorch/follow_shiny.pal b/graphics/pokemon/centiskorch/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/centiskorch/follow_shiny.pal rename to graphics/pokemon/centiskorch/overworld_shiny.pal diff --git a/graphics/pokemon/chandelure/follower.png b/graphics/pokemon/chandelure/overworld.png similarity index 100% rename from graphics/pokemon/chandelure/follower.png rename to graphics/pokemon/chandelure/overworld.png diff --git a/graphics/pokemon/chandelure/follow_normal.pal b/graphics/pokemon/chandelure/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chandelure/follow_normal.pal rename to graphics/pokemon/chandelure/overworld_normal.pal diff --git a/graphics/pokemon/chandelure/follow_shiny.pal b/graphics/pokemon/chandelure/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chandelure/follow_shiny.pal rename to graphics/pokemon/chandelure/overworld_shiny.pal diff --git a/graphics/pokemon/chansey/follower.png b/graphics/pokemon/chansey/overworld.png similarity index 100% rename from graphics/pokemon/chansey/follower.png rename to graphics/pokemon/chansey/overworld.png diff --git a/graphics/pokemon/chansey/follow_normal.pal b/graphics/pokemon/chansey/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chansey/follow_normal.pal rename to graphics/pokemon/chansey/overworld_normal.pal diff --git a/graphics/pokemon/chansey/follow_shiny.pal b/graphics/pokemon/chansey/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chansey/follow_shiny.pal rename to graphics/pokemon/chansey/overworld_shiny.pal diff --git a/graphics/pokemon/charizard/follower.png b/graphics/pokemon/charizard/overworld.png similarity index 100% rename from graphics/pokemon/charizard/follower.png rename to graphics/pokemon/charizard/overworld.png diff --git a/graphics/pokemon/charizard/follow_normal.pal b/graphics/pokemon/charizard/overworld_normal.pal similarity index 100% rename from graphics/pokemon/charizard/follow_normal.pal rename to graphics/pokemon/charizard/overworld_normal.pal diff --git a/graphics/pokemon/charizard/follow_shiny.pal b/graphics/pokemon/charizard/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/charizard/follow_shiny.pal rename to graphics/pokemon/charizard/overworld_shiny.pal diff --git a/graphics/pokemon/charjabug/follower.png b/graphics/pokemon/charjabug/overworld.png similarity index 100% rename from graphics/pokemon/charjabug/follower.png rename to graphics/pokemon/charjabug/overworld.png diff --git a/graphics/pokemon/charjabug/follow_normal.pal b/graphics/pokemon/charjabug/overworld_normal.pal similarity index 100% rename from graphics/pokemon/charjabug/follow_normal.pal rename to graphics/pokemon/charjabug/overworld_normal.pal diff --git a/graphics/pokemon/charjabug/follow_shiny.pal b/graphics/pokemon/charjabug/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/charjabug/follow_shiny.pal rename to graphics/pokemon/charjabug/overworld_shiny.pal diff --git a/graphics/pokemon/charmander/follower.png b/graphics/pokemon/charmander/overworld.png similarity index 100% rename from graphics/pokemon/charmander/follower.png rename to graphics/pokemon/charmander/overworld.png diff --git a/graphics/pokemon/charmander/follow_normal.pal b/graphics/pokemon/charmander/overworld_normal.pal similarity index 100% rename from graphics/pokemon/charmander/follow_normal.pal rename to graphics/pokemon/charmander/overworld_normal.pal diff --git a/graphics/pokemon/charmander/follow_shiny.pal b/graphics/pokemon/charmander/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/charmander/follow_shiny.pal rename to graphics/pokemon/charmander/overworld_shiny.pal diff --git a/graphics/pokemon/charmeleon/follower.png b/graphics/pokemon/charmeleon/overworld.png similarity index 100% rename from graphics/pokemon/charmeleon/follower.png rename to graphics/pokemon/charmeleon/overworld.png diff --git a/graphics/pokemon/charmeleon/follow_normal.pal b/graphics/pokemon/charmeleon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/charmeleon/follow_normal.pal rename to graphics/pokemon/charmeleon/overworld_normal.pal diff --git a/graphics/pokemon/charmeleon/follow_shiny.pal b/graphics/pokemon/charmeleon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/charmeleon/follow_shiny.pal rename to graphics/pokemon/charmeleon/overworld_shiny.pal diff --git a/graphics/pokemon/chatot/follower.png b/graphics/pokemon/chatot/overworld.png similarity index 100% rename from graphics/pokemon/chatot/follower.png rename to graphics/pokemon/chatot/overworld.png diff --git a/graphics/pokemon/chatot/follow_normal.pal b/graphics/pokemon/chatot/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chatot/follow_normal.pal rename to graphics/pokemon/chatot/overworld_normal.pal diff --git a/graphics/pokemon/chatot/follow_shiny.pal b/graphics/pokemon/chatot/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chatot/follow_shiny.pal rename to graphics/pokemon/chatot/overworld_shiny.pal diff --git a/graphics/pokemon/cherrim/follower.png b/graphics/pokemon/cherrim/overworld.png similarity index 100% rename from graphics/pokemon/cherrim/follower.png rename to graphics/pokemon/cherrim/overworld.png diff --git a/graphics/pokemon/cherrim/follow_normal.pal b/graphics/pokemon/cherrim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cherrim/follow_normal.pal rename to graphics/pokemon/cherrim/overworld_normal.pal diff --git a/graphics/pokemon/cherrim/follow_shiny.pal b/graphics/pokemon/cherrim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cherrim/follow_shiny.pal rename to graphics/pokemon/cherrim/overworld_shiny.pal diff --git a/graphics/pokemon/cherubi/follower.png b/graphics/pokemon/cherubi/overworld.png similarity index 100% rename from graphics/pokemon/cherubi/follower.png rename to graphics/pokemon/cherubi/overworld.png diff --git a/graphics/pokemon/cherubi/follow_normal.pal b/graphics/pokemon/cherubi/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cherubi/follow_normal.pal rename to graphics/pokemon/cherubi/overworld_normal.pal diff --git a/graphics/pokemon/cherubi/follow_shiny.pal b/graphics/pokemon/cherubi/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cherubi/follow_shiny.pal rename to graphics/pokemon/cherubi/overworld_shiny.pal diff --git a/graphics/pokemon/chesnaught/follower.png b/graphics/pokemon/chesnaught/overworld.png similarity index 100% rename from graphics/pokemon/chesnaught/follower.png rename to graphics/pokemon/chesnaught/overworld.png diff --git a/graphics/pokemon/chesnaught/follow_normal.pal b/graphics/pokemon/chesnaught/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chesnaught/follow_normal.pal rename to graphics/pokemon/chesnaught/overworld_normal.pal diff --git a/graphics/pokemon/chesnaught/follow_shiny.pal b/graphics/pokemon/chesnaught/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chesnaught/follow_shiny.pal rename to graphics/pokemon/chesnaught/overworld_shiny.pal diff --git a/graphics/pokemon/chespin/follower.png b/graphics/pokemon/chespin/overworld.png similarity index 100% rename from graphics/pokemon/chespin/follower.png rename to graphics/pokemon/chespin/overworld.png diff --git a/graphics/pokemon/chespin/follow_normal.pal b/graphics/pokemon/chespin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chespin/follow_normal.pal rename to graphics/pokemon/chespin/overworld_normal.pal diff --git a/graphics/pokemon/chespin/follow_shiny.pal b/graphics/pokemon/chespin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chespin/follow_shiny.pal rename to graphics/pokemon/chespin/overworld_shiny.pal diff --git a/graphics/pokemon/chewtle/follower.png b/graphics/pokemon/chewtle/overworld.png similarity index 100% rename from graphics/pokemon/chewtle/follower.png rename to graphics/pokemon/chewtle/overworld.png diff --git a/graphics/pokemon/chewtle/follow_normal.pal b/graphics/pokemon/chewtle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chewtle/follow_normal.pal rename to graphics/pokemon/chewtle/overworld_normal.pal diff --git a/graphics/pokemon/chewtle/follow_shiny.pal b/graphics/pokemon/chewtle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chewtle/follow_shiny.pal rename to graphics/pokemon/chewtle/overworld_shiny.pal diff --git a/graphics/pokemon/chikorita/follower.png b/graphics/pokemon/chikorita/overworld.png similarity index 100% rename from graphics/pokemon/chikorita/follower.png rename to graphics/pokemon/chikorita/overworld.png diff --git a/graphics/pokemon/chikorita/follow_normal.pal b/graphics/pokemon/chikorita/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chikorita/follow_normal.pal rename to graphics/pokemon/chikorita/overworld_normal.pal diff --git a/graphics/pokemon/chikorita/follow_shiny.pal b/graphics/pokemon/chikorita/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chikorita/follow_shiny.pal rename to graphics/pokemon/chikorita/overworld_shiny.pal diff --git a/graphics/pokemon/chimchar/follower.png b/graphics/pokemon/chimchar/overworld.png similarity index 100% rename from graphics/pokemon/chimchar/follower.png rename to graphics/pokemon/chimchar/overworld.png diff --git a/graphics/pokemon/chimchar/follow_normal.pal b/graphics/pokemon/chimchar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chimchar/follow_normal.pal rename to graphics/pokemon/chimchar/overworld_normal.pal diff --git a/graphics/pokemon/chimchar/follow_shiny.pal b/graphics/pokemon/chimchar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chimchar/follow_shiny.pal rename to graphics/pokemon/chimchar/overworld_shiny.pal diff --git a/graphics/pokemon/chimecho/follower.png b/graphics/pokemon/chimecho/overworld.png similarity index 100% rename from graphics/pokemon/chimecho/follower.png rename to graphics/pokemon/chimecho/overworld.png diff --git a/graphics/pokemon/chimecho/follow_normal.pal b/graphics/pokemon/chimecho/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chimecho/follow_normal.pal rename to graphics/pokemon/chimecho/overworld_normal.pal diff --git a/graphics/pokemon/chimecho/follow_shiny.pal b/graphics/pokemon/chimecho/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chimecho/follow_shiny.pal rename to graphics/pokemon/chimecho/overworld_shiny.pal diff --git a/graphics/pokemon/chinchou/follower.png b/graphics/pokemon/chinchou/overworld.png similarity index 100% rename from graphics/pokemon/chinchou/follower.png rename to graphics/pokemon/chinchou/overworld.png diff --git a/graphics/pokemon/chinchou/follow_normal.pal b/graphics/pokemon/chinchou/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chinchou/follow_normal.pal rename to graphics/pokemon/chinchou/overworld_normal.pal diff --git a/graphics/pokemon/chinchou/follow_shiny.pal b/graphics/pokemon/chinchou/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chinchou/follow_shiny.pal rename to graphics/pokemon/chinchou/overworld_shiny.pal diff --git a/graphics/pokemon/chingling/follower.png b/graphics/pokemon/chingling/overworld.png similarity index 100% rename from graphics/pokemon/chingling/follower.png rename to graphics/pokemon/chingling/overworld.png diff --git a/graphics/pokemon/chingling/follow_normal.pal b/graphics/pokemon/chingling/overworld_normal.pal similarity index 100% rename from graphics/pokemon/chingling/follow_normal.pal rename to graphics/pokemon/chingling/overworld_normal.pal diff --git a/graphics/pokemon/chingling/follow_shiny.pal b/graphics/pokemon/chingling/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/chingling/follow_shiny.pal rename to graphics/pokemon/chingling/overworld_shiny.pal diff --git a/graphics/pokemon/cinccino/follower.png b/graphics/pokemon/cinccino/overworld.png similarity index 100% rename from graphics/pokemon/cinccino/follower.png rename to graphics/pokemon/cinccino/overworld.png diff --git a/graphics/pokemon/cinccino/follow_normal.pal b/graphics/pokemon/cinccino/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cinccino/follow_normal.pal rename to graphics/pokemon/cinccino/overworld_normal.pal diff --git a/graphics/pokemon/cinccino/follow_shiny.pal b/graphics/pokemon/cinccino/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cinccino/follow_shiny.pal rename to graphics/pokemon/cinccino/overworld_shiny.pal diff --git a/graphics/pokemon/cinderace/follower.png b/graphics/pokemon/cinderace/overworld.png similarity index 100% rename from graphics/pokemon/cinderace/follower.png rename to graphics/pokemon/cinderace/overworld.png diff --git a/graphics/pokemon/cinderace/follow_normal.pal b/graphics/pokemon/cinderace/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cinderace/follow_normal.pal rename to graphics/pokemon/cinderace/overworld_normal.pal diff --git a/graphics/pokemon/cinderace/follow_shiny.pal b/graphics/pokemon/cinderace/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cinderace/follow_shiny.pal rename to graphics/pokemon/cinderace/overworld_shiny.pal diff --git a/graphics/pokemon/clamperl/follower.png b/graphics/pokemon/clamperl/overworld.png similarity index 100% rename from graphics/pokemon/clamperl/follower.png rename to graphics/pokemon/clamperl/overworld.png diff --git a/graphics/pokemon/clamperl/follow_normal.pal b/graphics/pokemon/clamperl/overworld_normal.pal similarity index 100% rename from graphics/pokemon/clamperl/follow_normal.pal rename to graphics/pokemon/clamperl/overworld_normal.pal diff --git a/graphics/pokemon/clamperl/follow_shiny.pal b/graphics/pokemon/clamperl/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/clamperl/follow_shiny.pal rename to graphics/pokemon/clamperl/overworld_shiny.pal diff --git a/graphics/pokemon/clauncher/follower.png b/graphics/pokemon/clauncher/overworld.png similarity index 100% rename from graphics/pokemon/clauncher/follower.png rename to graphics/pokemon/clauncher/overworld.png diff --git a/graphics/pokemon/clauncher/follow_normal.pal b/graphics/pokemon/clauncher/overworld_normal.pal similarity index 100% rename from graphics/pokemon/clauncher/follow_normal.pal rename to graphics/pokemon/clauncher/overworld_normal.pal diff --git a/graphics/pokemon/clauncher/follow_shiny.pal b/graphics/pokemon/clauncher/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/clauncher/follow_shiny.pal rename to graphics/pokemon/clauncher/overworld_shiny.pal diff --git a/graphics/pokemon/clawitzer/follower.png b/graphics/pokemon/clawitzer/overworld.png similarity index 100% rename from graphics/pokemon/clawitzer/follower.png rename to graphics/pokemon/clawitzer/overworld.png diff --git a/graphics/pokemon/clawitzer/follow_normal.pal b/graphics/pokemon/clawitzer/overworld_normal.pal similarity index 100% rename from graphics/pokemon/clawitzer/follow_normal.pal rename to graphics/pokemon/clawitzer/overworld_normal.pal diff --git a/graphics/pokemon/clawitzer/follow_shiny.pal b/graphics/pokemon/clawitzer/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/clawitzer/follow_shiny.pal rename to graphics/pokemon/clawitzer/overworld_shiny.pal diff --git a/graphics/pokemon/claydol/follower.png b/graphics/pokemon/claydol/overworld.png similarity index 100% rename from graphics/pokemon/claydol/follower.png rename to graphics/pokemon/claydol/overworld.png diff --git a/graphics/pokemon/claydol/follow_normal.pal b/graphics/pokemon/claydol/overworld_normal.pal similarity index 100% rename from graphics/pokemon/claydol/follow_normal.pal rename to graphics/pokemon/claydol/overworld_normal.pal diff --git a/graphics/pokemon/claydol/follow_shiny.pal b/graphics/pokemon/claydol/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/claydol/follow_shiny.pal rename to graphics/pokemon/claydol/overworld_shiny.pal diff --git a/graphics/pokemon/clefable/follower.png b/graphics/pokemon/clefable/overworld.png similarity index 100% rename from graphics/pokemon/clefable/follower.png rename to graphics/pokemon/clefable/overworld.png diff --git a/graphics/pokemon/clefable/follow_normal.pal b/graphics/pokemon/clefable/overworld_normal.pal similarity index 100% rename from graphics/pokemon/clefable/follow_normal.pal rename to graphics/pokemon/clefable/overworld_normal.pal diff --git a/graphics/pokemon/clefable/follow_shiny.pal b/graphics/pokemon/clefable/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/clefable/follow_shiny.pal rename to graphics/pokemon/clefable/overworld_shiny.pal diff --git a/graphics/pokemon/clefairy/follower.png b/graphics/pokemon/clefairy/overworld.png similarity index 100% rename from graphics/pokemon/clefairy/follower.png rename to graphics/pokemon/clefairy/overworld.png diff --git a/graphics/pokemon/clefairy/follow_normal.pal b/graphics/pokemon/clefairy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/clefairy/follow_normal.pal rename to graphics/pokemon/clefairy/overworld_normal.pal diff --git a/graphics/pokemon/clefairy/follow_shiny.pal b/graphics/pokemon/clefairy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/clefairy/follow_shiny.pal rename to graphics/pokemon/clefairy/overworld_shiny.pal diff --git a/graphics/pokemon/cleffa/follower.png b/graphics/pokemon/cleffa/overworld.png similarity index 100% rename from graphics/pokemon/cleffa/follower.png rename to graphics/pokemon/cleffa/overworld.png diff --git a/graphics/pokemon/cleffa/follow_normal.pal b/graphics/pokemon/cleffa/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cleffa/follow_normal.pal rename to graphics/pokemon/cleffa/overworld_normal.pal diff --git a/graphics/pokemon/cleffa/follow_shiny.pal b/graphics/pokemon/cleffa/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cleffa/follow_shiny.pal rename to graphics/pokemon/cleffa/overworld_shiny.pal diff --git a/graphics/pokemon/clobbopus/follower.png b/graphics/pokemon/clobbopus/overworld.png similarity index 100% rename from graphics/pokemon/clobbopus/follower.png rename to graphics/pokemon/clobbopus/overworld.png diff --git a/graphics/pokemon/clobbopus/follow_normal.pal b/graphics/pokemon/clobbopus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/clobbopus/follow_normal.pal rename to graphics/pokemon/clobbopus/overworld_normal.pal diff --git a/graphics/pokemon/clobbopus/follow_shiny.pal b/graphics/pokemon/clobbopus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/clobbopus/follow_shiny.pal rename to graphics/pokemon/clobbopus/overworld_shiny.pal diff --git a/graphics/pokemon/cloyster/follower.png b/graphics/pokemon/cloyster/overworld.png similarity index 100% rename from graphics/pokemon/cloyster/follower.png rename to graphics/pokemon/cloyster/overworld.png diff --git a/graphics/pokemon/cloyster/follow_normal.pal b/graphics/pokemon/cloyster/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cloyster/follow_normal.pal rename to graphics/pokemon/cloyster/overworld_normal.pal diff --git a/graphics/pokemon/cloyster/follow_shiny.pal b/graphics/pokemon/cloyster/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cloyster/follow_shiny.pal rename to graphics/pokemon/cloyster/overworld_shiny.pal diff --git a/graphics/pokemon/coalossal/follower.png b/graphics/pokemon/coalossal/overworld.png similarity index 100% rename from graphics/pokemon/coalossal/follower.png rename to graphics/pokemon/coalossal/overworld.png diff --git a/graphics/pokemon/coalossal/follow_normal.pal b/graphics/pokemon/coalossal/overworld_normal.pal similarity index 100% rename from graphics/pokemon/coalossal/follow_normal.pal rename to graphics/pokemon/coalossal/overworld_normal.pal diff --git a/graphics/pokemon/coalossal/follow_shiny.pal b/graphics/pokemon/coalossal/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/coalossal/follow_shiny.pal rename to graphics/pokemon/coalossal/overworld_shiny.pal diff --git a/graphics/pokemon/cobalion/follower.png b/graphics/pokemon/cobalion/overworld.png similarity index 100% rename from graphics/pokemon/cobalion/follower.png rename to graphics/pokemon/cobalion/overworld.png diff --git a/graphics/pokemon/cobalion/follow_normal.pal b/graphics/pokemon/cobalion/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cobalion/follow_normal.pal rename to graphics/pokemon/cobalion/overworld_normal.pal diff --git a/graphics/pokemon/cobalion/follow_shiny.pal b/graphics/pokemon/cobalion/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cobalion/follow_shiny.pal rename to graphics/pokemon/cobalion/overworld_shiny.pal diff --git a/graphics/pokemon/cofagrigus/follower.png b/graphics/pokemon/cofagrigus/overworld.png similarity index 100% rename from graphics/pokemon/cofagrigus/follower.png rename to graphics/pokemon/cofagrigus/overworld.png diff --git a/graphics/pokemon/cofagrigus/follow_normal.pal b/graphics/pokemon/cofagrigus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cofagrigus/follow_normal.pal rename to graphics/pokemon/cofagrigus/overworld_normal.pal diff --git a/graphics/pokemon/cofagrigus/follow_shiny.pal b/graphics/pokemon/cofagrigus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cofagrigus/follow_shiny.pal rename to graphics/pokemon/cofagrigus/overworld_shiny.pal diff --git a/graphics/pokemon/combee/follower.png b/graphics/pokemon/combee/overworld.png similarity index 100% rename from graphics/pokemon/combee/follower.png rename to graphics/pokemon/combee/overworld.png diff --git a/graphics/pokemon/combee/follow_normal.pal b/graphics/pokemon/combee/overworld_normal.pal similarity index 100% rename from graphics/pokemon/combee/follow_normal.pal rename to graphics/pokemon/combee/overworld_normal.pal diff --git a/graphics/pokemon/combee/follow_shiny.pal b/graphics/pokemon/combee/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/combee/follow_shiny.pal rename to graphics/pokemon/combee/overworld_shiny.pal diff --git a/graphics/pokemon/combusken/follower.png b/graphics/pokemon/combusken/overworld.png similarity index 100% rename from graphics/pokemon/combusken/follower.png rename to graphics/pokemon/combusken/overworld.png diff --git a/graphics/pokemon/combusken/follow_normal.pal b/graphics/pokemon/combusken/overworld_normal.pal similarity index 100% rename from graphics/pokemon/combusken/follow_normal.pal rename to graphics/pokemon/combusken/overworld_normal.pal diff --git a/graphics/pokemon/combusken/follow_shiny.pal b/graphics/pokemon/combusken/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/combusken/follow_shiny.pal rename to graphics/pokemon/combusken/overworld_shiny.pal diff --git a/graphics/pokemon/comfey/follower.png b/graphics/pokemon/comfey/overworld.png similarity index 100% rename from graphics/pokemon/comfey/follower.png rename to graphics/pokemon/comfey/overworld.png diff --git a/graphics/pokemon/comfey/follow_normal.pal b/graphics/pokemon/comfey/overworld_normal.pal similarity index 100% rename from graphics/pokemon/comfey/follow_normal.pal rename to graphics/pokemon/comfey/overworld_normal.pal diff --git a/graphics/pokemon/comfey/follow_shiny.pal b/graphics/pokemon/comfey/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/comfey/follow_shiny.pal rename to graphics/pokemon/comfey/overworld_shiny.pal diff --git a/graphics/pokemon/conkeldurr/follower.png b/graphics/pokemon/conkeldurr/overworld.png similarity index 100% rename from graphics/pokemon/conkeldurr/follower.png rename to graphics/pokemon/conkeldurr/overworld.png diff --git a/graphics/pokemon/conkeldurr/follow_normal.pal b/graphics/pokemon/conkeldurr/overworld_normal.pal similarity index 100% rename from graphics/pokemon/conkeldurr/follow_normal.pal rename to graphics/pokemon/conkeldurr/overworld_normal.pal diff --git a/graphics/pokemon/conkeldurr/follow_shiny.pal b/graphics/pokemon/conkeldurr/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/conkeldurr/follow_shiny.pal rename to graphics/pokemon/conkeldurr/overworld_shiny.pal diff --git a/graphics/pokemon/copperajah/follower.png b/graphics/pokemon/copperajah/overworld.png similarity index 100% rename from graphics/pokemon/copperajah/follower.png rename to graphics/pokemon/copperajah/overworld.png diff --git a/graphics/pokemon/copperajah/follow_normal.pal b/graphics/pokemon/copperajah/overworld_normal.pal similarity index 100% rename from graphics/pokemon/copperajah/follow_normal.pal rename to graphics/pokemon/copperajah/overworld_normal.pal diff --git a/graphics/pokemon/copperajah/follow_shiny.pal b/graphics/pokemon/copperajah/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/copperajah/follow_shiny.pal rename to graphics/pokemon/copperajah/overworld_shiny.pal diff --git a/graphics/pokemon/corphish/follower.png b/graphics/pokemon/corphish/overworld.png similarity index 100% rename from graphics/pokemon/corphish/follower.png rename to graphics/pokemon/corphish/overworld.png diff --git a/graphics/pokemon/corphish/follow_normal.pal b/graphics/pokemon/corphish/overworld_normal.pal similarity index 100% rename from graphics/pokemon/corphish/follow_normal.pal rename to graphics/pokemon/corphish/overworld_normal.pal diff --git a/graphics/pokemon/corphish/follow_shiny.pal b/graphics/pokemon/corphish/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/corphish/follow_shiny.pal rename to graphics/pokemon/corphish/overworld_shiny.pal diff --git a/graphics/pokemon/corsola/galarian/follower.png b/graphics/pokemon/corsola/galarian/overworld.png similarity index 100% rename from graphics/pokemon/corsola/galarian/follower.png rename to graphics/pokemon/corsola/galarian/overworld.png diff --git a/graphics/pokemon/corsola/galarian/follow_normal.pal b/graphics/pokemon/corsola/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/corsola/galarian/follow_normal.pal rename to graphics/pokemon/corsola/galarian/overworld_normal.pal diff --git a/graphics/pokemon/corsola/galarian/follow_shiny.pal b/graphics/pokemon/corsola/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/corsola/galarian/follow_shiny.pal rename to graphics/pokemon/corsola/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/corsola/follower.png b/graphics/pokemon/corsola/overworld.png similarity index 100% rename from graphics/pokemon/corsola/follower.png rename to graphics/pokemon/corsola/overworld.png diff --git a/graphics/pokemon/corsola/follow_normal.pal b/graphics/pokemon/corsola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/corsola/follow_normal.pal rename to graphics/pokemon/corsola/overworld_normal.pal diff --git a/graphics/pokemon/corsola/follow_shiny.pal b/graphics/pokemon/corsola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/corsola/follow_shiny.pal rename to graphics/pokemon/corsola/overworld_shiny.pal diff --git a/graphics/pokemon/corviknight/follower.png b/graphics/pokemon/corviknight/overworld.png similarity index 100% rename from graphics/pokemon/corviknight/follower.png rename to graphics/pokemon/corviknight/overworld.png diff --git a/graphics/pokemon/corviknight/follow_normal.pal b/graphics/pokemon/corviknight/overworld_normal.pal similarity index 100% rename from graphics/pokemon/corviknight/follow_normal.pal rename to graphics/pokemon/corviknight/overworld_normal.pal diff --git a/graphics/pokemon/corviknight/follow_shiny.pal b/graphics/pokemon/corviknight/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/corviknight/follow_shiny.pal rename to graphics/pokemon/corviknight/overworld_shiny.pal diff --git a/graphics/pokemon/corvisquire/follower.png b/graphics/pokemon/corvisquire/overworld.png similarity index 100% rename from graphics/pokemon/corvisquire/follower.png rename to graphics/pokemon/corvisquire/overworld.png diff --git a/graphics/pokemon/corvisquire/follow_normal.pal b/graphics/pokemon/corvisquire/overworld_normal.pal similarity index 100% rename from graphics/pokemon/corvisquire/follow_normal.pal rename to graphics/pokemon/corvisquire/overworld_normal.pal diff --git a/graphics/pokemon/corvisquire/follow_shiny.pal b/graphics/pokemon/corvisquire/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/corvisquire/follow_shiny.pal rename to graphics/pokemon/corvisquire/overworld_shiny.pal diff --git a/graphics/pokemon/cosmoem/follower.png b/graphics/pokemon/cosmoem/overworld.png similarity index 100% rename from graphics/pokemon/cosmoem/follower.png rename to graphics/pokemon/cosmoem/overworld.png diff --git a/graphics/pokemon/cosmoem/follow_normal.pal b/graphics/pokemon/cosmoem/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cosmoem/follow_normal.pal rename to graphics/pokemon/cosmoem/overworld_normal.pal diff --git a/graphics/pokemon/cosmoem/follow_shiny.pal b/graphics/pokemon/cosmoem/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cosmoem/follow_shiny.pal rename to graphics/pokemon/cosmoem/overworld_shiny.pal diff --git a/graphics/pokemon/cosmog/follower.png b/graphics/pokemon/cosmog/overworld.png similarity index 100% rename from graphics/pokemon/cosmog/follower.png rename to graphics/pokemon/cosmog/overworld.png diff --git a/graphics/pokemon/cosmog/follow_normal.pal b/graphics/pokemon/cosmog/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cosmog/follow_normal.pal rename to graphics/pokemon/cosmog/overworld_normal.pal diff --git a/graphics/pokemon/cosmog/follow_shiny.pal b/graphics/pokemon/cosmog/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cosmog/follow_shiny.pal rename to graphics/pokemon/cosmog/overworld_shiny.pal diff --git a/graphics/pokemon/cottonee/follower.png b/graphics/pokemon/cottonee/overworld.png similarity index 100% rename from graphics/pokemon/cottonee/follower.png rename to graphics/pokemon/cottonee/overworld.png diff --git a/graphics/pokemon/cottonee/follow_normal.pal b/graphics/pokemon/cottonee/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cottonee/follow_normal.pal rename to graphics/pokemon/cottonee/overworld_normal.pal diff --git a/graphics/pokemon/cottonee/follow_shiny.pal b/graphics/pokemon/cottonee/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cottonee/follow_shiny.pal rename to graphics/pokemon/cottonee/overworld_shiny.pal diff --git a/graphics/pokemon/crabominable/follower.png b/graphics/pokemon/crabominable/overworld.png similarity index 100% rename from graphics/pokemon/crabominable/follower.png rename to graphics/pokemon/crabominable/overworld.png diff --git a/graphics/pokemon/crabominable/follow_normal.pal b/graphics/pokemon/crabominable/overworld_normal.pal similarity index 100% rename from graphics/pokemon/crabominable/follow_normal.pal rename to graphics/pokemon/crabominable/overworld_normal.pal diff --git a/graphics/pokemon/crabominable/follow_shiny.pal b/graphics/pokemon/crabominable/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/crabominable/follow_shiny.pal rename to graphics/pokemon/crabominable/overworld_shiny.pal diff --git a/graphics/pokemon/crabrawler/follower.png b/graphics/pokemon/crabrawler/overworld.png similarity index 100% rename from graphics/pokemon/crabrawler/follower.png rename to graphics/pokemon/crabrawler/overworld.png diff --git a/graphics/pokemon/crabrawler/follow_normal.pal b/graphics/pokemon/crabrawler/overworld_normal.pal similarity index 100% rename from graphics/pokemon/crabrawler/follow_normal.pal rename to graphics/pokemon/crabrawler/overworld_normal.pal diff --git a/graphics/pokemon/crabrawler/follow_shiny.pal b/graphics/pokemon/crabrawler/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/crabrawler/follow_shiny.pal rename to graphics/pokemon/crabrawler/overworld_shiny.pal diff --git a/graphics/pokemon/cradily/follower.png b/graphics/pokemon/cradily/overworld.png similarity index 100% rename from graphics/pokemon/cradily/follower.png rename to graphics/pokemon/cradily/overworld.png diff --git a/graphics/pokemon/cradily/follow_normal.pal b/graphics/pokemon/cradily/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cradily/follow_normal.pal rename to graphics/pokemon/cradily/overworld_normal.pal diff --git a/graphics/pokemon/cradily/follow_shiny.pal b/graphics/pokemon/cradily/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cradily/follow_shiny.pal rename to graphics/pokemon/cradily/overworld_shiny.pal diff --git a/graphics/pokemon/cramorant/follower.png b/graphics/pokemon/cramorant/overworld.png similarity index 100% rename from graphics/pokemon/cramorant/follower.png rename to graphics/pokemon/cramorant/overworld.png diff --git a/graphics/pokemon/cramorant/follow_normal.pal b/graphics/pokemon/cramorant/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cramorant/follow_normal.pal rename to graphics/pokemon/cramorant/overworld_normal.pal diff --git a/graphics/pokemon/cramorant/follow_shiny.pal b/graphics/pokemon/cramorant/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cramorant/follow_shiny.pal rename to graphics/pokemon/cramorant/overworld_shiny.pal diff --git a/graphics/pokemon/cranidos/follower.png b/graphics/pokemon/cranidos/overworld.png similarity index 100% rename from graphics/pokemon/cranidos/follower.png rename to graphics/pokemon/cranidos/overworld.png diff --git a/graphics/pokemon/cranidos/follow_normal.pal b/graphics/pokemon/cranidos/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cranidos/follow_normal.pal rename to graphics/pokemon/cranidos/overworld_normal.pal diff --git a/graphics/pokemon/cranidos/follow_shiny.pal b/graphics/pokemon/cranidos/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cranidos/follow_shiny.pal rename to graphics/pokemon/cranidos/overworld_shiny.pal diff --git a/graphics/pokemon/crawdaunt/follower.png b/graphics/pokemon/crawdaunt/overworld.png similarity index 100% rename from graphics/pokemon/crawdaunt/follower.png rename to graphics/pokemon/crawdaunt/overworld.png diff --git a/graphics/pokemon/crawdaunt/follow_normal.pal b/graphics/pokemon/crawdaunt/overworld_normal.pal similarity index 100% rename from graphics/pokemon/crawdaunt/follow_normal.pal rename to graphics/pokemon/crawdaunt/overworld_normal.pal diff --git a/graphics/pokemon/crawdaunt/follow_shiny.pal b/graphics/pokemon/crawdaunt/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/crawdaunt/follow_shiny.pal rename to graphics/pokemon/crawdaunt/overworld_shiny.pal diff --git a/graphics/pokemon/cresselia/follower.png b/graphics/pokemon/cresselia/overworld.png similarity index 100% rename from graphics/pokemon/cresselia/follower.png rename to graphics/pokemon/cresselia/overworld.png diff --git a/graphics/pokemon/cresselia/follow_normal.pal b/graphics/pokemon/cresselia/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cresselia/follow_normal.pal rename to graphics/pokemon/cresselia/overworld_normal.pal diff --git a/graphics/pokemon/cresselia/follow_shiny.pal b/graphics/pokemon/cresselia/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cresselia/follow_shiny.pal rename to graphics/pokemon/cresselia/overworld_shiny.pal diff --git a/graphics/pokemon/croagunk/follower.png b/graphics/pokemon/croagunk/overworld.png similarity index 100% rename from graphics/pokemon/croagunk/follower.png rename to graphics/pokemon/croagunk/overworld.png diff --git a/graphics/pokemon/croagunk/follow_normal.pal b/graphics/pokemon/croagunk/overworld_normal.pal similarity index 100% rename from graphics/pokemon/croagunk/follow_normal.pal rename to graphics/pokemon/croagunk/overworld_normal.pal diff --git a/graphics/pokemon/croagunk/follow_shiny.pal b/graphics/pokemon/croagunk/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/croagunk/follow_shiny.pal rename to graphics/pokemon/croagunk/overworld_shiny.pal diff --git a/graphics/pokemon/crobat/follower.png b/graphics/pokemon/crobat/overworld.png similarity index 100% rename from graphics/pokemon/crobat/follower.png rename to graphics/pokemon/crobat/overworld.png diff --git a/graphics/pokemon/crobat/follow_normal.pal b/graphics/pokemon/crobat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/crobat/follow_normal.pal rename to graphics/pokemon/crobat/overworld_normal.pal diff --git a/graphics/pokemon/crobat/follow_shiny.pal b/graphics/pokemon/crobat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/crobat/follow_shiny.pal rename to graphics/pokemon/crobat/overworld_shiny.pal diff --git a/graphics/pokemon/croconaw/follower.png b/graphics/pokemon/croconaw/overworld.png similarity index 100% rename from graphics/pokemon/croconaw/follower.png rename to graphics/pokemon/croconaw/overworld.png diff --git a/graphics/pokemon/croconaw/follow_normal.pal b/graphics/pokemon/croconaw/overworld_normal.pal similarity index 100% rename from graphics/pokemon/croconaw/follow_normal.pal rename to graphics/pokemon/croconaw/overworld_normal.pal diff --git a/graphics/pokemon/croconaw/follow_shiny.pal b/graphics/pokemon/croconaw/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/croconaw/follow_shiny.pal rename to graphics/pokemon/croconaw/overworld_shiny.pal diff --git a/graphics/pokemon/crustle/follower.png b/graphics/pokemon/crustle/overworld.png similarity index 100% rename from graphics/pokemon/crustle/follower.png rename to graphics/pokemon/crustle/overworld.png diff --git a/graphics/pokemon/crustle/follow_normal.pal b/graphics/pokemon/crustle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/crustle/follow_normal.pal rename to graphics/pokemon/crustle/overworld_normal.pal diff --git a/graphics/pokemon/crustle/follow_shiny.pal b/graphics/pokemon/crustle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/crustle/follow_shiny.pal rename to graphics/pokemon/crustle/overworld_shiny.pal diff --git a/graphics/pokemon/cryogonal/follower.png b/graphics/pokemon/cryogonal/overworld.png similarity index 100% rename from graphics/pokemon/cryogonal/follower.png rename to graphics/pokemon/cryogonal/overworld.png diff --git a/graphics/pokemon/cryogonal/follow_normal.pal b/graphics/pokemon/cryogonal/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cryogonal/follow_normal.pal rename to graphics/pokemon/cryogonal/overworld_normal.pal diff --git a/graphics/pokemon/cryogonal/follow_shiny.pal b/graphics/pokemon/cryogonal/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cryogonal/follow_shiny.pal rename to graphics/pokemon/cryogonal/overworld_shiny.pal diff --git a/graphics/pokemon/cubchoo/follower.png b/graphics/pokemon/cubchoo/overworld.png similarity index 100% rename from graphics/pokemon/cubchoo/follower.png rename to graphics/pokemon/cubchoo/overworld.png diff --git a/graphics/pokemon/cubchoo/follow_normal.pal b/graphics/pokemon/cubchoo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cubchoo/follow_normal.pal rename to graphics/pokemon/cubchoo/overworld_normal.pal diff --git a/graphics/pokemon/cubchoo/follow_shiny.pal b/graphics/pokemon/cubchoo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cubchoo/follow_shiny.pal rename to graphics/pokemon/cubchoo/overworld_shiny.pal diff --git a/graphics/pokemon/cubone/follower.png b/graphics/pokemon/cubone/overworld.png similarity index 100% rename from graphics/pokemon/cubone/follower.png rename to graphics/pokemon/cubone/overworld.png diff --git a/graphics/pokemon/cubone/follow_normal.pal b/graphics/pokemon/cubone/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cubone/follow_normal.pal rename to graphics/pokemon/cubone/overworld_normal.pal diff --git a/graphics/pokemon/cubone/follow_shiny.pal b/graphics/pokemon/cubone/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cubone/follow_shiny.pal rename to graphics/pokemon/cubone/overworld_shiny.pal diff --git a/graphics/pokemon/cufant/follower.png b/graphics/pokemon/cufant/overworld.png similarity index 100% rename from graphics/pokemon/cufant/follower.png rename to graphics/pokemon/cufant/overworld.png diff --git a/graphics/pokemon/cufant/follow_normal.pal b/graphics/pokemon/cufant/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cufant/follow_normal.pal rename to graphics/pokemon/cufant/overworld_normal.pal diff --git a/graphics/pokemon/cufant/follow_shiny.pal b/graphics/pokemon/cufant/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cufant/follow_shiny.pal rename to graphics/pokemon/cufant/overworld_shiny.pal diff --git a/graphics/pokemon/cursola/follower.png b/graphics/pokemon/cursola/overworld.png similarity index 100% rename from graphics/pokemon/cursola/follower.png rename to graphics/pokemon/cursola/overworld.png diff --git a/graphics/pokemon/cursola/follow_normal.pal b/graphics/pokemon/cursola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cursola/follow_normal.pal rename to graphics/pokemon/cursola/overworld_normal.pal diff --git a/graphics/pokemon/cursola/follow_shiny.pal b/graphics/pokemon/cursola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cursola/follow_shiny.pal rename to graphics/pokemon/cursola/overworld_shiny.pal diff --git a/graphics/pokemon/cutiefly/follower.png b/graphics/pokemon/cutiefly/overworld.png similarity index 100% rename from graphics/pokemon/cutiefly/follower.png rename to graphics/pokemon/cutiefly/overworld.png diff --git a/graphics/pokemon/cutiefly/follow_normal.pal b/graphics/pokemon/cutiefly/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cutiefly/follow_normal.pal rename to graphics/pokemon/cutiefly/overworld_normal.pal diff --git a/graphics/pokemon/cutiefly/follow_shiny.pal b/graphics/pokemon/cutiefly/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cutiefly/follow_shiny.pal rename to graphics/pokemon/cutiefly/overworld_shiny.pal diff --git a/graphics/pokemon/cyndaquil/follower.png b/graphics/pokemon/cyndaquil/overworld.png similarity index 100% rename from graphics/pokemon/cyndaquil/follower.png rename to graphics/pokemon/cyndaquil/overworld.png diff --git a/graphics/pokemon/cyndaquil/follow_normal.pal b/graphics/pokemon/cyndaquil/overworld_normal.pal similarity index 100% rename from graphics/pokemon/cyndaquil/follow_normal.pal rename to graphics/pokemon/cyndaquil/overworld_normal.pal diff --git a/graphics/pokemon/cyndaquil/follow_shiny.pal b/graphics/pokemon/cyndaquil/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/cyndaquil/follow_shiny.pal rename to graphics/pokemon/cyndaquil/overworld_shiny.pal diff --git a/graphics/pokemon/darkrai/follower.png b/graphics/pokemon/darkrai/overworld.png similarity index 100% rename from graphics/pokemon/darkrai/follower.png rename to graphics/pokemon/darkrai/overworld.png diff --git a/graphics/pokemon/darkrai/follow_normal.pal b/graphics/pokemon/darkrai/overworld_normal.pal similarity index 100% rename from graphics/pokemon/darkrai/follow_normal.pal rename to graphics/pokemon/darkrai/overworld_normal.pal diff --git a/graphics/pokemon/darkrai/follow_shiny.pal b/graphics/pokemon/darkrai/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/darkrai/follow_shiny.pal rename to graphics/pokemon/darkrai/overworld_shiny.pal diff --git a/graphics/pokemon/darmanitan/galarian/follower.png b/graphics/pokemon/darmanitan/galarian/overworld.png similarity index 100% rename from graphics/pokemon/darmanitan/galarian/follower.png rename to graphics/pokemon/darmanitan/galarian/overworld.png diff --git a/graphics/pokemon/darmanitan/galarian/follow_normal.pal b/graphics/pokemon/darmanitan/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/darmanitan/galarian/follow_normal.pal rename to graphics/pokemon/darmanitan/galarian/overworld_normal.pal diff --git a/graphics/pokemon/darmanitan/galarian/follow_shiny.pal b/graphics/pokemon/darmanitan/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/darmanitan/galarian/follow_shiny.pal rename to graphics/pokemon/darmanitan/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/darmanitan/follower.png b/graphics/pokemon/darmanitan/overworld.png similarity index 100% rename from graphics/pokemon/darmanitan/follower.png rename to graphics/pokemon/darmanitan/overworld.png diff --git a/graphics/pokemon/darmanitan/follow_normal.pal b/graphics/pokemon/darmanitan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/darmanitan/follow_normal.pal rename to graphics/pokemon/darmanitan/overworld_normal.pal diff --git a/graphics/pokemon/darmanitan/follow_shiny.pal b/graphics/pokemon/darmanitan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/darmanitan/follow_shiny.pal rename to graphics/pokemon/darmanitan/overworld_shiny.pal diff --git a/graphics/pokemon/dartrix/follower.png b/graphics/pokemon/dartrix/overworld.png similarity index 100% rename from graphics/pokemon/dartrix/follower.png rename to graphics/pokemon/dartrix/overworld.png diff --git a/graphics/pokemon/dartrix/follow_normal.pal b/graphics/pokemon/dartrix/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dartrix/follow_normal.pal rename to graphics/pokemon/dartrix/overworld_normal.pal diff --git a/graphics/pokemon/dartrix/follow_shiny.pal b/graphics/pokemon/dartrix/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dartrix/follow_shiny.pal rename to graphics/pokemon/dartrix/overworld_shiny.pal diff --git a/graphics/pokemon/darumaka/galarian/follower.png b/graphics/pokemon/darumaka/galarian/overworld.png similarity index 100% rename from graphics/pokemon/darumaka/galarian/follower.png rename to graphics/pokemon/darumaka/galarian/overworld.png diff --git a/graphics/pokemon/darumaka/galarian/follow_normal.pal b/graphics/pokemon/darumaka/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/darumaka/galarian/follow_normal.pal rename to graphics/pokemon/darumaka/galarian/overworld_normal.pal diff --git a/graphics/pokemon/darumaka/galarian/follow_shiny.pal b/graphics/pokemon/darumaka/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/darumaka/galarian/follow_shiny.pal rename to graphics/pokemon/darumaka/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/darumaka/follower.png b/graphics/pokemon/darumaka/overworld.png similarity index 100% rename from graphics/pokemon/darumaka/follower.png rename to graphics/pokemon/darumaka/overworld.png diff --git a/graphics/pokemon/darumaka/follow_normal.pal b/graphics/pokemon/darumaka/overworld_normal.pal similarity index 100% rename from graphics/pokemon/darumaka/follow_normal.pal rename to graphics/pokemon/darumaka/overworld_normal.pal diff --git a/graphics/pokemon/darumaka/follow_shiny.pal b/graphics/pokemon/darumaka/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/darumaka/follow_shiny.pal rename to graphics/pokemon/darumaka/overworld_shiny.pal diff --git a/graphics/pokemon/decidueye/hisuian/follower.png b/graphics/pokemon/decidueye/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/decidueye/hisuian/follower.png rename to graphics/pokemon/decidueye/hisuian/overworld.png diff --git a/graphics/pokemon/decidueye/hisuian/follow_normal.pal b/graphics/pokemon/decidueye/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/decidueye/hisuian/follow_normal.pal rename to graphics/pokemon/decidueye/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/decidueye/hisuian/follow_shiny.pal b/graphics/pokemon/decidueye/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/decidueye/hisuian/follow_shiny.pal rename to graphics/pokemon/decidueye/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/decidueye/follower.png b/graphics/pokemon/decidueye/overworld.png similarity index 100% rename from graphics/pokemon/decidueye/follower.png rename to graphics/pokemon/decidueye/overworld.png diff --git a/graphics/pokemon/decidueye/follow_normal.pal b/graphics/pokemon/decidueye/overworld_normal.pal similarity index 100% rename from graphics/pokemon/decidueye/follow_normal.pal rename to graphics/pokemon/decidueye/overworld_normal.pal diff --git a/graphics/pokemon/decidueye/follow_shiny.pal b/graphics/pokemon/decidueye/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/decidueye/follow_shiny.pal rename to graphics/pokemon/decidueye/overworld_shiny.pal diff --git a/graphics/pokemon/dedenne/follower.png b/graphics/pokemon/dedenne/overworld.png similarity index 100% rename from graphics/pokemon/dedenne/follower.png rename to graphics/pokemon/dedenne/overworld.png diff --git a/graphics/pokemon/dedenne/follow_normal.pal b/graphics/pokemon/dedenne/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dedenne/follow_normal.pal rename to graphics/pokemon/dedenne/overworld_normal.pal diff --git a/graphics/pokemon/dedenne/follow_shiny.pal b/graphics/pokemon/dedenne/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dedenne/follow_shiny.pal rename to graphics/pokemon/dedenne/overworld_shiny.pal diff --git a/graphics/pokemon/deerling/autumn/follower.png b/graphics/pokemon/deerling/autumn/overworld.png similarity index 100% rename from graphics/pokemon/deerling/autumn/follower.png rename to graphics/pokemon/deerling/autumn/overworld.png diff --git a/graphics/pokemon/deerling/autumn/follow_normal.pal b/graphics/pokemon/deerling/autumn/overworld_normal.pal similarity index 100% rename from graphics/pokemon/deerling/autumn/follow_normal.pal rename to graphics/pokemon/deerling/autumn/overworld_normal.pal diff --git a/graphics/pokemon/deerling/autumn/follow_shiny.pal b/graphics/pokemon/deerling/autumn/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/deerling/autumn/follow_shiny.pal rename to graphics/pokemon/deerling/autumn/overworld_shiny.pal diff --git a/graphics/pokemon/deerling/follower.png b/graphics/pokemon/deerling/overworld.png similarity index 100% rename from graphics/pokemon/deerling/follower.png rename to graphics/pokemon/deerling/overworld.png diff --git a/graphics/pokemon/deerling/follow_normal.pal b/graphics/pokemon/deerling/overworld_normal.pal similarity index 100% rename from graphics/pokemon/deerling/follow_normal.pal rename to graphics/pokemon/deerling/overworld_normal.pal diff --git a/graphics/pokemon/deerling/follow_shiny.pal b/graphics/pokemon/deerling/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/deerling/follow_shiny.pal rename to graphics/pokemon/deerling/overworld_shiny.pal diff --git a/graphics/pokemon/deerling/summer/follower.png b/graphics/pokemon/deerling/summer/overworld.png similarity index 100% rename from graphics/pokemon/deerling/summer/follower.png rename to graphics/pokemon/deerling/summer/overworld.png diff --git a/graphics/pokemon/deerling/summer/follow_normal.pal b/graphics/pokemon/deerling/summer/overworld_normal.pal similarity index 100% rename from graphics/pokemon/deerling/summer/follow_normal.pal rename to graphics/pokemon/deerling/summer/overworld_normal.pal diff --git a/graphics/pokemon/deerling/summer/follow_shiny.pal b/graphics/pokemon/deerling/summer/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/deerling/summer/follow_shiny.pal rename to graphics/pokemon/deerling/summer/overworld_shiny.pal diff --git a/graphics/pokemon/deerling/winter/follower.png b/graphics/pokemon/deerling/winter/overworld.png similarity index 100% rename from graphics/pokemon/deerling/winter/follower.png rename to graphics/pokemon/deerling/winter/overworld.png diff --git a/graphics/pokemon/deerling/winter/follow_normal.pal b/graphics/pokemon/deerling/winter/overworld_normal.pal similarity index 100% rename from graphics/pokemon/deerling/winter/follow_normal.pal rename to graphics/pokemon/deerling/winter/overworld_normal.pal diff --git a/graphics/pokemon/deerling/winter/follow_shiny.pal b/graphics/pokemon/deerling/winter/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/deerling/winter/follow_shiny.pal rename to graphics/pokemon/deerling/winter/overworld_shiny.pal diff --git a/graphics/pokemon/deino/follower.png b/graphics/pokemon/deino/overworld.png similarity index 100% rename from graphics/pokemon/deino/follower.png rename to graphics/pokemon/deino/overworld.png diff --git a/graphics/pokemon/deino/follow_normal.pal b/graphics/pokemon/deino/overworld_normal.pal similarity index 100% rename from graphics/pokemon/deino/follow_normal.pal rename to graphics/pokemon/deino/overworld_normal.pal diff --git a/graphics/pokemon/deino/follow_shiny.pal b/graphics/pokemon/deino/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/deino/follow_shiny.pal rename to graphics/pokemon/deino/overworld_shiny.pal diff --git a/graphics/pokemon/delcatty/follower.png b/graphics/pokemon/delcatty/overworld.png similarity index 100% rename from graphics/pokemon/delcatty/follower.png rename to graphics/pokemon/delcatty/overworld.png diff --git a/graphics/pokemon/delcatty/follow_normal.pal b/graphics/pokemon/delcatty/overworld_normal.pal similarity index 100% rename from graphics/pokemon/delcatty/follow_normal.pal rename to graphics/pokemon/delcatty/overworld_normal.pal diff --git a/graphics/pokemon/delcatty/follow_shiny.pal b/graphics/pokemon/delcatty/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/delcatty/follow_shiny.pal rename to graphics/pokemon/delcatty/overworld_shiny.pal diff --git a/graphics/pokemon/delibird/follower.png b/graphics/pokemon/delibird/overworld.png similarity index 100% rename from graphics/pokemon/delibird/follower.png rename to graphics/pokemon/delibird/overworld.png diff --git a/graphics/pokemon/delibird/follow_normal.pal b/graphics/pokemon/delibird/overworld_normal.pal similarity index 100% rename from graphics/pokemon/delibird/follow_normal.pal rename to graphics/pokemon/delibird/overworld_normal.pal diff --git a/graphics/pokemon/delibird/follow_shiny.pal b/graphics/pokemon/delibird/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/delibird/follow_shiny.pal rename to graphics/pokemon/delibird/overworld_shiny.pal diff --git a/graphics/pokemon/delphox/follower.png b/graphics/pokemon/delphox/overworld.png similarity index 100% rename from graphics/pokemon/delphox/follower.png rename to graphics/pokemon/delphox/overworld.png diff --git a/graphics/pokemon/delphox/follow_normal.pal b/graphics/pokemon/delphox/overworld_normal.pal similarity index 100% rename from graphics/pokemon/delphox/follow_normal.pal rename to graphics/pokemon/delphox/overworld_normal.pal diff --git a/graphics/pokemon/delphox/follow_shiny.pal b/graphics/pokemon/delphox/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/delphox/follow_shiny.pal rename to graphics/pokemon/delphox/overworld_shiny.pal diff --git a/graphics/pokemon/deoxys/attack/follower.png b/graphics/pokemon/deoxys/attack/overworld.png similarity index 100% rename from graphics/pokemon/deoxys/attack/follower.png rename to graphics/pokemon/deoxys/attack/overworld.png diff --git a/graphics/pokemon/deoxys/attack/follow_normal.pal b/graphics/pokemon/deoxys/attack/overworld_normal.pal similarity index 100% rename from graphics/pokemon/deoxys/attack/follow_normal.pal rename to graphics/pokemon/deoxys/attack/overworld_normal.pal diff --git a/graphics/pokemon/deoxys/attack/follow_shiny.pal b/graphics/pokemon/deoxys/attack/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/attack/follow_shiny.pal rename to graphics/pokemon/deoxys/attack/overworld_shiny.pal diff --git a/graphics/pokemon/deoxys/defense/follower.png b/graphics/pokemon/deoxys/defense/overworld.png similarity index 100% rename from graphics/pokemon/deoxys/defense/follower.png rename to graphics/pokemon/deoxys/defense/overworld.png diff --git a/graphics/pokemon/deoxys/defense/follow_normal.pal b/graphics/pokemon/deoxys/defense/overworld_normal.pal similarity index 100% rename from graphics/pokemon/deoxys/defense/follow_normal.pal rename to graphics/pokemon/deoxys/defense/overworld_normal.pal diff --git a/graphics/pokemon/deoxys/defense/follow_shiny.pal b/graphics/pokemon/deoxys/defense/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/defense/follow_shiny.pal rename to graphics/pokemon/deoxys/defense/overworld_shiny.pal diff --git a/graphics/pokemon/deoxys/follower.png b/graphics/pokemon/deoxys/overworld.png similarity index 100% rename from graphics/pokemon/deoxys/follower.png rename to graphics/pokemon/deoxys/overworld.png diff --git a/graphics/pokemon/deoxys/follow_normal.pal b/graphics/pokemon/deoxys/overworld_normal.pal similarity index 100% rename from graphics/pokemon/deoxys/follow_normal.pal rename to graphics/pokemon/deoxys/overworld_normal.pal diff --git a/graphics/pokemon/deoxys/follow_shiny.pal b/graphics/pokemon/deoxys/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/follow_shiny.pal rename to graphics/pokemon/deoxys/overworld_shiny.pal diff --git a/graphics/pokemon/deoxys/speed/follower.png b/graphics/pokemon/deoxys/speed/overworld.png similarity index 100% rename from graphics/pokemon/deoxys/speed/follower.png rename to graphics/pokemon/deoxys/speed/overworld.png diff --git a/graphics/pokemon/deoxys/speed/follow_normal.pal b/graphics/pokemon/deoxys/speed/overworld_normal.pal similarity index 100% rename from graphics/pokemon/deoxys/speed/follow_normal.pal rename to graphics/pokemon/deoxys/speed/overworld_normal.pal diff --git a/graphics/pokemon/deoxys/speed/follow_shiny.pal b/graphics/pokemon/deoxys/speed/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/speed/follow_shiny.pal rename to graphics/pokemon/deoxys/speed/overworld_shiny.pal diff --git a/graphics/pokemon/dewgong/follower.png b/graphics/pokemon/dewgong/overworld.png similarity index 100% rename from graphics/pokemon/dewgong/follower.png rename to graphics/pokemon/dewgong/overworld.png diff --git a/graphics/pokemon/dewgong/follow_normal.pal b/graphics/pokemon/dewgong/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dewgong/follow_normal.pal rename to graphics/pokemon/dewgong/overworld_normal.pal diff --git a/graphics/pokemon/dewgong/follow_shiny.pal b/graphics/pokemon/dewgong/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dewgong/follow_shiny.pal rename to graphics/pokemon/dewgong/overworld_shiny.pal diff --git a/graphics/pokemon/dewott/follower.png b/graphics/pokemon/dewott/overworld.png similarity index 100% rename from graphics/pokemon/dewott/follower.png rename to graphics/pokemon/dewott/overworld.png diff --git a/graphics/pokemon/dewott/follow_normal.pal b/graphics/pokemon/dewott/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dewott/follow_normal.pal rename to graphics/pokemon/dewott/overworld_normal.pal diff --git a/graphics/pokemon/dewott/follow_shiny.pal b/graphics/pokemon/dewott/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dewott/follow_shiny.pal rename to graphics/pokemon/dewott/overworld_shiny.pal diff --git a/graphics/pokemon/dewpider/follower.png b/graphics/pokemon/dewpider/overworld.png similarity index 100% rename from graphics/pokemon/dewpider/follower.png rename to graphics/pokemon/dewpider/overworld.png diff --git a/graphics/pokemon/dewpider/follow_normal.pal b/graphics/pokemon/dewpider/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dewpider/follow_normal.pal rename to graphics/pokemon/dewpider/overworld_normal.pal diff --git a/graphics/pokemon/dewpider/follow_shiny.pal b/graphics/pokemon/dewpider/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dewpider/follow_shiny.pal rename to graphics/pokemon/dewpider/overworld_shiny.pal diff --git a/graphics/pokemon/dhelmise/follower.png b/graphics/pokemon/dhelmise/overworld.png similarity index 100% rename from graphics/pokemon/dhelmise/follower.png rename to graphics/pokemon/dhelmise/overworld.png diff --git a/graphics/pokemon/dhelmise/follow_normal.pal b/graphics/pokemon/dhelmise/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dhelmise/follow_normal.pal rename to graphics/pokemon/dhelmise/overworld_normal.pal diff --git a/graphics/pokemon/dhelmise/follow_shiny.pal b/graphics/pokemon/dhelmise/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dhelmise/follow_shiny.pal rename to graphics/pokemon/dhelmise/overworld_shiny.pal diff --git a/graphics/pokemon/dialga/origin/follower.png b/graphics/pokemon/dialga/origin/overworld.png similarity index 100% rename from graphics/pokemon/dialga/origin/follower.png rename to graphics/pokemon/dialga/origin/overworld.png diff --git a/graphics/pokemon/dialga/origin/follow_normal.pal b/graphics/pokemon/dialga/origin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dialga/origin/follow_normal.pal rename to graphics/pokemon/dialga/origin/overworld_normal.pal diff --git a/graphics/pokemon/dialga/follower.png b/graphics/pokemon/dialga/overworld.png similarity index 100% rename from graphics/pokemon/dialga/follower.png rename to graphics/pokemon/dialga/overworld.png diff --git a/graphics/pokemon/dialga/follow_normal.pal b/graphics/pokemon/dialga/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dialga/follow_normal.pal rename to graphics/pokemon/dialga/overworld_normal.pal diff --git a/graphics/pokemon/dialga/follow_shiny.pal b/graphics/pokemon/dialga/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dialga/follow_shiny.pal rename to graphics/pokemon/dialga/overworld_shiny.pal diff --git a/graphics/pokemon/diancie/follower.png b/graphics/pokemon/diancie/overworld.png similarity index 100% rename from graphics/pokemon/diancie/follower.png rename to graphics/pokemon/diancie/overworld.png diff --git a/graphics/pokemon/diancie/follow_normal.pal b/graphics/pokemon/diancie/overworld_normal.pal similarity index 100% rename from graphics/pokemon/diancie/follow_normal.pal rename to graphics/pokemon/diancie/overworld_normal.pal diff --git a/graphics/pokemon/diancie/follow_shiny.pal b/graphics/pokemon/diancie/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/diancie/follow_shiny.pal rename to graphics/pokemon/diancie/overworld_shiny.pal diff --git a/graphics/pokemon/diggersby/follower.png b/graphics/pokemon/diggersby/overworld.png similarity index 100% rename from graphics/pokemon/diggersby/follower.png rename to graphics/pokemon/diggersby/overworld.png diff --git a/graphics/pokemon/diggersby/follow_normal.pal b/graphics/pokemon/diggersby/overworld_normal.pal similarity index 100% rename from graphics/pokemon/diggersby/follow_normal.pal rename to graphics/pokemon/diggersby/overworld_normal.pal diff --git a/graphics/pokemon/diggersby/follow_shiny.pal b/graphics/pokemon/diggersby/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/diggersby/follow_shiny.pal rename to graphics/pokemon/diggersby/overworld_shiny.pal diff --git a/graphics/pokemon/diglett/alolan/follower.png b/graphics/pokemon/diglett/alolan/overworld.png similarity index 100% rename from graphics/pokemon/diglett/alolan/follower.png rename to graphics/pokemon/diglett/alolan/overworld.png diff --git a/graphics/pokemon/diglett/alolan/follow_normal.pal b/graphics/pokemon/diglett/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/diglett/alolan/follow_normal.pal rename to graphics/pokemon/diglett/alolan/overworld_normal.pal diff --git a/graphics/pokemon/diglett/alolan/follow_shiny.pal b/graphics/pokemon/diglett/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/diglett/alolan/follow_shiny.pal rename to graphics/pokemon/diglett/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/diglett/follower.png b/graphics/pokemon/diglett/overworld.png similarity index 100% rename from graphics/pokemon/diglett/follower.png rename to graphics/pokemon/diglett/overworld.png diff --git a/graphics/pokemon/diglett/follow_normal.pal b/graphics/pokemon/diglett/overworld_normal.pal similarity index 100% rename from graphics/pokemon/diglett/follow_normal.pal rename to graphics/pokemon/diglett/overworld_normal.pal diff --git a/graphics/pokemon/diglett/follow_shiny.pal b/graphics/pokemon/diglett/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/diglett/follow_shiny.pal rename to graphics/pokemon/diglett/overworld_shiny.pal diff --git a/graphics/pokemon/ditto/follower.png b/graphics/pokemon/ditto/overworld.png similarity index 100% rename from graphics/pokemon/ditto/follower.png rename to graphics/pokemon/ditto/overworld.png diff --git a/graphics/pokemon/ditto/follow_normal.pal b/graphics/pokemon/ditto/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ditto/follow_normal.pal rename to graphics/pokemon/ditto/overworld_normal.pal diff --git a/graphics/pokemon/ditto/follow_shiny.pal b/graphics/pokemon/ditto/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ditto/follow_shiny.pal rename to graphics/pokemon/ditto/overworld_shiny.pal diff --git a/graphics/pokemon/dodrio/follower.png b/graphics/pokemon/dodrio/overworld.png similarity index 100% rename from graphics/pokemon/dodrio/follower.png rename to graphics/pokemon/dodrio/overworld.png diff --git a/graphics/pokemon/dodrio/follow_normal.pal b/graphics/pokemon/dodrio/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dodrio/follow_normal.pal rename to graphics/pokemon/dodrio/overworld_normal.pal diff --git a/graphics/pokemon/dodrio/follow_shiny.pal b/graphics/pokemon/dodrio/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dodrio/follow_shiny.pal rename to graphics/pokemon/dodrio/overworld_shiny.pal diff --git a/graphics/pokemon/doduo/follower.png b/graphics/pokemon/doduo/overworld.png similarity index 100% rename from graphics/pokemon/doduo/follower.png rename to graphics/pokemon/doduo/overworld.png diff --git a/graphics/pokemon/doduo/follow_normal.pal b/graphics/pokemon/doduo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/doduo/follow_normal.pal rename to graphics/pokemon/doduo/overworld_normal.pal diff --git a/graphics/pokemon/doduo/follow_shiny.pal b/graphics/pokemon/doduo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/doduo/follow_shiny.pal rename to graphics/pokemon/doduo/overworld_shiny.pal diff --git a/graphics/pokemon/donphan/follower.png b/graphics/pokemon/donphan/overworld.png similarity index 100% rename from graphics/pokemon/donphan/follower.png rename to graphics/pokemon/donphan/overworld.png diff --git a/graphics/pokemon/donphan/follow_normal.pal b/graphics/pokemon/donphan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/donphan/follow_normal.pal rename to graphics/pokemon/donphan/overworld_normal.pal diff --git a/graphics/pokemon/donphan/follow_shiny.pal b/graphics/pokemon/donphan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/donphan/follow_shiny.pal rename to graphics/pokemon/donphan/overworld_shiny.pal diff --git a/graphics/pokemon/dottler/follower.png b/graphics/pokemon/dottler/overworld.png similarity index 100% rename from graphics/pokemon/dottler/follower.png rename to graphics/pokemon/dottler/overworld.png diff --git a/graphics/pokemon/dottler/follow_normal.pal b/graphics/pokemon/dottler/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dottler/follow_normal.pal rename to graphics/pokemon/dottler/overworld_normal.pal diff --git a/graphics/pokemon/dottler/follow_shiny.pal b/graphics/pokemon/dottler/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dottler/follow_shiny.pal rename to graphics/pokemon/dottler/overworld_shiny.pal diff --git a/graphics/pokemon/doublade/follower.png b/graphics/pokemon/doublade/overworld.png similarity index 100% rename from graphics/pokemon/doublade/follower.png rename to graphics/pokemon/doublade/overworld.png diff --git a/graphics/pokemon/doublade/follow_normal.pal b/graphics/pokemon/doublade/overworld_normal.pal similarity index 100% rename from graphics/pokemon/doublade/follow_normal.pal rename to graphics/pokemon/doublade/overworld_normal.pal diff --git a/graphics/pokemon/doublade/follow_shiny.pal b/graphics/pokemon/doublade/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/doublade/follow_shiny.pal rename to graphics/pokemon/doublade/overworld_shiny.pal diff --git a/graphics/pokemon/dracovish/follower.png b/graphics/pokemon/dracovish/overworld.png similarity index 100% rename from graphics/pokemon/dracovish/follower.png rename to graphics/pokemon/dracovish/overworld.png diff --git a/graphics/pokemon/dracovish/follow_normal.pal b/graphics/pokemon/dracovish/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dracovish/follow_normal.pal rename to graphics/pokemon/dracovish/overworld_normal.pal diff --git a/graphics/pokemon/dracovish/follow_shiny.pal b/graphics/pokemon/dracovish/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dracovish/follow_shiny.pal rename to graphics/pokemon/dracovish/overworld_shiny.pal diff --git a/graphics/pokemon/dracozolt/follower.png b/graphics/pokemon/dracozolt/overworld.png similarity index 100% rename from graphics/pokemon/dracozolt/follower.png rename to graphics/pokemon/dracozolt/overworld.png diff --git a/graphics/pokemon/dracozolt/follow_normal.pal b/graphics/pokemon/dracozolt/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dracozolt/follow_normal.pal rename to graphics/pokemon/dracozolt/overworld_normal.pal diff --git a/graphics/pokemon/dracozolt/follow_shiny.pal b/graphics/pokemon/dracozolt/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dracozolt/follow_shiny.pal rename to graphics/pokemon/dracozolt/overworld_shiny.pal diff --git a/graphics/pokemon/dragalge/follower.png b/graphics/pokemon/dragalge/overworld.png similarity index 100% rename from graphics/pokemon/dragalge/follower.png rename to graphics/pokemon/dragalge/overworld.png diff --git a/graphics/pokemon/dragalge/follow_normal.pal b/graphics/pokemon/dragalge/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dragalge/follow_normal.pal rename to graphics/pokemon/dragalge/overworld_normal.pal diff --git a/graphics/pokemon/dragalge/follow_shiny.pal b/graphics/pokemon/dragalge/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dragalge/follow_shiny.pal rename to graphics/pokemon/dragalge/overworld_shiny.pal diff --git a/graphics/pokemon/dragapult/follower.png b/graphics/pokemon/dragapult/overworld.png similarity index 100% rename from graphics/pokemon/dragapult/follower.png rename to graphics/pokemon/dragapult/overworld.png diff --git a/graphics/pokemon/dragapult/follow_normal.pal b/graphics/pokemon/dragapult/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dragapult/follow_normal.pal rename to graphics/pokemon/dragapult/overworld_normal.pal diff --git a/graphics/pokemon/dragapult/follow_shiny.pal b/graphics/pokemon/dragapult/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dragapult/follow_shiny.pal rename to graphics/pokemon/dragapult/overworld_shiny.pal diff --git a/graphics/pokemon/dragonair/follower.png b/graphics/pokemon/dragonair/overworld.png similarity index 100% rename from graphics/pokemon/dragonair/follower.png rename to graphics/pokemon/dragonair/overworld.png diff --git a/graphics/pokemon/dragonair/follow_normal.pal b/graphics/pokemon/dragonair/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dragonair/follow_normal.pal rename to graphics/pokemon/dragonair/overworld_normal.pal diff --git a/graphics/pokemon/dragonair/follow_shiny.pal b/graphics/pokemon/dragonair/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dragonair/follow_shiny.pal rename to graphics/pokemon/dragonair/overworld_shiny.pal diff --git a/graphics/pokemon/dragonite/follower.png b/graphics/pokemon/dragonite/overworld.png similarity index 100% rename from graphics/pokemon/dragonite/follower.png rename to graphics/pokemon/dragonite/overworld.png diff --git a/graphics/pokemon/dragonite/follow_normal.pal b/graphics/pokemon/dragonite/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dragonite/follow_normal.pal rename to graphics/pokemon/dragonite/overworld_normal.pal diff --git a/graphics/pokemon/dragonite/follow_shiny.pal b/graphics/pokemon/dragonite/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dragonite/follow_shiny.pal rename to graphics/pokemon/dragonite/overworld_shiny.pal diff --git a/graphics/pokemon/drakloak/follower.png b/graphics/pokemon/drakloak/overworld.png similarity index 100% rename from graphics/pokemon/drakloak/follower.png rename to graphics/pokemon/drakloak/overworld.png diff --git a/graphics/pokemon/drakloak/follow_normal.pal b/graphics/pokemon/drakloak/overworld_normal.pal similarity index 100% rename from graphics/pokemon/drakloak/follow_normal.pal rename to graphics/pokemon/drakloak/overworld_normal.pal diff --git a/graphics/pokemon/drakloak/follow_shiny.pal b/graphics/pokemon/drakloak/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/drakloak/follow_shiny.pal rename to graphics/pokemon/drakloak/overworld_shiny.pal diff --git a/graphics/pokemon/drampa/follower.png b/graphics/pokemon/drampa/overworld.png similarity index 100% rename from graphics/pokemon/drampa/follower.png rename to graphics/pokemon/drampa/overworld.png diff --git a/graphics/pokemon/drampa/follow_normal.pal b/graphics/pokemon/drampa/overworld_normal.pal similarity index 100% rename from graphics/pokemon/drampa/follow_normal.pal rename to graphics/pokemon/drampa/overworld_normal.pal diff --git a/graphics/pokemon/drampa/follow_shiny.pal b/graphics/pokemon/drampa/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/drampa/follow_shiny.pal rename to graphics/pokemon/drampa/overworld_shiny.pal diff --git a/graphics/pokemon/drapion/follower.png b/graphics/pokemon/drapion/overworld.png similarity index 100% rename from graphics/pokemon/drapion/follower.png rename to graphics/pokemon/drapion/overworld.png diff --git a/graphics/pokemon/drapion/follow_normal.pal b/graphics/pokemon/drapion/overworld_normal.pal similarity index 100% rename from graphics/pokemon/drapion/follow_normal.pal rename to graphics/pokemon/drapion/overworld_normal.pal diff --git a/graphics/pokemon/drapion/follow_shiny.pal b/graphics/pokemon/drapion/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/drapion/follow_shiny.pal rename to graphics/pokemon/drapion/overworld_shiny.pal diff --git a/graphics/pokemon/dratini/follower.png b/graphics/pokemon/dratini/overworld.png similarity index 100% rename from graphics/pokemon/dratini/follower.png rename to graphics/pokemon/dratini/overworld.png diff --git a/graphics/pokemon/dratini/follow_normal.pal b/graphics/pokemon/dratini/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dratini/follow_normal.pal rename to graphics/pokemon/dratini/overworld_normal.pal diff --git a/graphics/pokemon/dratini/follow_shiny.pal b/graphics/pokemon/dratini/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dratini/follow_shiny.pal rename to graphics/pokemon/dratini/overworld_shiny.pal diff --git a/graphics/pokemon/drednaw/follower.png b/graphics/pokemon/drednaw/overworld.png similarity index 100% rename from graphics/pokemon/drednaw/follower.png rename to graphics/pokemon/drednaw/overworld.png diff --git a/graphics/pokemon/drednaw/follow_normal.pal b/graphics/pokemon/drednaw/overworld_normal.pal similarity index 100% rename from graphics/pokemon/drednaw/follow_normal.pal rename to graphics/pokemon/drednaw/overworld_normal.pal diff --git a/graphics/pokemon/drednaw/follow_shiny.pal b/graphics/pokemon/drednaw/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/drednaw/follow_shiny.pal rename to graphics/pokemon/drednaw/overworld_shiny.pal diff --git a/graphics/pokemon/dreepy/follower.png b/graphics/pokemon/dreepy/overworld.png similarity index 100% rename from graphics/pokemon/dreepy/follower.png rename to graphics/pokemon/dreepy/overworld.png diff --git a/graphics/pokemon/dreepy/follow_normal.pal b/graphics/pokemon/dreepy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dreepy/follow_normal.pal rename to graphics/pokemon/dreepy/overworld_normal.pal diff --git a/graphics/pokemon/dreepy/follow_shiny.pal b/graphics/pokemon/dreepy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dreepy/follow_shiny.pal rename to graphics/pokemon/dreepy/overworld_shiny.pal diff --git a/graphics/pokemon/drifblim/follower.png b/graphics/pokemon/drifblim/overworld.png similarity index 100% rename from graphics/pokemon/drifblim/follower.png rename to graphics/pokemon/drifblim/overworld.png diff --git a/graphics/pokemon/drifblim/follow_normal.pal b/graphics/pokemon/drifblim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/drifblim/follow_normal.pal rename to graphics/pokemon/drifblim/overworld_normal.pal diff --git a/graphics/pokemon/drifblim/follow_shiny.pal b/graphics/pokemon/drifblim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/drifblim/follow_shiny.pal rename to graphics/pokemon/drifblim/overworld_shiny.pal diff --git a/graphics/pokemon/drifloon/follower.png b/graphics/pokemon/drifloon/overworld.png similarity index 100% rename from graphics/pokemon/drifloon/follower.png rename to graphics/pokemon/drifloon/overworld.png diff --git a/graphics/pokemon/drifloon/follow_normal.pal b/graphics/pokemon/drifloon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/drifloon/follow_normal.pal rename to graphics/pokemon/drifloon/overworld_normal.pal diff --git a/graphics/pokemon/drifloon/follow_shiny.pal b/graphics/pokemon/drifloon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/drifloon/follow_shiny.pal rename to graphics/pokemon/drifloon/overworld_shiny.pal diff --git a/graphics/pokemon/drilbur/follower.png b/graphics/pokemon/drilbur/overworld.png similarity index 100% rename from graphics/pokemon/drilbur/follower.png rename to graphics/pokemon/drilbur/overworld.png diff --git a/graphics/pokemon/drilbur/follow_normal.pal b/graphics/pokemon/drilbur/overworld_normal.pal similarity index 100% rename from graphics/pokemon/drilbur/follow_normal.pal rename to graphics/pokemon/drilbur/overworld_normal.pal diff --git a/graphics/pokemon/drilbur/follow_shiny.pal b/graphics/pokemon/drilbur/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/drilbur/follow_shiny.pal rename to graphics/pokemon/drilbur/overworld_shiny.pal diff --git a/graphics/pokemon/drizzile/follower.png b/graphics/pokemon/drizzile/overworld.png similarity index 100% rename from graphics/pokemon/drizzile/follower.png rename to graphics/pokemon/drizzile/overworld.png diff --git a/graphics/pokemon/drizzile/follow_normal.pal b/graphics/pokemon/drizzile/overworld_normal.pal similarity index 100% rename from graphics/pokemon/drizzile/follow_normal.pal rename to graphics/pokemon/drizzile/overworld_normal.pal diff --git a/graphics/pokemon/drizzile/follow_shiny.pal b/graphics/pokemon/drizzile/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/drizzile/follow_shiny.pal rename to graphics/pokemon/drizzile/overworld_shiny.pal diff --git a/graphics/pokemon/drowzee/follower.png b/graphics/pokemon/drowzee/overworld.png similarity index 100% rename from graphics/pokemon/drowzee/follower.png rename to graphics/pokemon/drowzee/overworld.png diff --git a/graphics/pokemon/drowzee/follow_normal.pal b/graphics/pokemon/drowzee/overworld_normal.pal similarity index 100% rename from graphics/pokemon/drowzee/follow_normal.pal rename to graphics/pokemon/drowzee/overworld_normal.pal diff --git a/graphics/pokemon/drowzee/follow_shiny.pal b/graphics/pokemon/drowzee/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/drowzee/follow_shiny.pal rename to graphics/pokemon/drowzee/overworld_shiny.pal diff --git a/graphics/pokemon/druddigon/follower.png b/graphics/pokemon/druddigon/overworld.png similarity index 100% rename from graphics/pokemon/druddigon/follower.png rename to graphics/pokemon/druddigon/overworld.png diff --git a/graphics/pokemon/druddigon/follow_normal.pal b/graphics/pokemon/druddigon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/druddigon/follow_normal.pal rename to graphics/pokemon/druddigon/overworld_normal.pal diff --git a/graphics/pokemon/druddigon/follow_shiny.pal b/graphics/pokemon/druddigon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/druddigon/follow_shiny.pal rename to graphics/pokemon/druddigon/overworld_shiny.pal diff --git a/graphics/pokemon/dubwool/follower.png b/graphics/pokemon/dubwool/overworld.png similarity index 100% rename from graphics/pokemon/dubwool/follower.png rename to graphics/pokemon/dubwool/overworld.png diff --git a/graphics/pokemon/dubwool/follow_normal.pal b/graphics/pokemon/dubwool/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dubwool/follow_normal.pal rename to graphics/pokemon/dubwool/overworld_normal.pal diff --git a/graphics/pokemon/dubwool/follow_shiny.pal b/graphics/pokemon/dubwool/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dubwool/follow_shiny.pal rename to graphics/pokemon/dubwool/overworld_shiny.pal diff --git a/graphics/pokemon/ducklett/follower.png b/graphics/pokemon/ducklett/overworld.png similarity index 100% rename from graphics/pokemon/ducklett/follower.png rename to graphics/pokemon/ducklett/overworld.png diff --git a/graphics/pokemon/ducklett/follow_normal.pal b/graphics/pokemon/ducklett/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ducklett/follow_normal.pal rename to graphics/pokemon/ducklett/overworld_normal.pal diff --git a/graphics/pokemon/ducklett/follow_shiny.pal b/graphics/pokemon/ducklett/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ducklett/follow_shiny.pal rename to graphics/pokemon/ducklett/overworld_shiny.pal diff --git a/graphics/pokemon/dugtrio/alolan/follower.png b/graphics/pokemon/dugtrio/alolan/overworld.png similarity index 100% rename from graphics/pokemon/dugtrio/alolan/follower.png rename to graphics/pokemon/dugtrio/alolan/overworld.png diff --git a/graphics/pokemon/dugtrio/alolan/follow_normal.pal b/graphics/pokemon/dugtrio/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dugtrio/alolan/follow_normal.pal rename to graphics/pokemon/dugtrio/alolan/overworld_normal.pal diff --git a/graphics/pokemon/dugtrio/alolan/follow_shiny.pal b/graphics/pokemon/dugtrio/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dugtrio/alolan/follow_shiny.pal rename to graphics/pokemon/dugtrio/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/dugtrio/follower.png b/graphics/pokemon/dugtrio/overworld.png similarity index 100% rename from graphics/pokemon/dugtrio/follower.png rename to graphics/pokemon/dugtrio/overworld.png diff --git a/graphics/pokemon/dugtrio/follow_normal.pal b/graphics/pokemon/dugtrio/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dugtrio/follow_normal.pal rename to graphics/pokemon/dugtrio/overworld_normal.pal diff --git a/graphics/pokemon/dugtrio/follow_shiny.pal b/graphics/pokemon/dugtrio/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dugtrio/follow_shiny.pal rename to graphics/pokemon/dugtrio/overworld_shiny.pal diff --git a/graphics/pokemon/dunsparce/follower.png b/graphics/pokemon/dunsparce/overworld.png similarity index 100% rename from graphics/pokemon/dunsparce/follower.png rename to graphics/pokemon/dunsparce/overworld.png diff --git a/graphics/pokemon/dunsparce/follow_normal.pal b/graphics/pokemon/dunsparce/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dunsparce/follow_normal.pal rename to graphics/pokemon/dunsparce/overworld_normal.pal diff --git a/graphics/pokemon/dunsparce/follow_shiny.pal b/graphics/pokemon/dunsparce/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dunsparce/follow_shiny.pal rename to graphics/pokemon/dunsparce/overworld_shiny.pal diff --git a/graphics/pokemon/duosion/follower.png b/graphics/pokemon/duosion/overworld.png similarity index 100% rename from graphics/pokemon/duosion/follower.png rename to graphics/pokemon/duosion/overworld.png diff --git a/graphics/pokemon/duosion/follow_normal.pal b/graphics/pokemon/duosion/overworld_normal.pal similarity index 100% rename from graphics/pokemon/duosion/follow_normal.pal rename to graphics/pokemon/duosion/overworld_normal.pal diff --git a/graphics/pokemon/duosion/follow_shiny.pal b/graphics/pokemon/duosion/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/duosion/follow_shiny.pal rename to graphics/pokemon/duosion/overworld_shiny.pal diff --git a/graphics/pokemon/duraludon/follower.png b/graphics/pokemon/duraludon/overworld.png similarity index 100% rename from graphics/pokemon/duraludon/follower.png rename to graphics/pokemon/duraludon/overworld.png diff --git a/graphics/pokemon/duraludon/follow_normal.pal b/graphics/pokemon/duraludon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/duraludon/follow_normal.pal rename to graphics/pokemon/duraludon/overworld_normal.pal diff --git a/graphics/pokemon/duraludon/follow_shiny.pal b/graphics/pokemon/duraludon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/duraludon/follow_shiny.pal rename to graphics/pokemon/duraludon/overworld_shiny.pal diff --git a/graphics/pokemon/durant/follower.png b/graphics/pokemon/durant/overworld.png similarity index 100% rename from graphics/pokemon/durant/follower.png rename to graphics/pokemon/durant/overworld.png diff --git a/graphics/pokemon/durant/follow_normal.pal b/graphics/pokemon/durant/overworld_normal.pal similarity index 100% rename from graphics/pokemon/durant/follow_normal.pal rename to graphics/pokemon/durant/overworld_normal.pal diff --git a/graphics/pokemon/durant/follow_shiny.pal b/graphics/pokemon/durant/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/durant/follow_shiny.pal rename to graphics/pokemon/durant/overworld_shiny.pal diff --git a/graphics/pokemon/dusclops/follower.png b/graphics/pokemon/dusclops/overworld.png similarity index 100% rename from graphics/pokemon/dusclops/follower.png rename to graphics/pokemon/dusclops/overworld.png diff --git a/graphics/pokemon/dusclops/follow_normal.pal b/graphics/pokemon/dusclops/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dusclops/follow_normal.pal rename to graphics/pokemon/dusclops/overworld_normal.pal diff --git a/graphics/pokemon/dusclops/follow_shiny.pal b/graphics/pokemon/dusclops/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dusclops/follow_shiny.pal rename to graphics/pokemon/dusclops/overworld_shiny.pal diff --git a/graphics/pokemon/dusknoir/follower.png b/graphics/pokemon/dusknoir/overworld.png similarity index 100% rename from graphics/pokemon/dusknoir/follower.png rename to graphics/pokemon/dusknoir/overworld.png diff --git a/graphics/pokemon/dusknoir/follow_normal.pal b/graphics/pokemon/dusknoir/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dusknoir/follow_normal.pal rename to graphics/pokemon/dusknoir/overworld_normal.pal diff --git a/graphics/pokemon/dusknoir/follow_shiny.pal b/graphics/pokemon/dusknoir/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dusknoir/follow_shiny.pal rename to graphics/pokemon/dusknoir/overworld_shiny.pal diff --git a/graphics/pokemon/duskull/follower.png b/graphics/pokemon/duskull/overworld.png similarity index 100% rename from graphics/pokemon/duskull/follower.png rename to graphics/pokemon/duskull/overworld.png diff --git a/graphics/pokemon/duskull/follow_normal.pal b/graphics/pokemon/duskull/overworld_normal.pal similarity index 100% rename from graphics/pokemon/duskull/follow_normal.pal rename to graphics/pokemon/duskull/overworld_normal.pal diff --git a/graphics/pokemon/duskull/follow_shiny.pal b/graphics/pokemon/duskull/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/duskull/follow_shiny.pal rename to graphics/pokemon/duskull/overworld_shiny.pal diff --git a/graphics/pokemon/dustox/follower.png b/graphics/pokemon/dustox/overworld.png similarity index 100% rename from graphics/pokemon/dustox/follower.png rename to graphics/pokemon/dustox/overworld.png diff --git a/graphics/pokemon/dustox/follow_normal.pal b/graphics/pokemon/dustox/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dustox/follow_normal.pal rename to graphics/pokemon/dustox/overworld_normal.pal diff --git a/graphics/pokemon/dustox/follow_shiny.pal b/graphics/pokemon/dustox/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dustox/follow_shiny.pal rename to graphics/pokemon/dustox/overworld_shiny.pal diff --git a/graphics/pokemon/dwebble/follower.png b/graphics/pokemon/dwebble/overworld.png similarity index 100% rename from graphics/pokemon/dwebble/follower.png rename to graphics/pokemon/dwebble/overworld.png diff --git a/graphics/pokemon/dwebble/follow_normal.pal b/graphics/pokemon/dwebble/overworld_normal.pal similarity index 100% rename from graphics/pokemon/dwebble/follow_normal.pal rename to graphics/pokemon/dwebble/overworld_normal.pal diff --git a/graphics/pokemon/dwebble/follow_shiny.pal b/graphics/pokemon/dwebble/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/dwebble/follow_shiny.pal rename to graphics/pokemon/dwebble/overworld_shiny.pal diff --git a/graphics/pokemon/eelektrik/follower.png b/graphics/pokemon/eelektrik/overworld.png similarity index 100% rename from graphics/pokemon/eelektrik/follower.png rename to graphics/pokemon/eelektrik/overworld.png diff --git a/graphics/pokemon/eelektrik/follow_normal.pal b/graphics/pokemon/eelektrik/overworld_normal.pal similarity index 100% rename from graphics/pokemon/eelektrik/follow_normal.pal rename to graphics/pokemon/eelektrik/overworld_normal.pal diff --git a/graphics/pokemon/eelektrik/follow_shiny.pal b/graphics/pokemon/eelektrik/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/eelektrik/follow_shiny.pal rename to graphics/pokemon/eelektrik/overworld_shiny.pal diff --git a/graphics/pokemon/eelektross/follower.png b/graphics/pokemon/eelektross/overworld.png similarity index 100% rename from graphics/pokemon/eelektross/follower.png rename to graphics/pokemon/eelektross/overworld.png diff --git a/graphics/pokemon/eelektross/follow_normal.pal b/graphics/pokemon/eelektross/overworld_normal.pal similarity index 100% rename from graphics/pokemon/eelektross/follow_normal.pal rename to graphics/pokemon/eelektross/overworld_normal.pal diff --git a/graphics/pokemon/eelektross/follow_shiny.pal b/graphics/pokemon/eelektross/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/eelektross/follow_shiny.pal rename to graphics/pokemon/eelektross/overworld_shiny.pal diff --git a/graphics/pokemon/eevee/follower.png b/graphics/pokemon/eevee/overworld.png similarity index 100% rename from graphics/pokemon/eevee/follower.png rename to graphics/pokemon/eevee/overworld.png diff --git a/graphics/pokemon/eevee/follow_normal.pal b/graphics/pokemon/eevee/overworld_normal.pal similarity index 100% rename from graphics/pokemon/eevee/follow_normal.pal rename to graphics/pokemon/eevee/overworld_normal.pal diff --git a/graphics/pokemon/eevee/follow_shiny.pal b/graphics/pokemon/eevee/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/eevee/follow_shiny.pal rename to graphics/pokemon/eevee/overworld_shiny.pal diff --git a/graphics/pokemon/eiscue/follower.png b/graphics/pokemon/eiscue/overworld.png similarity index 100% rename from graphics/pokemon/eiscue/follower.png rename to graphics/pokemon/eiscue/overworld.png diff --git a/graphics/pokemon/eiscue/follow_normal.pal b/graphics/pokemon/eiscue/overworld_normal.pal similarity index 100% rename from graphics/pokemon/eiscue/follow_normal.pal rename to graphics/pokemon/eiscue/overworld_normal.pal diff --git a/graphics/pokemon/eiscue/follow_shiny.pal b/graphics/pokemon/eiscue/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/eiscue/follow_shiny.pal rename to graphics/pokemon/eiscue/overworld_shiny.pal diff --git a/graphics/pokemon/ekans/follower.png b/graphics/pokemon/ekans/overworld.png similarity index 100% rename from graphics/pokemon/ekans/follower.png rename to graphics/pokemon/ekans/overworld.png diff --git a/graphics/pokemon/ekans/follow_normal.pal b/graphics/pokemon/ekans/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ekans/follow_normal.pal rename to graphics/pokemon/ekans/overworld_normal.pal diff --git a/graphics/pokemon/ekans/follow_shiny.pal b/graphics/pokemon/ekans/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ekans/follow_shiny.pal rename to graphics/pokemon/ekans/overworld_shiny.pal diff --git a/graphics/pokemon/eldegoss/follower.png b/graphics/pokemon/eldegoss/overworld.png similarity index 100% rename from graphics/pokemon/eldegoss/follower.png rename to graphics/pokemon/eldegoss/overworld.png diff --git a/graphics/pokemon/eldegoss/follow_normal.pal b/graphics/pokemon/eldegoss/overworld_normal.pal similarity index 100% rename from graphics/pokemon/eldegoss/follow_normal.pal rename to graphics/pokemon/eldegoss/overworld_normal.pal diff --git a/graphics/pokemon/eldegoss/follow_shiny.pal b/graphics/pokemon/eldegoss/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/eldegoss/follow_shiny.pal rename to graphics/pokemon/eldegoss/overworld_shiny.pal diff --git a/graphics/pokemon/electabuzz/follower.png b/graphics/pokemon/electabuzz/overworld.png similarity index 100% rename from graphics/pokemon/electabuzz/follower.png rename to graphics/pokemon/electabuzz/overworld.png diff --git a/graphics/pokemon/electabuzz/follow_normal.pal b/graphics/pokemon/electabuzz/overworld_normal.pal similarity index 100% rename from graphics/pokemon/electabuzz/follow_normal.pal rename to graphics/pokemon/electabuzz/overworld_normal.pal diff --git a/graphics/pokemon/electabuzz/follow_shiny.pal b/graphics/pokemon/electabuzz/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/electabuzz/follow_shiny.pal rename to graphics/pokemon/electabuzz/overworld_shiny.pal diff --git a/graphics/pokemon/electivire/follower.png b/graphics/pokemon/electivire/overworld.png similarity index 100% rename from graphics/pokemon/electivire/follower.png rename to graphics/pokemon/electivire/overworld.png diff --git a/graphics/pokemon/electivire/follow_normal.pal b/graphics/pokemon/electivire/overworld_normal.pal similarity index 100% rename from graphics/pokemon/electivire/follow_normal.pal rename to graphics/pokemon/electivire/overworld_normal.pal diff --git a/graphics/pokemon/electivire/follow_shiny.pal b/graphics/pokemon/electivire/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/electivire/follow_shiny.pal rename to graphics/pokemon/electivire/overworld_shiny.pal diff --git a/graphics/pokemon/electrike/follower.png b/graphics/pokemon/electrike/overworld.png similarity index 100% rename from graphics/pokemon/electrike/follower.png rename to graphics/pokemon/electrike/overworld.png diff --git a/graphics/pokemon/electrike/follow_normal.pal b/graphics/pokemon/electrike/overworld_normal.pal similarity index 100% rename from graphics/pokemon/electrike/follow_normal.pal rename to graphics/pokemon/electrike/overworld_normal.pal diff --git a/graphics/pokemon/electrike/follow_shiny.pal b/graphics/pokemon/electrike/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/electrike/follow_shiny.pal rename to graphics/pokemon/electrike/overworld_shiny.pal diff --git a/graphics/pokemon/electrode/hisuian/follower.png b/graphics/pokemon/electrode/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/electrode/hisuian/follower.png rename to graphics/pokemon/electrode/hisuian/overworld.png diff --git a/graphics/pokemon/electrode/hisuian/follow_normal.pal b/graphics/pokemon/electrode/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/electrode/hisuian/follow_normal.pal rename to graphics/pokemon/electrode/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/electrode/hisuian/follow_shiny.pal b/graphics/pokemon/electrode/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/electrode/hisuian/follow_shiny.pal rename to graphics/pokemon/electrode/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/electrode/follower.png b/graphics/pokemon/electrode/overworld.png similarity index 100% rename from graphics/pokemon/electrode/follower.png rename to graphics/pokemon/electrode/overworld.png diff --git a/graphics/pokemon/electrode/follow_normal.pal b/graphics/pokemon/electrode/overworld_normal.pal similarity index 100% rename from graphics/pokemon/electrode/follow_normal.pal rename to graphics/pokemon/electrode/overworld_normal.pal diff --git a/graphics/pokemon/electrode/follow_shiny.pal b/graphics/pokemon/electrode/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/electrode/follow_shiny.pal rename to graphics/pokemon/electrode/overworld_shiny.pal diff --git a/graphics/pokemon/elekid/follower.png b/graphics/pokemon/elekid/overworld.png similarity index 100% rename from graphics/pokemon/elekid/follower.png rename to graphics/pokemon/elekid/overworld.png diff --git a/graphics/pokemon/elekid/follow_normal.pal b/graphics/pokemon/elekid/overworld_normal.pal similarity index 100% rename from graphics/pokemon/elekid/follow_normal.pal rename to graphics/pokemon/elekid/overworld_normal.pal diff --git a/graphics/pokemon/elekid/follow_shiny.pal b/graphics/pokemon/elekid/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/elekid/follow_shiny.pal rename to graphics/pokemon/elekid/overworld_shiny.pal diff --git a/graphics/pokemon/elgyem/follower.png b/graphics/pokemon/elgyem/overworld.png similarity index 100% rename from graphics/pokemon/elgyem/follower.png rename to graphics/pokemon/elgyem/overworld.png diff --git a/graphics/pokemon/elgyem/follow_normal.pal b/graphics/pokemon/elgyem/overworld_normal.pal similarity index 100% rename from graphics/pokemon/elgyem/follow_normal.pal rename to graphics/pokemon/elgyem/overworld_normal.pal diff --git a/graphics/pokemon/elgyem/follow_shiny.pal b/graphics/pokemon/elgyem/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/elgyem/follow_shiny.pal rename to graphics/pokemon/elgyem/overworld_shiny.pal diff --git a/graphics/pokemon/emboar/follower.png b/graphics/pokemon/emboar/overworld.png similarity index 100% rename from graphics/pokemon/emboar/follower.png rename to graphics/pokemon/emboar/overworld.png diff --git a/graphics/pokemon/emboar/follow_normal.pal b/graphics/pokemon/emboar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/emboar/follow_normal.pal rename to graphics/pokemon/emboar/overworld_normal.pal diff --git a/graphics/pokemon/emboar/follow_shiny.pal b/graphics/pokemon/emboar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/emboar/follow_shiny.pal rename to graphics/pokemon/emboar/overworld_shiny.pal diff --git a/graphics/pokemon/emolga/follower.png b/graphics/pokemon/emolga/overworld.png similarity index 100% rename from graphics/pokemon/emolga/follower.png rename to graphics/pokemon/emolga/overworld.png diff --git a/graphics/pokemon/emolga/follow_normal.pal b/graphics/pokemon/emolga/overworld_normal.pal similarity index 100% rename from graphics/pokemon/emolga/follow_normal.pal rename to graphics/pokemon/emolga/overworld_normal.pal diff --git a/graphics/pokemon/emolga/follow_shiny.pal b/graphics/pokemon/emolga/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/emolga/follow_shiny.pal rename to graphics/pokemon/emolga/overworld_shiny.pal diff --git a/graphics/pokemon/empoleon/follower.png b/graphics/pokemon/empoleon/overworld.png similarity index 100% rename from graphics/pokemon/empoleon/follower.png rename to graphics/pokemon/empoleon/overworld.png diff --git a/graphics/pokemon/empoleon/follow_normal.pal b/graphics/pokemon/empoleon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/empoleon/follow_normal.pal rename to graphics/pokemon/empoleon/overworld_normal.pal diff --git a/graphics/pokemon/empoleon/follow_shiny.pal b/graphics/pokemon/empoleon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/empoleon/follow_shiny.pal rename to graphics/pokemon/empoleon/overworld_shiny.pal diff --git a/graphics/pokemon/enamorus/follower.png b/graphics/pokemon/enamorus/overworld.png similarity index 100% rename from graphics/pokemon/enamorus/follower.png rename to graphics/pokemon/enamorus/overworld.png diff --git a/graphics/pokemon/enamorus/follow_normal.pal b/graphics/pokemon/enamorus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/enamorus/follow_normal.pal rename to graphics/pokemon/enamorus/overworld_normal.pal diff --git a/graphics/pokemon/enamorus/therian/follower.png b/graphics/pokemon/enamorus/therian/overworld.png similarity index 100% rename from graphics/pokemon/enamorus/therian/follower.png rename to graphics/pokemon/enamorus/therian/overworld.png diff --git a/graphics/pokemon/enamorus/therian/follow_normal.pal b/graphics/pokemon/enamorus/therian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/enamorus/therian/follow_normal.pal rename to graphics/pokemon/enamorus/therian/overworld_normal.pal diff --git a/graphics/pokemon/entei/follower.png b/graphics/pokemon/entei/overworld.png similarity index 100% rename from graphics/pokemon/entei/follower.png rename to graphics/pokemon/entei/overworld.png diff --git a/graphics/pokemon/entei/follow_normal.pal b/graphics/pokemon/entei/overworld_normal.pal similarity index 100% rename from graphics/pokemon/entei/follow_normal.pal rename to graphics/pokemon/entei/overworld_normal.pal diff --git a/graphics/pokemon/entei/follow_shiny.pal b/graphics/pokemon/entei/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/entei/follow_shiny.pal rename to graphics/pokemon/entei/overworld_shiny.pal diff --git a/graphics/pokemon/escavalier/follower.png b/graphics/pokemon/escavalier/overworld.png similarity index 100% rename from graphics/pokemon/escavalier/follower.png rename to graphics/pokemon/escavalier/overworld.png diff --git a/graphics/pokemon/escavalier/follow_normal.pal b/graphics/pokemon/escavalier/overworld_normal.pal similarity index 100% rename from graphics/pokemon/escavalier/follow_normal.pal rename to graphics/pokemon/escavalier/overworld_normal.pal diff --git a/graphics/pokemon/escavalier/follow_shiny.pal b/graphics/pokemon/escavalier/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/escavalier/follow_shiny.pal rename to graphics/pokemon/escavalier/overworld_shiny.pal diff --git a/graphics/pokemon/espeon/follower.png b/graphics/pokemon/espeon/overworld.png similarity index 100% rename from graphics/pokemon/espeon/follower.png rename to graphics/pokemon/espeon/overworld.png diff --git a/graphics/pokemon/espeon/follow_normal.pal b/graphics/pokemon/espeon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/espeon/follow_normal.pal rename to graphics/pokemon/espeon/overworld_normal.pal diff --git a/graphics/pokemon/espeon/follow_shiny.pal b/graphics/pokemon/espeon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/espeon/follow_shiny.pal rename to graphics/pokemon/espeon/overworld_shiny.pal diff --git a/graphics/pokemon/espurr/follower.png b/graphics/pokemon/espurr/overworld.png similarity index 100% rename from graphics/pokemon/espurr/follower.png rename to graphics/pokemon/espurr/overworld.png diff --git a/graphics/pokemon/espurr/follow_normal.pal b/graphics/pokemon/espurr/overworld_normal.pal similarity index 100% rename from graphics/pokemon/espurr/follow_normal.pal rename to graphics/pokemon/espurr/overworld_normal.pal diff --git a/graphics/pokemon/espurr/follow_shiny.pal b/graphics/pokemon/espurr/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/espurr/follow_shiny.pal rename to graphics/pokemon/espurr/overworld_shiny.pal diff --git a/graphics/pokemon/eternatus/follower.png b/graphics/pokemon/eternatus/overworld.png similarity index 100% rename from graphics/pokemon/eternatus/follower.png rename to graphics/pokemon/eternatus/overworld.png diff --git a/graphics/pokemon/eternatus/follow_normal.pal b/graphics/pokemon/eternatus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/eternatus/follow_normal.pal rename to graphics/pokemon/eternatus/overworld_normal.pal diff --git a/graphics/pokemon/eternatus/follow_shiny.pal b/graphics/pokemon/eternatus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/eternatus/follow_shiny.pal rename to graphics/pokemon/eternatus/overworld_shiny.pal diff --git a/graphics/pokemon/excadrill/follower.png b/graphics/pokemon/excadrill/overworld.png similarity index 100% rename from graphics/pokemon/excadrill/follower.png rename to graphics/pokemon/excadrill/overworld.png diff --git a/graphics/pokemon/excadrill/follow_normal.pal b/graphics/pokemon/excadrill/overworld_normal.pal similarity index 100% rename from graphics/pokemon/excadrill/follow_normal.pal rename to graphics/pokemon/excadrill/overworld_normal.pal diff --git a/graphics/pokemon/excadrill/follow_shiny.pal b/graphics/pokemon/excadrill/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/excadrill/follow_shiny.pal rename to graphics/pokemon/excadrill/overworld_shiny.pal diff --git a/graphics/pokemon/exeggcute/follower.png b/graphics/pokemon/exeggcute/overworld.png similarity index 100% rename from graphics/pokemon/exeggcute/follower.png rename to graphics/pokemon/exeggcute/overworld.png diff --git a/graphics/pokemon/exeggcute/follow_normal.pal b/graphics/pokemon/exeggcute/overworld_normal.pal similarity index 100% rename from graphics/pokemon/exeggcute/follow_normal.pal rename to graphics/pokemon/exeggcute/overworld_normal.pal diff --git a/graphics/pokemon/exeggcute/follow_shiny.pal b/graphics/pokemon/exeggcute/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/exeggcute/follow_shiny.pal rename to graphics/pokemon/exeggcute/overworld_shiny.pal diff --git a/graphics/pokemon/exeggutor/alolan/follower.png b/graphics/pokemon/exeggutor/alolan/overworld.png similarity index 100% rename from graphics/pokemon/exeggutor/alolan/follower.png rename to graphics/pokemon/exeggutor/alolan/overworld.png diff --git a/graphics/pokemon/exeggutor/alolan/follow_normal.pal b/graphics/pokemon/exeggutor/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/exeggutor/alolan/follow_normal.pal rename to graphics/pokemon/exeggutor/alolan/overworld_normal.pal diff --git a/graphics/pokemon/exeggutor/alolan/follow_shiny.pal b/graphics/pokemon/exeggutor/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/exeggutor/alolan/follow_shiny.pal rename to graphics/pokemon/exeggutor/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/exeggutor/follower.png b/graphics/pokemon/exeggutor/overworld.png similarity index 100% rename from graphics/pokemon/exeggutor/follower.png rename to graphics/pokemon/exeggutor/overworld.png diff --git a/graphics/pokemon/exeggutor/follow_normal.pal b/graphics/pokemon/exeggutor/overworld_normal.pal similarity index 100% rename from graphics/pokemon/exeggutor/follow_normal.pal rename to graphics/pokemon/exeggutor/overworld_normal.pal diff --git a/graphics/pokemon/exeggutor/follow_shiny.pal b/graphics/pokemon/exeggutor/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/exeggutor/follow_shiny.pal rename to graphics/pokemon/exeggutor/overworld_shiny.pal diff --git a/graphics/pokemon/exploud/follower.png b/graphics/pokemon/exploud/overworld.png similarity index 100% rename from graphics/pokemon/exploud/follower.png rename to graphics/pokemon/exploud/overworld.png diff --git a/graphics/pokemon/exploud/follow_normal.pal b/graphics/pokemon/exploud/overworld_normal.pal similarity index 100% rename from graphics/pokemon/exploud/follow_normal.pal rename to graphics/pokemon/exploud/overworld_normal.pal diff --git a/graphics/pokemon/exploud/follow_shiny.pal b/graphics/pokemon/exploud/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/exploud/follow_shiny.pal rename to graphics/pokemon/exploud/overworld_shiny.pal diff --git a/graphics/pokemon/falinks/follower.png b/graphics/pokemon/falinks/overworld.png similarity index 100% rename from graphics/pokemon/falinks/follower.png rename to graphics/pokemon/falinks/overworld.png diff --git a/graphics/pokemon/falinks/follow_normal.pal b/graphics/pokemon/falinks/overworld_normal.pal similarity index 100% rename from graphics/pokemon/falinks/follow_normal.pal rename to graphics/pokemon/falinks/overworld_normal.pal diff --git a/graphics/pokemon/falinks/follow_shiny.pal b/graphics/pokemon/falinks/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/falinks/follow_shiny.pal rename to graphics/pokemon/falinks/overworld_shiny.pal diff --git a/graphics/pokemon/farfetchd/galarian/follower.png b/graphics/pokemon/farfetchd/galarian/overworld.png similarity index 100% rename from graphics/pokemon/farfetchd/galarian/follower.png rename to graphics/pokemon/farfetchd/galarian/overworld.png diff --git a/graphics/pokemon/farfetchd/galarian/follow_normal.pal b/graphics/pokemon/farfetchd/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/farfetchd/galarian/follow_normal.pal rename to graphics/pokemon/farfetchd/galarian/overworld_normal.pal diff --git a/graphics/pokemon/farfetchd/galarian/follow_shiny.pal b/graphics/pokemon/farfetchd/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/farfetchd/galarian/follow_shiny.pal rename to graphics/pokemon/farfetchd/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/farfetchd/follower.png b/graphics/pokemon/farfetchd/overworld.png similarity index 100% rename from graphics/pokemon/farfetchd/follower.png rename to graphics/pokemon/farfetchd/overworld.png diff --git a/graphics/pokemon/farfetchd/follow_normal.pal b/graphics/pokemon/farfetchd/overworld_normal.pal similarity index 100% rename from graphics/pokemon/farfetchd/follow_normal.pal rename to graphics/pokemon/farfetchd/overworld_normal.pal diff --git a/graphics/pokemon/farfetchd/follow_shiny.pal b/graphics/pokemon/farfetchd/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/farfetchd/follow_shiny.pal rename to graphics/pokemon/farfetchd/overworld_shiny.pal diff --git a/graphics/pokemon/fearow/follower.png b/graphics/pokemon/fearow/overworld.png similarity index 100% rename from graphics/pokemon/fearow/follower.png rename to graphics/pokemon/fearow/overworld.png diff --git a/graphics/pokemon/fearow/follow_normal.pal b/graphics/pokemon/fearow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/fearow/follow_normal.pal rename to graphics/pokemon/fearow/overworld_normal.pal diff --git a/graphics/pokemon/fearow/follow_shiny.pal b/graphics/pokemon/fearow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/fearow/follow_shiny.pal rename to graphics/pokemon/fearow/overworld_shiny.pal diff --git a/graphics/pokemon/feebas/follower.png b/graphics/pokemon/feebas/overworld.png similarity index 100% rename from graphics/pokemon/feebas/follower.png rename to graphics/pokemon/feebas/overworld.png diff --git a/graphics/pokemon/feebas/follow_normal.pal b/graphics/pokemon/feebas/overworld_normal.pal similarity index 100% rename from graphics/pokemon/feebas/follow_normal.pal rename to graphics/pokemon/feebas/overworld_normal.pal diff --git a/graphics/pokemon/feebas/follow_shiny.pal b/graphics/pokemon/feebas/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/feebas/follow_shiny.pal rename to graphics/pokemon/feebas/overworld_shiny.pal diff --git a/graphics/pokemon/fennekin/follower.png b/graphics/pokemon/fennekin/overworld.png similarity index 100% rename from graphics/pokemon/fennekin/follower.png rename to graphics/pokemon/fennekin/overworld.png diff --git a/graphics/pokemon/fennekin/follow_normal.pal b/graphics/pokemon/fennekin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/fennekin/follow_normal.pal rename to graphics/pokemon/fennekin/overworld_normal.pal diff --git a/graphics/pokemon/fennekin/follow_shiny.pal b/graphics/pokemon/fennekin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/fennekin/follow_shiny.pal rename to graphics/pokemon/fennekin/overworld_shiny.pal diff --git a/graphics/pokemon/feraligatr/follower.png b/graphics/pokemon/feraligatr/overworld.png similarity index 100% rename from graphics/pokemon/feraligatr/follower.png rename to graphics/pokemon/feraligatr/overworld.png diff --git a/graphics/pokemon/feraligatr/follow_normal.pal b/graphics/pokemon/feraligatr/overworld_normal.pal similarity index 100% rename from graphics/pokemon/feraligatr/follow_normal.pal rename to graphics/pokemon/feraligatr/overworld_normal.pal diff --git a/graphics/pokemon/feraligatr/follow_shiny.pal b/graphics/pokemon/feraligatr/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/feraligatr/follow_shiny.pal rename to graphics/pokemon/feraligatr/overworld_shiny.pal diff --git a/graphics/pokemon/ferroseed/follower.png b/graphics/pokemon/ferroseed/overworld.png similarity index 100% rename from graphics/pokemon/ferroseed/follower.png rename to graphics/pokemon/ferroseed/overworld.png diff --git a/graphics/pokemon/ferroseed/follow_normal.pal b/graphics/pokemon/ferroseed/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ferroseed/follow_normal.pal rename to graphics/pokemon/ferroseed/overworld_normal.pal diff --git a/graphics/pokemon/ferroseed/follow_shiny.pal b/graphics/pokemon/ferroseed/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ferroseed/follow_shiny.pal rename to graphics/pokemon/ferroseed/overworld_shiny.pal diff --git a/graphics/pokemon/ferrothorn/follower.png b/graphics/pokemon/ferrothorn/overworld.png similarity index 100% rename from graphics/pokemon/ferrothorn/follower.png rename to graphics/pokemon/ferrothorn/overworld.png diff --git a/graphics/pokemon/ferrothorn/follow_normal.pal b/graphics/pokemon/ferrothorn/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ferrothorn/follow_normal.pal rename to graphics/pokemon/ferrothorn/overworld_normal.pal diff --git a/graphics/pokemon/ferrothorn/follow_shiny.pal b/graphics/pokemon/ferrothorn/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ferrothorn/follow_shiny.pal rename to graphics/pokemon/ferrothorn/overworld_shiny.pal diff --git a/graphics/pokemon/finneon/follower.png b/graphics/pokemon/finneon/overworld.png similarity index 100% rename from graphics/pokemon/finneon/follower.png rename to graphics/pokemon/finneon/overworld.png diff --git a/graphics/pokemon/finneon/follow_normal.pal b/graphics/pokemon/finneon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/finneon/follow_normal.pal rename to graphics/pokemon/finneon/overworld_normal.pal diff --git a/graphics/pokemon/finneon/follow_shiny.pal b/graphics/pokemon/finneon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/finneon/follow_shiny.pal rename to graphics/pokemon/finneon/overworld_shiny.pal diff --git a/graphics/pokemon/flaaffy/follower.png b/graphics/pokemon/flaaffy/overworld.png similarity index 100% rename from graphics/pokemon/flaaffy/follower.png rename to graphics/pokemon/flaaffy/overworld.png diff --git a/graphics/pokemon/flaaffy/follow_normal.pal b/graphics/pokemon/flaaffy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flaaffy/follow_normal.pal rename to graphics/pokemon/flaaffy/overworld_normal.pal diff --git a/graphics/pokemon/flaaffy/follow_shiny.pal b/graphics/pokemon/flaaffy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flaaffy/follow_shiny.pal rename to graphics/pokemon/flaaffy/overworld_shiny.pal diff --git a/graphics/pokemon/flabebe/blue_flower/follower.png b/graphics/pokemon/flabebe/blue_flower/overworld.png similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/follower.png rename to graphics/pokemon/flabebe/blue_flower/overworld.png diff --git a/graphics/pokemon/flabebe/blue_flower/follow_normal.pal b/graphics/pokemon/flabebe/blue_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/follow_normal.pal rename to graphics/pokemon/flabebe/blue_flower/overworld_normal.pal diff --git a/graphics/pokemon/flabebe/blue_flower/follow_shiny.pal b/graphics/pokemon/flabebe/blue_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/blue_flower/follow_shiny.pal rename to graphics/pokemon/flabebe/blue_flower/overworld_shiny.pal diff --git a/graphics/pokemon/flabebe/orange_flower/follower.png b/graphics/pokemon/flabebe/orange_flower/overworld.png similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/follower.png rename to graphics/pokemon/flabebe/orange_flower/overworld.png diff --git a/graphics/pokemon/flabebe/orange_flower/follow_normal.pal b/graphics/pokemon/flabebe/orange_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/follow_normal.pal rename to graphics/pokemon/flabebe/orange_flower/overworld_normal.pal diff --git a/graphics/pokemon/flabebe/orange_flower/follow_shiny.pal b/graphics/pokemon/flabebe/orange_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/orange_flower/follow_shiny.pal rename to graphics/pokemon/flabebe/orange_flower/overworld_shiny.pal diff --git a/graphics/pokemon/flabebe/follower.png b/graphics/pokemon/flabebe/overworld.png similarity index 100% rename from graphics/pokemon/flabebe/follower.png rename to graphics/pokemon/flabebe/overworld.png diff --git a/graphics/pokemon/flabebe/follow_normal.pal b/graphics/pokemon/flabebe/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flabebe/follow_normal.pal rename to graphics/pokemon/flabebe/overworld_normal.pal diff --git a/graphics/pokemon/flabebe/follow_shiny.pal b/graphics/pokemon/flabebe/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/follow_shiny.pal rename to graphics/pokemon/flabebe/overworld_shiny.pal diff --git a/graphics/pokemon/flabebe/white_flower/follower.png b/graphics/pokemon/flabebe/white_flower/overworld.png similarity index 100% rename from graphics/pokemon/flabebe/white_flower/follower.png rename to graphics/pokemon/flabebe/white_flower/overworld.png diff --git a/graphics/pokemon/flabebe/white_flower/follow_normal.pal b/graphics/pokemon/flabebe/white_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flabebe/white_flower/follow_normal.pal rename to graphics/pokemon/flabebe/white_flower/overworld_normal.pal diff --git a/graphics/pokemon/flabebe/white_flower/follow_shiny.pal b/graphics/pokemon/flabebe/white_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/white_flower/follow_shiny.pal rename to graphics/pokemon/flabebe/white_flower/overworld_shiny.pal diff --git a/graphics/pokemon/flabebe/yellow_flower/follower.png b/graphics/pokemon/flabebe/yellow_flower/overworld.png similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/follower.png rename to graphics/pokemon/flabebe/yellow_flower/overworld.png diff --git a/graphics/pokemon/flabebe/yellow_flower/follow_normal.pal b/graphics/pokemon/flabebe/yellow_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/follow_normal.pal rename to graphics/pokemon/flabebe/yellow_flower/overworld_normal.pal diff --git a/graphics/pokemon/flabebe/yellow_flower/follow_shiny.pal b/graphics/pokemon/flabebe/yellow_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flabebe/yellow_flower/follow_shiny.pal rename to graphics/pokemon/flabebe/yellow_flower/overworld_shiny.pal diff --git a/graphics/pokemon/flapple/follower.png b/graphics/pokemon/flapple/overworld.png similarity index 100% rename from graphics/pokemon/flapple/follower.png rename to graphics/pokemon/flapple/overworld.png diff --git a/graphics/pokemon/flapple/follow_normal.pal b/graphics/pokemon/flapple/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flapple/follow_normal.pal rename to graphics/pokemon/flapple/overworld_normal.pal diff --git a/graphics/pokemon/flapple/follow_shiny.pal b/graphics/pokemon/flapple/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flapple/follow_shiny.pal rename to graphics/pokemon/flapple/overworld_shiny.pal diff --git a/graphics/pokemon/flareon/follower.png b/graphics/pokemon/flareon/overworld.png similarity index 100% rename from graphics/pokemon/flareon/follower.png rename to graphics/pokemon/flareon/overworld.png diff --git a/graphics/pokemon/flareon/follow_normal.pal b/graphics/pokemon/flareon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flareon/follow_normal.pal rename to graphics/pokemon/flareon/overworld_normal.pal diff --git a/graphics/pokemon/flareon/follow_shiny.pal b/graphics/pokemon/flareon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flareon/follow_shiny.pal rename to graphics/pokemon/flareon/overworld_shiny.pal diff --git a/graphics/pokemon/fletchinder/follower.png b/graphics/pokemon/fletchinder/overworld.png similarity index 100% rename from graphics/pokemon/fletchinder/follower.png rename to graphics/pokemon/fletchinder/overworld.png diff --git a/graphics/pokemon/fletchinder/follow_normal.pal b/graphics/pokemon/fletchinder/overworld_normal.pal similarity index 100% rename from graphics/pokemon/fletchinder/follow_normal.pal rename to graphics/pokemon/fletchinder/overworld_normal.pal diff --git a/graphics/pokemon/fletchinder/follow_shiny.pal b/graphics/pokemon/fletchinder/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/fletchinder/follow_shiny.pal rename to graphics/pokemon/fletchinder/overworld_shiny.pal diff --git a/graphics/pokemon/fletchling/follower.png b/graphics/pokemon/fletchling/overworld.png similarity index 100% rename from graphics/pokemon/fletchling/follower.png rename to graphics/pokemon/fletchling/overworld.png diff --git a/graphics/pokemon/fletchling/follow_normal.pal b/graphics/pokemon/fletchling/overworld_normal.pal similarity index 100% rename from graphics/pokemon/fletchling/follow_normal.pal rename to graphics/pokemon/fletchling/overworld_normal.pal diff --git a/graphics/pokemon/fletchling/follow_shiny.pal b/graphics/pokemon/fletchling/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/fletchling/follow_shiny.pal rename to graphics/pokemon/fletchling/overworld_shiny.pal diff --git a/graphics/pokemon/floatzel/follower.png b/graphics/pokemon/floatzel/overworld.png similarity index 100% rename from graphics/pokemon/floatzel/follower.png rename to graphics/pokemon/floatzel/overworld.png diff --git a/graphics/pokemon/floatzel/follow_normal.pal b/graphics/pokemon/floatzel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floatzel/follow_normal.pal rename to graphics/pokemon/floatzel/overworld_normal.pal diff --git a/graphics/pokemon/floatzel/follow_shiny.pal b/graphics/pokemon/floatzel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floatzel/follow_shiny.pal rename to graphics/pokemon/floatzel/overworld_shiny.pal diff --git a/graphics/pokemon/floette/blue_flower/follower.png b/graphics/pokemon/floette/blue_flower/overworld.png similarity index 100% rename from graphics/pokemon/floette/blue_flower/follower.png rename to graphics/pokemon/floette/blue_flower/overworld.png diff --git a/graphics/pokemon/floette/blue_flower/follow_normal.pal b/graphics/pokemon/floette/blue_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/blue_flower/follow_normal.pal rename to graphics/pokemon/floette/blue_flower/overworld_normal.pal diff --git a/graphics/pokemon/floette/blue_flower/follow_shiny.pal b/graphics/pokemon/floette/blue_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/blue_flower/follow_shiny.pal rename to graphics/pokemon/floette/blue_flower/overworld_shiny.pal diff --git a/graphics/pokemon/floette/eternal_flower/follower.png b/graphics/pokemon/floette/eternal_flower/overworld.png similarity index 100% rename from graphics/pokemon/floette/eternal_flower/follower.png rename to graphics/pokemon/floette/eternal_flower/overworld.png diff --git a/graphics/pokemon/floette/eternal_flower/follow_normal.pal b/graphics/pokemon/floette/eternal_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/eternal_flower/follow_normal.pal rename to graphics/pokemon/floette/eternal_flower/overworld_normal.pal diff --git a/graphics/pokemon/floette/eternal_flower/follow_shiny.pal b/graphics/pokemon/floette/eternal_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/eternal_flower/follow_shiny.pal rename to graphics/pokemon/floette/eternal_flower/overworld_shiny.pal diff --git a/graphics/pokemon/floette/orange_flower/follower.png b/graphics/pokemon/floette/orange_flower/overworld.png similarity index 100% rename from graphics/pokemon/floette/orange_flower/follower.png rename to graphics/pokemon/floette/orange_flower/overworld.png diff --git a/graphics/pokemon/floette/orange_flower/follow_normal.pal b/graphics/pokemon/floette/orange_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/orange_flower/follow_normal.pal rename to graphics/pokemon/floette/orange_flower/overworld_normal.pal diff --git a/graphics/pokemon/floette/orange_flower/follow_shiny.pal b/graphics/pokemon/floette/orange_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/orange_flower/follow_shiny.pal rename to graphics/pokemon/floette/orange_flower/overworld_shiny.pal diff --git a/graphics/pokemon/floette/follower.png b/graphics/pokemon/floette/overworld.png similarity index 100% rename from graphics/pokemon/floette/follower.png rename to graphics/pokemon/floette/overworld.png diff --git a/graphics/pokemon/floette/follow_normal.pal b/graphics/pokemon/floette/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/follow_normal.pal rename to graphics/pokemon/floette/overworld_normal.pal diff --git a/graphics/pokemon/floette/follow_shiny.pal b/graphics/pokemon/floette/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/follow_shiny.pal rename to graphics/pokemon/floette/overworld_shiny.pal diff --git a/graphics/pokemon/floette/white_flower/follower.png b/graphics/pokemon/floette/white_flower/overworld.png similarity index 100% rename from graphics/pokemon/floette/white_flower/follower.png rename to graphics/pokemon/floette/white_flower/overworld.png diff --git a/graphics/pokemon/floette/white_flower/follow_normal.pal b/graphics/pokemon/floette/white_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/white_flower/follow_normal.pal rename to graphics/pokemon/floette/white_flower/overworld_normal.pal diff --git a/graphics/pokemon/floette/white_flower/follow_shiny.pal b/graphics/pokemon/floette/white_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/white_flower/follow_shiny.pal rename to graphics/pokemon/floette/white_flower/overworld_shiny.pal diff --git a/graphics/pokemon/floette/yellow_flower/follower.png b/graphics/pokemon/floette/yellow_flower/overworld.png similarity index 100% rename from graphics/pokemon/floette/yellow_flower/follower.png rename to graphics/pokemon/floette/yellow_flower/overworld.png diff --git a/graphics/pokemon/floette/yellow_flower/follow_normal.pal b/graphics/pokemon/floette/yellow_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/floette/yellow_flower/follow_normal.pal rename to graphics/pokemon/floette/yellow_flower/overworld_normal.pal diff --git a/graphics/pokemon/floette/yellow_flower/follow_shiny.pal b/graphics/pokemon/floette/yellow_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/floette/yellow_flower/follow_shiny.pal rename to graphics/pokemon/floette/yellow_flower/overworld_shiny.pal diff --git a/graphics/pokemon/florges/blue_flower/follower.png b/graphics/pokemon/florges/blue_flower/overworld.png similarity index 100% rename from graphics/pokemon/florges/blue_flower/follower.png rename to graphics/pokemon/florges/blue_flower/overworld.png diff --git a/graphics/pokemon/florges/blue_flower/follow_normal.pal b/graphics/pokemon/florges/blue_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/florges/blue_flower/follow_normal.pal rename to graphics/pokemon/florges/blue_flower/overworld_normal.pal diff --git a/graphics/pokemon/florges/blue_flower/follow_shiny.pal b/graphics/pokemon/florges/blue_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/florges/blue_flower/follow_shiny.pal rename to graphics/pokemon/florges/blue_flower/overworld_shiny.pal diff --git a/graphics/pokemon/florges/orange_flower/follower.png b/graphics/pokemon/florges/orange_flower/overworld.png similarity index 100% rename from graphics/pokemon/florges/orange_flower/follower.png rename to graphics/pokemon/florges/orange_flower/overworld.png diff --git a/graphics/pokemon/florges/orange_flower/follow_normal.pal b/graphics/pokemon/florges/orange_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/florges/orange_flower/follow_normal.pal rename to graphics/pokemon/florges/orange_flower/overworld_normal.pal diff --git a/graphics/pokemon/florges/orange_flower/follow_shiny.pal b/graphics/pokemon/florges/orange_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/florges/orange_flower/follow_shiny.pal rename to graphics/pokemon/florges/orange_flower/overworld_shiny.pal diff --git a/graphics/pokemon/florges/follower.png b/graphics/pokemon/florges/overworld.png similarity index 100% rename from graphics/pokemon/florges/follower.png rename to graphics/pokemon/florges/overworld.png diff --git a/graphics/pokemon/florges/follow_normal.pal b/graphics/pokemon/florges/overworld_normal.pal similarity index 100% rename from graphics/pokemon/florges/follow_normal.pal rename to graphics/pokemon/florges/overworld_normal.pal diff --git a/graphics/pokemon/florges/follow_shiny.pal b/graphics/pokemon/florges/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/florges/follow_shiny.pal rename to graphics/pokemon/florges/overworld_shiny.pal diff --git a/graphics/pokemon/florges/white_flower/follower.png b/graphics/pokemon/florges/white_flower/overworld.png similarity index 100% rename from graphics/pokemon/florges/white_flower/follower.png rename to graphics/pokemon/florges/white_flower/overworld.png diff --git a/graphics/pokemon/florges/white_flower/follow_normal.pal b/graphics/pokemon/florges/white_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/florges/white_flower/follow_normal.pal rename to graphics/pokemon/florges/white_flower/overworld_normal.pal diff --git a/graphics/pokemon/florges/white_flower/follow_shiny.pal b/graphics/pokemon/florges/white_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/florges/white_flower/follow_shiny.pal rename to graphics/pokemon/florges/white_flower/overworld_shiny.pal diff --git a/graphics/pokemon/florges/yellow_flower/follower.png b/graphics/pokemon/florges/yellow_flower/overworld.png similarity index 100% rename from graphics/pokemon/florges/yellow_flower/follower.png rename to graphics/pokemon/florges/yellow_flower/overworld.png diff --git a/graphics/pokemon/florges/yellow_flower/follow_normal.pal b/graphics/pokemon/florges/yellow_flower/overworld_normal.pal similarity index 100% rename from graphics/pokemon/florges/yellow_flower/follow_normal.pal rename to graphics/pokemon/florges/yellow_flower/overworld_normal.pal diff --git a/graphics/pokemon/florges/yellow_flower/follow_shiny.pal b/graphics/pokemon/florges/yellow_flower/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/florges/yellow_flower/follow_shiny.pal rename to graphics/pokemon/florges/yellow_flower/overworld_shiny.pal diff --git a/graphics/pokemon/flygon/follower.png b/graphics/pokemon/flygon/overworld.png similarity index 100% rename from graphics/pokemon/flygon/follower.png rename to graphics/pokemon/flygon/overworld.png diff --git a/graphics/pokemon/flygon/follow_normal.pal b/graphics/pokemon/flygon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/flygon/follow_normal.pal rename to graphics/pokemon/flygon/overworld_normal.pal diff --git a/graphics/pokemon/flygon/follow_shiny.pal b/graphics/pokemon/flygon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/flygon/follow_shiny.pal rename to graphics/pokemon/flygon/overworld_shiny.pal diff --git a/graphics/pokemon/fomantis/follower.png b/graphics/pokemon/fomantis/overworld.png similarity index 100% rename from graphics/pokemon/fomantis/follower.png rename to graphics/pokemon/fomantis/overworld.png diff --git a/graphics/pokemon/fomantis/follow_normal.pal b/graphics/pokemon/fomantis/overworld_normal.pal similarity index 100% rename from graphics/pokemon/fomantis/follow_normal.pal rename to graphics/pokemon/fomantis/overworld_normal.pal diff --git a/graphics/pokemon/fomantis/follow_shiny.pal b/graphics/pokemon/fomantis/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/fomantis/follow_shiny.pal rename to graphics/pokemon/fomantis/overworld_shiny.pal diff --git a/graphics/pokemon/foongus/follower.png b/graphics/pokemon/foongus/overworld.png similarity index 100% rename from graphics/pokemon/foongus/follower.png rename to graphics/pokemon/foongus/overworld.png diff --git a/graphics/pokemon/foongus/follow_normal.pal b/graphics/pokemon/foongus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/foongus/follow_normal.pal rename to graphics/pokemon/foongus/overworld_normal.pal diff --git a/graphics/pokemon/foongus/follow_shiny.pal b/graphics/pokemon/foongus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/foongus/follow_shiny.pal rename to graphics/pokemon/foongus/overworld_shiny.pal diff --git a/graphics/pokemon/forretress/follower.png b/graphics/pokemon/forretress/overworld.png similarity index 100% rename from graphics/pokemon/forretress/follower.png rename to graphics/pokemon/forretress/overworld.png diff --git a/graphics/pokemon/forretress/follow_normal.pal b/graphics/pokemon/forretress/overworld_normal.pal similarity index 100% rename from graphics/pokemon/forretress/follow_normal.pal rename to graphics/pokemon/forretress/overworld_normal.pal diff --git a/graphics/pokemon/forretress/follow_shiny.pal b/graphics/pokemon/forretress/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/forretress/follow_shiny.pal rename to graphics/pokemon/forretress/overworld_shiny.pal diff --git a/graphics/pokemon/fraxure/follower.png b/graphics/pokemon/fraxure/overworld.png similarity index 100% rename from graphics/pokemon/fraxure/follower.png rename to graphics/pokemon/fraxure/overworld.png diff --git a/graphics/pokemon/fraxure/follow_normal.pal b/graphics/pokemon/fraxure/overworld_normal.pal similarity index 100% rename from graphics/pokemon/fraxure/follow_normal.pal rename to graphics/pokemon/fraxure/overworld_normal.pal diff --git a/graphics/pokemon/fraxure/follow_shiny.pal b/graphics/pokemon/fraxure/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/fraxure/follow_shiny.pal rename to graphics/pokemon/fraxure/overworld_shiny.pal diff --git a/graphics/pokemon/frillish/follower.png b/graphics/pokemon/frillish/overworld.png similarity index 100% rename from graphics/pokemon/frillish/follower.png rename to graphics/pokemon/frillish/overworld.png diff --git a/graphics/pokemon/frillish/follow_normal.pal b/graphics/pokemon/frillish/overworld_normal.pal similarity index 100% rename from graphics/pokemon/frillish/follow_normal.pal rename to graphics/pokemon/frillish/overworld_normal.pal diff --git a/graphics/pokemon/frillish/follow_shiny.pal b/graphics/pokemon/frillish/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/frillish/follow_shiny.pal rename to graphics/pokemon/frillish/overworld_shiny.pal diff --git a/graphics/pokemon/froakie/follower.png b/graphics/pokemon/froakie/overworld.png similarity index 100% rename from graphics/pokemon/froakie/follower.png rename to graphics/pokemon/froakie/overworld.png diff --git a/graphics/pokemon/froakie/follow_normal.pal b/graphics/pokemon/froakie/overworld_normal.pal similarity index 100% rename from graphics/pokemon/froakie/follow_normal.pal rename to graphics/pokemon/froakie/overworld_normal.pal diff --git a/graphics/pokemon/froakie/follow_shiny.pal b/graphics/pokemon/froakie/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/froakie/follow_shiny.pal rename to graphics/pokemon/froakie/overworld_shiny.pal diff --git a/graphics/pokemon/frogadier/follower.png b/graphics/pokemon/frogadier/overworld.png similarity index 100% rename from graphics/pokemon/frogadier/follower.png rename to graphics/pokemon/frogadier/overworld.png diff --git a/graphics/pokemon/frogadier/follow_normal.pal b/graphics/pokemon/frogadier/overworld_normal.pal similarity index 100% rename from graphics/pokemon/frogadier/follow_normal.pal rename to graphics/pokemon/frogadier/overworld_normal.pal diff --git a/graphics/pokemon/frogadier/follow_shiny.pal b/graphics/pokemon/frogadier/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/frogadier/follow_shiny.pal rename to graphics/pokemon/frogadier/overworld_shiny.pal diff --git a/graphics/pokemon/froslass/follower.png b/graphics/pokemon/froslass/overworld.png similarity index 100% rename from graphics/pokemon/froslass/follower.png rename to graphics/pokemon/froslass/overworld.png diff --git a/graphics/pokemon/froslass/follow_normal.pal b/graphics/pokemon/froslass/overworld_normal.pal similarity index 100% rename from graphics/pokemon/froslass/follow_normal.pal rename to graphics/pokemon/froslass/overworld_normal.pal diff --git a/graphics/pokemon/froslass/follow_shiny.pal b/graphics/pokemon/froslass/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/froslass/follow_shiny.pal rename to graphics/pokemon/froslass/overworld_shiny.pal diff --git a/graphics/pokemon/frosmoth/follower.png b/graphics/pokemon/frosmoth/overworld.png similarity index 100% rename from graphics/pokemon/frosmoth/follower.png rename to graphics/pokemon/frosmoth/overworld.png diff --git a/graphics/pokemon/frosmoth/follow_normal.pal b/graphics/pokemon/frosmoth/overworld_normal.pal similarity index 100% rename from graphics/pokemon/frosmoth/follow_normal.pal rename to graphics/pokemon/frosmoth/overworld_normal.pal diff --git a/graphics/pokemon/frosmoth/follow_shiny.pal b/graphics/pokemon/frosmoth/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/frosmoth/follow_shiny.pal rename to graphics/pokemon/frosmoth/overworld_shiny.pal diff --git a/graphics/pokemon/furfrou/dandy_trim/follower.png b/graphics/pokemon/furfrou/dandy_trim/overworld.png similarity index 100% rename from graphics/pokemon/furfrou/dandy_trim/follower.png rename to graphics/pokemon/furfrou/dandy_trim/overworld.png diff --git a/graphics/pokemon/furfrou/dandy_trim/follow_normal.pal b/graphics/pokemon/furfrou/dandy_trim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furfrou/dandy_trim/follow_normal.pal rename to graphics/pokemon/furfrou/dandy_trim/overworld_normal.pal diff --git a/graphics/pokemon/furfrou/dandy_trim/follow_shiny.pal b/graphics/pokemon/furfrou/dandy_trim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/dandy_trim/follow_shiny.pal rename to graphics/pokemon/furfrou/dandy_trim/overworld_shiny.pal diff --git a/graphics/pokemon/furfrou/debutante_trim/follower.png b/graphics/pokemon/furfrou/debutante_trim/overworld.png similarity index 100% rename from graphics/pokemon/furfrou/debutante_trim/follower.png rename to graphics/pokemon/furfrou/debutante_trim/overworld.png diff --git a/graphics/pokemon/furfrou/debutante_trim/follow_normal.pal b/graphics/pokemon/furfrou/debutante_trim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furfrou/debutante_trim/follow_normal.pal rename to graphics/pokemon/furfrou/debutante_trim/overworld_normal.pal diff --git a/graphics/pokemon/furfrou/debutante_trim/follow_shiny.pal b/graphics/pokemon/furfrou/debutante_trim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/debutante_trim/follow_shiny.pal rename to graphics/pokemon/furfrou/debutante_trim/overworld_shiny.pal diff --git a/graphics/pokemon/furfrou/diamond_trim/follower.png b/graphics/pokemon/furfrou/diamond_trim/overworld.png similarity index 100% rename from graphics/pokemon/furfrou/diamond_trim/follower.png rename to graphics/pokemon/furfrou/diamond_trim/overworld.png diff --git a/graphics/pokemon/furfrou/diamond_trim/follow_normal.pal b/graphics/pokemon/furfrou/diamond_trim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furfrou/diamond_trim/follow_normal.pal rename to graphics/pokemon/furfrou/diamond_trim/overworld_normal.pal diff --git a/graphics/pokemon/furfrou/diamond_trim/follow_shiny.pal b/graphics/pokemon/furfrou/diamond_trim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/diamond_trim/follow_shiny.pal rename to graphics/pokemon/furfrou/diamond_trim/overworld_shiny.pal diff --git a/graphics/pokemon/furfrou/heart_trim/follower.png b/graphics/pokemon/furfrou/heart_trim/overworld.png similarity index 100% rename from graphics/pokemon/furfrou/heart_trim/follower.png rename to graphics/pokemon/furfrou/heart_trim/overworld.png diff --git a/graphics/pokemon/furfrou/heart_trim/follow_normal.pal b/graphics/pokemon/furfrou/heart_trim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furfrou/heart_trim/follow_normal.pal rename to graphics/pokemon/furfrou/heart_trim/overworld_normal.pal diff --git a/graphics/pokemon/furfrou/heart_trim/follow_shiny.pal b/graphics/pokemon/furfrou/heart_trim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/heart_trim/follow_shiny.pal rename to graphics/pokemon/furfrou/heart_trim/overworld_shiny.pal diff --git a/graphics/pokemon/furfrou/kabuki_trim/follower.png b/graphics/pokemon/furfrou/kabuki_trim/overworld.png similarity index 100% rename from graphics/pokemon/furfrou/kabuki_trim/follower.png rename to graphics/pokemon/furfrou/kabuki_trim/overworld.png diff --git a/graphics/pokemon/furfrou/kabuki_trim/follow_normal.pal b/graphics/pokemon/furfrou/kabuki_trim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furfrou/kabuki_trim/follow_normal.pal rename to graphics/pokemon/furfrou/kabuki_trim/overworld_normal.pal diff --git a/graphics/pokemon/furfrou/kabuki_trim/follow_shiny.pal b/graphics/pokemon/furfrou/kabuki_trim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/kabuki_trim/follow_shiny.pal rename to graphics/pokemon/furfrou/kabuki_trim/overworld_shiny.pal diff --git a/graphics/pokemon/furfrou/la_reine_trim/follower.png b/graphics/pokemon/furfrou/la_reine_trim/overworld.png similarity index 100% rename from graphics/pokemon/furfrou/la_reine_trim/follower.png rename to graphics/pokemon/furfrou/la_reine_trim/overworld.png diff --git a/graphics/pokemon/furfrou/la_reine_trim/follow_normal.pal b/graphics/pokemon/furfrou/la_reine_trim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furfrou/la_reine_trim/follow_normal.pal rename to graphics/pokemon/furfrou/la_reine_trim/overworld_normal.pal diff --git a/graphics/pokemon/furfrou/la_reine_trim/follow_shiny.pal b/graphics/pokemon/furfrou/la_reine_trim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/la_reine_trim/follow_shiny.pal rename to graphics/pokemon/furfrou/la_reine_trim/overworld_shiny.pal diff --git a/graphics/pokemon/furfrou/matron_trim/follower.png b/graphics/pokemon/furfrou/matron_trim/overworld.png similarity index 100% rename from graphics/pokemon/furfrou/matron_trim/follower.png rename to graphics/pokemon/furfrou/matron_trim/overworld.png diff --git a/graphics/pokemon/furfrou/matron_trim/follow_normal.pal b/graphics/pokemon/furfrou/matron_trim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furfrou/matron_trim/follow_normal.pal rename to graphics/pokemon/furfrou/matron_trim/overworld_normal.pal diff --git a/graphics/pokemon/furfrou/matron_trim/follow_shiny.pal b/graphics/pokemon/furfrou/matron_trim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/matron_trim/follow_shiny.pal rename to graphics/pokemon/furfrou/matron_trim/overworld_shiny.pal diff --git a/graphics/pokemon/furfrou/follower.png b/graphics/pokemon/furfrou/overworld.png similarity index 100% rename from graphics/pokemon/furfrou/follower.png rename to graphics/pokemon/furfrou/overworld.png diff --git a/graphics/pokemon/furfrou/follow_normal.pal b/graphics/pokemon/furfrou/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furfrou/follow_normal.pal rename to graphics/pokemon/furfrou/overworld_normal.pal diff --git a/graphics/pokemon/furfrou/follow_shiny.pal b/graphics/pokemon/furfrou/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/follow_shiny.pal rename to graphics/pokemon/furfrou/overworld_shiny.pal diff --git a/graphics/pokemon/furfrou/pharaoh_trim/follower.png b/graphics/pokemon/furfrou/pharaoh_trim/overworld.png similarity index 100% rename from graphics/pokemon/furfrou/pharaoh_trim/follower.png rename to graphics/pokemon/furfrou/pharaoh_trim/overworld.png diff --git a/graphics/pokemon/furfrou/pharaoh_trim/follow_normal.pal b/graphics/pokemon/furfrou/pharaoh_trim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furfrou/pharaoh_trim/follow_normal.pal rename to graphics/pokemon/furfrou/pharaoh_trim/overworld_normal.pal diff --git a/graphics/pokemon/furfrou/pharaoh_trim/follow_shiny.pal b/graphics/pokemon/furfrou/pharaoh_trim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/pharaoh_trim/follow_shiny.pal rename to graphics/pokemon/furfrou/pharaoh_trim/overworld_shiny.pal diff --git a/graphics/pokemon/furfrou/star_trim/follower.png b/graphics/pokemon/furfrou/star_trim/overworld.png similarity index 100% rename from graphics/pokemon/furfrou/star_trim/follower.png rename to graphics/pokemon/furfrou/star_trim/overworld.png diff --git a/graphics/pokemon/furfrou/star_trim/follow_normal.pal b/graphics/pokemon/furfrou/star_trim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furfrou/star_trim/follow_normal.pal rename to graphics/pokemon/furfrou/star_trim/overworld_normal.pal diff --git a/graphics/pokemon/furfrou/star_trim/follow_shiny.pal b/graphics/pokemon/furfrou/star_trim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furfrou/star_trim/follow_shiny.pal rename to graphics/pokemon/furfrou/star_trim/overworld_shiny.pal diff --git a/graphics/pokemon/furret/follower.png b/graphics/pokemon/furret/overworld.png similarity index 100% rename from graphics/pokemon/furret/follower.png rename to graphics/pokemon/furret/overworld.png diff --git a/graphics/pokemon/furret/follow_normal.pal b/graphics/pokemon/furret/overworld_normal.pal similarity index 100% rename from graphics/pokemon/furret/follow_normal.pal rename to graphics/pokemon/furret/overworld_normal.pal diff --git a/graphics/pokemon/furret/follow_shiny.pal b/graphics/pokemon/furret/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/furret/follow_shiny.pal rename to graphics/pokemon/furret/overworld_shiny.pal diff --git a/graphics/pokemon/gabite/follower.png b/graphics/pokemon/gabite/overworld.png similarity index 100% rename from graphics/pokemon/gabite/follower.png rename to graphics/pokemon/gabite/overworld.png diff --git a/graphics/pokemon/gabite/follow_normal.pal b/graphics/pokemon/gabite/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gabite/follow_normal.pal rename to graphics/pokemon/gabite/overworld_normal.pal diff --git a/graphics/pokemon/gabite/follow_shiny.pal b/graphics/pokemon/gabite/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gabite/follow_shiny.pal rename to graphics/pokemon/gabite/overworld_shiny.pal diff --git a/graphics/pokemon/gallade/follower.png b/graphics/pokemon/gallade/overworld.png similarity index 100% rename from graphics/pokemon/gallade/follower.png rename to graphics/pokemon/gallade/overworld.png diff --git a/graphics/pokemon/gallade/follow_normal.pal b/graphics/pokemon/gallade/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gallade/follow_normal.pal rename to graphics/pokemon/gallade/overworld_normal.pal diff --git a/graphics/pokemon/gallade/follow_shiny.pal b/graphics/pokemon/gallade/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gallade/follow_shiny.pal rename to graphics/pokemon/gallade/overworld_shiny.pal diff --git a/graphics/pokemon/galvantula/follower.png b/graphics/pokemon/galvantula/overworld.png similarity index 100% rename from graphics/pokemon/galvantula/follower.png rename to graphics/pokemon/galvantula/overworld.png diff --git a/graphics/pokemon/galvantula/follow_normal.pal b/graphics/pokemon/galvantula/overworld_normal.pal similarity index 100% rename from graphics/pokemon/galvantula/follow_normal.pal rename to graphics/pokemon/galvantula/overworld_normal.pal diff --git a/graphics/pokemon/galvantula/follow_shiny.pal b/graphics/pokemon/galvantula/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/galvantula/follow_shiny.pal rename to graphics/pokemon/galvantula/overworld_shiny.pal diff --git a/graphics/pokemon/garbodor/follower.png b/graphics/pokemon/garbodor/overworld.png similarity index 100% rename from graphics/pokemon/garbodor/follower.png rename to graphics/pokemon/garbodor/overworld.png diff --git a/graphics/pokemon/garbodor/follow_normal.pal b/graphics/pokemon/garbodor/overworld_normal.pal similarity index 100% rename from graphics/pokemon/garbodor/follow_normal.pal rename to graphics/pokemon/garbodor/overworld_normal.pal diff --git a/graphics/pokemon/garbodor/follow_shiny.pal b/graphics/pokemon/garbodor/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/garbodor/follow_shiny.pal rename to graphics/pokemon/garbodor/overworld_shiny.pal diff --git a/graphics/pokemon/garchomp/follower.png b/graphics/pokemon/garchomp/overworld.png similarity index 100% rename from graphics/pokemon/garchomp/follower.png rename to graphics/pokemon/garchomp/overworld.png diff --git a/graphics/pokemon/garchomp/follow_normal.pal b/graphics/pokemon/garchomp/overworld_normal.pal similarity index 100% rename from graphics/pokemon/garchomp/follow_normal.pal rename to graphics/pokemon/garchomp/overworld_normal.pal diff --git a/graphics/pokemon/garchomp/follow_shiny.pal b/graphics/pokemon/garchomp/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/garchomp/follow_shiny.pal rename to graphics/pokemon/garchomp/overworld_shiny.pal diff --git a/graphics/pokemon/gardevoir/follower.png b/graphics/pokemon/gardevoir/overworld.png similarity index 100% rename from graphics/pokemon/gardevoir/follower.png rename to graphics/pokemon/gardevoir/overworld.png diff --git a/graphics/pokemon/gardevoir/follow_normal.pal b/graphics/pokemon/gardevoir/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gardevoir/follow_normal.pal rename to graphics/pokemon/gardevoir/overworld_normal.pal diff --git a/graphics/pokemon/gardevoir/follow_shiny.pal b/graphics/pokemon/gardevoir/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gardevoir/follow_shiny.pal rename to graphics/pokemon/gardevoir/overworld_shiny.pal diff --git a/graphics/pokemon/gastly/follower.png b/graphics/pokemon/gastly/overworld.png similarity index 100% rename from graphics/pokemon/gastly/follower.png rename to graphics/pokemon/gastly/overworld.png diff --git a/graphics/pokemon/gastly/follow_normal.pal b/graphics/pokemon/gastly/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gastly/follow_normal.pal rename to graphics/pokemon/gastly/overworld_normal.pal diff --git a/graphics/pokemon/gastly/follow_shiny.pal b/graphics/pokemon/gastly/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gastly/follow_shiny.pal rename to graphics/pokemon/gastly/overworld_shiny.pal diff --git a/graphics/pokemon/gastrodon/east_sea/follower.png b/graphics/pokemon/gastrodon/east_sea/overworld.png similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/follower.png rename to graphics/pokemon/gastrodon/east_sea/overworld.png diff --git a/graphics/pokemon/gastrodon/east_sea/follow_normal.pal b/graphics/pokemon/gastrodon/east_sea/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/follow_normal.pal rename to graphics/pokemon/gastrodon/east_sea/overworld_normal.pal diff --git a/graphics/pokemon/gastrodon/east_sea/follow_shiny.pal b/graphics/pokemon/gastrodon/east_sea/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gastrodon/east_sea/follow_shiny.pal rename to graphics/pokemon/gastrodon/east_sea/overworld_shiny.pal diff --git a/graphics/pokemon/gastrodon/follower.png b/graphics/pokemon/gastrodon/overworld.png similarity index 100% rename from graphics/pokemon/gastrodon/follower.png rename to graphics/pokemon/gastrodon/overworld.png diff --git a/graphics/pokemon/gastrodon/follow_normal.pal b/graphics/pokemon/gastrodon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gastrodon/follow_normal.pal rename to graphics/pokemon/gastrodon/overworld_normal.pal diff --git a/graphics/pokemon/gastrodon/follow_shiny.pal b/graphics/pokemon/gastrodon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gastrodon/follow_shiny.pal rename to graphics/pokemon/gastrodon/overworld_shiny.pal diff --git a/graphics/pokemon/genesect/follower.png b/graphics/pokemon/genesect/overworld.png similarity index 100% rename from graphics/pokemon/genesect/follower.png rename to graphics/pokemon/genesect/overworld.png diff --git a/graphics/pokemon/genesect/follow_normal.pal b/graphics/pokemon/genesect/overworld_normal.pal similarity index 100% rename from graphics/pokemon/genesect/follow_normal.pal rename to graphics/pokemon/genesect/overworld_normal.pal diff --git a/graphics/pokemon/genesect/follow_shiny.pal b/graphics/pokemon/genesect/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/genesect/follow_shiny.pal rename to graphics/pokemon/genesect/overworld_shiny.pal diff --git a/graphics/pokemon/gengar/follower.png b/graphics/pokemon/gengar/overworld.png similarity index 100% rename from graphics/pokemon/gengar/follower.png rename to graphics/pokemon/gengar/overworld.png diff --git a/graphics/pokemon/gengar/follow_normal.pal b/graphics/pokemon/gengar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gengar/follow_normal.pal rename to graphics/pokemon/gengar/overworld_normal.pal diff --git a/graphics/pokemon/gengar/follow_shiny.pal b/graphics/pokemon/gengar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gengar/follow_shiny.pal rename to graphics/pokemon/gengar/overworld_shiny.pal diff --git a/graphics/pokemon/geodude/alolan/follower.png b/graphics/pokemon/geodude/alolan/overworld.png similarity index 100% rename from graphics/pokemon/geodude/alolan/follower.png rename to graphics/pokemon/geodude/alolan/overworld.png diff --git a/graphics/pokemon/geodude/alolan/follow_normal.pal b/graphics/pokemon/geodude/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/geodude/alolan/follow_normal.pal rename to graphics/pokemon/geodude/alolan/overworld_normal.pal diff --git a/graphics/pokemon/geodude/alolan/follow_shiny.pal b/graphics/pokemon/geodude/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/geodude/alolan/follow_shiny.pal rename to graphics/pokemon/geodude/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/geodude/follower.png b/graphics/pokemon/geodude/overworld.png similarity index 100% rename from graphics/pokemon/geodude/follower.png rename to graphics/pokemon/geodude/overworld.png diff --git a/graphics/pokemon/geodude/follow_normal.pal b/graphics/pokemon/geodude/overworld_normal.pal similarity index 100% rename from graphics/pokemon/geodude/follow_normal.pal rename to graphics/pokemon/geodude/overworld_normal.pal diff --git a/graphics/pokemon/geodude/follow_shiny.pal b/graphics/pokemon/geodude/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/geodude/follow_shiny.pal rename to graphics/pokemon/geodude/overworld_shiny.pal diff --git a/graphics/pokemon/gible/follower.png b/graphics/pokemon/gible/overworld.png similarity index 100% rename from graphics/pokemon/gible/follower.png rename to graphics/pokemon/gible/overworld.png diff --git a/graphics/pokemon/gible/follow_normal.pal b/graphics/pokemon/gible/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gible/follow_normal.pal rename to graphics/pokemon/gible/overworld_normal.pal diff --git a/graphics/pokemon/gible/follow_shiny.pal b/graphics/pokemon/gible/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gible/follow_shiny.pal rename to graphics/pokemon/gible/overworld_shiny.pal diff --git a/graphics/pokemon/gigalith/follower.png b/graphics/pokemon/gigalith/overworld.png similarity index 100% rename from graphics/pokemon/gigalith/follower.png rename to graphics/pokemon/gigalith/overworld.png diff --git a/graphics/pokemon/gigalith/follow_normal.pal b/graphics/pokemon/gigalith/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gigalith/follow_normal.pal rename to graphics/pokemon/gigalith/overworld_normal.pal diff --git a/graphics/pokemon/gigalith/follow_shiny.pal b/graphics/pokemon/gigalith/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gigalith/follow_shiny.pal rename to graphics/pokemon/gigalith/overworld_shiny.pal diff --git a/graphics/pokemon/girafarig/follower.png b/graphics/pokemon/girafarig/overworld.png similarity index 100% rename from graphics/pokemon/girafarig/follower.png rename to graphics/pokemon/girafarig/overworld.png diff --git a/graphics/pokemon/girafarig/follow_normal.pal b/graphics/pokemon/girafarig/overworld_normal.pal similarity index 100% rename from graphics/pokemon/girafarig/follow_normal.pal rename to graphics/pokemon/girafarig/overworld_normal.pal diff --git a/graphics/pokemon/girafarig/follow_shiny.pal b/graphics/pokemon/girafarig/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/girafarig/follow_shiny.pal rename to graphics/pokemon/girafarig/overworld_shiny.pal diff --git a/graphics/pokemon/giratina/origin/follower.png b/graphics/pokemon/giratina/origin/overworld.png similarity index 100% rename from graphics/pokemon/giratina/origin/follower.png rename to graphics/pokemon/giratina/origin/overworld.png diff --git a/graphics/pokemon/giratina/origin/follow_normal.pal b/graphics/pokemon/giratina/origin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/giratina/origin/follow_normal.pal rename to graphics/pokemon/giratina/origin/overworld_normal.pal diff --git a/graphics/pokemon/giratina/origin/follow_shiny.pal b/graphics/pokemon/giratina/origin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/giratina/origin/follow_shiny.pal rename to graphics/pokemon/giratina/origin/overworld_shiny.pal diff --git a/graphics/pokemon/giratina/follower.png b/graphics/pokemon/giratina/overworld.png similarity index 100% rename from graphics/pokemon/giratina/follower.png rename to graphics/pokemon/giratina/overworld.png diff --git a/graphics/pokemon/giratina/follow_normal.pal b/graphics/pokemon/giratina/overworld_normal.pal similarity index 100% rename from graphics/pokemon/giratina/follow_normal.pal rename to graphics/pokemon/giratina/overworld_normal.pal diff --git a/graphics/pokemon/giratina/follow_shiny.pal b/graphics/pokemon/giratina/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/giratina/follow_shiny.pal rename to graphics/pokemon/giratina/overworld_shiny.pal diff --git a/graphics/pokemon/glaceon/follower.png b/graphics/pokemon/glaceon/overworld.png similarity index 100% rename from graphics/pokemon/glaceon/follower.png rename to graphics/pokemon/glaceon/overworld.png diff --git a/graphics/pokemon/glaceon/follow_normal.pal b/graphics/pokemon/glaceon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/glaceon/follow_normal.pal rename to graphics/pokemon/glaceon/overworld_normal.pal diff --git a/graphics/pokemon/glaceon/follow_shiny.pal b/graphics/pokemon/glaceon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/glaceon/follow_shiny.pal rename to graphics/pokemon/glaceon/overworld_shiny.pal diff --git a/graphics/pokemon/glalie/follower.png b/graphics/pokemon/glalie/overworld.png similarity index 100% rename from graphics/pokemon/glalie/follower.png rename to graphics/pokemon/glalie/overworld.png diff --git a/graphics/pokemon/glalie/follow_normal.pal b/graphics/pokemon/glalie/overworld_normal.pal similarity index 100% rename from graphics/pokemon/glalie/follow_normal.pal rename to graphics/pokemon/glalie/overworld_normal.pal diff --git a/graphics/pokemon/glalie/follow_shiny.pal b/graphics/pokemon/glalie/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/glalie/follow_shiny.pal rename to graphics/pokemon/glalie/overworld_shiny.pal diff --git a/graphics/pokemon/glameow/follower.png b/graphics/pokemon/glameow/overworld.png similarity index 100% rename from graphics/pokemon/glameow/follower.png rename to graphics/pokemon/glameow/overworld.png diff --git a/graphics/pokemon/glameow/follow_normal.pal b/graphics/pokemon/glameow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/glameow/follow_normal.pal rename to graphics/pokemon/glameow/overworld_normal.pal diff --git a/graphics/pokemon/glameow/follow_shiny.pal b/graphics/pokemon/glameow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/glameow/follow_shiny.pal rename to graphics/pokemon/glameow/overworld_shiny.pal diff --git a/graphics/pokemon/glastrier/follower.png b/graphics/pokemon/glastrier/overworld.png similarity index 100% rename from graphics/pokemon/glastrier/follower.png rename to graphics/pokemon/glastrier/overworld.png diff --git a/graphics/pokemon/glastrier/follow_normal.pal b/graphics/pokemon/glastrier/overworld_normal.pal similarity index 100% rename from graphics/pokemon/glastrier/follow_normal.pal rename to graphics/pokemon/glastrier/overworld_normal.pal diff --git a/graphics/pokemon/glastrier/follow_shiny.pal b/graphics/pokemon/glastrier/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/glastrier/follow_shiny.pal rename to graphics/pokemon/glastrier/overworld_shiny.pal diff --git a/graphics/pokemon/gligar/follower.png b/graphics/pokemon/gligar/overworld.png similarity index 100% rename from graphics/pokemon/gligar/follower.png rename to graphics/pokemon/gligar/overworld.png diff --git a/graphics/pokemon/gligar/follow_normal.pal b/graphics/pokemon/gligar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gligar/follow_normal.pal rename to graphics/pokemon/gligar/overworld_normal.pal diff --git a/graphics/pokemon/gligar/follow_shiny.pal b/graphics/pokemon/gligar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gligar/follow_shiny.pal rename to graphics/pokemon/gligar/overworld_shiny.pal diff --git a/graphics/pokemon/gliscor/follower.png b/graphics/pokemon/gliscor/overworld.png similarity index 100% rename from graphics/pokemon/gliscor/follower.png rename to graphics/pokemon/gliscor/overworld.png diff --git a/graphics/pokemon/gliscor/follow_normal.pal b/graphics/pokemon/gliscor/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gliscor/follow_normal.pal rename to graphics/pokemon/gliscor/overworld_normal.pal diff --git a/graphics/pokemon/gliscor/follow_shiny.pal b/graphics/pokemon/gliscor/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gliscor/follow_shiny.pal rename to graphics/pokemon/gliscor/overworld_shiny.pal diff --git a/graphics/pokemon/gloom/follower.png b/graphics/pokemon/gloom/overworld.png similarity index 100% rename from graphics/pokemon/gloom/follower.png rename to graphics/pokemon/gloom/overworld.png diff --git a/graphics/pokemon/gloom/follow_normal.pal b/graphics/pokemon/gloom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gloom/follow_normal.pal rename to graphics/pokemon/gloom/overworld_normal.pal diff --git a/graphics/pokemon/gloom/follow_shiny.pal b/graphics/pokemon/gloom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gloom/follow_shiny.pal rename to graphics/pokemon/gloom/overworld_shiny.pal diff --git a/graphics/pokemon/gogoat/follower.png b/graphics/pokemon/gogoat/overworld.png similarity index 100% rename from graphics/pokemon/gogoat/follower.png rename to graphics/pokemon/gogoat/overworld.png diff --git a/graphics/pokemon/gogoat/follow_normal.pal b/graphics/pokemon/gogoat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gogoat/follow_normal.pal rename to graphics/pokemon/gogoat/overworld_normal.pal diff --git a/graphics/pokemon/gogoat/follow_shiny.pal b/graphics/pokemon/gogoat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gogoat/follow_shiny.pal rename to graphics/pokemon/gogoat/overworld_shiny.pal diff --git a/graphics/pokemon/golbat/follower.png b/graphics/pokemon/golbat/overworld.png similarity index 100% rename from graphics/pokemon/golbat/follower.png rename to graphics/pokemon/golbat/overworld.png diff --git a/graphics/pokemon/golbat/follow_normal.pal b/graphics/pokemon/golbat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/golbat/follow_normal.pal rename to graphics/pokemon/golbat/overworld_normal.pal diff --git a/graphics/pokemon/golbat/follow_shiny.pal b/graphics/pokemon/golbat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/golbat/follow_shiny.pal rename to graphics/pokemon/golbat/overworld_shiny.pal diff --git a/graphics/pokemon/goldeen/follower.png b/graphics/pokemon/goldeen/overworld.png similarity index 100% rename from graphics/pokemon/goldeen/follower.png rename to graphics/pokemon/goldeen/overworld.png diff --git a/graphics/pokemon/goldeen/follow_normal.pal b/graphics/pokemon/goldeen/overworld_normal.pal similarity index 100% rename from graphics/pokemon/goldeen/follow_normal.pal rename to graphics/pokemon/goldeen/overworld_normal.pal diff --git a/graphics/pokemon/goldeen/follow_shiny.pal b/graphics/pokemon/goldeen/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/goldeen/follow_shiny.pal rename to graphics/pokemon/goldeen/overworld_shiny.pal diff --git a/graphics/pokemon/golduck/follower.png b/graphics/pokemon/golduck/overworld.png similarity index 100% rename from graphics/pokemon/golduck/follower.png rename to graphics/pokemon/golduck/overworld.png diff --git a/graphics/pokemon/golduck/follow_normal.pal b/graphics/pokemon/golduck/overworld_normal.pal similarity index 100% rename from graphics/pokemon/golduck/follow_normal.pal rename to graphics/pokemon/golduck/overworld_normal.pal diff --git a/graphics/pokemon/golduck/follow_shiny.pal b/graphics/pokemon/golduck/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/golduck/follow_shiny.pal rename to graphics/pokemon/golduck/overworld_shiny.pal diff --git a/graphics/pokemon/golem/alolan/follower.png b/graphics/pokemon/golem/alolan/overworld.png similarity index 100% rename from graphics/pokemon/golem/alolan/follower.png rename to graphics/pokemon/golem/alolan/overworld.png diff --git a/graphics/pokemon/golem/alolan/follow_normal.pal b/graphics/pokemon/golem/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/golem/alolan/follow_normal.pal rename to graphics/pokemon/golem/alolan/overworld_normal.pal diff --git a/graphics/pokemon/golem/alolan/follow_shiny.pal b/graphics/pokemon/golem/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/golem/alolan/follow_shiny.pal rename to graphics/pokemon/golem/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/golem/follower.png b/graphics/pokemon/golem/overworld.png similarity index 100% rename from graphics/pokemon/golem/follower.png rename to graphics/pokemon/golem/overworld.png diff --git a/graphics/pokemon/golem/follow_normal.pal b/graphics/pokemon/golem/overworld_normal.pal similarity index 100% rename from graphics/pokemon/golem/follow_normal.pal rename to graphics/pokemon/golem/overworld_normal.pal diff --git a/graphics/pokemon/golem/follow_shiny.pal b/graphics/pokemon/golem/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/golem/follow_shiny.pal rename to graphics/pokemon/golem/overworld_shiny.pal diff --git a/graphics/pokemon/golett/follower.png b/graphics/pokemon/golett/overworld.png similarity index 100% rename from graphics/pokemon/golett/follower.png rename to graphics/pokemon/golett/overworld.png diff --git a/graphics/pokemon/golett/follow_normal.pal b/graphics/pokemon/golett/overworld_normal.pal similarity index 100% rename from graphics/pokemon/golett/follow_normal.pal rename to graphics/pokemon/golett/overworld_normal.pal diff --git a/graphics/pokemon/golett/follow_shiny.pal b/graphics/pokemon/golett/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/golett/follow_shiny.pal rename to graphics/pokemon/golett/overworld_shiny.pal diff --git a/graphics/pokemon/golisopod/follower.png b/graphics/pokemon/golisopod/overworld.png similarity index 100% rename from graphics/pokemon/golisopod/follower.png rename to graphics/pokemon/golisopod/overworld.png diff --git a/graphics/pokemon/golisopod/follow_normal.pal b/graphics/pokemon/golisopod/overworld_normal.pal similarity index 100% rename from graphics/pokemon/golisopod/follow_normal.pal rename to graphics/pokemon/golisopod/overworld_normal.pal diff --git a/graphics/pokemon/golisopod/follow_shiny.pal b/graphics/pokemon/golisopod/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/golisopod/follow_shiny.pal rename to graphics/pokemon/golisopod/overworld_shiny.pal diff --git a/graphics/pokemon/golurk/follower.png b/graphics/pokemon/golurk/overworld.png similarity index 100% rename from graphics/pokemon/golurk/follower.png rename to graphics/pokemon/golurk/overworld.png diff --git a/graphics/pokemon/golurk/follow_normal.pal b/graphics/pokemon/golurk/overworld_normal.pal similarity index 100% rename from graphics/pokemon/golurk/follow_normal.pal rename to graphics/pokemon/golurk/overworld_normal.pal diff --git a/graphics/pokemon/golurk/follow_shiny.pal b/graphics/pokemon/golurk/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/golurk/follow_shiny.pal rename to graphics/pokemon/golurk/overworld_shiny.pal diff --git a/graphics/pokemon/goodra/hisuian/follower.png b/graphics/pokemon/goodra/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/goodra/hisuian/follower.png rename to graphics/pokemon/goodra/hisuian/overworld.png diff --git a/graphics/pokemon/goodra/hisuian/follow_normal.pal b/graphics/pokemon/goodra/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/goodra/hisuian/follow_normal.pal rename to graphics/pokemon/goodra/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/goodra/hisuian/follow_shiny.pal b/graphics/pokemon/goodra/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/goodra/hisuian/follow_shiny.pal rename to graphics/pokemon/goodra/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/goodra/follower.png b/graphics/pokemon/goodra/overworld.png similarity index 100% rename from graphics/pokemon/goodra/follower.png rename to graphics/pokemon/goodra/overworld.png diff --git a/graphics/pokemon/goodra/follow_normal.pal b/graphics/pokemon/goodra/overworld_normal.pal similarity index 100% rename from graphics/pokemon/goodra/follow_normal.pal rename to graphics/pokemon/goodra/overworld_normal.pal diff --git a/graphics/pokemon/goodra/follow_shiny.pal b/graphics/pokemon/goodra/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/goodra/follow_shiny.pal rename to graphics/pokemon/goodra/overworld_shiny.pal diff --git a/graphics/pokemon/goomy/follower.png b/graphics/pokemon/goomy/overworld.png similarity index 100% rename from graphics/pokemon/goomy/follower.png rename to graphics/pokemon/goomy/overworld.png diff --git a/graphics/pokemon/goomy/follow_normal.pal b/graphics/pokemon/goomy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/goomy/follow_normal.pal rename to graphics/pokemon/goomy/overworld_normal.pal diff --git a/graphics/pokemon/goomy/follow_shiny.pal b/graphics/pokemon/goomy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/goomy/follow_shiny.pal rename to graphics/pokemon/goomy/overworld_shiny.pal diff --git a/graphics/pokemon/gorebyss/follower.png b/graphics/pokemon/gorebyss/overworld.png similarity index 100% rename from graphics/pokemon/gorebyss/follower.png rename to graphics/pokemon/gorebyss/overworld.png diff --git a/graphics/pokemon/gorebyss/follow_normal.pal b/graphics/pokemon/gorebyss/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gorebyss/follow_normal.pal rename to graphics/pokemon/gorebyss/overworld_normal.pal diff --git a/graphics/pokemon/gorebyss/follow_shiny.pal b/graphics/pokemon/gorebyss/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gorebyss/follow_shiny.pal rename to graphics/pokemon/gorebyss/overworld_shiny.pal diff --git a/graphics/pokemon/gossifleur/follower.png b/graphics/pokemon/gossifleur/overworld.png similarity index 100% rename from graphics/pokemon/gossifleur/follower.png rename to graphics/pokemon/gossifleur/overworld.png diff --git a/graphics/pokemon/gossifleur/follow_normal.pal b/graphics/pokemon/gossifleur/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gossifleur/follow_normal.pal rename to graphics/pokemon/gossifleur/overworld_normal.pal diff --git a/graphics/pokemon/gossifleur/follow_shiny.pal b/graphics/pokemon/gossifleur/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gossifleur/follow_shiny.pal rename to graphics/pokemon/gossifleur/overworld_shiny.pal diff --git a/graphics/pokemon/gothita/follower.png b/graphics/pokemon/gothita/overworld.png similarity index 100% rename from graphics/pokemon/gothita/follower.png rename to graphics/pokemon/gothita/overworld.png diff --git a/graphics/pokemon/gothita/follow_normal.pal b/graphics/pokemon/gothita/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gothita/follow_normal.pal rename to graphics/pokemon/gothita/overworld_normal.pal diff --git a/graphics/pokemon/gothita/follow_shiny.pal b/graphics/pokemon/gothita/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gothita/follow_shiny.pal rename to graphics/pokemon/gothita/overworld_shiny.pal diff --git a/graphics/pokemon/gothitelle/follower.png b/graphics/pokemon/gothitelle/overworld.png similarity index 100% rename from graphics/pokemon/gothitelle/follower.png rename to graphics/pokemon/gothitelle/overworld.png diff --git a/graphics/pokemon/gothitelle/follow_normal.pal b/graphics/pokemon/gothitelle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gothitelle/follow_normal.pal rename to graphics/pokemon/gothitelle/overworld_normal.pal diff --git a/graphics/pokemon/gothitelle/follow_shiny.pal b/graphics/pokemon/gothitelle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gothitelle/follow_shiny.pal rename to graphics/pokemon/gothitelle/overworld_shiny.pal diff --git a/graphics/pokemon/gothorita/follower.png b/graphics/pokemon/gothorita/overworld.png similarity index 100% rename from graphics/pokemon/gothorita/follower.png rename to graphics/pokemon/gothorita/overworld.png diff --git a/graphics/pokemon/gothorita/follow_normal.pal b/graphics/pokemon/gothorita/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gothorita/follow_normal.pal rename to graphics/pokemon/gothorita/overworld_normal.pal diff --git a/graphics/pokemon/gothorita/follow_shiny.pal b/graphics/pokemon/gothorita/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gothorita/follow_shiny.pal rename to graphics/pokemon/gothorita/overworld_shiny.pal diff --git a/graphics/pokemon/gourgeist/follower.png b/graphics/pokemon/gourgeist/overworld.png similarity index 100% rename from graphics/pokemon/gourgeist/follower.png rename to graphics/pokemon/gourgeist/overworld.png diff --git a/graphics/pokemon/gourgeist/follow_normal.pal b/graphics/pokemon/gourgeist/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gourgeist/follow_normal.pal rename to graphics/pokemon/gourgeist/overworld_normal.pal diff --git a/graphics/pokemon/gourgeist/follow_shiny.pal b/graphics/pokemon/gourgeist/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gourgeist/follow_shiny.pal rename to graphics/pokemon/gourgeist/overworld_shiny.pal diff --git a/graphics/pokemon/granbull/follower.png b/graphics/pokemon/granbull/overworld.png similarity index 100% rename from graphics/pokemon/granbull/follower.png rename to graphics/pokemon/granbull/overworld.png diff --git a/graphics/pokemon/granbull/follow_normal.pal b/graphics/pokemon/granbull/overworld_normal.pal similarity index 100% rename from graphics/pokemon/granbull/follow_normal.pal rename to graphics/pokemon/granbull/overworld_normal.pal diff --git a/graphics/pokemon/granbull/follow_shiny.pal b/graphics/pokemon/granbull/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/granbull/follow_shiny.pal rename to graphics/pokemon/granbull/overworld_shiny.pal diff --git a/graphics/pokemon/grapploct/follower.png b/graphics/pokemon/grapploct/overworld.png similarity index 100% rename from graphics/pokemon/grapploct/follower.png rename to graphics/pokemon/grapploct/overworld.png diff --git a/graphics/pokemon/grapploct/follow_normal.pal b/graphics/pokemon/grapploct/overworld_normal.pal similarity index 100% rename from graphics/pokemon/grapploct/follow_normal.pal rename to graphics/pokemon/grapploct/overworld_normal.pal diff --git a/graphics/pokemon/grapploct/follow_shiny.pal b/graphics/pokemon/grapploct/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/grapploct/follow_shiny.pal rename to graphics/pokemon/grapploct/overworld_shiny.pal diff --git a/graphics/pokemon/graveler/alolan/follower.png b/graphics/pokemon/graveler/alolan/overworld.png similarity index 100% rename from graphics/pokemon/graveler/alolan/follower.png rename to graphics/pokemon/graveler/alolan/overworld.png diff --git a/graphics/pokemon/graveler/alolan/follow_normal.pal b/graphics/pokemon/graveler/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/graveler/alolan/follow_normal.pal rename to graphics/pokemon/graveler/alolan/overworld_normal.pal diff --git a/graphics/pokemon/graveler/alolan/follow_shiny.pal b/graphics/pokemon/graveler/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/graveler/alolan/follow_shiny.pal rename to graphics/pokemon/graveler/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/graveler/follower.png b/graphics/pokemon/graveler/overworld.png similarity index 100% rename from graphics/pokemon/graveler/follower.png rename to graphics/pokemon/graveler/overworld.png diff --git a/graphics/pokemon/graveler/follow_normal.pal b/graphics/pokemon/graveler/overworld_normal.pal similarity index 100% rename from graphics/pokemon/graveler/follow_normal.pal rename to graphics/pokemon/graveler/overworld_normal.pal diff --git a/graphics/pokemon/graveler/follow_shiny.pal b/graphics/pokemon/graveler/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/graveler/follow_shiny.pal rename to graphics/pokemon/graveler/overworld_shiny.pal diff --git a/graphics/pokemon/greedent/follower.png b/graphics/pokemon/greedent/overworld.png similarity index 100% rename from graphics/pokemon/greedent/follower.png rename to graphics/pokemon/greedent/overworld.png diff --git a/graphics/pokemon/greedent/follow_normal.pal b/graphics/pokemon/greedent/overworld_normal.pal similarity index 100% rename from graphics/pokemon/greedent/follow_normal.pal rename to graphics/pokemon/greedent/overworld_normal.pal diff --git a/graphics/pokemon/greedent/follow_shiny.pal b/graphics/pokemon/greedent/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/greedent/follow_shiny.pal rename to graphics/pokemon/greedent/overworld_shiny.pal diff --git a/graphics/pokemon/greninja/follower.png b/graphics/pokemon/greninja/overworld.png similarity index 100% rename from graphics/pokemon/greninja/follower.png rename to graphics/pokemon/greninja/overworld.png diff --git a/graphics/pokemon/greninja/follow_normal.pal b/graphics/pokemon/greninja/overworld_normal.pal similarity index 100% rename from graphics/pokemon/greninja/follow_normal.pal rename to graphics/pokemon/greninja/overworld_normal.pal diff --git a/graphics/pokemon/greninja/follow_shiny.pal b/graphics/pokemon/greninja/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/greninja/follow_shiny.pal rename to graphics/pokemon/greninja/overworld_shiny.pal diff --git a/graphics/pokemon/grimer/alolan/follower.png b/graphics/pokemon/grimer/alolan/overworld.png similarity index 100% rename from graphics/pokemon/grimer/alolan/follower.png rename to graphics/pokemon/grimer/alolan/overworld.png diff --git a/graphics/pokemon/grimer/alolan/follow_normal.pal b/graphics/pokemon/grimer/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/grimer/alolan/follow_normal.pal rename to graphics/pokemon/grimer/alolan/overworld_normal.pal diff --git a/graphics/pokemon/grimer/alolan/follow_shiny.pal b/graphics/pokemon/grimer/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/grimer/alolan/follow_shiny.pal rename to graphics/pokemon/grimer/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/grimer/follower.png b/graphics/pokemon/grimer/overworld.png similarity index 100% rename from graphics/pokemon/grimer/follower.png rename to graphics/pokemon/grimer/overworld.png diff --git a/graphics/pokemon/grimer/follow_normal.pal b/graphics/pokemon/grimer/overworld_normal.pal similarity index 100% rename from graphics/pokemon/grimer/follow_normal.pal rename to graphics/pokemon/grimer/overworld_normal.pal diff --git a/graphics/pokemon/grimer/follow_shiny.pal b/graphics/pokemon/grimer/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/grimer/follow_shiny.pal rename to graphics/pokemon/grimer/overworld_shiny.pal diff --git a/graphics/pokemon/grimmsnarl/follower.png b/graphics/pokemon/grimmsnarl/overworld.png similarity index 100% rename from graphics/pokemon/grimmsnarl/follower.png rename to graphics/pokemon/grimmsnarl/overworld.png diff --git a/graphics/pokemon/grimmsnarl/follow_normal.pal b/graphics/pokemon/grimmsnarl/overworld_normal.pal similarity index 100% rename from graphics/pokemon/grimmsnarl/follow_normal.pal rename to graphics/pokemon/grimmsnarl/overworld_normal.pal diff --git a/graphics/pokemon/grimmsnarl/follow_shiny.pal b/graphics/pokemon/grimmsnarl/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/grimmsnarl/follow_shiny.pal rename to graphics/pokemon/grimmsnarl/overworld_shiny.pal diff --git a/graphics/pokemon/grookey/follower.png b/graphics/pokemon/grookey/overworld.png similarity index 100% rename from graphics/pokemon/grookey/follower.png rename to graphics/pokemon/grookey/overworld.png diff --git a/graphics/pokemon/grookey/follow_normal.pal b/graphics/pokemon/grookey/overworld_normal.pal similarity index 100% rename from graphics/pokemon/grookey/follow_normal.pal rename to graphics/pokemon/grookey/overworld_normal.pal diff --git a/graphics/pokemon/grookey/follow_shiny.pal b/graphics/pokemon/grookey/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/grookey/follow_shiny.pal rename to graphics/pokemon/grookey/overworld_shiny.pal diff --git a/graphics/pokemon/grotle/follower.png b/graphics/pokemon/grotle/overworld.png similarity index 100% rename from graphics/pokemon/grotle/follower.png rename to graphics/pokemon/grotle/overworld.png diff --git a/graphics/pokemon/grotle/follow_normal.pal b/graphics/pokemon/grotle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/grotle/follow_normal.pal rename to graphics/pokemon/grotle/overworld_normal.pal diff --git a/graphics/pokemon/grotle/follow_shiny.pal b/graphics/pokemon/grotle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/grotle/follow_shiny.pal rename to graphics/pokemon/grotle/overworld_shiny.pal diff --git a/graphics/pokemon/groudon/follower.png b/graphics/pokemon/groudon/overworld.png similarity index 100% rename from graphics/pokemon/groudon/follower.png rename to graphics/pokemon/groudon/overworld.png diff --git a/graphics/pokemon/groudon/follow_normal.pal b/graphics/pokemon/groudon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/groudon/follow_normal.pal rename to graphics/pokemon/groudon/overworld_normal.pal diff --git a/graphics/pokemon/groudon/follow_shiny.pal b/graphics/pokemon/groudon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/groudon/follow_shiny.pal rename to graphics/pokemon/groudon/overworld_shiny.pal diff --git a/graphics/pokemon/grovyle/follower.png b/graphics/pokemon/grovyle/overworld.png similarity index 100% rename from graphics/pokemon/grovyle/follower.png rename to graphics/pokemon/grovyle/overworld.png diff --git a/graphics/pokemon/grovyle/follow_normal.pal b/graphics/pokemon/grovyle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/grovyle/follow_normal.pal rename to graphics/pokemon/grovyle/overworld_normal.pal diff --git a/graphics/pokemon/grovyle/follow_shiny.pal b/graphics/pokemon/grovyle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/grovyle/follow_shiny.pal rename to graphics/pokemon/grovyle/overworld_shiny.pal diff --git a/graphics/pokemon/growlithe/hisuian/follower.png b/graphics/pokemon/growlithe/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/growlithe/hisuian/follower.png rename to graphics/pokemon/growlithe/hisuian/overworld.png diff --git a/graphics/pokemon/growlithe/hisuian/follow_normal.pal b/graphics/pokemon/growlithe/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/growlithe/hisuian/follow_normal.pal rename to graphics/pokemon/growlithe/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/growlithe/hisuian/follow_shiny.pal b/graphics/pokemon/growlithe/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/growlithe/hisuian/follow_shiny.pal rename to graphics/pokemon/growlithe/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/growlithe/follower.png b/graphics/pokemon/growlithe/overworld.png similarity index 100% rename from graphics/pokemon/growlithe/follower.png rename to graphics/pokemon/growlithe/overworld.png diff --git a/graphics/pokemon/growlithe/follow_normal.pal b/graphics/pokemon/growlithe/overworld_normal.pal similarity index 100% rename from graphics/pokemon/growlithe/follow_normal.pal rename to graphics/pokemon/growlithe/overworld_normal.pal diff --git a/graphics/pokemon/growlithe/follow_shiny.pal b/graphics/pokemon/growlithe/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/growlithe/follow_shiny.pal rename to graphics/pokemon/growlithe/overworld_shiny.pal diff --git a/graphics/pokemon/grubbin/follower.png b/graphics/pokemon/grubbin/overworld.png similarity index 100% rename from graphics/pokemon/grubbin/follower.png rename to graphics/pokemon/grubbin/overworld.png diff --git a/graphics/pokemon/grubbin/follow_normal.pal b/graphics/pokemon/grubbin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/grubbin/follow_normal.pal rename to graphics/pokemon/grubbin/overworld_normal.pal diff --git a/graphics/pokemon/grubbin/follow_shiny.pal b/graphics/pokemon/grubbin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/grubbin/follow_shiny.pal rename to graphics/pokemon/grubbin/overworld_shiny.pal diff --git a/graphics/pokemon/grumpig/follower.png b/graphics/pokemon/grumpig/overworld.png similarity index 100% rename from graphics/pokemon/grumpig/follower.png rename to graphics/pokemon/grumpig/overworld.png diff --git a/graphics/pokemon/grumpig/follow_normal.pal b/graphics/pokemon/grumpig/overworld_normal.pal similarity index 100% rename from graphics/pokemon/grumpig/follow_normal.pal rename to graphics/pokemon/grumpig/overworld_normal.pal diff --git a/graphics/pokemon/grumpig/follow_shiny.pal b/graphics/pokemon/grumpig/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/grumpig/follow_shiny.pal rename to graphics/pokemon/grumpig/overworld_shiny.pal diff --git a/graphics/pokemon/gulpin/follower.png b/graphics/pokemon/gulpin/overworld.png similarity index 100% rename from graphics/pokemon/gulpin/follower.png rename to graphics/pokemon/gulpin/overworld.png diff --git a/graphics/pokemon/gulpin/follow_normal.pal b/graphics/pokemon/gulpin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gulpin/follow_normal.pal rename to graphics/pokemon/gulpin/overworld_normal.pal diff --git a/graphics/pokemon/gulpin/follow_shiny.pal b/graphics/pokemon/gulpin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gulpin/follow_shiny.pal rename to graphics/pokemon/gulpin/overworld_shiny.pal diff --git a/graphics/pokemon/gumshoos/follower.png b/graphics/pokemon/gumshoos/overworld.png similarity index 100% rename from graphics/pokemon/gumshoos/follower.png rename to graphics/pokemon/gumshoos/overworld.png diff --git a/graphics/pokemon/gumshoos/follow_normal.pal b/graphics/pokemon/gumshoos/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gumshoos/follow_normal.pal rename to graphics/pokemon/gumshoos/overworld_normal.pal diff --git a/graphics/pokemon/gumshoos/follow_shiny.pal b/graphics/pokemon/gumshoos/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gumshoos/follow_shiny.pal rename to graphics/pokemon/gumshoos/overworld_shiny.pal diff --git a/graphics/pokemon/gurdurr/follower.png b/graphics/pokemon/gurdurr/overworld.png similarity index 100% rename from graphics/pokemon/gurdurr/follower.png rename to graphics/pokemon/gurdurr/overworld.png diff --git a/graphics/pokemon/gurdurr/follow_normal.pal b/graphics/pokemon/gurdurr/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gurdurr/follow_normal.pal rename to graphics/pokemon/gurdurr/overworld_normal.pal diff --git a/graphics/pokemon/gurdurr/follow_shiny.pal b/graphics/pokemon/gurdurr/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gurdurr/follow_shiny.pal rename to graphics/pokemon/gurdurr/overworld_shiny.pal diff --git a/graphics/pokemon/guzzlord/follower.png b/graphics/pokemon/guzzlord/overworld.png similarity index 100% rename from graphics/pokemon/guzzlord/follower.png rename to graphics/pokemon/guzzlord/overworld.png diff --git a/graphics/pokemon/guzzlord/follow_normal.pal b/graphics/pokemon/guzzlord/overworld_normal.pal similarity index 100% rename from graphics/pokemon/guzzlord/follow_normal.pal rename to graphics/pokemon/guzzlord/overworld_normal.pal diff --git a/graphics/pokemon/guzzlord/follow_shiny.pal b/graphics/pokemon/guzzlord/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/guzzlord/follow_shiny.pal rename to graphics/pokemon/guzzlord/overworld_shiny.pal diff --git a/graphics/pokemon/gyarados/follower.png b/graphics/pokemon/gyarados/overworld.png similarity index 100% rename from graphics/pokemon/gyarados/follower.png rename to graphics/pokemon/gyarados/overworld.png diff --git a/graphics/pokemon/gyarados/follow_normal.pal b/graphics/pokemon/gyarados/overworld_normal.pal similarity index 100% rename from graphics/pokemon/gyarados/follow_normal.pal rename to graphics/pokemon/gyarados/overworld_normal.pal diff --git a/graphics/pokemon/gyarados/follow_shiny.pal b/graphics/pokemon/gyarados/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/gyarados/follow_shiny.pal rename to graphics/pokemon/gyarados/overworld_shiny.pal diff --git a/graphics/pokemon/hakamo_o/follower.png b/graphics/pokemon/hakamo_o/overworld.png similarity index 100% rename from graphics/pokemon/hakamo_o/follower.png rename to graphics/pokemon/hakamo_o/overworld.png diff --git a/graphics/pokemon/hakamo_o/follow_normal.pal b/graphics/pokemon/hakamo_o/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hakamo_o/follow_normal.pal rename to graphics/pokemon/hakamo_o/overworld_normal.pal diff --git a/graphics/pokemon/hakamo_o/follow_shiny.pal b/graphics/pokemon/hakamo_o/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hakamo_o/follow_shiny.pal rename to graphics/pokemon/hakamo_o/overworld_shiny.pal diff --git a/graphics/pokemon/happiny/follower.png b/graphics/pokemon/happiny/overworld.png similarity index 100% rename from graphics/pokemon/happiny/follower.png rename to graphics/pokemon/happiny/overworld.png diff --git a/graphics/pokemon/happiny/follow_normal.pal b/graphics/pokemon/happiny/overworld_normal.pal similarity index 100% rename from graphics/pokemon/happiny/follow_normal.pal rename to graphics/pokemon/happiny/overworld_normal.pal diff --git a/graphics/pokemon/happiny/follow_shiny.pal b/graphics/pokemon/happiny/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/happiny/follow_shiny.pal rename to graphics/pokemon/happiny/overworld_shiny.pal diff --git a/graphics/pokemon/hariyama/follower.png b/graphics/pokemon/hariyama/overworld.png similarity index 100% rename from graphics/pokemon/hariyama/follower.png rename to graphics/pokemon/hariyama/overworld.png diff --git a/graphics/pokemon/hariyama/follow_normal.pal b/graphics/pokemon/hariyama/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hariyama/follow_normal.pal rename to graphics/pokemon/hariyama/overworld_normal.pal diff --git a/graphics/pokemon/hariyama/follow_shiny.pal b/graphics/pokemon/hariyama/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hariyama/follow_shiny.pal rename to graphics/pokemon/hariyama/overworld_shiny.pal diff --git a/graphics/pokemon/hatenna/follower.png b/graphics/pokemon/hatenna/overworld.png similarity index 100% rename from graphics/pokemon/hatenna/follower.png rename to graphics/pokemon/hatenna/overworld.png diff --git a/graphics/pokemon/hatenna/follow_normal.pal b/graphics/pokemon/hatenna/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hatenna/follow_normal.pal rename to graphics/pokemon/hatenna/overworld_normal.pal diff --git a/graphics/pokemon/hatenna/follow_shiny.pal b/graphics/pokemon/hatenna/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hatenna/follow_shiny.pal rename to graphics/pokemon/hatenna/overworld_shiny.pal diff --git a/graphics/pokemon/hatterene/follower.png b/graphics/pokemon/hatterene/overworld.png similarity index 100% rename from graphics/pokemon/hatterene/follower.png rename to graphics/pokemon/hatterene/overworld.png diff --git a/graphics/pokemon/hatterene/follow_normal.pal b/graphics/pokemon/hatterene/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hatterene/follow_normal.pal rename to graphics/pokemon/hatterene/overworld_normal.pal diff --git a/graphics/pokemon/hatterene/follow_shiny.pal b/graphics/pokemon/hatterene/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hatterene/follow_shiny.pal rename to graphics/pokemon/hatterene/overworld_shiny.pal diff --git a/graphics/pokemon/hattrem/follower.png b/graphics/pokemon/hattrem/overworld.png similarity index 100% rename from graphics/pokemon/hattrem/follower.png rename to graphics/pokemon/hattrem/overworld.png diff --git a/graphics/pokemon/hattrem/follow_normal.pal b/graphics/pokemon/hattrem/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hattrem/follow_normal.pal rename to graphics/pokemon/hattrem/overworld_normal.pal diff --git a/graphics/pokemon/hattrem/follow_shiny.pal b/graphics/pokemon/hattrem/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hattrem/follow_shiny.pal rename to graphics/pokemon/hattrem/overworld_shiny.pal diff --git a/graphics/pokemon/haunter/follower.png b/graphics/pokemon/haunter/overworld.png similarity index 100% rename from graphics/pokemon/haunter/follower.png rename to graphics/pokemon/haunter/overworld.png diff --git a/graphics/pokemon/haunter/follow_normal.pal b/graphics/pokemon/haunter/overworld_normal.pal similarity index 100% rename from graphics/pokemon/haunter/follow_normal.pal rename to graphics/pokemon/haunter/overworld_normal.pal diff --git a/graphics/pokemon/haunter/follow_shiny.pal b/graphics/pokemon/haunter/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/haunter/follow_shiny.pal rename to graphics/pokemon/haunter/overworld_shiny.pal diff --git a/graphics/pokemon/hawlucha/follower.png b/graphics/pokemon/hawlucha/overworld.png similarity index 100% rename from graphics/pokemon/hawlucha/follower.png rename to graphics/pokemon/hawlucha/overworld.png diff --git a/graphics/pokemon/hawlucha/follow_normal.pal b/graphics/pokemon/hawlucha/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hawlucha/follow_normal.pal rename to graphics/pokemon/hawlucha/overworld_normal.pal diff --git a/graphics/pokemon/hawlucha/follow_shiny.pal b/graphics/pokemon/hawlucha/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hawlucha/follow_shiny.pal rename to graphics/pokemon/hawlucha/overworld_shiny.pal diff --git a/graphics/pokemon/haxorus/follower.png b/graphics/pokemon/haxorus/overworld.png similarity index 100% rename from graphics/pokemon/haxorus/follower.png rename to graphics/pokemon/haxorus/overworld.png diff --git a/graphics/pokemon/haxorus/follow_normal.pal b/graphics/pokemon/haxorus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/haxorus/follow_normal.pal rename to graphics/pokemon/haxorus/overworld_normal.pal diff --git a/graphics/pokemon/haxorus/follow_shiny.pal b/graphics/pokemon/haxorus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/haxorus/follow_shiny.pal rename to graphics/pokemon/haxorus/overworld_shiny.pal diff --git a/graphics/pokemon/heatmor/follower.png b/graphics/pokemon/heatmor/overworld.png similarity index 100% rename from graphics/pokemon/heatmor/follower.png rename to graphics/pokemon/heatmor/overworld.png diff --git a/graphics/pokemon/heatmor/follow_normal.pal b/graphics/pokemon/heatmor/overworld_normal.pal similarity index 100% rename from graphics/pokemon/heatmor/follow_normal.pal rename to graphics/pokemon/heatmor/overworld_normal.pal diff --git a/graphics/pokemon/heatmor/follow_shiny.pal b/graphics/pokemon/heatmor/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/heatmor/follow_shiny.pal rename to graphics/pokemon/heatmor/overworld_shiny.pal diff --git a/graphics/pokemon/heatran/follower.png b/graphics/pokemon/heatran/overworld.png similarity index 100% rename from graphics/pokemon/heatran/follower.png rename to graphics/pokemon/heatran/overworld.png diff --git a/graphics/pokemon/heatran/follow_normal.pal b/graphics/pokemon/heatran/overworld_normal.pal similarity index 100% rename from graphics/pokemon/heatran/follow_normal.pal rename to graphics/pokemon/heatran/overworld_normal.pal diff --git a/graphics/pokemon/heatran/follow_shiny.pal b/graphics/pokemon/heatran/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/heatran/follow_shiny.pal rename to graphics/pokemon/heatran/overworld_shiny.pal diff --git a/graphics/pokemon/heliolisk/follower.png b/graphics/pokemon/heliolisk/overworld.png similarity index 100% rename from graphics/pokemon/heliolisk/follower.png rename to graphics/pokemon/heliolisk/overworld.png diff --git a/graphics/pokemon/heliolisk/follow_normal.pal b/graphics/pokemon/heliolisk/overworld_normal.pal similarity index 100% rename from graphics/pokemon/heliolisk/follow_normal.pal rename to graphics/pokemon/heliolisk/overworld_normal.pal diff --git a/graphics/pokemon/heliolisk/follow_shiny.pal b/graphics/pokemon/heliolisk/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/heliolisk/follow_shiny.pal rename to graphics/pokemon/heliolisk/overworld_shiny.pal diff --git a/graphics/pokemon/helioptile/follower.png b/graphics/pokemon/helioptile/overworld.png similarity index 100% rename from graphics/pokemon/helioptile/follower.png rename to graphics/pokemon/helioptile/overworld.png diff --git a/graphics/pokemon/helioptile/follow_normal.pal b/graphics/pokemon/helioptile/overworld_normal.pal similarity index 100% rename from graphics/pokemon/helioptile/follow_normal.pal rename to graphics/pokemon/helioptile/overworld_normal.pal diff --git a/graphics/pokemon/helioptile/follow_shiny.pal b/graphics/pokemon/helioptile/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/helioptile/follow_shiny.pal rename to graphics/pokemon/helioptile/overworld_shiny.pal diff --git a/graphics/pokemon/heracross/follower.png b/graphics/pokemon/heracross/overworld.png similarity index 100% rename from graphics/pokemon/heracross/follower.png rename to graphics/pokemon/heracross/overworld.png diff --git a/graphics/pokemon/heracross/follow_normal.pal b/graphics/pokemon/heracross/overworld_normal.pal similarity index 100% rename from graphics/pokemon/heracross/follow_normal.pal rename to graphics/pokemon/heracross/overworld_normal.pal diff --git a/graphics/pokemon/heracross/follow_shiny.pal b/graphics/pokemon/heracross/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/heracross/follow_shiny.pal rename to graphics/pokemon/heracross/overworld_shiny.pal diff --git a/graphics/pokemon/herdier/follower.png b/graphics/pokemon/herdier/overworld.png similarity index 100% rename from graphics/pokemon/herdier/follower.png rename to graphics/pokemon/herdier/overworld.png diff --git a/graphics/pokemon/herdier/follow_normal.pal b/graphics/pokemon/herdier/overworld_normal.pal similarity index 100% rename from graphics/pokemon/herdier/follow_normal.pal rename to graphics/pokemon/herdier/overworld_normal.pal diff --git a/graphics/pokemon/herdier/follow_shiny.pal b/graphics/pokemon/herdier/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/herdier/follow_shiny.pal rename to graphics/pokemon/herdier/overworld_shiny.pal diff --git a/graphics/pokemon/hippopotas/follower.png b/graphics/pokemon/hippopotas/overworld.png similarity index 100% rename from graphics/pokemon/hippopotas/follower.png rename to graphics/pokemon/hippopotas/overworld.png diff --git a/graphics/pokemon/hippopotas/follow_normal.pal b/graphics/pokemon/hippopotas/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hippopotas/follow_normal.pal rename to graphics/pokemon/hippopotas/overworld_normal.pal diff --git a/graphics/pokemon/hippopotas/follow_shiny.pal b/graphics/pokemon/hippopotas/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hippopotas/follow_shiny.pal rename to graphics/pokemon/hippopotas/overworld_shiny.pal diff --git a/graphics/pokemon/hippowdon/follower.png b/graphics/pokemon/hippowdon/overworld.png similarity index 100% rename from graphics/pokemon/hippowdon/follower.png rename to graphics/pokemon/hippowdon/overworld.png diff --git a/graphics/pokemon/hippowdon/follow_normal.pal b/graphics/pokemon/hippowdon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hippowdon/follow_normal.pal rename to graphics/pokemon/hippowdon/overworld_normal.pal diff --git a/graphics/pokemon/hippowdon/follow_shiny.pal b/graphics/pokemon/hippowdon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hippowdon/follow_shiny.pal rename to graphics/pokemon/hippowdon/overworld_shiny.pal diff --git a/graphics/pokemon/hitmonchan/follower.png b/graphics/pokemon/hitmonchan/overworld.png similarity index 100% rename from graphics/pokemon/hitmonchan/follower.png rename to graphics/pokemon/hitmonchan/overworld.png diff --git a/graphics/pokemon/hitmonchan/follow_normal.pal b/graphics/pokemon/hitmonchan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hitmonchan/follow_normal.pal rename to graphics/pokemon/hitmonchan/overworld_normal.pal diff --git a/graphics/pokemon/hitmonchan/follow_shiny.pal b/graphics/pokemon/hitmonchan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hitmonchan/follow_shiny.pal rename to graphics/pokemon/hitmonchan/overworld_shiny.pal diff --git a/graphics/pokemon/hitmonlee/follower.png b/graphics/pokemon/hitmonlee/overworld.png similarity index 100% rename from graphics/pokemon/hitmonlee/follower.png rename to graphics/pokemon/hitmonlee/overworld.png diff --git a/graphics/pokemon/hitmonlee/follow_normal.pal b/graphics/pokemon/hitmonlee/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hitmonlee/follow_normal.pal rename to graphics/pokemon/hitmonlee/overworld_normal.pal diff --git a/graphics/pokemon/hitmonlee/follow_shiny.pal b/graphics/pokemon/hitmonlee/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hitmonlee/follow_shiny.pal rename to graphics/pokemon/hitmonlee/overworld_shiny.pal diff --git a/graphics/pokemon/hitmontop/follower.png b/graphics/pokemon/hitmontop/overworld.png similarity index 100% rename from graphics/pokemon/hitmontop/follower.png rename to graphics/pokemon/hitmontop/overworld.png diff --git a/graphics/pokemon/hitmontop/follow_normal.pal b/graphics/pokemon/hitmontop/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hitmontop/follow_normal.pal rename to graphics/pokemon/hitmontop/overworld_normal.pal diff --git a/graphics/pokemon/hitmontop/follow_shiny.pal b/graphics/pokemon/hitmontop/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hitmontop/follow_shiny.pal rename to graphics/pokemon/hitmontop/overworld_shiny.pal diff --git a/graphics/pokemon/ho_oh/follower.png b/graphics/pokemon/ho_oh/overworld.png similarity index 100% rename from graphics/pokemon/ho_oh/follower.png rename to graphics/pokemon/ho_oh/overworld.png diff --git a/graphics/pokemon/ho_oh/follow_normal.pal b/graphics/pokemon/ho_oh/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ho_oh/follow_normal.pal rename to graphics/pokemon/ho_oh/overworld_normal.pal diff --git a/graphics/pokemon/ho_oh/follow_shiny.pal b/graphics/pokemon/ho_oh/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ho_oh/follow_shiny.pal rename to graphics/pokemon/ho_oh/overworld_shiny.pal diff --git a/graphics/pokemon/honchkrow/follower.png b/graphics/pokemon/honchkrow/overworld.png similarity index 100% rename from graphics/pokemon/honchkrow/follower.png rename to graphics/pokemon/honchkrow/overworld.png diff --git a/graphics/pokemon/honchkrow/follow_normal.pal b/graphics/pokemon/honchkrow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/honchkrow/follow_normal.pal rename to graphics/pokemon/honchkrow/overworld_normal.pal diff --git a/graphics/pokemon/honchkrow/follow_shiny.pal b/graphics/pokemon/honchkrow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/honchkrow/follow_shiny.pal rename to graphics/pokemon/honchkrow/overworld_shiny.pal diff --git a/graphics/pokemon/honedge/follower.png b/graphics/pokemon/honedge/overworld.png similarity index 100% rename from graphics/pokemon/honedge/follower.png rename to graphics/pokemon/honedge/overworld.png diff --git a/graphics/pokemon/honedge/follow_normal.pal b/graphics/pokemon/honedge/overworld_normal.pal similarity index 100% rename from graphics/pokemon/honedge/follow_normal.pal rename to graphics/pokemon/honedge/overworld_normal.pal diff --git a/graphics/pokemon/honedge/follow_shiny.pal b/graphics/pokemon/honedge/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/honedge/follow_shiny.pal rename to graphics/pokemon/honedge/overworld_shiny.pal diff --git a/graphics/pokemon/hoopa/follower.png b/graphics/pokemon/hoopa/overworld.png similarity index 100% rename from graphics/pokemon/hoopa/follower.png rename to graphics/pokemon/hoopa/overworld.png diff --git a/graphics/pokemon/hoopa/follow_normal.pal b/graphics/pokemon/hoopa/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hoopa/follow_normal.pal rename to graphics/pokemon/hoopa/overworld_normal.pal diff --git a/graphics/pokemon/hoopa/follow_shiny.pal b/graphics/pokemon/hoopa/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hoopa/follow_shiny.pal rename to graphics/pokemon/hoopa/overworld_shiny.pal diff --git a/graphics/pokemon/hoopa/unbound/follower.png b/graphics/pokemon/hoopa/unbound/overworld.png similarity index 100% rename from graphics/pokemon/hoopa/unbound/follower.png rename to graphics/pokemon/hoopa/unbound/overworld.png diff --git a/graphics/pokemon/hoopa/unbound/follow_normal.pal b/graphics/pokemon/hoopa/unbound/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hoopa/unbound/follow_normal.pal rename to graphics/pokemon/hoopa/unbound/overworld_normal.pal diff --git a/graphics/pokemon/hoopa/unbound/follow_shiny.pal b/graphics/pokemon/hoopa/unbound/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hoopa/unbound/follow_shiny.pal rename to graphics/pokemon/hoopa/unbound/overworld_shiny.pal diff --git a/graphics/pokemon/hoothoot/follower.png b/graphics/pokemon/hoothoot/overworld.png similarity index 100% rename from graphics/pokemon/hoothoot/follower.png rename to graphics/pokemon/hoothoot/overworld.png diff --git a/graphics/pokemon/hoothoot/follow_normal.pal b/graphics/pokemon/hoothoot/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hoothoot/follow_normal.pal rename to graphics/pokemon/hoothoot/overworld_normal.pal diff --git a/graphics/pokemon/hoothoot/follow_shiny.pal b/graphics/pokemon/hoothoot/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hoothoot/follow_shiny.pal rename to graphics/pokemon/hoothoot/overworld_shiny.pal diff --git a/graphics/pokemon/hoppip/follower.png b/graphics/pokemon/hoppip/overworld.png similarity index 100% rename from graphics/pokemon/hoppip/follower.png rename to graphics/pokemon/hoppip/overworld.png diff --git a/graphics/pokemon/hoppip/follow_normal.pal b/graphics/pokemon/hoppip/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hoppip/follow_normal.pal rename to graphics/pokemon/hoppip/overworld_normal.pal diff --git a/graphics/pokemon/hoppip/follow_shiny.pal b/graphics/pokemon/hoppip/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hoppip/follow_shiny.pal rename to graphics/pokemon/hoppip/overworld_shiny.pal diff --git a/graphics/pokemon/horsea/follower.png b/graphics/pokemon/horsea/overworld.png similarity index 100% rename from graphics/pokemon/horsea/follower.png rename to graphics/pokemon/horsea/overworld.png diff --git a/graphics/pokemon/horsea/follow_normal.pal b/graphics/pokemon/horsea/overworld_normal.pal similarity index 100% rename from graphics/pokemon/horsea/follow_normal.pal rename to graphics/pokemon/horsea/overworld_normal.pal diff --git a/graphics/pokemon/horsea/follow_shiny.pal b/graphics/pokemon/horsea/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/horsea/follow_shiny.pal rename to graphics/pokemon/horsea/overworld_shiny.pal diff --git a/graphics/pokemon/houndoom/follower.png b/graphics/pokemon/houndoom/overworld.png similarity index 100% rename from graphics/pokemon/houndoom/follower.png rename to graphics/pokemon/houndoom/overworld.png diff --git a/graphics/pokemon/houndoom/follow_normal.pal b/graphics/pokemon/houndoom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/houndoom/follow_normal.pal rename to graphics/pokemon/houndoom/overworld_normal.pal diff --git a/graphics/pokemon/houndoom/follow_shiny.pal b/graphics/pokemon/houndoom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/houndoom/follow_shiny.pal rename to graphics/pokemon/houndoom/overworld_shiny.pal diff --git a/graphics/pokemon/houndour/follower.png b/graphics/pokemon/houndour/overworld.png similarity index 100% rename from graphics/pokemon/houndour/follower.png rename to graphics/pokemon/houndour/overworld.png diff --git a/graphics/pokemon/houndour/follow_normal.pal b/graphics/pokemon/houndour/overworld_normal.pal similarity index 100% rename from graphics/pokemon/houndour/follow_normal.pal rename to graphics/pokemon/houndour/overworld_normal.pal diff --git a/graphics/pokemon/houndour/follow_shiny.pal b/graphics/pokemon/houndour/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/houndour/follow_shiny.pal rename to graphics/pokemon/houndour/overworld_shiny.pal diff --git a/graphics/pokemon/huntail/follower.png b/graphics/pokemon/huntail/overworld.png similarity index 100% rename from graphics/pokemon/huntail/follower.png rename to graphics/pokemon/huntail/overworld.png diff --git a/graphics/pokemon/huntail/follow_normal.pal b/graphics/pokemon/huntail/overworld_normal.pal similarity index 100% rename from graphics/pokemon/huntail/follow_normal.pal rename to graphics/pokemon/huntail/overworld_normal.pal diff --git a/graphics/pokemon/huntail/follow_shiny.pal b/graphics/pokemon/huntail/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/huntail/follow_shiny.pal rename to graphics/pokemon/huntail/overworld_shiny.pal diff --git a/graphics/pokemon/hydreigon/follower.png b/graphics/pokemon/hydreigon/overworld.png similarity index 100% rename from graphics/pokemon/hydreigon/follower.png rename to graphics/pokemon/hydreigon/overworld.png diff --git a/graphics/pokemon/hydreigon/follow_normal.pal b/graphics/pokemon/hydreigon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hydreigon/follow_normal.pal rename to graphics/pokemon/hydreigon/overworld_normal.pal diff --git a/graphics/pokemon/hydreigon/follow_shiny.pal b/graphics/pokemon/hydreigon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hydreigon/follow_shiny.pal rename to graphics/pokemon/hydreigon/overworld_shiny.pal diff --git a/graphics/pokemon/hypno/follower.png b/graphics/pokemon/hypno/overworld.png similarity index 100% rename from graphics/pokemon/hypno/follower.png rename to graphics/pokemon/hypno/overworld.png diff --git a/graphics/pokemon/hypno/follow_normal.pal b/graphics/pokemon/hypno/overworld_normal.pal similarity index 100% rename from graphics/pokemon/hypno/follow_normal.pal rename to graphics/pokemon/hypno/overworld_normal.pal diff --git a/graphics/pokemon/hypno/follow_shiny.pal b/graphics/pokemon/hypno/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/hypno/follow_shiny.pal rename to graphics/pokemon/hypno/overworld_shiny.pal diff --git a/graphics/pokemon/igglybuff/follower.png b/graphics/pokemon/igglybuff/overworld.png similarity index 100% rename from graphics/pokemon/igglybuff/follower.png rename to graphics/pokemon/igglybuff/overworld.png diff --git a/graphics/pokemon/igglybuff/follow_normal.pal b/graphics/pokemon/igglybuff/overworld_normal.pal similarity index 100% rename from graphics/pokemon/igglybuff/follow_normal.pal rename to graphics/pokemon/igglybuff/overworld_normal.pal diff --git a/graphics/pokemon/igglybuff/follow_shiny.pal b/graphics/pokemon/igglybuff/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/igglybuff/follow_shiny.pal rename to graphics/pokemon/igglybuff/overworld_shiny.pal diff --git a/graphics/pokemon/illumise/follower.png b/graphics/pokemon/illumise/overworld.png similarity index 100% rename from graphics/pokemon/illumise/follower.png rename to graphics/pokemon/illumise/overworld.png diff --git a/graphics/pokemon/illumise/follow_normal.pal b/graphics/pokemon/illumise/overworld_normal.pal similarity index 100% rename from graphics/pokemon/illumise/follow_normal.pal rename to graphics/pokemon/illumise/overworld_normal.pal diff --git a/graphics/pokemon/illumise/follow_shiny.pal b/graphics/pokemon/illumise/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/illumise/follow_shiny.pal rename to graphics/pokemon/illumise/overworld_shiny.pal diff --git a/graphics/pokemon/impidimp/follower.png b/graphics/pokemon/impidimp/overworld.png similarity index 100% rename from graphics/pokemon/impidimp/follower.png rename to graphics/pokemon/impidimp/overworld.png diff --git a/graphics/pokemon/impidimp/follow_normal.pal b/graphics/pokemon/impidimp/overworld_normal.pal similarity index 100% rename from graphics/pokemon/impidimp/follow_normal.pal rename to graphics/pokemon/impidimp/overworld_normal.pal diff --git a/graphics/pokemon/impidimp/follow_shiny.pal b/graphics/pokemon/impidimp/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/impidimp/follow_shiny.pal rename to graphics/pokemon/impidimp/overworld_shiny.pal diff --git a/graphics/pokemon/incineroar/follower.png b/graphics/pokemon/incineroar/overworld.png similarity index 100% rename from graphics/pokemon/incineroar/follower.png rename to graphics/pokemon/incineroar/overworld.png diff --git a/graphics/pokemon/incineroar/follow_normal.pal b/graphics/pokemon/incineroar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/incineroar/follow_normal.pal rename to graphics/pokemon/incineroar/overworld_normal.pal diff --git a/graphics/pokemon/incineroar/follow_shiny.pal b/graphics/pokemon/incineroar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/incineroar/follow_shiny.pal rename to graphics/pokemon/incineroar/overworld_shiny.pal diff --git a/graphics/pokemon/indeedee/female/follower.png b/graphics/pokemon/indeedee/female/overworld.png similarity index 100% rename from graphics/pokemon/indeedee/female/follower.png rename to graphics/pokemon/indeedee/female/overworld.png diff --git a/graphics/pokemon/indeedee/female/follow_normal.pal b/graphics/pokemon/indeedee/female/overworld_normal.pal similarity index 100% rename from graphics/pokemon/indeedee/female/follow_normal.pal rename to graphics/pokemon/indeedee/female/overworld_normal.pal diff --git a/graphics/pokemon/indeedee/female/follow_shiny.pal b/graphics/pokemon/indeedee/female/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/indeedee/female/follow_shiny.pal rename to graphics/pokemon/indeedee/female/overworld_shiny.pal diff --git a/graphics/pokemon/indeedee/follower.png b/graphics/pokemon/indeedee/overworld.png similarity index 100% rename from graphics/pokemon/indeedee/follower.png rename to graphics/pokemon/indeedee/overworld.png diff --git a/graphics/pokemon/indeedee/follow_normal.pal b/graphics/pokemon/indeedee/overworld_normal.pal similarity index 100% rename from graphics/pokemon/indeedee/follow_normal.pal rename to graphics/pokemon/indeedee/overworld_normal.pal diff --git a/graphics/pokemon/indeedee/follow_shiny.pal b/graphics/pokemon/indeedee/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/indeedee/follow_shiny.pal rename to graphics/pokemon/indeedee/overworld_shiny.pal diff --git a/graphics/pokemon/infernape/follower.png b/graphics/pokemon/infernape/overworld.png similarity index 100% rename from graphics/pokemon/infernape/follower.png rename to graphics/pokemon/infernape/overworld.png diff --git a/graphics/pokemon/infernape/follow_normal.pal b/graphics/pokemon/infernape/overworld_normal.pal similarity index 100% rename from graphics/pokemon/infernape/follow_normal.pal rename to graphics/pokemon/infernape/overworld_normal.pal diff --git a/graphics/pokemon/infernape/follow_shiny.pal b/graphics/pokemon/infernape/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/infernape/follow_shiny.pal rename to graphics/pokemon/infernape/overworld_shiny.pal diff --git a/graphics/pokemon/inkay/follower.png b/graphics/pokemon/inkay/overworld.png similarity index 100% rename from graphics/pokemon/inkay/follower.png rename to graphics/pokemon/inkay/overworld.png diff --git a/graphics/pokemon/inkay/follow_normal.pal b/graphics/pokemon/inkay/overworld_normal.pal similarity index 100% rename from graphics/pokemon/inkay/follow_normal.pal rename to graphics/pokemon/inkay/overworld_normal.pal diff --git a/graphics/pokemon/inkay/follow_shiny.pal b/graphics/pokemon/inkay/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/inkay/follow_shiny.pal rename to graphics/pokemon/inkay/overworld_shiny.pal diff --git a/graphics/pokemon/inteleon/follower.png b/graphics/pokemon/inteleon/overworld.png similarity index 100% rename from graphics/pokemon/inteleon/follower.png rename to graphics/pokemon/inteleon/overworld.png diff --git a/graphics/pokemon/inteleon/follow_normal.pal b/graphics/pokemon/inteleon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/inteleon/follow_normal.pal rename to graphics/pokemon/inteleon/overworld_normal.pal diff --git a/graphics/pokemon/inteleon/follow_shiny.pal b/graphics/pokemon/inteleon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/inteleon/follow_shiny.pal rename to graphics/pokemon/inteleon/overworld_shiny.pal diff --git a/graphics/pokemon/ivysaur/follower.png b/graphics/pokemon/ivysaur/overworld.png similarity index 100% rename from graphics/pokemon/ivysaur/follower.png rename to graphics/pokemon/ivysaur/overworld.png diff --git a/graphics/pokemon/ivysaur/follow_normal.pal b/graphics/pokemon/ivysaur/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ivysaur/follow_normal.pal rename to graphics/pokemon/ivysaur/overworld_normal.pal diff --git a/graphics/pokemon/ivysaur/follow_shiny.pal b/graphics/pokemon/ivysaur/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ivysaur/follow_shiny.pal rename to graphics/pokemon/ivysaur/overworld_shiny.pal diff --git a/graphics/pokemon/jangmo_o/follower.png b/graphics/pokemon/jangmo_o/overworld.png similarity index 100% rename from graphics/pokemon/jangmo_o/follower.png rename to graphics/pokemon/jangmo_o/overworld.png diff --git a/graphics/pokemon/jangmo_o/follow_normal.pal b/graphics/pokemon/jangmo_o/overworld_normal.pal similarity index 100% rename from graphics/pokemon/jangmo_o/follow_normal.pal rename to graphics/pokemon/jangmo_o/overworld_normal.pal diff --git a/graphics/pokemon/jangmo_o/follow_shiny.pal b/graphics/pokemon/jangmo_o/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/jangmo_o/follow_shiny.pal rename to graphics/pokemon/jangmo_o/overworld_shiny.pal diff --git a/graphics/pokemon/jellicent/follower.png b/graphics/pokemon/jellicent/overworld.png similarity index 100% rename from graphics/pokemon/jellicent/follower.png rename to graphics/pokemon/jellicent/overworld.png diff --git a/graphics/pokemon/jellicent/follow_normal.pal b/graphics/pokemon/jellicent/overworld_normal.pal similarity index 100% rename from graphics/pokemon/jellicent/follow_normal.pal rename to graphics/pokemon/jellicent/overworld_normal.pal diff --git a/graphics/pokemon/jellicent/follow_shiny.pal b/graphics/pokemon/jellicent/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/jellicent/follow_shiny.pal rename to graphics/pokemon/jellicent/overworld_shiny.pal diff --git a/graphics/pokemon/jigglypuff/follower.png b/graphics/pokemon/jigglypuff/overworld.png similarity index 100% rename from graphics/pokemon/jigglypuff/follower.png rename to graphics/pokemon/jigglypuff/overworld.png diff --git a/graphics/pokemon/jigglypuff/follow_normal.pal b/graphics/pokemon/jigglypuff/overworld_normal.pal similarity index 100% rename from graphics/pokemon/jigglypuff/follow_normal.pal rename to graphics/pokemon/jigglypuff/overworld_normal.pal diff --git a/graphics/pokemon/jigglypuff/follow_shiny.pal b/graphics/pokemon/jigglypuff/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/jigglypuff/follow_shiny.pal rename to graphics/pokemon/jigglypuff/overworld_shiny.pal diff --git a/graphics/pokemon/jirachi/follower.png b/graphics/pokemon/jirachi/overworld.png similarity index 100% rename from graphics/pokemon/jirachi/follower.png rename to graphics/pokemon/jirachi/overworld.png diff --git a/graphics/pokemon/jirachi/follow_normal.pal b/graphics/pokemon/jirachi/overworld_normal.pal similarity index 100% rename from graphics/pokemon/jirachi/follow_normal.pal rename to graphics/pokemon/jirachi/overworld_normal.pal diff --git a/graphics/pokemon/jirachi/follow_shiny.pal b/graphics/pokemon/jirachi/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/jirachi/follow_shiny.pal rename to graphics/pokemon/jirachi/overworld_shiny.pal diff --git a/graphics/pokemon/jolteon/follower.png b/graphics/pokemon/jolteon/overworld.png similarity index 100% rename from graphics/pokemon/jolteon/follower.png rename to graphics/pokemon/jolteon/overworld.png diff --git a/graphics/pokemon/jolteon/follow_normal.pal b/graphics/pokemon/jolteon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/jolteon/follow_normal.pal rename to graphics/pokemon/jolteon/overworld_normal.pal diff --git a/graphics/pokemon/jolteon/follow_shiny.pal b/graphics/pokemon/jolteon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/jolteon/follow_shiny.pal rename to graphics/pokemon/jolteon/overworld_shiny.pal diff --git a/graphics/pokemon/joltik/follower.png b/graphics/pokemon/joltik/overworld.png similarity index 100% rename from graphics/pokemon/joltik/follower.png rename to graphics/pokemon/joltik/overworld.png diff --git a/graphics/pokemon/joltik/follow_normal.pal b/graphics/pokemon/joltik/overworld_normal.pal similarity index 100% rename from graphics/pokemon/joltik/follow_normal.pal rename to graphics/pokemon/joltik/overworld_normal.pal diff --git a/graphics/pokemon/joltik/follow_shiny.pal b/graphics/pokemon/joltik/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/joltik/follow_shiny.pal rename to graphics/pokemon/joltik/overworld_shiny.pal diff --git a/graphics/pokemon/jumpluff/follower.png b/graphics/pokemon/jumpluff/overworld.png similarity index 100% rename from graphics/pokemon/jumpluff/follower.png rename to graphics/pokemon/jumpluff/overworld.png diff --git a/graphics/pokemon/jumpluff/follow_normal.pal b/graphics/pokemon/jumpluff/overworld_normal.pal similarity index 100% rename from graphics/pokemon/jumpluff/follow_normal.pal rename to graphics/pokemon/jumpluff/overworld_normal.pal diff --git a/graphics/pokemon/jumpluff/follow_shiny.pal b/graphics/pokemon/jumpluff/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/jumpluff/follow_shiny.pal rename to graphics/pokemon/jumpluff/overworld_shiny.pal diff --git a/graphics/pokemon/jynx/follower.png b/graphics/pokemon/jynx/overworld.png similarity index 100% rename from graphics/pokemon/jynx/follower.png rename to graphics/pokemon/jynx/overworld.png diff --git a/graphics/pokemon/jynx/follow_normal.pal b/graphics/pokemon/jynx/overworld_normal.pal similarity index 100% rename from graphics/pokemon/jynx/follow_normal.pal rename to graphics/pokemon/jynx/overworld_normal.pal diff --git a/graphics/pokemon/jynx/follow_shiny.pal b/graphics/pokemon/jynx/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/jynx/follow_shiny.pal rename to graphics/pokemon/jynx/overworld_shiny.pal diff --git a/graphics/pokemon/kabuto/follower.png b/graphics/pokemon/kabuto/overworld.png similarity index 100% rename from graphics/pokemon/kabuto/follower.png rename to graphics/pokemon/kabuto/overworld.png diff --git a/graphics/pokemon/kabuto/follow_normal.pal b/graphics/pokemon/kabuto/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kabuto/follow_normal.pal rename to graphics/pokemon/kabuto/overworld_normal.pal diff --git a/graphics/pokemon/kabuto/follow_shiny.pal b/graphics/pokemon/kabuto/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kabuto/follow_shiny.pal rename to graphics/pokemon/kabuto/overworld_shiny.pal diff --git a/graphics/pokemon/kabutops/follower.png b/graphics/pokemon/kabutops/overworld.png similarity index 100% rename from graphics/pokemon/kabutops/follower.png rename to graphics/pokemon/kabutops/overworld.png diff --git a/graphics/pokemon/kabutops/follow_normal.pal b/graphics/pokemon/kabutops/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kabutops/follow_normal.pal rename to graphics/pokemon/kabutops/overworld_normal.pal diff --git a/graphics/pokemon/kabutops/follow_shiny.pal b/graphics/pokemon/kabutops/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kabutops/follow_shiny.pal rename to graphics/pokemon/kabutops/overworld_shiny.pal diff --git a/graphics/pokemon/kadabra/follower.png b/graphics/pokemon/kadabra/overworld.png similarity index 100% rename from graphics/pokemon/kadabra/follower.png rename to graphics/pokemon/kadabra/overworld.png diff --git a/graphics/pokemon/kadabra/follow_normal.pal b/graphics/pokemon/kadabra/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kadabra/follow_normal.pal rename to graphics/pokemon/kadabra/overworld_normal.pal diff --git a/graphics/pokemon/kadabra/follow_shiny.pal b/graphics/pokemon/kadabra/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kadabra/follow_shiny.pal rename to graphics/pokemon/kadabra/overworld_shiny.pal diff --git a/graphics/pokemon/kakuna/follower.png b/graphics/pokemon/kakuna/overworld.png similarity index 100% rename from graphics/pokemon/kakuna/follower.png rename to graphics/pokemon/kakuna/overworld.png diff --git a/graphics/pokemon/kakuna/follow_normal.pal b/graphics/pokemon/kakuna/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kakuna/follow_normal.pal rename to graphics/pokemon/kakuna/overworld_normal.pal diff --git a/graphics/pokemon/kakuna/follow_shiny.pal b/graphics/pokemon/kakuna/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kakuna/follow_shiny.pal rename to graphics/pokemon/kakuna/overworld_shiny.pal diff --git a/graphics/pokemon/kangaskhan/follower.png b/graphics/pokemon/kangaskhan/overworld.png similarity index 100% rename from graphics/pokemon/kangaskhan/follower.png rename to graphics/pokemon/kangaskhan/overworld.png diff --git a/graphics/pokemon/kangaskhan/follow_normal.pal b/graphics/pokemon/kangaskhan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kangaskhan/follow_normal.pal rename to graphics/pokemon/kangaskhan/overworld_normal.pal diff --git a/graphics/pokemon/kangaskhan/follow_shiny.pal b/graphics/pokemon/kangaskhan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kangaskhan/follow_shiny.pal rename to graphics/pokemon/kangaskhan/overworld_shiny.pal diff --git a/graphics/pokemon/karrablast/follower.png b/graphics/pokemon/karrablast/overworld.png similarity index 100% rename from graphics/pokemon/karrablast/follower.png rename to graphics/pokemon/karrablast/overworld.png diff --git a/graphics/pokemon/karrablast/follow_normal.pal b/graphics/pokemon/karrablast/overworld_normal.pal similarity index 100% rename from graphics/pokemon/karrablast/follow_normal.pal rename to graphics/pokemon/karrablast/overworld_normal.pal diff --git a/graphics/pokemon/karrablast/follow_shiny.pal b/graphics/pokemon/karrablast/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/karrablast/follow_shiny.pal rename to graphics/pokemon/karrablast/overworld_shiny.pal diff --git a/graphics/pokemon/kartana/follower.png b/graphics/pokemon/kartana/overworld.png similarity index 100% rename from graphics/pokemon/kartana/follower.png rename to graphics/pokemon/kartana/overworld.png diff --git a/graphics/pokemon/kartana/follow_normal.pal b/graphics/pokemon/kartana/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kartana/follow_normal.pal rename to graphics/pokemon/kartana/overworld_normal.pal diff --git a/graphics/pokemon/kartana/follow_shiny.pal b/graphics/pokemon/kartana/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kartana/follow_shiny.pal rename to graphics/pokemon/kartana/overworld_shiny.pal diff --git a/graphics/pokemon/kecleon/follower.png b/graphics/pokemon/kecleon/overworld.png similarity index 100% rename from graphics/pokemon/kecleon/follower.png rename to graphics/pokemon/kecleon/overworld.png diff --git a/graphics/pokemon/kecleon/follow_normal.pal b/graphics/pokemon/kecleon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kecleon/follow_normal.pal rename to graphics/pokemon/kecleon/overworld_normal.pal diff --git a/graphics/pokemon/kecleon/follow_shiny.pal b/graphics/pokemon/kecleon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kecleon/follow_shiny.pal rename to graphics/pokemon/kecleon/overworld_shiny.pal diff --git a/graphics/pokemon/keldeo/follower.png b/graphics/pokemon/keldeo/overworld.png similarity index 100% rename from graphics/pokemon/keldeo/follower.png rename to graphics/pokemon/keldeo/overworld.png diff --git a/graphics/pokemon/keldeo/follow_normal.pal b/graphics/pokemon/keldeo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/keldeo/follow_normal.pal rename to graphics/pokemon/keldeo/overworld_normal.pal diff --git a/graphics/pokemon/keldeo/follow_shiny.pal b/graphics/pokemon/keldeo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/keldeo/follow_shiny.pal rename to graphics/pokemon/keldeo/overworld_shiny.pal diff --git a/graphics/pokemon/kingdra/follower.png b/graphics/pokemon/kingdra/overworld.png similarity index 100% rename from graphics/pokemon/kingdra/follower.png rename to graphics/pokemon/kingdra/overworld.png diff --git a/graphics/pokemon/kingdra/follow_normal.pal b/graphics/pokemon/kingdra/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kingdra/follow_normal.pal rename to graphics/pokemon/kingdra/overworld_normal.pal diff --git a/graphics/pokemon/kingdra/follow_shiny.pal b/graphics/pokemon/kingdra/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kingdra/follow_shiny.pal rename to graphics/pokemon/kingdra/overworld_shiny.pal diff --git a/graphics/pokemon/kingler/follower.png b/graphics/pokemon/kingler/overworld.png similarity index 100% rename from graphics/pokemon/kingler/follower.png rename to graphics/pokemon/kingler/overworld.png diff --git a/graphics/pokemon/kingler/follow_normal.pal b/graphics/pokemon/kingler/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kingler/follow_normal.pal rename to graphics/pokemon/kingler/overworld_normal.pal diff --git a/graphics/pokemon/kingler/follow_shiny.pal b/graphics/pokemon/kingler/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kingler/follow_shiny.pal rename to graphics/pokemon/kingler/overworld_shiny.pal diff --git a/graphics/pokemon/kirlia/follower.png b/graphics/pokemon/kirlia/overworld.png similarity index 100% rename from graphics/pokemon/kirlia/follower.png rename to graphics/pokemon/kirlia/overworld.png diff --git a/graphics/pokemon/kirlia/follow_normal.pal b/graphics/pokemon/kirlia/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kirlia/follow_normal.pal rename to graphics/pokemon/kirlia/overworld_normal.pal diff --git a/graphics/pokemon/kirlia/follow_shiny.pal b/graphics/pokemon/kirlia/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kirlia/follow_shiny.pal rename to graphics/pokemon/kirlia/overworld_shiny.pal diff --git a/graphics/pokemon/klang/follower.png b/graphics/pokemon/klang/overworld.png similarity index 100% rename from graphics/pokemon/klang/follower.png rename to graphics/pokemon/klang/overworld.png diff --git a/graphics/pokemon/klang/follow_normal.pal b/graphics/pokemon/klang/overworld_normal.pal similarity index 100% rename from graphics/pokemon/klang/follow_normal.pal rename to graphics/pokemon/klang/overworld_normal.pal diff --git a/graphics/pokemon/klang/follow_shiny.pal b/graphics/pokemon/klang/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/klang/follow_shiny.pal rename to graphics/pokemon/klang/overworld_shiny.pal diff --git a/graphics/pokemon/kleavor/follower.png b/graphics/pokemon/kleavor/overworld.png similarity index 100% rename from graphics/pokemon/kleavor/follower.png rename to graphics/pokemon/kleavor/overworld.png diff --git a/graphics/pokemon/kleavor/follow_normal.pal b/graphics/pokemon/kleavor/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kleavor/follow_normal.pal rename to graphics/pokemon/kleavor/overworld_normal.pal diff --git a/graphics/pokemon/kleavor/follow_shiny.pal b/graphics/pokemon/kleavor/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kleavor/follow_shiny.pal rename to graphics/pokemon/kleavor/overworld_shiny.pal diff --git a/graphics/pokemon/klefki/follower.png b/graphics/pokemon/klefki/overworld.png similarity index 100% rename from graphics/pokemon/klefki/follower.png rename to graphics/pokemon/klefki/overworld.png diff --git a/graphics/pokemon/klefki/follow_normal.pal b/graphics/pokemon/klefki/overworld_normal.pal similarity index 100% rename from graphics/pokemon/klefki/follow_normal.pal rename to graphics/pokemon/klefki/overworld_normal.pal diff --git a/graphics/pokemon/klefki/follow_shiny.pal b/graphics/pokemon/klefki/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/klefki/follow_shiny.pal rename to graphics/pokemon/klefki/overworld_shiny.pal diff --git a/graphics/pokemon/klink/follower.png b/graphics/pokemon/klink/overworld.png similarity index 100% rename from graphics/pokemon/klink/follower.png rename to graphics/pokemon/klink/overworld.png diff --git a/graphics/pokemon/klink/follow_normal.pal b/graphics/pokemon/klink/overworld_normal.pal similarity index 100% rename from graphics/pokemon/klink/follow_normal.pal rename to graphics/pokemon/klink/overworld_normal.pal diff --git a/graphics/pokemon/klink/follow_shiny.pal b/graphics/pokemon/klink/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/klink/follow_shiny.pal rename to graphics/pokemon/klink/overworld_shiny.pal diff --git a/graphics/pokemon/klinklang/follower.png b/graphics/pokemon/klinklang/overworld.png similarity index 100% rename from graphics/pokemon/klinklang/follower.png rename to graphics/pokemon/klinklang/overworld.png diff --git a/graphics/pokemon/klinklang/follow_normal.pal b/graphics/pokemon/klinklang/overworld_normal.pal similarity index 100% rename from graphics/pokemon/klinklang/follow_normal.pal rename to graphics/pokemon/klinklang/overworld_normal.pal diff --git a/graphics/pokemon/klinklang/follow_shiny.pal b/graphics/pokemon/klinklang/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/klinklang/follow_shiny.pal rename to graphics/pokemon/klinklang/overworld_shiny.pal diff --git a/graphics/pokemon/koffing/follower.png b/graphics/pokemon/koffing/overworld.png similarity index 100% rename from graphics/pokemon/koffing/follower.png rename to graphics/pokemon/koffing/overworld.png diff --git a/graphics/pokemon/koffing/follow_normal.pal b/graphics/pokemon/koffing/overworld_normal.pal similarity index 100% rename from graphics/pokemon/koffing/follow_normal.pal rename to graphics/pokemon/koffing/overworld_normal.pal diff --git a/graphics/pokemon/koffing/follow_shiny.pal b/graphics/pokemon/koffing/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/koffing/follow_shiny.pal rename to graphics/pokemon/koffing/overworld_shiny.pal diff --git a/graphics/pokemon/komala/follower.png b/graphics/pokemon/komala/overworld.png similarity index 100% rename from graphics/pokemon/komala/follower.png rename to graphics/pokemon/komala/overworld.png diff --git a/graphics/pokemon/komala/follow_normal.pal b/graphics/pokemon/komala/overworld_normal.pal similarity index 100% rename from graphics/pokemon/komala/follow_normal.pal rename to graphics/pokemon/komala/overworld_normal.pal diff --git a/graphics/pokemon/komala/follow_shiny.pal b/graphics/pokemon/komala/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/komala/follow_shiny.pal rename to graphics/pokemon/komala/overworld_shiny.pal diff --git a/graphics/pokemon/kommo_o/follower.png b/graphics/pokemon/kommo_o/overworld.png similarity index 100% rename from graphics/pokemon/kommo_o/follower.png rename to graphics/pokemon/kommo_o/overworld.png diff --git a/graphics/pokemon/kommo_o/follow_normal.pal b/graphics/pokemon/kommo_o/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kommo_o/follow_normal.pal rename to graphics/pokemon/kommo_o/overworld_normal.pal diff --git a/graphics/pokemon/kommo_o/follow_shiny.pal b/graphics/pokemon/kommo_o/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kommo_o/follow_shiny.pal rename to graphics/pokemon/kommo_o/overworld_shiny.pal diff --git a/graphics/pokemon/krabby/follower.png b/graphics/pokemon/krabby/overworld.png similarity index 100% rename from graphics/pokemon/krabby/follower.png rename to graphics/pokemon/krabby/overworld.png diff --git a/graphics/pokemon/krabby/follow_normal.pal b/graphics/pokemon/krabby/overworld_normal.pal similarity index 100% rename from graphics/pokemon/krabby/follow_normal.pal rename to graphics/pokemon/krabby/overworld_normal.pal diff --git a/graphics/pokemon/krabby/follow_shiny.pal b/graphics/pokemon/krabby/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/krabby/follow_shiny.pal rename to graphics/pokemon/krabby/overworld_shiny.pal diff --git a/graphics/pokemon/kricketot/follower.png b/graphics/pokemon/kricketot/overworld.png similarity index 100% rename from graphics/pokemon/kricketot/follower.png rename to graphics/pokemon/kricketot/overworld.png diff --git a/graphics/pokemon/kricketot/follow_normal.pal b/graphics/pokemon/kricketot/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kricketot/follow_normal.pal rename to graphics/pokemon/kricketot/overworld_normal.pal diff --git a/graphics/pokemon/kricketot/follow_shiny.pal b/graphics/pokemon/kricketot/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kricketot/follow_shiny.pal rename to graphics/pokemon/kricketot/overworld_shiny.pal diff --git a/graphics/pokemon/kricketune/follower.png b/graphics/pokemon/kricketune/overworld.png similarity index 100% rename from graphics/pokemon/kricketune/follower.png rename to graphics/pokemon/kricketune/overworld.png diff --git a/graphics/pokemon/kricketune/follow_normal.pal b/graphics/pokemon/kricketune/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kricketune/follow_normal.pal rename to graphics/pokemon/kricketune/overworld_normal.pal diff --git a/graphics/pokemon/kricketune/follow_shiny.pal b/graphics/pokemon/kricketune/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kricketune/follow_shiny.pal rename to graphics/pokemon/kricketune/overworld_shiny.pal diff --git a/graphics/pokemon/krokorok/follower.png b/graphics/pokemon/krokorok/overworld.png similarity index 100% rename from graphics/pokemon/krokorok/follower.png rename to graphics/pokemon/krokorok/overworld.png diff --git a/graphics/pokemon/krokorok/follow_normal.pal b/graphics/pokemon/krokorok/overworld_normal.pal similarity index 100% rename from graphics/pokemon/krokorok/follow_normal.pal rename to graphics/pokemon/krokorok/overworld_normal.pal diff --git a/graphics/pokemon/krokorok/follow_shiny.pal b/graphics/pokemon/krokorok/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/krokorok/follow_shiny.pal rename to graphics/pokemon/krokorok/overworld_shiny.pal diff --git a/graphics/pokemon/krookodile/follower.png b/graphics/pokemon/krookodile/overworld.png similarity index 100% rename from graphics/pokemon/krookodile/follower.png rename to graphics/pokemon/krookodile/overworld.png diff --git a/graphics/pokemon/krookodile/follow_normal.pal b/graphics/pokemon/krookodile/overworld_normal.pal similarity index 100% rename from graphics/pokemon/krookodile/follow_normal.pal rename to graphics/pokemon/krookodile/overworld_normal.pal diff --git a/graphics/pokemon/krookodile/follow_shiny.pal b/graphics/pokemon/krookodile/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/krookodile/follow_shiny.pal rename to graphics/pokemon/krookodile/overworld_shiny.pal diff --git a/graphics/pokemon/kubfu/follower.png b/graphics/pokemon/kubfu/overworld.png similarity index 100% rename from graphics/pokemon/kubfu/follower.png rename to graphics/pokemon/kubfu/overworld.png diff --git a/graphics/pokemon/kubfu/follow_normal.pal b/graphics/pokemon/kubfu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kubfu/follow_normal.pal rename to graphics/pokemon/kubfu/overworld_normal.pal diff --git a/graphics/pokemon/kubfu/follow_shiny.pal b/graphics/pokemon/kubfu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kubfu/follow_shiny.pal rename to graphics/pokemon/kubfu/overworld_shiny.pal diff --git a/graphics/pokemon/kyogre/follower.png b/graphics/pokemon/kyogre/overworld.png similarity index 100% rename from graphics/pokemon/kyogre/follower.png rename to graphics/pokemon/kyogre/overworld.png diff --git a/graphics/pokemon/kyogre/follow_normal.pal b/graphics/pokemon/kyogre/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kyogre/follow_normal.pal rename to graphics/pokemon/kyogre/overworld_normal.pal diff --git a/graphics/pokemon/kyogre/follow_shiny.pal b/graphics/pokemon/kyogre/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kyogre/follow_shiny.pal rename to graphics/pokemon/kyogre/overworld_shiny.pal diff --git a/graphics/pokemon/kyurem/follower.png b/graphics/pokemon/kyurem/overworld.png similarity index 100% rename from graphics/pokemon/kyurem/follower.png rename to graphics/pokemon/kyurem/overworld.png diff --git a/graphics/pokemon/kyurem/follow_normal.pal b/graphics/pokemon/kyurem/overworld_normal.pal similarity index 100% rename from graphics/pokemon/kyurem/follow_normal.pal rename to graphics/pokemon/kyurem/overworld_normal.pal diff --git a/graphics/pokemon/kyurem/follow_shiny.pal b/graphics/pokemon/kyurem/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/kyurem/follow_shiny.pal rename to graphics/pokemon/kyurem/overworld_shiny.pal diff --git a/graphics/pokemon/lairon/follower.png b/graphics/pokemon/lairon/overworld.png similarity index 100% rename from graphics/pokemon/lairon/follower.png rename to graphics/pokemon/lairon/overworld.png diff --git a/graphics/pokemon/lairon/follow_normal.pal b/graphics/pokemon/lairon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lairon/follow_normal.pal rename to graphics/pokemon/lairon/overworld_normal.pal diff --git a/graphics/pokemon/lairon/follow_shiny.pal b/graphics/pokemon/lairon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lairon/follow_shiny.pal rename to graphics/pokemon/lairon/overworld_shiny.pal diff --git a/graphics/pokemon/lampent/follower.png b/graphics/pokemon/lampent/overworld.png similarity index 100% rename from graphics/pokemon/lampent/follower.png rename to graphics/pokemon/lampent/overworld.png diff --git a/graphics/pokemon/lampent/follow_normal.pal b/graphics/pokemon/lampent/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lampent/follow_normal.pal rename to graphics/pokemon/lampent/overworld_normal.pal diff --git a/graphics/pokemon/lampent/follow_shiny.pal b/graphics/pokemon/lampent/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lampent/follow_shiny.pal rename to graphics/pokemon/lampent/overworld_shiny.pal diff --git a/graphics/pokemon/landorus/follower.png b/graphics/pokemon/landorus/overworld.png similarity index 100% rename from graphics/pokemon/landorus/follower.png rename to graphics/pokemon/landorus/overworld.png diff --git a/graphics/pokemon/landorus/follow_normal.pal b/graphics/pokemon/landorus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/landorus/follow_normal.pal rename to graphics/pokemon/landorus/overworld_normal.pal diff --git a/graphics/pokemon/landorus/follow_shiny.pal b/graphics/pokemon/landorus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/landorus/follow_shiny.pal rename to graphics/pokemon/landorus/overworld_shiny.pal diff --git a/graphics/pokemon/lanturn/follower.png b/graphics/pokemon/lanturn/overworld.png similarity index 100% rename from graphics/pokemon/lanturn/follower.png rename to graphics/pokemon/lanturn/overworld.png diff --git a/graphics/pokemon/lanturn/follow_normal.pal b/graphics/pokemon/lanturn/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lanturn/follow_normal.pal rename to graphics/pokemon/lanturn/overworld_normal.pal diff --git a/graphics/pokemon/lanturn/follow_shiny.pal b/graphics/pokemon/lanturn/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lanturn/follow_shiny.pal rename to graphics/pokemon/lanturn/overworld_shiny.pal diff --git a/graphics/pokemon/lapras/follower.png b/graphics/pokemon/lapras/overworld.png similarity index 100% rename from graphics/pokemon/lapras/follower.png rename to graphics/pokemon/lapras/overworld.png diff --git a/graphics/pokemon/lapras/follow_normal.pal b/graphics/pokemon/lapras/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lapras/follow_normal.pal rename to graphics/pokemon/lapras/overworld_normal.pal diff --git a/graphics/pokemon/lapras/follow_shiny.pal b/graphics/pokemon/lapras/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lapras/follow_shiny.pal rename to graphics/pokemon/lapras/overworld_shiny.pal diff --git a/graphics/pokemon/larvesta/follower.png b/graphics/pokemon/larvesta/overworld.png similarity index 100% rename from graphics/pokemon/larvesta/follower.png rename to graphics/pokemon/larvesta/overworld.png diff --git a/graphics/pokemon/larvesta/follow_normal.pal b/graphics/pokemon/larvesta/overworld_normal.pal similarity index 100% rename from graphics/pokemon/larvesta/follow_normal.pal rename to graphics/pokemon/larvesta/overworld_normal.pal diff --git a/graphics/pokemon/larvesta/follow_shiny.pal b/graphics/pokemon/larvesta/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/larvesta/follow_shiny.pal rename to graphics/pokemon/larvesta/overworld_shiny.pal diff --git a/graphics/pokemon/larvitar/follower.png b/graphics/pokemon/larvitar/overworld.png similarity index 100% rename from graphics/pokemon/larvitar/follower.png rename to graphics/pokemon/larvitar/overworld.png diff --git a/graphics/pokemon/larvitar/follow_normal.pal b/graphics/pokemon/larvitar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/larvitar/follow_normal.pal rename to graphics/pokemon/larvitar/overworld_normal.pal diff --git a/graphics/pokemon/larvitar/follow_shiny.pal b/graphics/pokemon/larvitar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/larvitar/follow_shiny.pal rename to graphics/pokemon/larvitar/overworld_shiny.pal diff --git a/graphics/pokemon/latias/follower.png b/graphics/pokemon/latias/overworld.png similarity index 100% rename from graphics/pokemon/latias/follower.png rename to graphics/pokemon/latias/overworld.png diff --git a/graphics/pokemon/latias/follow_normal.pal b/graphics/pokemon/latias/overworld_normal.pal similarity index 100% rename from graphics/pokemon/latias/follow_normal.pal rename to graphics/pokemon/latias/overworld_normal.pal diff --git a/graphics/pokemon/latias/follow_shiny.pal b/graphics/pokemon/latias/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/latias/follow_shiny.pal rename to graphics/pokemon/latias/overworld_shiny.pal diff --git a/graphics/pokemon/latios/follower.png b/graphics/pokemon/latios/overworld.png similarity index 100% rename from graphics/pokemon/latios/follower.png rename to graphics/pokemon/latios/overworld.png diff --git a/graphics/pokemon/latios/follow_normal.pal b/graphics/pokemon/latios/overworld_normal.pal similarity index 100% rename from graphics/pokemon/latios/follow_normal.pal rename to graphics/pokemon/latios/overworld_normal.pal diff --git a/graphics/pokemon/latios/follow_shiny.pal b/graphics/pokemon/latios/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/latios/follow_shiny.pal rename to graphics/pokemon/latios/overworld_shiny.pal diff --git a/graphics/pokemon/leafeon/follower.png b/graphics/pokemon/leafeon/overworld.png similarity index 100% rename from graphics/pokemon/leafeon/follower.png rename to graphics/pokemon/leafeon/overworld.png diff --git a/graphics/pokemon/leafeon/follow_normal.pal b/graphics/pokemon/leafeon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/leafeon/follow_normal.pal rename to graphics/pokemon/leafeon/overworld_normal.pal diff --git a/graphics/pokemon/leafeon/follow_shiny.pal b/graphics/pokemon/leafeon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/leafeon/follow_shiny.pal rename to graphics/pokemon/leafeon/overworld_shiny.pal diff --git a/graphics/pokemon/leavanny/follower.png b/graphics/pokemon/leavanny/overworld.png similarity index 100% rename from graphics/pokemon/leavanny/follower.png rename to graphics/pokemon/leavanny/overworld.png diff --git a/graphics/pokemon/leavanny/follow_normal.pal b/graphics/pokemon/leavanny/overworld_normal.pal similarity index 100% rename from graphics/pokemon/leavanny/follow_normal.pal rename to graphics/pokemon/leavanny/overworld_normal.pal diff --git a/graphics/pokemon/leavanny/follow_shiny.pal b/graphics/pokemon/leavanny/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/leavanny/follow_shiny.pal rename to graphics/pokemon/leavanny/overworld_shiny.pal diff --git a/graphics/pokemon/ledian/follower.png b/graphics/pokemon/ledian/overworld.png similarity index 100% rename from graphics/pokemon/ledian/follower.png rename to graphics/pokemon/ledian/overworld.png diff --git a/graphics/pokemon/ledian/follow_normal.pal b/graphics/pokemon/ledian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ledian/follow_normal.pal rename to graphics/pokemon/ledian/overworld_normal.pal diff --git a/graphics/pokemon/ledian/follow_shiny.pal b/graphics/pokemon/ledian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ledian/follow_shiny.pal rename to graphics/pokemon/ledian/overworld_shiny.pal diff --git a/graphics/pokemon/ledyba/follower.png b/graphics/pokemon/ledyba/overworld.png similarity index 100% rename from graphics/pokemon/ledyba/follower.png rename to graphics/pokemon/ledyba/overworld.png diff --git a/graphics/pokemon/ledyba/follow_normal.pal b/graphics/pokemon/ledyba/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ledyba/follow_normal.pal rename to graphics/pokemon/ledyba/overworld_normal.pal diff --git a/graphics/pokemon/ledyba/follow_shiny.pal b/graphics/pokemon/ledyba/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ledyba/follow_shiny.pal rename to graphics/pokemon/ledyba/overworld_shiny.pal diff --git a/graphics/pokemon/lickilicky/follower.png b/graphics/pokemon/lickilicky/overworld.png similarity index 100% rename from graphics/pokemon/lickilicky/follower.png rename to graphics/pokemon/lickilicky/overworld.png diff --git a/graphics/pokemon/lickilicky/follow_normal.pal b/graphics/pokemon/lickilicky/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lickilicky/follow_normal.pal rename to graphics/pokemon/lickilicky/overworld_normal.pal diff --git a/graphics/pokemon/lickilicky/follow_shiny.pal b/graphics/pokemon/lickilicky/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lickilicky/follow_shiny.pal rename to graphics/pokemon/lickilicky/overworld_shiny.pal diff --git a/graphics/pokemon/lickitung/follower.png b/graphics/pokemon/lickitung/overworld.png similarity index 100% rename from graphics/pokemon/lickitung/follower.png rename to graphics/pokemon/lickitung/overworld.png diff --git a/graphics/pokemon/lickitung/follow_normal.pal b/graphics/pokemon/lickitung/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lickitung/follow_normal.pal rename to graphics/pokemon/lickitung/overworld_normal.pal diff --git a/graphics/pokemon/lickitung/follow_shiny.pal b/graphics/pokemon/lickitung/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lickitung/follow_shiny.pal rename to graphics/pokemon/lickitung/overworld_shiny.pal diff --git a/graphics/pokemon/liepard/follower.png b/graphics/pokemon/liepard/overworld.png similarity index 100% rename from graphics/pokemon/liepard/follower.png rename to graphics/pokemon/liepard/overworld.png diff --git a/graphics/pokemon/liepard/follow_normal.pal b/graphics/pokemon/liepard/overworld_normal.pal similarity index 100% rename from graphics/pokemon/liepard/follow_normal.pal rename to graphics/pokemon/liepard/overworld_normal.pal diff --git a/graphics/pokemon/liepard/follow_shiny.pal b/graphics/pokemon/liepard/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/liepard/follow_shiny.pal rename to graphics/pokemon/liepard/overworld_shiny.pal diff --git a/graphics/pokemon/lileep/follower.png b/graphics/pokemon/lileep/overworld.png similarity index 100% rename from graphics/pokemon/lileep/follower.png rename to graphics/pokemon/lileep/overworld.png diff --git a/graphics/pokemon/lileep/follow_normal.pal b/graphics/pokemon/lileep/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lileep/follow_normal.pal rename to graphics/pokemon/lileep/overworld_normal.pal diff --git a/graphics/pokemon/lileep/follow_shiny.pal b/graphics/pokemon/lileep/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lileep/follow_shiny.pal rename to graphics/pokemon/lileep/overworld_shiny.pal diff --git a/graphics/pokemon/lilligant/hisuian/follower.png b/graphics/pokemon/lilligant/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/lilligant/hisuian/follower.png rename to graphics/pokemon/lilligant/hisuian/overworld.png diff --git a/graphics/pokemon/lilligant/hisuian/follow_normal.pal b/graphics/pokemon/lilligant/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lilligant/hisuian/follow_normal.pal rename to graphics/pokemon/lilligant/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/lilligant/hisuian/follow_shiny.pal b/graphics/pokemon/lilligant/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lilligant/hisuian/follow_shiny.pal rename to graphics/pokemon/lilligant/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/lilligant/follower.png b/graphics/pokemon/lilligant/overworld.png similarity index 100% rename from graphics/pokemon/lilligant/follower.png rename to graphics/pokemon/lilligant/overworld.png diff --git a/graphics/pokemon/lilligant/follow_normal.pal b/graphics/pokemon/lilligant/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lilligant/follow_normal.pal rename to graphics/pokemon/lilligant/overworld_normal.pal diff --git a/graphics/pokemon/lilligant/follow_shiny.pal b/graphics/pokemon/lilligant/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lilligant/follow_shiny.pal rename to graphics/pokemon/lilligant/overworld_shiny.pal diff --git a/graphics/pokemon/lillipup/follower.png b/graphics/pokemon/lillipup/overworld.png similarity index 100% rename from graphics/pokemon/lillipup/follower.png rename to graphics/pokemon/lillipup/overworld.png diff --git a/graphics/pokemon/lillipup/follow_normal.pal b/graphics/pokemon/lillipup/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lillipup/follow_normal.pal rename to graphics/pokemon/lillipup/overworld_normal.pal diff --git a/graphics/pokemon/lillipup/follow_shiny.pal b/graphics/pokemon/lillipup/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lillipup/follow_shiny.pal rename to graphics/pokemon/lillipup/overworld_shiny.pal diff --git a/graphics/pokemon/linoone/galarian/follower.png b/graphics/pokemon/linoone/galarian/overworld.png similarity index 100% rename from graphics/pokemon/linoone/galarian/follower.png rename to graphics/pokemon/linoone/galarian/overworld.png diff --git a/graphics/pokemon/linoone/galarian/follow_normal.pal b/graphics/pokemon/linoone/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/linoone/galarian/follow_normal.pal rename to graphics/pokemon/linoone/galarian/overworld_normal.pal diff --git a/graphics/pokemon/linoone/galarian/follow_shiny.pal b/graphics/pokemon/linoone/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/linoone/galarian/follow_shiny.pal rename to graphics/pokemon/linoone/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/linoone/follower.png b/graphics/pokemon/linoone/overworld.png similarity index 100% rename from graphics/pokemon/linoone/follower.png rename to graphics/pokemon/linoone/overworld.png diff --git a/graphics/pokemon/linoone/follow_normal.pal b/graphics/pokemon/linoone/overworld_normal.pal similarity index 100% rename from graphics/pokemon/linoone/follow_normal.pal rename to graphics/pokemon/linoone/overworld_normal.pal diff --git a/graphics/pokemon/linoone/follow_shiny.pal b/graphics/pokemon/linoone/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/linoone/follow_shiny.pal rename to graphics/pokemon/linoone/overworld_shiny.pal diff --git a/graphics/pokemon/litleo/follower.png b/graphics/pokemon/litleo/overworld.png similarity index 100% rename from graphics/pokemon/litleo/follower.png rename to graphics/pokemon/litleo/overworld.png diff --git a/graphics/pokemon/litleo/follow_normal.pal b/graphics/pokemon/litleo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/litleo/follow_normal.pal rename to graphics/pokemon/litleo/overworld_normal.pal diff --git a/graphics/pokemon/litleo/follow_shiny.pal b/graphics/pokemon/litleo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/litleo/follow_shiny.pal rename to graphics/pokemon/litleo/overworld_shiny.pal diff --git a/graphics/pokemon/litten/follower.png b/graphics/pokemon/litten/overworld.png similarity index 100% rename from graphics/pokemon/litten/follower.png rename to graphics/pokemon/litten/overworld.png diff --git a/graphics/pokemon/litten/follow_normal.pal b/graphics/pokemon/litten/overworld_normal.pal similarity index 100% rename from graphics/pokemon/litten/follow_normal.pal rename to graphics/pokemon/litten/overworld_normal.pal diff --git a/graphics/pokemon/litten/follow_shiny.pal b/graphics/pokemon/litten/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/litten/follow_shiny.pal rename to graphics/pokemon/litten/overworld_shiny.pal diff --git a/graphics/pokemon/litwick/follower.png b/graphics/pokemon/litwick/overworld.png similarity index 100% rename from graphics/pokemon/litwick/follower.png rename to graphics/pokemon/litwick/overworld.png diff --git a/graphics/pokemon/litwick/follow_normal.pal b/graphics/pokemon/litwick/overworld_normal.pal similarity index 100% rename from graphics/pokemon/litwick/follow_normal.pal rename to graphics/pokemon/litwick/overworld_normal.pal diff --git a/graphics/pokemon/litwick/follow_shiny.pal b/graphics/pokemon/litwick/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/litwick/follow_shiny.pal rename to graphics/pokemon/litwick/overworld_shiny.pal diff --git a/graphics/pokemon/lombre/follower.png b/graphics/pokemon/lombre/overworld.png similarity index 100% rename from graphics/pokemon/lombre/follower.png rename to graphics/pokemon/lombre/overworld.png diff --git a/graphics/pokemon/lombre/follow_normal.pal b/graphics/pokemon/lombre/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lombre/follow_normal.pal rename to graphics/pokemon/lombre/overworld_normal.pal diff --git a/graphics/pokemon/lombre/follow_shiny.pal b/graphics/pokemon/lombre/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lombre/follow_shiny.pal rename to graphics/pokemon/lombre/overworld_shiny.pal diff --git a/graphics/pokemon/lopunny/follower.png b/graphics/pokemon/lopunny/overworld.png similarity index 100% rename from graphics/pokemon/lopunny/follower.png rename to graphics/pokemon/lopunny/overworld.png diff --git a/graphics/pokemon/lopunny/follow_normal.pal b/graphics/pokemon/lopunny/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lopunny/follow_normal.pal rename to graphics/pokemon/lopunny/overworld_normal.pal diff --git a/graphics/pokemon/lopunny/follow_shiny.pal b/graphics/pokemon/lopunny/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lopunny/follow_shiny.pal rename to graphics/pokemon/lopunny/overworld_shiny.pal diff --git a/graphics/pokemon/lotad/follower.png b/graphics/pokemon/lotad/overworld.png similarity index 100% rename from graphics/pokemon/lotad/follower.png rename to graphics/pokemon/lotad/overworld.png diff --git a/graphics/pokemon/lotad/follow_normal.pal b/graphics/pokemon/lotad/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lotad/follow_normal.pal rename to graphics/pokemon/lotad/overworld_normal.pal diff --git a/graphics/pokemon/lotad/follow_shiny.pal b/graphics/pokemon/lotad/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lotad/follow_shiny.pal rename to graphics/pokemon/lotad/overworld_shiny.pal diff --git a/graphics/pokemon/loudred/follower.png b/graphics/pokemon/loudred/overworld.png similarity index 100% rename from graphics/pokemon/loudred/follower.png rename to graphics/pokemon/loudred/overworld.png diff --git a/graphics/pokemon/loudred/follow_normal.pal b/graphics/pokemon/loudred/overworld_normal.pal similarity index 100% rename from graphics/pokemon/loudred/follow_normal.pal rename to graphics/pokemon/loudred/overworld_normal.pal diff --git a/graphics/pokemon/loudred/follow_shiny.pal b/graphics/pokemon/loudred/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/loudred/follow_shiny.pal rename to graphics/pokemon/loudred/overworld_shiny.pal diff --git a/graphics/pokemon/lucario/follower.png b/graphics/pokemon/lucario/overworld.png similarity index 100% rename from graphics/pokemon/lucario/follower.png rename to graphics/pokemon/lucario/overworld.png diff --git a/graphics/pokemon/lucario/follow_normal.pal b/graphics/pokemon/lucario/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lucario/follow_normal.pal rename to graphics/pokemon/lucario/overworld_normal.pal diff --git a/graphics/pokemon/lucario/follow_shiny.pal b/graphics/pokemon/lucario/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lucario/follow_shiny.pal rename to graphics/pokemon/lucario/overworld_shiny.pal diff --git a/graphics/pokemon/ludicolo/follower.png b/graphics/pokemon/ludicolo/overworld.png similarity index 100% rename from graphics/pokemon/ludicolo/follower.png rename to graphics/pokemon/ludicolo/overworld.png diff --git a/graphics/pokemon/ludicolo/follow_normal.pal b/graphics/pokemon/ludicolo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ludicolo/follow_normal.pal rename to graphics/pokemon/ludicolo/overworld_normal.pal diff --git a/graphics/pokemon/ludicolo/follow_shiny.pal b/graphics/pokemon/ludicolo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ludicolo/follow_shiny.pal rename to graphics/pokemon/ludicolo/overworld_shiny.pal diff --git a/graphics/pokemon/lugia/follower.png b/graphics/pokemon/lugia/overworld.png similarity index 100% rename from graphics/pokemon/lugia/follower.png rename to graphics/pokemon/lugia/overworld.png diff --git a/graphics/pokemon/lugia/follow_normal.pal b/graphics/pokemon/lugia/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lugia/follow_normal.pal rename to graphics/pokemon/lugia/overworld_normal.pal diff --git a/graphics/pokemon/lugia/follow_shiny.pal b/graphics/pokemon/lugia/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lugia/follow_shiny.pal rename to graphics/pokemon/lugia/overworld_shiny.pal diff --git a/graphics/pokemon/lumineon/follower.png b/graphics/pokemon/lumineon/overworld.png similarity index 100% rename from graphics/pokemon/lumineon/follower.png rename to graphics/pokemon/lumineon/overworld.png diff --git a/graphics/pokemon/lumineon/follow_normal.pal b/graphics/pokemon/lumineon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lumineon/follow_normal.pal rename to graphics/pokemon/lumineon/overworld_normal.pal diff --git a/graphics/pokemon/lumineon/follow_shiny.pal b/graphics/pokemon/lumineon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lumineon/follow_shiny.pal rename to graphics/pokemon/lumineon/overworld_shiny.pal diff --git a/graphics/pokemon/lunala/follower.png b/graphics/pokemon/lunala/overworld.png similarity index 100% rename from graphics/pokemon/lunala/follower.png rename to graphics/pokemon/lunala/overworld.png diff --git a/graphics/pokemon/lunala/follow_normal.pal b/graphics/pokemon/lunala/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lunala/follow_normal.pal rename to graphics/pokemon/lunala/overworld_normal.pal diff --git a/graphics/pokemon/lunala/follow_shiny.pal b/graphics/pokemon/lunala/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lunala/follow_shiny.pal rename to graphics/pokemon/lunala/overworld_shiny.pal diff --git a/graphics/pokemon/lunatone/follower.png b/graphics/pokemon/lunatone/overworld.png similarity index 100% rename from graphics/pokemon/lunatone/follower.png rename to graphics/pokemon/lunatone/overworld.png diff --git a/graphics/pokemon/lunatone/follow_normal.pal b/graphics/pokemon/lunatone/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lunatone/follow_normal.pal rename to graphics/pokemon/lunatone/overworld_normal.pal diff --git a/graphics/pokemon/lunatone/follow_shiny.pal b/graphics/pokemon/lunatone/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lunatone/follow_shiny.pal rename to graphics/pokemon/lunatone/overworld_shiny.pal diff --git a/graphics/pokemon/lurantis/follower.png b/graphics/pokemon/lurantis/overworld.png similarity index 100% rename from graphics/pokemon/lurantis/follower.png rename to graphics/pokemon/lurantis/overworld.png diff --git a/graphics/pokemon/lurantis/follow_normal.pal b/graphics/pokemon/lurantis/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lurantis/follow_normal.pal rename to graphics/pokemon/lurantis/overworld_normal.pal diff --git a/graphics/pokemon/lurantis/follow_shiny.pal b/graphics/pokemon/lurantis/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lurantis/follow_shiny.pal rename to graphics/pokemon/lurantis/overworld_shiny.pal diff --git a/graphics/pokemon/luvdisc/follower.png b/graphics/pokemon/luvdisc/overworld.png similarity index 100% rename from graphics/pokemon/luvdisc/follower.png rename to graphics/pokemon/luvdisc/overworld.png diff --git a/graphics/pokemon/luvdisc/follow_normal.pal b/graphics/pokemon/luvdisc/overworld_normal.pal similarity index 100% rename from graphics/pokemon/luvdisc/follow_normal.pal rename to graphics/pokemon/luvdisc/overworld_normal.pal diff --git a/graphics/pokemon/luvdisc/follow_shiny.pal b/graphics/pokemon/luvdisc/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/luvdisc/follow_shiny.pal rename to graphics/pokemon/luvdisc/overworld_shiny.pal diff --git a/graphics/pokemon/luxio/follower.png b/graphics/pokemon/luxio/overworld.png similarity index 100% rename from graphics/pokemon/luxio/follower.png rename to graphics/pokemon/luxio/overworld.png diff --git a/graphics/pokemon/luxio/follow_normal.pal b/graphics/pokemon/luxio/overworld_normal.pal similarity index 100% rename from graphics/pokemon/luxio/follow_normal.pal rename to graphics/pokemon/luxio/overworld_normal.pal diff --git a/graphics/pokemon/luxio/follow_shiny.pal b/graphics/pokemon/luxio/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/luxio/follow_shiny.pal rename to graphics/pokemon/luxio/overworld_shiny.pal diff --git a/graphics/pokemon/luxray/follower.png b/graphics/pokemon/luxray/overworld.png similarity index 100% rename from graphics/pokemon/luxray/follower.png rename to graphics/pokemon/luxray/overworld.png diff --git a/graphics/pokemon/luxray/follow_normal.pal b/graphics/pokemon/luxray/overworld_normal.pal similarity index 100% rename from graphics/pokemon/luxray/follow_normal.pal rename to graphics/pokemon/luxray/overworld_normal.pal diff --git a/graphics/pokemon/luxray/follow_shiny.pal b/graphics/pokemon/luxray/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/luxray/follow_shiny.pal rename to graphics/pokemon/luxray/overworld_shiny.pal diff --git a/graphics/pokemon/lycanroc/dusk/follower.png b/graphics/pokemon/lycanroc/dusk/overworld.png similarity index 100% rename from graphics/pokemon/lycanroc/dusk/follower.png rename to graphics/pokemon/lycanroc/dusk/overworld.png diff --git a/graphics/pokemon/lycanroc/dusk/follow_normal.pal b/graphics/pokemon/lycanroc/dusk/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lycanroc/dusk/follow_normal.pal rename to graphics/pokemon/lycanroc/dusk/overworld_normal.pal diff --git a/graphics/pokemon/lycanroc/dusk/follow_shiny.pal b/graphics/pokemon/lycanroc/dusk/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lycanroc/dusk/follow_shiny.pal rename to graphics/pokemon/lycanroc/dusk/overworld_shiny.pal diff --git a/graphics/pokemon/lycanroc/midnight/follower.png b/graphics/pokemon/lycanroc/midnight/overworld.png similarity index 100% rename from graphics/pokemon/lycanroc/midnight/follower.png rename to graphics/pokemon/lycanroc/midnight/overworld.png diff --git a/graphics/pokemon/lycanroc/midnight/follow_normal.pal b/graphics/pokemon/lycanroc/midnight/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lycanroc/midnight/follow_normal.pal rename to graphics/pokemon/lycanroc/midnight/overworld_normal.pal diff --git a/graphics/pokemon/lycanroc/midnight/follow_shiny.pal b/graphics/pokemon/lycanroc/midnight/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lycanroc/midnight/follow_shiny.pal rename to graphics/pokemon/lycanroc/midnight/overworld_shiny.pal diff --git a/graphics/pokemon/lycanroc/follower.png b/graphics/pokemon/lycanroc/overworld.png similarity index 100% rename from graphics/pokemon/lycanroc/follower.png rename to graphics/pokemon/lycanroc/overworld.png diff --git a/graphics/pokemon/lycanroc/follow_normal.pal b/graphics/pokemon/lycanroc/overworld_normal.pal similarity index 100% rename from graphics/pokemon/lycanroc/follow_normal.pal rename to graphics/pokemon/lycanroc/overworld_normal.pal diff --git a/graphics/pokemon/lycanroc/follow_shiny.pal b/graphics/pokemon/lycanroc/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/lycanroc/follow_shiny.pal rename to graphics/pokemon/lycanroc/overworld_shiny.pal diff --git a/graphics/pokemon/machamp/follower.png b/graphics/pokemon/machamp/overworld.png similarity index 100% rename from graphics/pokemon/machamp/follower.png rename to graphics/pokemon/machamp/overworld.png diff --git a/graphics/pokemon/machamp/follow_normal.pal b/graphics/pokemon/machamp/overworld_normal.pal similarity index 100% rename from graphics/pokemon/machamp/follow_normal.pal rename to graphics/pokemon/machamp/overworld_normal.pal diff --git a/graphics/pokemon/machamp/follow_shiny.pal b/graphics/pokemon/machamp/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/machamp/follow_shiny.pal rename to graphics/pokemon/machamp/overworld_shiny.pal diff --git a/graphics/pokemon/machoke/follower.png b/graphics/pokemon/machoke/overworld.png similarity index 100% rename from graphics/pokemon/machoke/follower.png rename to graphics/pokemon/machoke/overworld.png diff --git a/graphics/pokemon/machoke/follow_normal.pal b/graphics/pokemon/machoke/overworld_normal.pal similarity index 100% rename from graphics/pokemon/machoke/follow_normal.pal rename to graphics/pokemon/machoke/overworld_normal.pal diff --git a/graphics/pokemon/machoke/follow_shiny.pal b/graphics/pokemon/machoke/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/machoke/follow_shiny.pal rename to graphics/pokemon/machoke/overworld_shiny.pal diff --git a/graphics/pokemon/machop/follower.png b/graphics/pokemon/machop/overworld.png similarity index 100% rename from graphics/pokemon/machop/follower.png rename to graphics/pokemon/machop/overworld.png diff --git a/graphics/pokemon/machop/follow_normal.pal b/graphics/pokemon/machop/overworld_normal.pal similarity index 100% rename from graphics/pokemon/machop/follow_normal.pal rename to graphics/pokemon/machop/overworld_normal.pal diff --git a/graphics/pokemon/machop/follow_shiny.pal b/graphics/pokemon/machop/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/machop/follow_shiny.pal rename to graphics/pokemon/machop/overworld_shiny.pal diff --git a/graphics/pokemon/magby/follower.png b/graphics/pokemon/magby/overworld.png similarity index 100% rename from graphics/pokemon/magby/follower.png rename to graphics/pokemon/magby/overworld.png diff --git a/graphics/pokemon/magby/follow_normal.pal b/graphics/pokemon/magby/overworld_normal.pal similarity index 100% rename from graphics/pokemon/magby/follow_normal.pal rename to graphics/pokemon/magby/overworld_normal.pal diff --git a/graphics/pokemon/magby/follow_shiny.pal b/graphics/pokemon/magby/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/magby/follow_shiny.pal rename to graphics/pokemon/magby/overworld_shiny.pal diff --git a/graphics/pokemon/magcargo/follower.png b/graphics/pokemon/magcargo/overworld.png similarity index 100% rename from graphics/pokemon/magcargo/follower.png rename to graphics/pokemon/magcargo/overworld.png diff --git a/graphics/pokemon/magcargo/follow_normal.pal b/graphics/pokemon/magcargo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/magcargo/follow_normal.pal rename to graphics/pokemon/magcargo/overworld_normal.pal diff --git a/graphics/pokemon/magcargo/follow_shiny.pal b/graphics/pokemon/magcargo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/magcargo/follow_shiny.pal rename to graphics/pokemon/magcargo/overworld_shiny.pal diff --git a/graphics/pokemon/magearna/follower.png b/graphics/pokemon/magearna/overworld.png similarity index 100% rename from graphics/pokemon/magearna/follower.png rename to graphics/pokemon/magearna/overworld.png diff --git a/graphics/pokemon/magearna/follow_normal.pal b/graphics/pokemon/magearna/overworld_normal.pal similarity index 100% rename from graphics/pokemon/magearna/follow_normal.pal rename to graphics/pokemon/magearna/overworld_normal.pal diff --git a/graphics/pokemon/magearna/follow_shiny.pal b/graphics/pokemon/magearna/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/magearna/follow_shiny.pal rename to graphics/pokemon/magearna/overworld_shiny.pal diff --git a/graphics/pokemon/magikarp/follower.png b/graphics/pokemon/magikarp/overworld.png similarity index 100% rename from graphics/pokemon/magikarp/follower.png rename to graphics/pokemon/magikarp/overworld.png diff --git a/graphics/pokemon/magikarp/follow_normal.pal b/graphics/pokemon/magikarp/overworld_normal.pal similarity index 100% rename from graphics/pokemon/magikarp/follow_normal.pal rename to graphics/pokemon/magikarp/overworld_normal.pal diff --git a/graphics/pokemon/magikarp/follow_shiny.pal b/graphics/pokemon/magikarp/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/magikarp/follow_shiny.pal rename to graphics/pokemon/magikarp/overworld_shiny.pal diff --git a/graphics/pokemon/magmar/follower.png b/graphics/pokemon/magmar/overworld.png similarity index 100% rename from graphics/pokemon/magmar/follower.png rename to graphics/pokemon/magmar/overworld.png diff --git a/graphics/pokemon/magmar/follow_normal.pal b/graphics/pokemon/magmar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/magmar/follow_normal.pal rename to graphics/pokemon/magmar/overworld_normal.pal diff --git a/graphics/pokemon/magmar/follow_shiny.pal b/graphics/pokemon/magmar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/magmar/follow_shiny.pal rename to graphics/pokemon/magmar/overworld_shiny.pal diff --git a/graphics/pokemon/magmortar/follower.png b/graphics/pokemon/magmortar/overworld.png similarity index 100% rename from graphics/pokemon/magmortar/follower.png rename to graphics/pokemon/magmortar/overworld.png diff --git a/graphics/pokemon/magmortar/follow_normal.pal b/graphics/pokemon/magmortar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/magmortar/follow_normal.pal rename to graphics/pokemon/magmortar/overworld_normal.pal diff --git a/graphics/pokemon/magmortar/follow_shiny.pal b/graphics/pokemon/magmortar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/magmortar/follow_shiny.pal rename to graphics/pokemon/magmortar/overworld_shiny.pal diff --git a/graphics/pokemon/magnemite/follower.png b/graphics/pokemon/magnemite/overworld.png similarity index 100% rename from graphics/pokemon/magnemite/follower.png rename to graphics/pokemon/magnemite/overworld.png diff --git a/graphics/pokemon/magnemite/follow_normal.pal b/graphics/pokemon/magnemite/overworld_normal.pal similarity index 100% rename from graphics/pokemon/magnemite/follow_normal.pal rename to graphics/pokemon/magnemite/overworld_normal.pal diff --git a/graphics/pokemon/magnemite/follow_shiny.pal b/graphics/pokemon/magnemite/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/magnemite/follow_shiny.pal rename to graphics/pokemon/magnemite/overworld_shiny.pal diff --git a/graphics/pokemon/magneton/follower.png b/graphics/pokemon/magneton/overworld.png similarity index 100% rename from graphics/pokemon/magneton/follower.png rename to graphics/pokemon/magneton/overworld.png diff --git a/graphics/pokemon/magneton/follow_normal.pal b/graphics/pokemon/magneton/overworld_normal.pal similarity index 100% rename from graphics/pokemon/magneton/follow_normal.pal rename to graphics/pokemon/magneton/overworld_normal.pal diff --git a/graphics/pokemon/magneton/follow_shiny.pal b/graphics/pokemon/magneton/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/magneton/follow_shiny.pal rename to graphics/pokemon/magneton/overworld_shiny.pal diff --git a/graphics/pokemon/magnezone/follower.png b/graphics/pokemon/magnezone/overworld.png similarity index 100% rename from graphics/pokemon/magnezone/follower.png rename to graphics/pokemon/magnezone/overworld.png diff --git a/graphics/pokemon/magnezone/follow_normal.pal b/graphics/pokemon/magnezone/overworld_normal.pal similarity index 100% rename from graphics/pokemon/magnezone/follow_normal.pal rename to graphics/pokemon/magnezone/overworld_normal.pal diff --git a/graphics/pokemon/magnezone/follow_shiny.pal b/graphics/pokemon/magnezone/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/magnezone/follow_shiny.pal rename to graphics/pokemon/magnezone/overworld_shiny.pal diff --git a/graphics/pokemon/makuhita/follower.png b/graphics/pokemon/makuhita/overworld.png similarity index 100% rename from graphics/pokemon/makuhita/follower.png rename to graphics/pokemon/makuhita/overworld.png diff --git a/graphics/pokemon/makuhita/follow_normal.pal b/graphics/pokemon/makuhita/overworld_normal.pal similarity index 100% rename from graphics/pokemon/makuhita/follow_normal.pal rename to graphics/pokemon/makuhita/overworld_normal.pal diff --git a/graphics/pokemon/makuhita/follow_shiny.pal b/graphics/pokemon/makuhita/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/makuhita/follow_shiny.pal rename to graphics/pokemon/makuhita/overworld_shiny.pal diff --git a/graphics/pokemon/malamar/follower.png b/graphics/pokemon/malamar/overworld.png similarity index 100% rename from graphics/pokemon/malamar/follower.png rename to graphics/pokemon/malamar/overworld.png diff --git a/graphics/pokemon/malamar/follow_normal.pal b/graphics/pokemon/malamar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/malamar/follow_normal.pal rename to graphics/pokemon/malamar/overworld_normal.pal diff --git a/graphics/pokemon/malamar/follow_shiny.pal b/graphics/pokemon/malamar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/malamar/follow_shiny.pal rename to graphics/pokemon/malamar/overworld_shiny.pal diff --git a/graphics/pokemon/mamoswine/follower.png b/graphics/pokemon/mamoswine/overworld.png similarity index 100% rename from graphics/pokemon/mamoswine/follower.png rename to graphics/pokemon/mamoswine/overworld.png diff --git a/graphics/pokemon/mamoswine/follow_normal.pal b/graphics/pokemon/mamoswine/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mamoswine/follow_normal.pal rename to graphics/pokemon/mamoswine/overworld_normal.pal diff --git a/graphics/pokemon/mamoswine/follow_shiny.pal b/graphics/pokemon/mamoswine/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mamoswine/follow_shiny.pal rename to graphics/pokemon/mamoswine/overworld_shiny.pal diff --git a/graphics/pokemon/manaphy/follower.png b/graphics/pokemon/manaphy/overworld.png similarity index 100% rename from graphics/pokemon/manaphy/follower.png rename to graphics/pokemon/manaphy/overworld.png diff --git a/graphics/pokemon/manaphy/follow_normal.pal b/graphics/pokemon/manaphy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/manaphy/follow_normal.pal rename to graphics/pokemon/manaphy/overworld_normal.pal diff --git a/graphics/pokemon/manaphy/follow_shiny.pal b/graphics/pokemon/manaphy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/manaphy/follow_shiny.pal rename to graphics/pokemon/manaphy/overworld_shiny.pal diff --git a/graphics/pokemon/mandibuzz/follower.png b/graphics/pokemon/mandibuzz/overworld.png similarity index 100% rename from graphics/pokemon/mandibuzz/follower.png rename to graphics/pokemon/mandibuzz/overworld.png diff --git a/graphics/pokemon/mandibuzz/follow_normal.pal b/graphics/pokemon/mandibuzz/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mandibuzz/follow_normal.pal rename to graphics/pokemon/mandibuzz/overworld_normal.pal diff --git a/graphics/pokemon/mandibuzz/follow_shiny.pal b/graphics/pokemon/mandibuzz/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mandibuzz/follow_shiny.pal rename to graphics/pokemon/mandibuzz/overworld_shiny.pal diff --git a/graphics/pokemon/manectric/follower.png b/graphics/pokemon/manectric/overworld.png similarity index 100% rename from graphics/pokemon/manectric/follower.png rename to graphics/pokemon/manectric/overworld.png diff --git a/graphics/pokemon/manectric/follow_normal.pal b/graphics/pokemon/manectric/overworld_normal.pal similarity index 100% rename from graphics/pokemon/manectric/follow_normal.pal rename to graphics/pokemon/manectric/overworld_normal.pal diff --git a/graphics/pokemon/manectric/follow_shiny.pal b/graphics/pokemon/manectric/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/manectric/follow_shiny.pal rename to graphics/pokemon/manectric/overworld_shiny.pal diff --git a/graphics/pokemon/mankey/follower.png b/graphics/pokemon/mankey/overworld.png similarity index 100% rename from graphics/pokemon/mankey/follower.png rename to graphics/pokemon/mankey/overworld.png diff --git a/graphics/pokemon/mankey/follow_normal.pal b/graphics/pokemon/mankey/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mankey/follow_normal.pal rename to graphics/pokemon/mankey/overworld_normal.pal diff --git a/graphics/pokemon/mankey/follow_shiny.pal b/graphics/pokemon/mankey/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mankey/follow_shiny.pal rename to graphics/pokemon/mankey/overworld_shiny.pal diff --git a/graphics/pokemon/mantine/follower.png b/graphics/pokemon/mantine/overworld.png similarity index 100% rename from graphics/pokemon/mantine/follower.png rename to graphics/pokemon/mantine/overworld.png diff --git a/graphics/pokemon/mantine/follow_normal.pal b/graphics/pokemon/mantine/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mantine/follow_normal.pal rename to graphics/pokemon/mantine/overworld_normal.pal diff --git a/graphics/pokemon/mantine/follow_shiny.pal b/graphics/pokemon/mantine/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mantine/follow_shiny.pal rename to graphics/pokemon/mantine/overworld_shiny.pal diff --git a/graphics/pokemon/mantyke/follower.png b/graphics/pokemon/mantyke/overworld.png similarity index 100% rename from graphics/pokemon/mantyke/follower.png rename to graphics/pokemon/mantyke/overworld.png diff --git a/graphics/pokemon/mantyke/follow_normal.pal b/graphics/pokemon/mantyke/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mantyke/follow_normal.pal rename to graphics/pokemon/mantyke/overworld_normal.pal diff --git a/graphics/pokemon/mantyke/follow_shiny.pal b/graphics/pokemon/mantyke/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mantyke/follow_shiny.pal rename to graphics/pokemon/mantyke/overworld_shiny.pal diff --git a/graphics/pokemon/maractus/follower.png b/graphics/pokemon/maractus/overworld.png similarity index 100% rename from graphics/pokemon/maractus/follower.png rename to graphics/pokemon/maractus/overworld.png diff --git a/graphics/pokemon/maractus/follow_normal.pal b/graphics/pokemon/maractus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/maractus/follow_normal.pal rename to graphics/pokemon/maractus/overworld_normal.pal diff --git a/graphics/pokemon/maractus/follow_shiny.pal b/graphics/pokemon/maractus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/maractus/follow_shiny.pal rename to graphics/pokemon/maractus/overworld_shiny.pal diff --git a/graphics/pokemon/mareanie/follower.png b/graphics/pokemon/mareanie/overworld.png similarity index 100% rename from graphics/pokemon/mareanie/follower.png rename to graphics/pokemon/mareanie/overworld.png diff --git a/graphics/pokemon/mareanie/follow_normal.pal b/graphics/pokemon/mareanie/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mareanie/follow_normal.pal rename to graphics/pokemon/mareanie/overworld_normal.pal diff --git a/graphics/pokemon/mareanie/follow_shiny.pal b/graphics/pokemon/mareanie/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mareanie/follow_shiny.pal rename to graphics/pokemon/mareanie/overworld_shiny.pal diff --git a/graphics/pokemon/mareep/follower.png b/graphics/pokemon/mareep/overworld.png similarity index 100% rename from graphics/pokemon/mareep/follower.png rename to graphics/pokemon/mareep/overworld.png diff --git a/graphics/pokemon/mareep/follow_normal.pal b/graphics/pokemon/mareep/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mareep/follow_normal.pal rename to graphics/pokemon/mareep/overworld_normal.pal diff --git a/graphics/pokemon/mareep/follow_shiny.pal b/graphics/pokemon/mareep/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mareep/follow_shiny.pal rename to graphics/pokemon/mareep/overworld_shiny.pal diff --git a/graphics/pokemon/marill/follower.png b/graphics/pokemon/marill/overworld.png similarity index 100% rename from graphics/pokemon/marill/follower.png rename to graphics/pokemon/marill/overworld.png diff --git a/graphics/pokemon/marill/follow_normal.pal b/graphics/pokemon/marill/overworld_normal.pal similarity index 100% rename from graphics/pokemon/marill/follow_normal.pal rename to graphics/pokemon/marill/overworld_normal.pal diff --git a/graphics/pokemon/marill/follow_shiny.pal b/graphics/pokemon/marill/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/marill/follow_shiny.pal rename to graphics/pokemon/marill/overworld_shiny.pal diff --git a/graphics/pokemon/marowak/alolan/follower.png b/graphics/pokemon/marowak/alolan/overworld.png similarity index 100% rename from graphics/pokemon/marowak/alolan/follower.png rename to graphics/pokemon/marowak/alolan/overworld.png diff --git a/graphics/pokemon/marowak/alolan/follow_normal.pal b/graphics/pokemon/marowak/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/marowak/alolan/follow_normal.pal rename to graphics/pokemon/marowak/alolan/overworld_normal.pal diff --git a/graphics/pokemon/marowak/alolan/follow_shiny.pal b/graphics/pokemon/marowak/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/marowak/alolan/follow_shiny.pal rename to graphics/pokemon/marowak/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/marowak/follower.png b/graphics/pokemon/marowak/overworld.png similarity index 100% rename from graphics/pokemon/marowak/follower.png rename to graphics/pokemon/marowak/overworld.png diff --git a/graphics/pokemon/marowak/follow_normal.pal b/graphics/pokemon/marowak/overworld_normal.pal similarity index 100% rename from graphics/pokemon/marowak/follow_normal.pal rename to graphics/pokemon/marowak/overworld_normal.pal diff --git a/graphics/pokemon/marowak/follow_shiny.pal b/graphics/pokemon/marowak/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/marowak/follow_shiny.pal rename to graphics/pokemon/marowak/overworld_shiny.pal diff --git a/graphics/pokemon/marshadow/follower.png b/graphics/pokemon/marshadow/overworld.png similarity index 100% rename from graphics/pokemon/marshadow/follower.png rename to graphics/pokemon/marshadow/overworld.png diff --git a/graphics/pokemon/marshadow/follow_normal.pal b/graphics/pokemon/marshadow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/marshadow/follow_normal.pal rename to graphics/pokemon/marshadow/overworld_normal.pal diff --git a/graphics/pokemon/marshadow/follow_shiny.pal b/graphics/pokemon/marshadow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/marshadow/follow_shiny.pal rename to graphics/pokemon/marshadow/overworld_shiny.pal diff --git a/graphics/pokemon/marshtomp/follower.png b/graphics/pokemon/marshtomp/overworld.png similarity index 100% rename from graphics/pokemon/marshtomp/follower.png rename to graphics/pokemon/marshtomp/overworld.png diff --git a/graphics/pokemon/marshtomp/follow_normal.pal b/graphics/pokemon/marshtomp/overworld_normal.pal similarity index 100% rename from graphics/pokemon/marshtomp/follow_normal.pal rename to graphics/pokemon/marshtomp/overworld_normal.pal diff --git a/graphics/pokemon/marshtomp/follow_shiny.pal b/graphics/pokemon/marshtomp/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/marshtomp/follow_shiny.pal rename to graphics/pokemon/marshtomp/overworld_shiny.pal diff --git a/graphics/pokemon/masquerain/follower.png b/graphics/pokemon/masquerain/overworld.png similarity index 100% rename from graphics/pokemon/masquerain/follower.png rename to graphics/pokemon/masquerain/overworld.png diff --git a/graphics/pokemon/masquerain/follow_normal.pal b/graphics/pokemon/masquerain/overworld_normal.pal similarity index 100% rename from graphics/pokemon/masquerain/follow_normal.pal rename to graphics/pokemon/masquerain/overworld_normal.pal diff --git a/graphics/pokemon/masquerain/follow_shiny.pal b/graphics/pokemon/masquerain/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/masquerain/follow_shiny.pal rename to graphics/pokemon/masquerain/overworld_shiny.pal diff --git a/graphics/pokemon/mawile/follower.png b/graphics/pokemon/mawile/overworld.png similarity index 100% rename from graphics/pokemon/mawile/follower.png rename to graphics/pokemon/mawile/overworld.png diff --git a/graphics/pokemon/mawile/follow_normal.pal b/graphics/pokemon/mawile/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mawile/follow_normal.pal rename to graphics/pokemon/mawile/overworld_normal.pal diff --git a/graphics/pokemon/mawile/follow_shiny.pal b/graphics/pokemon/mawile/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mawile/follow_shiny.pal rename to graphics/pokemon/mawile/overworld_shiny.pal diff --git a/graphics/pokemon/medicham/follower.png b/graphics/pokemon/medicham/overworld.png similarity index 100% rename from graphics/pokemon/medicham/follower.png rename to graphics/pokemon/medicham/overworld.png diff --git a/graphics/pokemon/medicham/follow_normal.pal b/graphics/pokemon/medicham/overworld_normal.pal similarity index 100% rename from graphics/pokemon/medicham/follow_normal.pal rename to graphics/pokemon/medicham/overworld_normal.pal diff --git a/graphics/pokemon/medicham/follow_shiny.pal b/graphics/pokemon/medicham/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/medicham/follow_shiny.pal rename to graphics/pokemon/medicham/overworld_shiny.pal diff --git a/graphics/pokemon/meditite/follower.png b/graphics/pokemon/meditite/overworld.png similarity index 100% rename from graphics/pokemon/meditite/follower.png rename to graphics/pokemon/meditite/overworld.png diff --git a/graphics/pokemon/meditite/follow_normal.pal b/graphics/pokemon/meditite/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meditite/follow_normal.pal rename to graphics/pokemon/meditite/overworld_normal.pal diff --git a/graphics/pokemon/meditite/follow_shiny.pal b/graphics/pokemon/meditite/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meditite/follow_shiny.pal rename to graphics/pokemon/meditite/overworld_shiny.pal diff --git a/graphics/pokemon/meganium/follower.png b/graphics/pokemon/meganium/overworld.png similarity index 100% rename from graphics/pokemon/meganium/follower.png rename to graphics/pokemon/meganium/overworld.png diff --git a/graphics/pokemon/meganium/follow_normal.pal b/graphics/pokemon/meganium/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meganium/follow_normal.pal rename to graphics/pokemon/meganium/overworld_normal.pal diff --git a/graphics/pokemon/meganium/follow_shiny.pal b/graphics/pokemon/meganium/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meganium/follow_shiny.pal rename to graphics/pokemon/meganium/overworld_shiny.pal diff --git a/graphics/pokemon/melmetal/follower.png b/graphics/pokemon/melmetal/overworld.png similarity index 100% rename from graphics/pokemon/melmetal/follower.png rename to graphics/pokemon/melmetal/overworld.png diff --git a/graphics/pokemon/melmetal/follow_normal.pal b/graphics/pokemon/melmetal/overworld_normal.pal similarity index 100% rename from graphics/pokemon/melmetal/follow_normal.pal rename to graphics/pokemon/melmetal/overworld_normal.pal diff --git a/graphics/pokemon/melmetal/follow_shiny.pal b/graphics/pokemon/melmetal/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/melmetal/follow_shiny.pal rename to graphics/pokemon/melmetal/overworld_shiny.pal diff --git a/graphics/pokemon/meloetta/follower.png b/graphics/pokemon/meloetta/overworld.png similarity index 100% rename from graphics/pokemon/meloetta/follower.png rename to graphics/pokemon/meloetta/overworld.png diff --git a/graphics/pokemon/meloetta/follow_normal.pal b/graphics/pokemon/meloetta/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meloetta/follow_normal.pal rename to graphics/pokemon/meloetta/overworld_normal.pal diff --git a/graphics/pokemon/meloetta/follow_shiny.pal b/graphics/pokemon/meloetta/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meloetta/follow_shiny.pal rename to graphics/pokemon/meloetta/overworld_shiny.pal diff --git a/graphics/pokemon/meloetta/pirouette/follower.png b/graphics/pokemon/meloetta/pirouette/overworld.png similarity index 100% rename from graphics/pokemon/meloetta/pirouette/follower.png rename to graphics/pokemon/meloetta/pirouette/overworld.png diff --git a/graphics/pokemon/meloetta/pirouette/follow_normal.pal b/graphics/pokemon/meloetta/pirouette/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meloetta/pirouette/follow_normal.pal rename to graphics/pokemon/meloetta/pirouette/overworld_normal.pal diff --git a/graphics/pokemon/meloetta/pirouette/follow_shiny.pal b/graphics/pokemon/meloetta/pirouette/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meloetta/pirouette/follow_shiny.pal rename to graphics/pokemon/meloetta/pirouette/overworld_shiny.pal diff --git a/graphics/pokemon/meltan/follower.png b/graphics/pokemon/meltan/overworld.png similarity index 100% rename from graphics/pokemon/meltan/follower.png rename to graphics/pokemon/meltan/overworld.png diff --git a/graphics/pokemon/meltan/follow_normal.pal b/graphics/pokemon/meltan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meltan/follow_normal.pal rename to graphics/pokemon/meltan/overworld_normal.pal diff --git a/graphics/pokemon/meltan/follow_shiny.pal b/graphics/pokemon/meltan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meltan/follow_shiny.pal rename to graphics/pokemon/meltan/overworld_shiny.pal diff --git a/graphics/pokemon/meowstic/female/follower.png b/graphics/pokemon/meowstic/female/overworld.png similarity index 100% rename from graphics/pokemon/meowstic/female/follower.png rename to graphics/pokemon/meowstic/female/overworld.png diff --git a/graphics/pokemon/meowstic/female/follow_normal.pal b/graphics/pokemon/meowstic/female/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meowstic/female/follow_normal.pal rename to graphics/pokemon/meowstic/female/overworld_normal.pal diff --git a/graphics/pokemon/meowstic/female/follow_shiny.pal b/graphics/pokemon/meowstic/female/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meowstic/female/follow_shiny.pal rename to graphics/pokemon/meowstic/female/overworld_shiny.pal diff --git a/graphics/pokemon/meowstic/follower.png b/graphics/pokemon/meowstic/overworld.png similarity index 100% rename from graphics/pokemon/meowstic/follower.png rename to graphics/pokemon/meowstic/overworld.png diff --git a/graphics/pokemon/meowstic/follow_normal.pal b/graphics/pokemon/meowstic/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meowstic/follow_normal.pal rename to graphics/pokemon/meowstic/overworld_normal.pal diff --git a/graphics/pokemon/meowstic/follow_shiny.pal b/graphics/pokemon/meowstic/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meowstic/follow_shiny.pal rename to graphics/pokemon/meowstic/overworld_shiny.pal diff --git a/graphics/pokemon/meowth/alolan/follower.png b/graphics/pokemon/meowth/alolan/overworld.png similarity index 100% rename from graphics/pokemon/meowth/alolan/follower.png rename to graphics/pokemon/meowth/alolan/overworld.png diff --git a/graphics/pokemon/meowth/alolan/follow_normal.pal b/graphics/pokemon/meowth/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meowth/alolan/follow_normal.pal rename to graphics/pokemon/meowth/alolan/overworld_normal.pal diff --git a/graphics/pokemon/meowth/alolan/follow_shiny.pal b/graphics/pokemon/meowth/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meowth/alolan/follow_shiny.pal rename to graphics/pokemon/meowth/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/meowth/galarian/follower.png b/graphics/pokemon/meowth/galarian/overworld.png similarity index 100% rename from graphics/pokemon/meowth/galarian/follower.png rename to graphics/pokemon/meowth/galarian/overworld.png diff --git a/graphics/pokemon/meowth/galarian/follow_normal.pal b/graphics/pokemon/meowth/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meowth/galarian/follow_normal.pal rename to graphics/pokemon/meowth/galarian/overworld_normal.pal diff --git a/graphics/pokemon/meowth/galarian/follow_shiny.pal b/graphics/pokemon/meowth/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meowth/galarian/follow_shiny.pal rename to graphics/pokemon/meowth/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/meowth/follower.png b/graphics/pokemon/meowth/overworld.png similarity index 100% rename from graphics/pokemon/meowth/follower.png rename to graphics/pokemon/meowth/overworld.png diff --git a/graphics/pokemon/meowth/follow_normal.pal b/graphics/pokemon/meowth/overworld_normal.pal similarity index 100% rename from graphics/pokemon/meowth/follow_normal.pal rename to graphics/pokemon/meowth/overworld_normal.pal diff --git a/graphics/pokemon/meowth/follow_shiny.pal b/graphics/pokemon/meowth/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/meowth/follow_shiny.pal rename to graphics/pokemon/meowth/overworld_shiny.pal diff --git a/graphics/pokemon/mesprit/follower.png b/graphics/pokemon/mesprit/overworld.png similarity index 100% rename from graphics/pokemon/mesprit/follower.png rename to graphics/pokemon/mesprit/overworld.png diff --git a/graphics/pokemon/mesprit/follow_normal.pal b/graphics/pokemon/mesprit/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mesprit/follow_normal.pal rename to graphics/pokemon/mesprit/overworld_normal.pal diff --git a/graphics/pokemon/mesprit/follow_shiny.pal b/graphics/pokemon/mesprit/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mesprit/follow_shiny.pal rename to graphics/pokemon/mesprit/overworld_shiny.pal diff --git a/graphics/pokemon/metagross/follower.png b/graphics/pokemon/metagross/overworld.png similarity index 100% rename from graphics/pokemon/metagross/follower.png rename to graphics/pokemon/metagross/overworld.png diff --git a/graphics/pokemon/metagross/follow_normal.pal b/graphics/pokemon/metagross/overworld_normal.pal similarity index 100% rename from graphics/pokemon/metagross/follow_normal.pal rename to graphics/pokemon/metagross/overworld_normal.pal diff --git a/graphics/pokemon/metagross/follow_shiny.pal b/graphics/pokemon/metagross/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/metagross/follow_shiny.pal rename to graphics/pokemon/metagross/overworld_shiny.pal diff --git a/graphics/pokemon/metang/follower.png b/graphics/pokemon/metang/overworld.png similarity index 100% rename from graphics/pokemon/metang/follower.png rename to graphics/pokemon/metang/overworld.png diff --git a/graphics/pokemon/metang/follow_normal.pal b/graphics/pokemon/metang/overworld_normal.pal similarity index 100% rename from graphics/pokemon/metang/follow_normal.pal rename to graphics/pokemon/metang/overworld_normal.pal diff --git a/graphics/pokemon/metang/follow_shiny.pal b/graphics/pokemon/metang/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/metang/follow_shiny.pal rename to graphics/pokemon/metang/overworld_shiny.pal diff --git a/graphics/pokemon/metapod/follower.png b/graphics/pokemon/metapod/overworld.png similarity index 100% rename from graphics/pokemon/metapod/follower.png rename to graphics/pokemon/metapod/overworld.png diff --git a/graphics/pokemon/metapod/follow_normal.pal b/graphics/pokemon/metapod/overworld_normal.pal similarity index 100% rename from graphics/pokemon/metapod/follow_normal.pal rename to graphics/pokemon/metapod/overworld_normal.pal diff --git a/graphics/pokemon/metapod/follow_shiny.pal b/graphics/pokemon/metapod/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/metapod/follow_shiny.pal rename to graphics/pokemon/metapod/overworld_shiny.pal diff --git a/graphics/pokemon/mew/follower.png b/graphics/pokemon/mew/overworld.png similarity index 100% rename from graphics/pokemon/mew/follower.png rename to graphics/pokemon/mew/overworld.png diff --git a/graphics/pokemon/mew/follow_normal.pal b/graphics/pokemon/mew/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mew/follow_normal.pal rename to graphics/pokemon/mew/overworld_normal.pal diff --git a/graphics/pokemon/mew/follow_shiny.pal b/graphics/pokemon/mew/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mew/follow_shiny.pal rename to graphics/pokemon/mew/overworld_shiny.pal diff --git a/graphics/pokemon/mewtwo/follower.png b/graphics/pokemon/mewtwo/overworld.png similarity index 100% rename from graphics/pokemon/mewtwo/follower.png rename to graphics/pokemon/mewtwo/overworld.png diff --git a/graphics/pokemon/mewtwo/follow_normal.pal b/graphics/pokemon/mewtwo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mewtwo/follow_normal.pal rename to graphics/pokemon/mewtwo/overworld_normal.pal diff --git a/graphics/pokemon/mewtwo/follow_shiny.pal b/graphics/pokemon/mewtwo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mewtwo/follow_shiny.pal rename to graphics/pokemon/mewtwo/overworld_shiny.pal diff --git a/graphics/pokemon/mienfoo/follower.png b/graphics/pokemon/mienfoo/overworld.png similarity index 100% rename from graphics/pokemon/mienfoo/follower.png rename to graphics/pokemon/mienfoo/overworld.png diff --git a/graphics/pokemon/mienfoo/follow_normal.pal b/graphics/pokemon/mienfoo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mienfoo/follow_normal.pal rename to graphics/pokemon/mienfoo/overworld_normal.pal diff --git a/graphics/pokemon/mienfoo/follow_shiny.pal b/graphics/pokemon/mienfoo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mienfoo/follow_shiny.pal rename to graphics/pokemon/mienfoo/overworld_shiny.pal diff --git a/graphics/pokemon/mienshao/follower.png b/graphics/pokemon/mienshao/overworld.png similarity index 100% rename from graphics/pokemon/mienshao/follower.png rename to graphics/pokemon/mienshao/overworld.png diff --git a/graphics/pokemon/mienshao/follow_normal.pal b/graphics/pokemon/mienshao/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mienshao/follow_normal.pal rename to graphics/pokemon/mienshao/overworld_normal.pal diff --git a/graphics/pokemon/mienshao/follow_shiny.pal b/graphics/pokemon/mienshao/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mienshao/follow_shiny.pal rename to graphics/pokemon/mienshao/overworld_shiny.pal diff --git a/graphics/pokemon/mightyena/follower.png b/graphics/pokemon/mightyena/overworld.png similarity index 100% rename from graphics/pokemon/mightyena/follower.png rename to graphics/pokemon/mightyena/overworld.png diff --git a/graphics/pokemon/mightyena/follow_normal.pal b/graphics/pokemon/mightyena/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mightyena/follow_normal.pal rename to graphics/pokemon/mightyena/overworld_normal.pal diff --git a/graphics/pokemon/mightyena/follow_shiny.pal b/graphics/pokemon/mightyena/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mightyena/follow_shiny.pal rename to graphics/pokemon/mightyena/overworld_shiny.pal diff --git a/graphics/pokemon/milcery/follower.png b/graphics/pokemon/milcery/overworld.png similarity index 100% rename from graphics/pokemon/milcery/follower.png rename to graphics/pokemon/milcery/overworld.png diff --git a/graphics/pokemon/milcery/follow_normal.pal b/graphics/pokemon/milcery/overworld_normal.pal similarity index 100% rename from graphics/pokemon/milcery/follow_normal.pal rename to graphics/pokemon/milcery/overworld_normal.pal diff --git a/graphics/pokemon/milcery/follow_shiny.pal b/graphics/pokemon/milcery/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/milcery/follow_shiny.pal rename to graphics/pokemon/milcery/overworld_shiny.pal diff --git a/graphics/pokemon/milotic/follower.png b/graphics/pokemon/milotic/overworld.png similarity index 100% rename from graphics/pokemon/milotic/follower.png rename to graphics/pokemon/milotic/overworld.png diff --git a/graphics/pokemon/milotic/follow_normal.pal b/graphics/pokemon/milotic/overworld_normal.pal similarity index 100% rename from graphics/pokemon/milotic/follow_normal.pal rename to graphics/pokemon/milotic/overworld_normal.pal diff --git a/graphics/pokemon/milotic/follow_shiny.pal b/graphics/pokemon/milotic/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/milotic/follow_shiny.pal rename to graphics/pokemon/milotic/overworld_shiny.pal diff --git a/graphics/pokemon/miltank/follower.png b/graphics/pokemon/miltank/overworld.png similarity index 100% rename from graphics/pokemon/miltank/follower.png rename to graphics/pokemon/miltank/overworld.png diff --git a/graphics/pokemon/miltank/follow_normal.pal b/graphics/pokemon/miltank/overworld_normal.pal similarity index 100% rename from graphics/pokemon/miltank/follow_normal.pal rename to graphics/pokemon/miltank/overworld_normal.pal diff --git a/graphics/pokemon/miltank/follow_shiny.pal b/graphics/pokemon/miltank/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/miltank/follow_shiny.pal rename to graphics/pokemon/miltank/overworld_shiny.pal diff --git a/graphics/pokemon/mime_jr/follower.png b/graphics/pokemon/mime_jr/overworld.png similarity index 100% rename from graphics/pokemon/mime_jr/follower.png rename to graphics/pokemon/mime_jr/overworld.png diff --git a/graphics/pokemon/mime_jr/follow_normal.pal b/graphics/pokemon/mime_jr/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mime_jr/follow_normal.pal rename to graphics/pokemon/mime_jr/overworld_normal.pal diff --git a/graphics/pokemon/mime_jr/follow_shiny.pal b/graphics/pokemon/mime_jr/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mime_jr/follow_shiny.pal rename to graphics/pokemon/mime_jr/overworld_shiny.pal diff --git a/graphics/pokemon/mimikyu/follower.png b/graphics/pokemon/mimikyu/overworld.png similarity index 100% rename from graphics/pokemon/mimikyu/follower.png rename to graphics/pokemon/mimikyu/overworld.png diff --git a/graphics/pokemon/mimikyu/follow_normal.pal b/graphics/pokemon/mimikyu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mimikyu/follow_normal.pal rename to graphics/pokemon/mimikyu/overworld_normal.pal diff --git a/graphics/pokemon/mimikyu/follow_shiny.pal b/graphics/pokemon/mimikyu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mimikyu/follow_shiny.pal rename to graphics/pokemon/mimikyu/overworld_shiny.pal diff --git a/graphics/pokemon/minccino/follower.png b/graphics/pokemon/minccino/overworld.png similarity index 100% rename from graphics/pokemon/minccino/follower.png rename to graphics/pokemon/minccino/overworld.png diff --git a/graphics/pokemon/minccino/follow_normal.pal b/graphics/pokemon/minccino/overworld_normal.pal similarity index 100% rename from graphics/pokemon/minccino/follow_normal.pal rename to graphics/pokemon/minccino/overworld_normal.pal diff --git a/graphics/pokemon/minccino/follow_shiny.pal b/graphics/pokemon/minccino/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/minccino/follow_shiny.pal rename to graphics/pokemon/minccino/overworld_shiny.pal diff --git a/graphics/pokemon/minior/follower.png b/graphics/pokemon/minior/overworld.png similarity index 100% rename from graphics/pokemon/minior/follower.png rename to graphics/pokemon/minior/overworld.png diff --git a/graphics/pokemon/minior/follow_normal.pal b/graphics/pokemon/minior/overworld_normal.pal similarity index 100% rename from graphics/pokemon/minior/follow_normal.pal rename to graphics/pokemon/minior/overworld_normal.pal diff --git a/graphics/pokemon/minior/follow_shiny.pal b/graphics/pokemon/minior/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/minior/follow_shiny.pal rename to graphics/pokemon/minior/overworld_shiny.pal diff --git a/graphics/pokemon/minun/follower.png b/graphics/pokemon/minun/overworld.png similarity index 100% rename from graphics/pokemon/minun/follower.png rename to graphics/pokemon/minun/overworld.png diff --git a/graphics/pokemon/minun/follow_normal.pal b/graphics/pokemon/minun/overworld_normal.pal similarity index 100% rename from graphics/pokemon/minun/follow_normal.pal rename to graphics/pokemon/minun/overworld_normal.pal diff --git a/graphics/pokemon/minun/follow_shiny.pal b/graphics/pokemon/minun/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/minun/follow_shiny.pal rename to graphics/pokemon/minun/overworld_shiny.pal diff --git a/graphics/pokemon/misdreavus/follower.png b/graphics/pokemon/misdreavus/overworld.png similarity index 100% rename from graphics/pokemon/misdreavus/follower.png rename to graphics/pokemon/misdreavus/overworld.png diff --git a/graphics/pokemon/misdreavus/follow_normal.pal b/graphics/pokemon/misdreavus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/misdreavus/follow_normal.pal rename to graphics/pokemon/misdreavus/overworld_normal.pal diff --git a/graphics/pokemon/misdreavus/follow_shiny.pal b/graphics/pokemon/misdreavus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/misdreavus/follow_shiny.pal rename to graphics/pokemon/misdreavus/overworld_shiny.pal diff --git a/graphics/pokemon/mismagius/follower.png b/graphics/pokemon/mismagius/overworld.png similarity index 100% rename from graphics/pokemon/mismagius/follower.png rename to graphics/pokemon/mismagius/overworld.png diff --git a/graphics/pokemon/mismagius/follow_normal.pal b/graphics/pokemon/mismagius/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mismagius/follow_normal.pal rename to graphics/pokemon/mismagius/overworld_normal.pal diff --git a/graphics/pokemon/mismagius/follow_shiny.pal b/graphics/pokemon/mismagius/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mismagius/follow_shiny.pal rename to graphics/pokemon/mismagius/overworld_shiny.pal diff --git a/graphics/pokemon/moltres/galarian/follower.png b/graphics/pokemon/moltres/galarian/overworld.png similarity index 100% rename from graphics/pokemon/moltres/galarian/follower.png rename to graphics/pokemon/moltres/galarian/overworld.png diff --git a/graphics/pokemon/moltres/galarian/follow_normal.pal b/graphics/pokemon/moltres/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/moltres/galarian/follow_normal.pal rename to graphics/pokemon/moltres/galarian/overworld_normal.pal diff --git a/graphics/pokemon/moltres/galarian/follow_shiny.pal b/graphics/pokemon/moltres/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/moltres/galarian/follow_shiny.pal rename to graphics/pokemon/moltres/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/moltres/follower.png b/graphics/pokemon/moltres/overworld.png similarity index 100% rename from graphics/pokemon/moltres/follower.png rename to graphics/pokemon/moltres/overworld.png diff --git a/graphics/pokemon/moltres/follow_normal.pal b/graphics/pokemon/moltres/overworld_normal.pal similarity index 100% rename from graphics/pokemon/moltres/follow_normal.pal rename to graphics/pokemon/moltres/overworld_normal.pal diff --git a/graphics/pokemon/moltres/follow_shiny.pal b/graphics/pokemon/moltres/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/moltres/follow_shiny.pal rename to graphics/pokemon/moltres/overworld_shiny.pal diff --git a/graphics/pokemon/monferno/follower.png b/graphics/pokemon/monferno/overworld.png similarity index 100% rename from graphics/pokemon/monferno/follower.png rename to graphics/pokemon/monferno/overworld.png diff --git a/graphics/pokemon/monferno/follow_normal.pal b/graphics/pokemon/monferno/overworld_normal.pal similarity index 100% rename from graphics/pokemon/monferno/follow_normal.pal rename to graphics/pokemon/monferno/overworld_normal.pal diff --git a/graphics/pokemon/monferno/follow_shiny.pal b/graphics/pokemon/monferno/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/monferno/follow_shiny.pal rename to graphics/pokemon/monferno/overworld_shiny.pal diff --git a/graphics/pokemon/morelull/follower.png b/graphics/pokemon/morelull/overworld.png similarity index 100% rename from graphics/pokemon/morelull/follower.png rename to graphics/pokemon/morelull/overworld.png diff --git a/graphics/pokemon/morelull/follow_normal.pal b/graphics/pokemon/morelull/overworld_normal.pal similarity index 100% rename from graphics/pokemon/morelull/follow_normal.pal rename to graphics/pokemon/morelull/overworld_normal.pal diff --git a/graphics/pokemon/morelull/follow_shiny.pal b/graphics/pokemon/morelull/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/morelull/follow_shiny.pal rename to graphics/pokemon/morelull/overworld_shiny.pal diff --git a/graphics/pokemon/morgrem/follower.png b/graphics/pokemon/morgrem/overworld.png similarity index 100% rename from graphics/pokemon/morgrem/follower.png rename to graphics/pokemon/morgrem/overworld.png diff --git a/graphics/pokemon/morgrem/follow_normal.pal b/graphics/pokemon/morgrem/overworld_normal.pal similarity index 100% rename from graphics/pokemon/morgrem/follow_normal.pal rename to graphics/pokemon/morgrem/overworld_normal.pal diff --git a/graphics/pokemon/morgrem/follow_shiny.pal b/graphics/pokemon/morgrem/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/morgrem/follow_shiny.pal rename to graphics/pokemon/morgrem/overworld_shiny.pal diff --git a/graphics/pokemon/morpeko/follower.png b/graphics/pokemon/morpeko/overworld.png similarity index 100% rename from graphics/pokemon/morpeko/follower.png rename to graphics/pokemon/morpeko/overworld.png diff --git a/graphics/pokemon/morpeko/follow_normal.pal b/graphics/pokemon/morpeko/overworld_normal.pal similarity index 100% rename from graphics/pokemon/morpeko/follow_normal.pal rename to graphics/pokemon/morpeko/overworld_normal.pal diff --git a/graphics/pokemon/morpeko/follow_shiny.pal b/graphics/pokemon/morpeko/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/morpeko/follow_shiny.pal rename to graphics/pokemon/morpeko/overworld_shiny.pal diff --git a/graphics/pokemon/mothim/follower.png b/graphics/pokemon/mothim/overworld.png similarity index 100% rename from graphics/pokemon/mothim/follower.png rename to graphics/pokemon/mothim/overworld.png diff --git a/graphics/pokemon/mothim/follow_normal.pal b/graphics/pokemon/mothim/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mothim/follow_normal.pal rename to graphics/pokemon/mothim/overworld_normal.pal diff --git a/graphics/pokemon/mothim/follow_shiny.pal b/graphics/pokemon/mothim/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mothim/follow_shiny.pal rename to graphics/pokemon/mothim/overworld_shiny.pal diff --git a/graphics/pokemon/mr_mime/galarian/follower.png b/graphics/pokemon/mr_mime/galarian/overworld.png similarity index 100% rename from graphics/pokemon/mr_mime/galarian/follower.png rename to graphics/pokemon/mr_mime/galarian/overworld.png diff --git a/graphics/pokemon/mr_mime/galarian/follow_normal.pal b/graphics/pokemon/mr_mime/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mr_mime/galarian/follow_normal.pal rename to graphics/pokemon/mr_mime/galarian/overworld_normal.pal diff --git a/graphics/pokemon/mr_mime/galarian/follow_shiny.pal b/graphics/pokemon/mr_mime/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mr_mime/galarian/follow_shiny.pal rename to graphics/pokemon/mr_mime/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/mr_mime/follower.png b/graphics/pokemon/mr_mime/overworld.png similarity index 100% rename from graphics/pokemon/mr_mime/follower.png rename to graphics/pokemon/mr_mime/overworld.png diff --git a/graphics/pokemon/mr_mime/follow_normal.pal b/graphics/pokemon/mr_mime/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mr_mime/follow_normal.pal rename to graphics/pokemon/mr_mime/overworld_normal.pal diff --git a/graphics/pokemon/mr_mime/follow_shiny.pal b/graphics/pokemon/mr_mime/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mr_mime/follow_shiny.pal rename to graphics/pokemon/mr_mime/overworld_shiny.pal diff --git a/graphics/pokemon/mr_rime/follower.png b/graphics/pokemon/mr_rime/overworld.png similarity index 100% rename from graphics/pokemon/mr_rime/follower.png rename to graphics/pokemon/mr_rime/overworld.png diff --git a/graphics/pokemon/mr_rime/follow_normal.pal b/graphics/pokemon/mr_rime/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mr_rime/follow_normal.pal rename to graphics/pokemon/mr_rime/overworld_normal.pal diff --git a/graphics/pokemon/mr_rime/follow_shiny.pal b/graphics/pokemon/mr_rime/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mr_rime/follow_shiny.pal rename to graphics/pokemon/mr_rime/overworld_shiny.pal diff --git a/graphics/pokemon/mudbray/follower.png b/graphics/pokemon/mudbray/overworld.png similarity index 100% rename from graphics/pokemon/mudbray/follower.png rename to graphics/pokemon/mudbray/overworld.png diff --git a/graphics/pokemon/mudbray/follow_normal.pal b/graphics/pokemon/mudbray/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mudbray/follow_normal.pal rename to graphics/pokemon/mudbray/overworld_normal.pal diff --git a/graphics/pokemon/mudbray/follow_shiny.pal b/graphics/pokemon/mudbray/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mudbray/follow_shiny.pal rename to graphics/pokemon/mudbray/overworld_shiny.pal diff --git a/graphics/pokemon/mudkip/follower.png b/graphics/pokemon/mudkip/overworld.png similarity index 100% rename from graphics/pokemon/mudkip/follower.png rename to graphics/pokemon/mudkip/overworld.png diff --git a/graphics/pokemon/mudkip/follow_normal.pal b/graphics/pokemon/mudkip/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mudkip/follow_normal.pal rename to graphics/pokemon/mudkip/overworld_normal.pal diff --git a/graphics/pokemon/mudkip/follow_shiny.pal b/graphics/pokemon/mudkip/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mudkip/follow_shiny.pal rename to graphics/pokemon/mudkip/overworld_shiny.pal diff --git a/graphics/pokemon/mudsdale/follower.png b/graphics/pokemon/mudsdale/overworld.png similarity index 100% rename from graphics/pokemon/mudsdale/follower.png rename to graphics/pokemon/mudsdale/overworld.png diff --git a/graphics/pokemon/mudsdale/follow_normal.pal b/graphics/pokemon/mudsdale/overworld_normal.pal similarity index 100% rename from graphics/pokemon/mudsdale/follow_normal.pal rename to graphics/pokemon/mudsdale/overworld_normal.pal diff --git a/graphics/pokemon/mudsdale/follow_shiny.pal b/graphics/pokemon/mudsdale/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/mudsdale/follow_shiny.pal rename to graphics/pokemon/mudsdale/overworld_shiny.pal diff --git a/graphics/pokemon/muk/alolan/follower.png b/graphics/pokemon/muk/alolan/overworld.png similarity index 100% rename from graphics/pokemon/muk/alolan/follower.png rename to graphics/pokemon/muk/alolan/overworld.png diff --git a/graphics/pokemon/muk/alolan/follow_normal.pal b/graphics/pokemon/muk/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/muk/alolan/follow_normal.pal rename to graphics/pokemon/muk/alolan/overworld_normal.pal diff --git a/graphics/pokemon/muk/alolan/follow_shiny.pal b/graphics/pokemon/muk/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/muk/alolan/follow_shiny.pal rename to graphics/pokemon/muk/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/muk/follower.png b/graphics/pokemon/muk/overworld.png similarity index 100% rename from graphics/pokemon/muk/follower.png rename to graphics/pokemon/muk/overworld.png diff --git a/graphics/pokemon/muk/follow_normal.pal b/graphics/pokemon/muk/overworld_normal.pal similarity index 100% rename from graphics/pokemon/muk/follow_normal.pal rename to graphics/pokemon/muk/overworld_normal.pal diff --git a/graphics/pokemon/muk/follow_shiny.pal b/graphics/pokemon/muk/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/muk/follow_shiny.pal rename to graphics/pokemon/muk/overworld_shiny.pal diff --git a/graphics/pokemon/munchlax/follower.png b/graphics/pokemon/munchlax/overworld.png similarity index 100% rename from graphics/pokemon/munchlax/follower.png rename to graphics/pokemon/munchlax/overworld.png diff --git a/graphics/pokemon/munchlax/follow_normal.pal b/graphics/pokemon/munchlax/overworld_normal.pal similarity index 100% rename from graphics/pokemon/munchlax/follow_normal.pal rename to graphics/pokemon/munchlax/overworld_normal.pal diff --git a/graphics/pokemon/munchlax/follow_shiny.pal b/graphics/pokemon/munchlax/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/munchlax/follow_shiny.pal rename to graphics/pokemon/munchlax/overworld_shiny.pal diff --git a/graphics/pokemon/munna/follower.png b/graphics/pokemon/munna/overworld.png similarity index 100% rename from graphics/pokemon/munna/follower.png rename to graphics/pokemon/munna/overworld.png diff --git a/graphics/pokemon/munna/follow_normal.pal b/graphics/pokemon/munna/overworld_normal.pal similarity index 100% rename from graphics/pokemon/munna/follow_normal.pal rename to graphics/pokemon/munna/overworld_normal.pal diff --git a/graphics/pokemon/munna/follow_shiny.pal b/graphics/pokemon/munna/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/munna/follow_shiny.pal rename to graphics/pokemon/munna/overworld_shiny.pal diff --git a/graphics/pokemon/murkrow/follower.png b/graphics/pokemon/murkrow/overworld.png similarity index 100% rename from graphics/pokemon/murkrow/follower.png rename to graphics/pokemon/murkrow/overworld.png diff --git a/graphics/pokemon/murkrow/follow_normal.pal b/graphics/pokemon/murkrow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/murkrow/follow_normal.pal rename to graphics/pokemon/murkrow/overworld_normal.pal diff --git a/graphics/pokemon/murkrow/follow_shiny.pal b/graphics/pokemon/murkrow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/murkrow/follow_shiny.pal rename to graphics/pokemon/murkrow/overworld_shiny.pal diff --git a/graphics/pokemon/musharna/follower.png b/graphics/pokemon/musharna/overworld.png similarity index 100% rename from graphics/pokemon/musharna/follower.png rename to graphics/pokemon/musharna/overworld.png diff --git a/graphics/pokemon/musharna/follow_normal.pal b/graphics/pokemon/musharna/overworld_normal.pal similarity index 100% rename from graphics/pokemon/musharna/follow_normal.pal rename to graphics/pokemon/musharna/overworld_normal.pal diff --git a/graphics/pokemon/musharna/follow_shiny.pal b/graphics/pokemon/musharna/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/musharna/follow_shiny.pal rename to graphics/pokemon/musharna/overworld_shiny.pal diff --git a/graphics/pokemon/naganadel/follower.png b/graphics/pokemon/naganadel/overworld.png similarity index 100% rename from graphics/pokemon/naganadel/follower.png rename to graphics/pokemon/naganadel/overworld.png diff --git a/graphics/pokemon/naganadel/follow_normal.pal b/graphics/pokemon/naganadel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/naganadel/follow_normal.pal rename to graphics/pokemon/naganadel/overworld_normal.pal diff --git a/graphics/pokemon/naganadel/follow_shiny.pal b/graphics/pokemon/naganadel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/naganadel/follow_shiny.pal rename to graphics/pokemon/naganadel/overworld_shiny.pal diff --git a/graphics/pokemon/natu/follower.png b/graphics/pokemon/natu/overworld.png similarity index 100% rename from graphics/pokemon/natu/follower.png rename to graphics/pokemon/natu/overworld.png diff --git a/graphics/pokemon/natu/follow_normal.pal b/graphics/pokemon/natu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/natu/follow_normal.pal rename to graphics/pokemon/natu/overworld_normal.pal diff --git a/graphics/pokemon/natu/follow_shiny.pal b/graphics/pokemon/natu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/natu/follow_shiny.pal rename to graphics/pokemon/natu/overworld_shiny.pal diff --git a/graphics/pokemon/necrozma/dawn_wings/follower.png b/graphics/pokemon/necrozma/dawn_wings/overworld.png similarity index 100% rename from graphics/pokemon/necrozma/dawn_wings/follower.png rename to graphics/pokemon/necrozma/dawn_wings/overworld.png diff --git a/graphics/pokemon/necrozma/dawn_wings/follow_normal.pal b/graphics/pokemon/necrozma/dawn_wings/overworld_normal.pal similarity index 100% rename from graphics/pokemon/necrozma/dawn_wings/follow_normal.pal rename to graphics/pokemon/necrozma/dawn_wings/overworld_normal.pal diff --git a/graphics/pokemon/necrozma/dawn_wings/follow_shiny.pal b/graphics/pokemon/necrozma/dawn_wings/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/necrozma/dawn_wings/follow_shiny.pal rename to graphics/pokemon/necrozma/dawn_wings/overworld_shiny.pal diff --git a/graphics/pokemon/necrozma/dusk_mane/follower.png b/graphics/pokemon/necrozma/dusk_mane/overworld.png similarity index 100% rename from graphics/pokemon/necrozma/dusk_mane/follower.png rename to graphics/pokemon/necrozma/dusk_mane/overworld.png diff --git a/graphics/pokemon/necrozma/dusk_mane/follow_normal.pal b/graphics/pokemon/necrozma/dusk_mane/overworld_normal.pal similarity index 100% rename from graphics/pokemon/necrozma/dusk_mane/follow_normal.pal rename to graphics/pokemon/necrozma/dusk_mane/overworld_normal.pal diff --git a/graphics/pokemon/necrozma/dusk_mane/follow_shiny.pal b/graphics/pokemon/necrozma/dusk_mane/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/necrozma/dusk_mane/follow_shiny.pal rename to graphics/pokemon/necrozma/dusk_mane/overworld_shiny.pal diff --git a/graphics/pokemon/necrozma/follower.png b/graphics/pokemon/necrozma/overworld.png similarity index 100% rename from graphics/pokemon/necrozma/follower.png rename to graphics/pokemon/necrozma/overworld.png diff --git a/graphics/pokemon/necrozma/follow_normal.pal b/graphics/pokemon/necrozma/overworld_normal.pal similarity index 100% rename from graphics/pokemon/necrozma/follow_normal.pal rename to graphics/pokemon/necrozma/overworld_normal.pal diff --git a/graphics/pokemon/necrozma/follow_shiny.pal b/graphics/pokemon/necrozma/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/necrozma/follow_shiny.pal rename to graphics/pokemon/necrozma/overworld_shiny.pal diff --git a/graphics/pokemon/nickit/follower.png b/graphics/pokemon/nickit/overworld.png similarity index 100% rename from graphics/pokemon/nickit/follower.png rename to graphics/pokemon/nickit/overworld.png diff --git a/graphics/pokemon/nickit/follow_normal.pal b/graphics/pokemon/nickit/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nickit/follow_normal.pal rename to graphics/pokemon/nickit/overworld_normal.pal diff --git a/graphics/pokemon/nickit/follow_shiny.pal b/graphics/pokemon/nickit/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nickit/follow_shiny.pal rename to graphics/pokemon/nickit/overworld_shiny.pal diff --git a/graphics/pokemon/nidoking/follower.png b/graphics/pokemon/nidoking/overworld.png similarity index 100% rename from graphics/pokemon/nidoking/follower.png rename to graphics/pokemon/nidoking/overworld.png diff --git a/graphics/pokemon/nidoking/follow_normal.pal b/graphics/pokemon/nidoking/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nidoking/follow_normal.pal rename to graphics/pokemon/nidoking/overworld_normal.pal diff --git a/graphics/pokemon/nidoking/follow_shiny.pal b/graphics/pokemon/nidoking/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nidoking/follow_shiny.pal rename to graphics/pokemon/nidoking/overworld_shiny.pal diff --git a/graphics/pokemon/nidoqueen/follower.png b/graphics/pokemon/nidoqueen/overworld.png similarity index 100% rename from graphics/pokemon/nidoqueen/follower.png rename to graphics/pokemon/nidoqueen/overworld.png diff --git a/graphics/pokemon/nidoqueen/follow_normal.pal b/graphics/pokemon/nidoqueen/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nidoqueen/follow_normal.pal rename to graphics/pokemon/nidoqueen/overworld_normal.pal diff --git a/graphics/pokemon/nidoqueen/follow_shiny.pal b/graphics/pokemon/nidoqueen/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nidoqueen/follow_shiny.pal rename to graphics/pokemon/nidoqueen/overworld_shiny.pal diff --git a/graphics/pokemon/nidoran_f/follower.png b/graphics/pokemon/nidoran_f/overworld.png similarity index 100% rename from graphics/pokemon/nidoran_f/follower.png rename to graphics/pokemon/nidoran_f/overworld.png diff --git a/graphics/pokemon/nidoran_f/follow_normal.pal b/graphics/pokemon/nidoran_f/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nidoran_f/follow_normal.pal rename to graphics/pokemon/nidoran_f/overworld_normal.pal diff --git a/graphics/pokemon/nidoran_f/follow_shiny.pal b/graphics/pokemon/nidoran_f/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nidoran_f/follow_shiny.pal rename to graphics/pokemon/nidoran_f/overworld_shiny.pal diff --git a/graphics/pokemon/nidoran_m/follower.png b/graphics/pokemon/nidoran_m/overworld.png similarity index 100% rename from graphics/pokemon/nidoran_m/follower.png rename to graphics/pokemon/nidoran_m/overworld.png diff --git a/graphics/pokemon/nidoran_m/follow_normal.pal b/graphics/pokemon/nidoran_m/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nidoran_m/follow_normal.pal rename to graphics/pokemon/nidoran_m/overworld_normal.pal diff --git a/graphics/pokemon/nidoran_m/follow_shiny.pal b/graphics/pokemon/nidoran_m/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nidoran_m/follow_shiny.pal rename to graphics/pokemon/nidoran_m/overworld_shiny.pal diff --git a/graphics/pokemon/nidorina/follower.png b/graphics/pokemon/nidorina/overworld.png similarity index 100% rename from graphics/pokemon/nidorina/follower.png rename to graphics/pokemon/nidorina/overworld.png diff --git a/graphics/pokemon/nidorina/follow_normal.pal b/graphics/pokemon/nidorina/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nidorina/follow_normal.pal rename to graphics/pokemon/nidorina/overworld_normal.pal diff --git a/graphics/pokemon/nidorina/follow_shiny.pal b/graphics/pokemon/nidorina/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nidorina/follow_shiny.pal rename to graphics/pokemon/nidorina/overworld_shiny.pal diff --git a/graphics/pokemon/nidorino/follower.png b/graphics/pokemon/nidorino/overworld.png similarity index 100% rename from graphics/pokemon/nidorino/follower.png rename to graphics/pokemon/nidorino/overworld.png diff --git a/graphics/pokemon/nidorino/follow_normal.pal b/graphics/pokemon/nidorino/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nidorino/follow_normal.pal rename to graphics/pokemon/nidorino/overworld_normal.pal diff --git a/graphics/pokemon/nidorino/follow_shiny.pal b/graphics/pokemon/nidorino/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nidorino/follow_shiny.pal rename to graphics/pokemon/nidorino/overworld_shiny.pal diff --git a/graphics/pokemon/nihilego/follower.png b/graphics/pokemon/nihilego/overworld.png similarity index 100% rename from graphics/pokemon/nihilego/follower.png rename to graphics/pokemon/nihilego/overworld.png diff --git a/graphics/pokemon/nihilego/follow_normal.pal b/graphics/pokemon/nihilego/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nihilego/follow_normal.pal rename to graphics/pokemon/nihilego/overworld_normal.pal diff --git a/graphics/pokemon/nihilego/follow_shiny.pal b/graphics/pokemon/nihilego/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nihilego/follow_shiny.pal rename to graphics/pokemon/nihilego/overworld_shiny.pal diff --git a/graphics/pokemon/nincada/follower.png b/graphics/pokemon/nincada/overworld.png similarity index 100% rename from graphics/pokemon/nincada/follower.png rename to graphics/pokemon/nincada/overworld.png diff --git a/graphics/pokemon/nincada/follow_normal.pal b/graphics/pokemon/nincada/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nincada/follow_normal.pal rename to graphics/pokemon/nincada/overworld_normal.pal diff --git a/graphics/pokemon/nincada/follow_shiny.pal b/graphics/pokemon/nincada/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nincada/follow_shiny.pal rename to graphics/pokemon/nincada/overworld_shiny.pal diff --git a/graphics/pokemon/ninetales/alolan/follower.png b/graphics/pokemon/ninetales/alolan/overworld.png similarity index 100% rename from graphics/pokemon/ninetales/alolan/follower.png rename to graphics/pokemon/ninetales/alolan/overworld.png diff --git a/graphics/pokemon/ninetales/alolan/follow_normal.pal b/graphics/pokemon/ninetales/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ninetales/alolan/follow_normal.pal rename to graphics/pokemon/ninetales/alolan/overworld_normal.pal diff --git a/graphics/pokemon/ninetales/alolan/follow_shiny.pal b/graphics/pokemon/ninetales/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ninetales/alolan/follow_shiny.pal rename to graphics/pokemon/ninetales/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/ninetales/follower.png b/graphics/pokemon/ninetales/overworld.png similarity index 100% rename from graphics/pokemon/ninetales/follower.png rename to graphics/pokemon/ninetales/overworld.png diff --git a/graphics/pokemon/ninetales/follow_normal.pal b/graphics/pokemon/ninetales/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ninetales/follow_normal.pal rename to graphics/pokemon/ninetales/overworld_normal.pal diff --git a/graphics/pokemon/ninetales/follow_shiny.pal b/graphics/pokemon/ninetales/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ninetales/follow_shiny.pal rename to graphics/pokemon/ninetales/overworld_shiny.pal diff --git a/graphics/pokemon/ninjask/follower.png b/graphics/pokemon/ninjask/overworld.png similarity index 100% rename from graphics/pokemon/ninjask/follower.png rename to graphics/pokemon/ninjask/overworld.png diff --git a/graphics/pokemon/ninjask/follow_normal.pal b/graphics/pokemon/ninjask/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ninjask/follow_normal.pal rename to graphics/pokemon/ninjask/overworld_normal.pal diff --git a/graphics/pokemon/ninjask/follow_shiny.pal b/graphics/pokemon/ninjask/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ninjask/follow_shiny.pal rename to graphics/pokemon/ninjask/overworld_shiny.pal diff --git a/graphics/pokemon/noctowl/follower.png b/graphics/pokemon/noctowl/overworld.png similarity index 100% rename from graphics/pokemon/noctowl/follower.png rename to graphics/pokemon/noctowl/overworld.png diff --git a/graphics/pokemon/noctowl/follow_normal.pal b/graphics/pokemon/noctowl/overworld_normal.pal similarity index 100% rename from graphics/pokemon/noctowl/follow_normal.pal rename to graphics/pokemon/noctowl/overworld_normal.pal diff --git a/graphics/pokemon/noctowl/follow_shiny.pal b/graphics/pokemon/noctowl/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/noctowl/follow_shiny.pal rename to graphics/pokemon/noctowl/overworld_shiny.pal diff --git a/graphics/pokemon/noibat/follower.png b/graphics/pokemon/noibat/overworld.png similarity index 100% rename from graphics/pokemon/noibat/follower.png rename to graphics/pokemon/noibat/overworld.png diff --git a/graphics/pokemon/noibat/follow_normal.pal b/graphics/pokemon/noibat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/noibat/follow_normal.pal rename to graphics/pokemon/noibat/overworld_normal.pal diff --git a/graphics/pokemon/noibat/follow_shiny.pal b/graphics/pokemon/noibat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/noibat/follow_shiny.pal rename to graphics/pokemon/noibat/overworld_shiny.pal diff --git a/graphics/pokemon/noivern/follower.png b/graphics/pokemon/noivern/overworld.png similarity index 100% rename from graphics/pokemon/noivern/follower.png rename to graphics/pokemon/noivern/overworld.png diff --git a/graphics/pokemon/noivern/follow_normal.pal b/graphics/pokemon/noivern/overworld_normal.pal similarity index 100% rename from graphics/pokemon/noivern/follow_normal.pal rename to graphics/pokemon/noivern/overworld_normal.pal diff --git a/graphics/pokemon/noivern/follow_shiny.pal b/graphics/pokemon/noivern/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/noivern/follow_shiny.pal rename to graphics/pokemon/noivern/overworld_shiny.pal diff --git a/graphics/pokemon/nosepass/follower.png b/graphics/pokemon/nosepass/overworld.png similarity index 100% rename from graphics/pokemon/nosepass/follower.png rename to graphics/pokemon/nosepass/overworld.png diff --git a/graphics/pokemon/nosepass/follow_normal.pal b/graphics/pokemon/nosepass/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nosepass/follow_normal.pal rename to graphics/pokemon/nosepass/overworld_normal.pal diff --git a/graphics/pokemon/nosepass/follow_shiny.pal b/graphics/pokemon/nosepass/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nosepass/follow_shiny.pal rename to graphics/pokemon/nosepass/overworld_shiny.pal diff --git a/graphics/pokemon/numel/follower.png b/graphics/pokemon/numel/overworld.png similarity index 100% rename from graphics/pokemon/numel/follower.png rename to graphics/pokemon/numel/overworld.png diff --git a/graphics/pokemon/numel/follow_normal.pal b/graphics/pokemon/numel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/numel/follow_normal.pal rename to graphics/pokemon/numel/overworld_normal.pal diff --git a/graphics/pokemon/numel/follow_shiny.pal b/graphics/pokemon/numel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/numel/follow_shiny.pal rename to graphics/pokemon/numel/overworld_shiny.pal diff --git a/graphics/pokemon/nuzleaf/follower.png b/graphics/pokemon/nuzleaf/overworld.png similarity index 100% rename from graphics/pokemon/nuzleaf/follower.png rename to graphics/pokemon/nuzleaf/overworld.png diff --git a/graphics/pokemon/nuzleaf/follow_normal.pal b/graphics/pokemon/nuzleaf/overworld_normal.pal similarity index 100% rename from graphics/pokemon/nuzleaf/follow_normal.pal rename to graphics/pokemon/nuzleaf/overworld_normal.pal diff --git a/graphics/pokemon/nuzleaf/follow_shiny.pal b/graphics/pokemon/nuzleaf/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/nuzleaf/follow_shiny.pal rename to graphics/pokemon/nuzleaf/overworld_shiny.pal diff --git a/graphics/pokemon/obstagoon/follower.png b/graphics/pokemon/obstagoon/overworld.png similarity index 100% rename from graphics/pokemon/obstagoon/follower.png rename to graphics/pokemon/obstagoon/overworld.png diff --git a/graphics/pokemon/obstagoon/follow_normal.pal b/graphics/pokemon/obstagoon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/obstagoon/follow_normal.pal rename to graphics/pokemon/obstagoon/overworld_normal.pal diff --git a/graphics/pokemon/obstagoon/follow_shiny.pal b/graphics/pokemon/obstagoon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/obstagoon/follow_shiny.pal rename to graphics/pokemon/obstagoon/overworld_shiny.pal diff --git a/graphics/pokemon/octillery/follower.png b/graphics/pokemon/octillery/overworld.png similarity index 100% rename from graphics/pokemon/octillery/follower.png rename to graphics/pokemon/octillery/overworld.png diff --git a/graphics/pokemon/octillery/follow_normal.pal b/graphics/pokemon/octillery/overworld_normal.pal similarity index 100% rename from graphics/pokemon/octillery/follow_normal.pal rename to graphics/pokemon/octillery/overworld_normal.pal diff --git a/graphics/pokemon/octillery/follow_shiny.pal b/graphics/pokemon/octillery/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/octillery/follow_shiny.pal rename to graphics/pokemon/octillery/overworld_shiny.pal diff --git a/graphics/pokemon/oddish/follower.png b/graphics/pokemon/oddish/overworld.png similarity index 100% rename from graphics/pokemon/oddish/follower.png rename to graphics/pokemon/oddish/overworld.png diff --git a/graphics/pokemon/oddish/follow_normal.pal b/graphics/pokemon/oddish/overworld_normal.pal similarity index 100% rename from graphics/pokemon/oddish/follow_normal.pal rename to graphics/pokemon/oddish/overworld_normal.pal diff --git a/graphics/pokemon/oddish/follow_shiny.pal b/graphics/pokemon/oddish/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/oddish/follow_shiny.pal rename to graphics/pokemon/oddish/overworld_shiny.pal diff --git a/graphics/pokemon/omanyte/follower.png b/graphics/pokemon/omanyte/overworld.png similarity index 100% rename from graphics/pokemon/omanyte/follower.png rename to graphics/pokemon/omanyte/overworld.png diff --git a/graphics/pokemon/omanyte/follow_normal.pal b/graphics/pokemon/omanyte/overworld_normal.pal similarity index 100% rename from graphics/pokemon/omanyte/follow_normal.pal rename to graphics/pokemon/omanyte/overworld_normal.pal diff --git a/graphics/pokemon/omanyte/follow_shiny.pal b/graphics/pokemon/omanyte/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/omanyte/follow_shiny.pal rename to graphics/pokemon/omanyte/overworld_shiny.pal diff --git a/graphics/pokemon/omastar/follower.png b/graphics/pokemon/omastar/overworld.png similarity index 100% rename from graphics/pokemon/omastar/follower.png rename to graphics/pokemon/omastar/overworld.png diff --git a/graphics/pokemon/omastar/follow_normal.pal b/graphics/pokemon/omastar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/omastar/follow_normal.pal rename to graphics/pokemon/omastar/overworld_normal.pal diff --git a/graphics/pokemon/omastar/follow_shiny.pal b/graphics/pokemon/omastar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/omastar/follow_shiny.pal rename to graphics/pokemon/omastar/overworld_shiny.pal diff --git a/graphics/pokemon/onix/follower.png b/graphics/pokemon/onix/overworld.png similarity index 100% rename from graphics/pokemon/onix/follower.png rename to graphics/pokemon/onix/overworld.png diff --git a/graphics/pokemon/onix/follow_normal.pal b/graphics/pokemon/onix/overworld_normal.pal similarity index 100% rename from graphics/pokemon/onix/follow_normal.pal rename to graphics/pokemon/onix/overworld_normal.pal diff --git a/graphics/pokemon/onix/follow_shiny.pal b/graphics/pokemon/onix/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/onix/follow_shiny.pal rename to graphics/pokemon/onix/overworld_shiny.pal diff --git a/graphics/pokemon/oranguru/follower.png b/graphics/pokemon/oranguru/overworld.png similarity index 100% rename from graphics/pokemon/oranguru/follower.png rename to graphics/pokemon/oranguru/overworld.png diff --git a/graphics/pokemon/oranguru/follow_normal.pal b/graphics/pokemon/oranguru/overworld_normal.pal similarity index 100% rename from graphics/pokemon/oranguru/follow_normal.pal rename to graphics/pokemon/oranguru/overworld_normal.pal diff --git a/graphics/pokemon/oranguru/follow_shiny.pal b/graphics/pokemon/oranguru/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/oranguru/follow_shiny.pal rename to graphics/pokemon/oranguru/overworld_shiny.pal diff --git a/graphics/pokemon/orbeetle/follower.png b/graphics/pokemon/orbeetle/overworld.png similarity index 100% rename from graphics/pokemon/orbeetle/follower.png rename to graphics/pokemon/orbeetle/overworld.png diff --git a/graphics/pokemon/orbeetle/follow_normal.pal b/graphics/pokemon/orbeetle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/orbeetle/follow_normal.pal rename to graphics/pokemon/orbeetle/overworld_normal.pal diff --git a/graphics/pokemon/orbeetle/follow_shiny.pal b/graphics/pokemon/orbeetle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/orbeetle/follow_shiny.pal rename to graphics/pokemon/orbeetle/overworld_shiny.pal diff --git a/graphics/pokemon/oricorio/follower.png b/graphics/pokemon/oricorio/overworld.png similarity index 100% rename from graphics/pokemon/oricorio/follower.png rename to graphics/pokemon/oricorio/overworld.png diff --git a/graphics/pokemon/oricorio/follow_normal.pal b/graphics/pokemon/oricorio/overworld_normal.pal similarity index 100% rename from graphics/pokemon/oricorio/follow_normal.pal rename to graphics/pokemon/oricorio/overworld_normal.pal diff --git a/graphics/pokemon/oricorio/follow_shiny.pal b/graphics/pokemon/oricorio/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/oricorio/follow_shiny.pal rename to graphics/pokemon/oricorio/overworld_shiny.pal diff --git a/graphics/pokemon/oshawott/follower.png b/graphics/pokemon/oshawott/overworld.png similarity index 100% rename from graphics/pokemon/oshawott/follower.png rename to graphics/pokemon/oshawott/overworld.png diff --git a/graphics/pokemon/oshawott/follow_normal.pal b/graphics/pokemon/oshawott/overworld_normal.pal similarity index 100% rename from graphics/pokemon/oshawott/follow_normal.pal rename to graphics/pokemon/oshawott/overworld_normal.pal diff --git a/graphics/pokemon/oshawott/follow_shiny.pal b/graphics/pokemon/oshawott/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/oshawott/follow_shiny.pal rename to graphics/pokemon/oshawott/overworld_shiny.pal diff --git a/graphics/pokemon/overqwil/follower.png b/graphics/pokemon/overqwil/overworld.png similarity index 100% rename from graphics/pokemon/overqwil/follower.png rename to graphics/pokemon/overqwil/overworld.png diff --git a/graphics/pokemon/overqwil/follow_normal.pal b/graphics/pokemon/overqwil/overworld_normal.pal similarity index 100% rename from graphics/pokemon/overqwil/follow_normal.pal rename to graphics/pokemon/overqwil/overworld_normal.pal diff --git a/graphics/pokemon/overqwil/follow_shiny.pal b/graphics/pokemon/overqwil/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/overqwil/follow_shiny.pal rename to graphics/pokemon/overqwil/overworld_shiny.pal diff --git a/graphics/pokemon/pachirisu/follower.png b/graphics/pokemon/pachirisu/overworld.png similarity index 100% rename from graphics/pokemon/pachirisu/follower.png rename to graphics/pokemon/pachirisu/overworld.png diff --git a/graphics/pokemon/pachirisu/follow_normal.pal b/graphics/pokemon/pachirisu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pachirisu/follow_normal.pal rename to graphics/pokemon/pachirisu/overworld_normal.pal diff --git a/graphics/pokemon/pachirisu/follow_shiny.pal b/graphics/pokemon/pachirisu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pachirisu/follow_shiny.pal rename to graphics/pokemon/pachirisu/overworld_shiny.pal diff --git a/graphics/pokemon/palkia/origin/follower.png b/graphics/pokemon/palkia/origin/overworld.png similarity index 100% rename from graphics/pokemon/palkia/origin/follower.png rename to graphics/pokemon/palkia/origin/overworld.png diff --git a/graphics/pokemon/palkia/origin/follow_normal.pal b/graphics/pokemon/palkia/origin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/palkia/origin/follow_normal.pal rename to graphics/pokemon/palkia/origin/overworld_normal.pal diff --git a/graphics/pokemon/palkia/follower.png b/graphics/pokemon/palkia/overworld.png similarity index 100% rename from graphics/pokemon/palkia/follower.png rename to graphics/pokemon/palkia/overworld.png diff --git a/graphics/pokemon/palkia/follow_normal.pal b/graphics/pokemon/palkia/overworld_normal.pal similarity index 100% rename from graphics/pokemon/palkia/follow_normal.pal rename to graphics/pokemon/palkia/overworld_normal.pal diff --git a/graphics/pokemon/palkia/follow_shiny.pal b/graphics/pokemon/palkia/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/palkia/follow_shiny.pal rename to graphics/pokemon/palkia/overworld_shiny.pal diff --git a/graphics/pokemon/palossand/follower.png b/graphics/pokemon/palossand/overworld.png similarity index 100% rename from graphics/pokemon/palossand/follower.png rename to graphics/pokemon/palossand/overworld.png diff --git a/graphics/pokemon/palossand/follow_normal.pal b/graphics/pokemon/palossand/overworld_normal.pal similarity index 100% rename from graphics/pokemon/palossand/follow_normal.pal rename to graphics/pokemon/palossand/overworld_normal.pal diff --git a/graphics/pokemon/palossand/follow_shiny.pal b/graphics/pokemon/palossand/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/palossand/follow_shiny.pal rename to graphics/pokemon/palossand/overworld_shiny.pal diff --git a/graphics/pokemon/palpitoad/follower.png b/graphics/pokemon/palpitoad/overworld.png similarity index 100% rename from graphics/pokemon/palpitoad/follower.png rename to graphics/pokemon/palpitoad/overworld.png diff --git a/graphics/pokemon/palpitoad/follow_normal.pal b/graphics/pokemon/palpitoad/overworld_normal.pal similarity index 100% rename from graphics/pokemon/palpitoad/follow_normal.pal rename to graphics/pokemon/palpitoad/overworld_normal.pal diff --git a/graphics/pokemon/palpitoad/follow_shiny.pal b/graphics/pokemon/palpitoad/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/palpitoad/follow_shiny.pal rename to graphics/pokemon/palpitoad/overworld_shiny.pal diff --git a/graphics/pokemon/pancham/follower.png b/graphics/pokemon/pancham/overworld.png similarity index 100% rename from graphics/pokemon/pancham/follower.png rename to graphics/pokemon/pancham/overworld.png diff --git a/graphics/pokemon/pancham/follow_normal.pal b/graphics/pokemon/pancham/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pancham/follow_normal.pal rename to graphics/pokemon/pancham/overworld_normal.pal diff --git a/graphics/pokemon/pancham/follow_shiny.pal b/graphics/pokemon/pancham/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pancham/follow_shiny.pal rename to graphics/pokemon/pancham/overworld_shiny.pal diff --git a/graphics/pokemon/pangoro/follower.png b/graphics/pokemon/pangoro/overworld.png similarity index 100% rename from graphics/pokemon/pangoro/follower.png rename to graphics/pokemon/pangoro/overworld.png diff --git a/graphics/pokemon/pangoro/follow_normal.pal b/graphics/pokemon/pangoro/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pangoro/follow_normal.pal rename to graphics/pokemon/pangoro/overworld_normal.pal diff --git a/graphics/pokemon/pangoro/follow_shiny.pal b/graphics/pokemon/pangoro/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pangoro/follow_shiny.pal rename to graphics/pokemon/pangoro/overworld_shiny.pal diff --git a/graphics/pokemon/panpour/follower.png b/graphics/pokemon/panpour/overworld.png similarity index 100% rename from graphics/pokemon/panpour/follower.png rename to graphics/pokemon/panpour/overworld.png diff --git a/graphics/pokemon/panpour/follow_normal.pal b/graphics/pokemon/panpour/overworld_normal.pal similarity index 100% rename from graphics/pokemon/panpour/follow_normal.pal rename to graphics/pokemon/panpour/overworld_normal.pal diff --git a/graphics/pokemon/panpour/follow_shiny.pal b/graphics/pokemon/panpour/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/panpour/follow_shiny.pal rename to graphics/pokemon/panpour/overworld_shiny.pal diff --git a/graphics/pokemon/pansage/follower.png b/graphics/pokemon/pansage/overworld.png similarity index 100% rename from graphics/pokemon/pansage/follower.png rename to graphics/pokemon/pansage/overworld.png diff --git a/graphics/pokemon/pansage/follow_normal.pal b/graphics/pokemon/pansage/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pansage/follow_normal.pal rename to graphics/pokemon/pansage/overworld_normal.pal diff --git a/graphics/pokemon/pansage/follow_shiny.pal b/graphics/pokemon/pansage/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pansage/follow_shiny.pal rename to graphics/pokemon/pansage/overworld_shiny.pal diff --git a/graphics/pokemon/pansear/follower.png b/graphics/pokemon/pansear/overworld.png similarity index 100% rename from graphics/pokemon/pansear/follower.png rename to graphics/pokemon/pansear/overworld.png diff --git a/graphics/pokemon/pansear/follow_normal.pal b/graphics/pokemon/pansear/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pansear/follow_normal.pal rename to graphics/pokemon/pansear/overworld_normal.pal diff --git a/graphics/pokemon/pansear/follow_shiny.pal b/graphics/pokemon/pansear/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pansear/follow_shiny.pal rename to graphics/pokemon/pansear/overworld_shiny.pal diff --git a/graphics/pokemon/paras/follower.png b/graphics/pokemon/paras/overworld.png similarity index 100% rename from graphics/pokemon/paras/follower.png rename to graphics/pokemon/paras/overworld.png diff --git a/graphics/pokemon/paras/follow_normal.pal b/graphics/pokemon/paras/overworld_normal.pal similarity index 100% rename from graphics/pokemon/paras/follow_normal.pal rename to graphics/pokemon/paras/overworld_normal.pal diff --git a/graphics/pokemon/paras/follow_shiny.pal b/graphics/pokemon/paras/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/paras/follow_shiny.pal rename to graphics/pokemon/paras/overworld_shiny.pal diff --git a/graphics/pokemon/parasect/follower.png b/graphics/pokemon/parasect/overworld.png similarity index 100% rename from graphics/pokemon/parasect/follower.png rename to graphics/pokemon/parasect/overworld.png diff --git a/graphics/pokemon/parasect/follow_normal.pal b/graphics/pokemon/parasect/overworld_normal.pal similarity index 100% rename from graphics/pokemon/parasect/follow_normal.pal rename to graphics/pokemon/parasect/overworld_normal.pal diff --git a/graphics/pokemon/parasect/follow_shiny.pal b/graphics/pokemon/parasect/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/parasect/follow_shiny.pal rename to graphics/pokemon/parasect/overworld_shiny.pal diff --git a/graphics/pokemon/passimian/follower.png b/graphics/pokemon/passimian/overworld.png similarity index 100% rename from graphics/pokemon/passimian/follower.png rename to graphics/pokemon/passimian/overworld.png diff --git a/graphics/pokemon/passimian/follow_normal.pal b/graphics/pokemon/passimian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/passimian/follow_normal.pal rename to graphics/pokemon/passimian/overworld_normal.pal diff --git a/graphics/pokemon/passimian/follow_shiny.pal b/graphics/pokemon/passimian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/passimian/follow_shiny.pal rename to graphics/pokemon/passimian/overworld_shiny.pal diff --git a/graphics/pokemon/patrat/follower.png b/graphics/pokemon/patrat/overworld.png similarity index 100% rename from graphics/pokemon/patrat/follower.png rename to graphics/pokemon/patrat/overworld.png diff --git a/graphics/pokemon/patrat/follow_normal.pal b/graphics/pokemon/patrat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/patrat/follow_normal.pal rename to graphics/pokemon/patrat/overworld_normal.pal diff --git a/graphics/pokemon/patrat/follow_shiny.pal b/graphics/pokemon/patrat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/patrat/follow_shiny.pal rename to graphics/pokemon/patrat/overworld_shiny.pal diff --git a/graphics/pokemon/pawniard/follower.png b/graphics/pokemon/pawniard/overworld.png similarity index 100% rename from graphics/pokemon/pawniard/follower.png rename to graphics/pokemon/pawniard/overworld.png diff --git a/graphics/pokemon/pawniard/follow_normal.pal b/graphics/pokemon/pawniard/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pawniard/follow_normal.pal rename to graphics/pokemon/pawniard/overworld_normal.pal diff --git a/graphics/pokemon/pawniard/follow_shiny.pal b/graphics/pokemon/pawniard/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pawniard/follow_shiny.pal rename to graphics/pokemon/pawniard/overworld_shiny.pal diff --git a/graphics/pokemon/pelipper/follower.png b/graphics/pokemon/pelipper/overworld.png similarity index 100% rename from graphics/pokemon/pelipper/follower.png rename to graphics/pokemon/pelipper/overworld.png diff --git a/graphics/pokemon/pelipper/follow_normal.pal b/graphics/pokemon/pelipper/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pelipper/follow_normal.pal rename to graphics/pokemon/pelipper/overworld_normal.pal diff --git a/graphics/pokemon/pelipper/follow_shiny.pal b/graphics/pokemon/pelipper/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pelipper/follow_shiny.pal rename to graphics/pokemon/pelipper/overworld_shiny.pal diff --git a/graphics/pokemon/perrserker/follower.png b/graphics/pokemon/perrserker/overworld.png similarity index 100% rename from graphics/pokemon/perrserker/follower.png rename to graphics/pokemon/perrserker/overworld.png diff --git a/graphics/pokemon/perrserker/follow_normal.pal b/graphics/pokemon/perrserker/overworld_normal.pal similarity index 100% rename from graphics/pokemon/perrserker/follow_normal.pal rename to graphics/pokemon/perrserker/overworld_normal.pal diff --git a/graphics/pokemon/perrserker/follow_shiny.pal b/graphics/pokemon/perrserker/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/perrserker/follow_shiny.pal rename to graphics/pokemon/perrserker/overworld_shiny.pal diff --git a/graphics/pokemon/persian/alolan/follower.png b/graphics/pokemon/persian/alolan/overworld.png similarity index 100% rename from graphics/pokemon/persian/alolan/follower.png rename to graphics/pokemon/persian/alolan/overworld.png diff --git a/graphics/pokemon/persian/alolan/follow_normal.pal b/graphics/pokemon/persian/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/persian/alolan/follow_normal.pal rename to graphics/pokemon/persian/alolan/overworld_normal.pal diff --git a/graphics/pokemon/persian/alolan/follow_shiny.pal b/graphics/pokemon/persian/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/persian/alolan/follow_shiny.pal rename to graphics/pokemon/persian/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/persian/follower.png b/graphics/pokemon/persian/overworld.png similarity index 100% rename from graphics/pokemon/persian/follower.png rename to graphics/pokemon/persian/overworld.png diff --git a/graphics/pokemon/persian/follow_normal.pal b/graphics/pokemon/persian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/persian/follow_normal.pal rename to graphics/pokemon/persian/overworld_normal.pal diff --git a/graphics/pokemon/persian/follow_shiny.pal b/graphics/pokemon/persian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/persian/follow_shiny.pal rename to graphics/pokemon/persian/overworld_shiny.pal diff --git a/graphics/pokemon/petilil/follower.png b/graphics/pokemon/petilil/overworld.png similarity index 100% rename from graphics/pokemon/petilil/follower.png rename to graphics/pokemon/petilil/overworld.png diff --git a/graphics/pokemon/petilil/follow_normal.pal b/graphics/pokemon/petilil/overworld_normal.pal similarity index 100% rename from graphics/pokemon/petilil/follow_normal.pal rename to graphics/pokemon/petilil/overworld_normal.pal diff --git a/graphics/pokemon/petilil/follow_shiny.pal b/graphics/pokemon/petilil/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/petilil/follow_shiny.pal rename to graphics/pokemon/petilil/overworld_shiny.pal diff --git a/graphics/pokemon/phanpy/follower.png b/graphics/pokemon/phanpy/overworld.png similarity index 100% rename from graphics/pokemon/phanpy/follower.png rename to graphics/pokemon/phanpy/overworld.png diff --git a/graphics/pokemon/phanpy/follow_normal.pal b/graphics/pokemon/phanpy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/phanpy/follow_normal.pal rename to graphics/pokemon/phanpy/overworld_normal.pal diff --git a/graphics/pokemon/phanpy/follow_shiny.pal b/graphics/pokemon/phanpy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/phanpy/follow_shiny.pal rename to graphics/pokemon/phanpy/overworld_shiny.pal diff --git a/graphics/pokemon/phantump/follower.png b/graphics/pokemon/phantump/overworld.png similarity index 100% rename from graphics/pokemon/phantump/follower.png rename to graphics/pokemon/phantump/overworld.png diff --git a/graphics/pokemon/phantump/follow_normal.pal b/graphics/pokemon/phantump/overworld_normal.pal similarity index 100% rename from graphics/pokemon/phantump/follow_normal.pal rename to graphics/pokemon/phantump/overworld_normal.pal diff --git a/graphics/pokemon/phantump/follow_shiny.pal b/graphics/pokemon/phantump/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/phantump/follow_shiny.pal rename to graphics/pokemon/phantump/overworld_shiny.pal diff --git a/graphics/pokemon/pheromosa/follower.png b/graphics/pokemon/pheromosa/overworld.png similarity index 100% rename from graphics/pokemon/pheromosa/follower.png rename to graphics/pokemon/pheromosa/overworld.png diff --git a/graphics/pokemon/pheromosa/follow_normal.pal b/graphics/pokemon/pheromosa/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pheromosa/follow_normal.pal rename to graphics/pokemon/pheromosa/overworld_normal.pal diff --git a/graphics/pokemon/pheromosa/follow_shiny.pal b/graphics/pokemon/pheromosa/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pheromosa/follow_shiny.pal rename to graphics/pokemon/pheromosa/overworld_shiny.pal diff --git a/graphics/pokemon/phione/follower.png b/graphics/pokemon/phione/overworld.png similarity index 100% rename from graphics/pokemon/phione/follower.png rename to graphics/pokemon/phione/overworld.png diff --git a/graphics/pokemon/phione/follow_normal.pal b/graphics/pokemon/phione/overworld_normal.pal similarity index 100% rename from graphics/pokemon/phione/follow_normal.pal rename to graphics/pokemon/phione/overworld_normal.pal diff --git a/graphics/pokemon/phione/follow_shiny.pal b/graphics/pokemon/phione/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/phione/follow_shiny.pal rename to graphics/pokemon/phione/overworld_shiny.pal diff --git a/graphics/pokemon/pichu/follower.png b/graphics/pokemon/pichu/overworld.png similarity index 100% rename from graphics/pokemon/pichu/follower.png rename to graphics/pokemon/pichu/overworld.png diff --git a/graphics/pokemon/pichu/follow_normal.pal b/graphics/pokemon/pichu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pichu/follow_normal.pal rename to graphics/pokemon/pichu/overworld_normal.pal diff --git a/graphics/pokemon/pichu/follow_shiny.pal b/graphics/pokemon/pichu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pichu/follow_shiny.pal rename to graphics/pokemon/pichu/overworld_shiny.pal diff --git a/graphics/pokemon/pichu/spiky_eared/follower.png b/graphics/pokemon/pichu/spiky_eared/overworld.png similarity index 100% rename from graphics/pokemon/pichu/spiky_eared/follower.png rename to graphics/pokemon/pichu/spiky_eared/overworld.png diff --git a/graphics/pokemon/pichu/spiky_eared/follow_normal.pal b/graphics/pokemon/pichu/spiky_eared/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pichu/spiky_eared/follow_normal.pal rename to graphics/pokemon/pichu/spiky_eared/overworld_normal.pal diff --git a/graphics/pokemon/pichu/spiky_eared/follow_shiny.pal b/graphics/pokemon/pichu/spiky_eared/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pichu/spiky_eared/follow_shiny.pal rename to graphics/pokemon/pichu/spiky_eared/overworld_shiny.pal diff --git a/graphics/pokemon/pidgeot/follower.png b/graphics/pokemon/pidgeot/overworld.png similarity index 100% rename from graphics/pokemon/pidgeot/follower.png rename to graphics/pokemon/pidgeot/overworld.png diff --git a/graphics/pokemon/pidgeot/follow_normal.pal b/graphics/pokemon/pidgeot/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pidgeot/follow_normal.pal rename to graphics/pokemon/pidgeot/overworld_normal.pal diff --git a/graphics/pokemon/pidgeot/follow_shiny.pal b/graphics/pokemon/pidgeot/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pidgeot/follow_shiny.pal rename to graphics/pokemon/pidgeot/overworld_shiny.pal diff --git a/graphics/pokemon/pidgeotto/follower.png b/graphics/pokemon/pidgeotto/overworld.png similarity index 100% rename from graphics/pokemon/pidgeotto/follower.png rename to graphics/pokemon/pidgeotto/overworld.png diff --git a/graphics/pokemon/pidgeotto/follow_normal.pal b/graphics/pokemon/pidgeotto/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pidgeotto/follow_normal.pal rename to graphics/pokemon/pidgeotto/overworld_normal.pal diff --git a/graphics/pokemon/pidgeotto/follow_shiny.pal b/graphics/pokemon/pidgeotto/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pidgeotto/follow_shiny.pal rename to graphics/pokemon/pidgeotto/overworld_shiny.pal diff --git a/graphics/pokemon/pidgey/follower.png b/graphics/pokemon/pidgey/overworld.png similarity index 100% rename from graphics/pokemon/pidgey/follower.png rename to graphics/pokemon/pidgey/overworld.png diff --git a/graphics/pokemon/pidgey/follow_normal.pal b/graphics/pokemon/pidgey/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pidgey/follow_normal.pal rename to graphics/pokemon/pidgey/overworld_normal.pal diff --git a/graphics/pokemon/pidgey/follow_shiny.pal b/graphics/pokemon/pidgey/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pidgey/follow_shiny.pal rename to graphics/pokemon/pidgey/overworld_shiny.pal diff --git a/graphics/pokemon/pidove/follower.png b/graphics/pokemon/pidove/overworld.png similarity index 100% rename from graphics/pokemon/pidove/follower.png rename to graphics/pokemon/pidove/overworld.png diff --git a/graphics/pokemon/pidove/follow_normal.pal b/graphics/pokemon/pidove/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pidove/follow_normal.pal rename to graphics/pokemon/pidove/overworld_normal.pal diff --git a/graphics/pokemon/pidove/follow_shiny.pal b/graphics/pokemon/pidove/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pidove/follow_shiny.pal rename to graphics/pokemon/pidove/overworld_shiny.pal diff --git a/graphics/pokemon/pignite/follower.png b/graphics/pokemon/pignite/overworld.png similarity index 100% rename from graphics/pokemon/pignite/follower.png rename to graphics/pokemon/pignite/overworld.png diff --git a/graphics/pokemon/pignite/follow_normal.pal b/graphics/pokemon/pignite/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pignite/follow_normal.pal rename to graphics/pokemon/pignite/overworld_normal.pal diff --git a/graphics/pokemon/pignite/follow_shiny.pal b/graphics/pokemon/pignite/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pignite/follow_shiny.pal rename to graphics/pokemon/pignite/overworld_shiny.pal diff --git a/graphics/pokemon/pikachu/follower.png b/graphics/pokemon/pikachu/overworld.png similarity index 100% rename from graphics/pokemon/pikachu/follower.png rename to graphics/pokemon/pikachu/overworld.png diff --git a/graphics/pokemon/pikachu/follow_normal.pal b/graphics/pokemon/pikachu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pikachu/follow_normal.pal rename to graphics/pokemon/pikachu/overworld_normal.pal diff --git a/graphics/pokemon/pikachu/follow_shiny.pal b/graphics/pokemon/pikachu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pikachu/follow_shiny.pal rename to graphics/pokemon/pikachu/overworld_shiny.pal diff --git a/graphics/pokemon/pikipek/follower.png b/graphics/pokemon/pikipek/overworld.png similarity index 100% rename from graphics/pokemon/pikipek/follower.png rename to graphics/pokemon/pikipek/overworld.png diff --git a/graphics/pokemon/pikipek/follow_normal.pal b/graphics/pokemon/pikipek/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pikipek/follow_normal.pal rename to graphics/pokemon/pikipek/overworld_normal.pal diff --git a/graphics/pokemon/pikipek/follow_shiny.pal b/graphics/pokemon/pikipek/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pikipek/follow_shiny.pal rename to graphics/pokemon/pikipek/overworld_shiny.pal diff --git a/graphics/pokemon/piloswine/follower.png b/graphics/pokemon/piloswine/overworld.png similarity index 100% rename from graphics/pokemon/piloswine/follower.png rename to graphics/pokemon/piloswine/overworld.png diff --git a/graphics/pokemon/piloswine/follow_normal.pal b/graphics/pokemon/piloswine/overworld_normal.pal similarity index 100% rename from graphics/pokemon/piloswine/follow_normal.pal rename to graphics/pokemon/piloswine/overworld_normal.pal diff --git a/graphics/pokemon/piloswine/follow_shiny.pal b/graphics/pokemon/piloswine/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/piloswine/follow_shiny.pal rename to graphics/pokemon/piloswine/overworld_shiny.pal diff --git a/graphics/pokemon/pincurchin/follower.png b/graphics/pokemon/pincurchin/overworld.png similarity index 100% rename from graphics/pokemon/pincurchin/follower.png rename to graphics/pokemon/pincurchin/overworld.png diff --git a/graphics/pokemon/pincurchin/follow_normal.pal b/graphics/pokemon/pincurchin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pincurchin/follow_normal.pal rename to graphics/pokemon/pincurchin/overworld_normal.pal diff --git a/graphics/pokemon/pincurchin/follow_shiny.pal b/graphics/pokemon/pincurchin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pincurchin/follow_shiny.pal rename to graphics/pokemon/pincurchin/overworld_shiny.pal diff --git a/graphics/pokemon/pineco/follower.png b/graphics/pokemon/pineco/overworld.png similarity index 100% rename from graphics/pokemon/pineco/follower.png rename to graphics/pokemon/pineco/overworld.png diff --git a/graphics/pokemon/pineco/follow_normal.pal b/graphics/pokemon/pineco/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pineco/follow_normal.pal rename to graphics/pokemon/pineco/overworld_normal.pal diff --git a/graphics/pokemon/pineco/follow_shiny.pal b/graphics/pokemon/pineco/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pineco/follow_shiny.pal rename to graphics/pokemon/pineco/overworld_shiny.pal diff --git a/graphics/pokemon/pinsir/follower.png b/graphics/pokemon/pinsir/overworld.png similarity index 100% rename from graphics/pokemon/pinsir/follower.png rename to graphics/pokemon/pinsir/overworld.png diff --git a/graphics/pokemon/pinsir/follow_normal.pal b/graphics/pokemon/pinsir/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pinsir/follow_normal.pal rename to graphics/pokemon/pinsir/overworld_normal.pal diff --git a/graphics/pokemon/pinsir/follow_shiny.pal b/graphics/pokemon/pinsir/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pinsir/follow_shiny.pal rename to graphics/pokemon/pinsir/overworld_shiny.pal diff --git a/graphics/pokemon/piplup/follower.png b/graphics/pokemon/piplup/overworld.png similarity index 100% rename from graphics/pokemon/piplup/follower.png rename to graphics/pokemon/piplup/overworld.png diff --git a/graphics/pokemon/piplup/follow_normal.pal b/graphics/pokemon/piplup/overworld_normal.pal similarity index 100% rename from graphics/pokemon/piplup/follow_normal.pal rename to graphics/pokemon/piplup/overworld_normal.pal diff --git a/graphics/pokemon/piplup/follow_shiny.pal b/graphics/pokemon/piplup/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/piplup/follow_shiny.pal rename to graphics/pokemon/piplup/overworld_shiny.pal diff --git a/graphics/pokemon/plusle/follower.png b/graphics/pokemon/plusle/overworld.png similarity index 100% rename from graphics/pokemon/plusle/follower.png rename to graphics/pokemon/plusle/overworld.png diff --git a/graphics/pokemon/plusle/follow_normal.pal b/graphics/pokemon/plusle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/plusle/follow_normal.pal rename to graphics/pokemon/plusle/overworld_normal.pal diff --git a/graphics/pokemon/plusle/follow_shiny.pal b/graphics/pokemon/plusle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/plusle/follow_shiny.pal rename to graphics/pokemon/plusle/overworld_shiny.pal diff --git a/graphics/pokemon/poipole/follower.png b/graphics/pokemon/poipole/overworld.png similarity index 100% rename from graphics/pokemon/poipole/follower.png rename to graphics/pokemon/poipole/overworld.png diff --git a/graphics/pokemon/poipole/follow_normal.pal b/graphics/pokemon/poipole/overworld_normal.pal similarity index 100% rename from graphics/pokemon/poipole/follow_normal.pal rename to graphics/pokemon/poipole/overworld_normal.pal diff --git a/graphics/pokemon/poipole/follow_shiny.pal b/graphics/pokemon/poipole/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/poipole/follow_shiny.pal rename to graphics/pokemon/poipole/overworld_shiny.pal diff --git a/graphics/pokemon/politoed/follower.png b/graphics/pokemon/politoed/overworld.png similarity index 100% rename from graphics/pokemon/politoed/follower.png rename to graphics/pokemon/politoed/overworld.png diff --git a/graphics/pokemon/politoed/follow_normal.pal b/graphics/pokemon/politoed/overworld_normal.pal similarity index 100% rename from graphics/pokemon/politoed/follow_normal.pal rename to graphics/pokemon/politoed/overworld_normal.pal diff --git a/graphics/pokemon/politoed/follow_shiny.pal b/graphics/pokemon/politoed/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/politoed/follow_shiny.pal rename to graphics/pokemon/politoed/overworld_shiny.pal diff --git a/graphics/pokemon/poliwag/follower.png b/graphics/pokemon/poliwag/overworld.png similarity index 100% rename from graphics/pokemon/poliwag/follower.png rename to graphics/pokemon/poliwag/overworld.png diff --git a/graphics/pokemon/poliwag/follow_normal.pal b/graphics/pokemon/poliwag/overworld_normal.pal similarity index 100% rename from graphics/pokemon/poliwag/follow_normal.pal rename to graphics/pokemon/poliwag/overworld_normal.pal diff --git a/graphics/pokemon/poliwag/follow_shiny.pal b/graphics/pokemon/poliwag/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/poliwag/follow_shiny.pal rename to graphics/pokemon/poliwag/overworld_shiny.pal diff --git a/graphics/pokemon/poliwhirl/follower.png b/graphics/pokemon/poliwhirl/overworld.png similarity index 100% rename from graphics/pokemon/poliwhirl/follower.png rename to graphics/pokemon/poliwhirl/overworld.png diff --git a/graphics/pokemon/poliwhirl/follow_normal.pal b/graphics/pokemon/poliwhirl/overworld_normal.pal similarity index 100% rename from graphics/pokemon/poliwhirl/follow_normal.pal rename to graphics/pokemon/poliwhirl/overworld_normal.pal diff --git a/graphics/pokemon/poliwhirl/follow_shiny.pal b/graphics/pokemon/poliwhirl/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/poliwhirl/follow_shiny.pal rename to graphics/pokemon/poliwhirl/overworld_shiny.pal diff --git a/graphics/pokemon/poliwrath/follower.png b/graphics/pokemon/poliwrath/overworld.png similarity index 100% rename from graphics/pokemon/poliwrath/follower.png rename to graphics/pokemon/poliwrath/overworld.png diff --git a/graphics/pokemon/poliwrath/follow_normal.pal b/graphics/pokemon/poliwrath/overworld_normal.pal similarity index 100% rename from graphics/pokemon/poliwrath/follow_normal.pal rename to graphics/pokemon/poliwrath/overworld_normal.pal diff --git a/graphics/pokemon/poliwrath/follow_shiny.pal b/graphics/pokemon/poliwrath/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/poliwrath/follow_shiny.pal rename to graphics/pokemon/poliwrath/overworld_shiny.pal diff --git a/graphics/pokemon/polteageist/follower.png b/graphics/pokemon/polteageist/overworld.png similarity index 100% rename from graphics/pokemon/polteageist/follower.png rename to graphics/pokemon/polteageist/overworld.png diff --git a/graphics/pokemon/polteageist/follow_normal.pal b/graphics/pokemon/polteageist/overworld_normal.pal similarity index 100% rename from graphics/pokemon/polteageist/follow_normal.pal rename to graphics/pokemon/polteageist/overworld_normal.pal diff --git a/graphics/pokemon/polteageist/follow_shiny.pal b/graphics/pokemon/polteageist/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/polteageist/follow_shiny.pal rename to graphics/pokemon/polteageist/overworld_shiny.pal diff --git a/graphics/pokemon/ponyta/galarian/follower.png b/graphics/pokemon/ponyta/galarian/overworld.png similarity index 100% rename from graphics/pokemon/ponyta/galarian/follower.png rename to graphics/pokemon/ponyta/galarian/overworld.png diff --git a/graphics/pokemon/ponyta/galarian/follow_normal.pal b/graphics/pokemon/ponyta/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ponyta/galarian/follow_normal.pal rename to graphics/pokemon/ponyta/galarian/overworld_normal.pal diff --git a/graphics/pokemon/ponyta/galarian/follow_shiny.pal b/graphics/pokemon/ponyta/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ponyta/galarian/follow_shiny.pal rename to graphics/pokemon/ponyta/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/ponyta/follower.png b/graphics/pokemon/ponyta/overworld.png similarity index 100% rename from graphics/pokemon/ponyta/follower.png rename to graphics/pokemon/ponyta/overworld.png diff --git a/graphics/pokemon/ponyta/follow_normal.pal b/graphics/pokemon/ponyta/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ponyta/follow_normal.pal rename to graphics/pokemon/ponyta/overworld_normal.pal diff --git a/graphics/pokemon/ponyta/follow_shiny.pal b/graphics/pokemon/ponyta/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ponyta/follow_shiny.pal rename to graphics/pokemon/ponyta/overworld_shiny.pal diff --git a/graphics/pokemon/poochyena/follower.png b/graphics/pokemon/poochyena/overworld.png similarity index 100% rename from graphics/pokemon/poochyena/follower.png rename to graphics/pokemon/poochyena/overworld.png diff --git a/graphics/pokemon/poochyena/follow_normal.pal b/graphics/pokemon/poochyena/overworld_normal.pal similarity index 100% rename from graphics/pokemon/poochyena/follow_normal.pal rename to graphics/pokemon/poochyena/overworld_normal.pal diff --git a/graphics/pokemon/poochyena/follow_shiny.pal b/graphics/pokemon/poochyena/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/poochyena/follow_shiny.pal rename to graphics/pokemon/poochyena/overworld_shiny.pal diff --git a/graphics/pokemon/popplio/follower.png b/graphics/pokemon/popplio/overworld.png similarity index 100% rename from graphics/pokemon/popplio/follower.png rename to graphics/pokemon/popplio/overworld.png diff --git a/graphics/pokemon/popplio/follow_normal.pal b/graphics/pokemon/popplio/overworld_normal.pal similarity index 100% rename from graphics/pokemon/popplio/follow_normal.pal rename to graphics/pokemon/popplio/overworld_normal.pal diff --git a/graphics/pokemon/popplio/follow_shiny.pal b/graphics/pokemon/popplio/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/popplio/follow_shiny.pal rename to graphics/pokemon/popplio/overworld_shiny.pal diff --git a/graphics/pokemon/porygon/follower.png b/graphics/pokemon/porygon/overworld.png similarity index 100% rename from graphics/pokemon/porygon/follower.png rename to graphics/pokemon/porygon/overworld.png diff --git a/graphics/pokemon/porygon/follow_normal.pal b/graphics/pokemon/porygon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/porygon/follow_normal.pal rename to graphics/pokemon/porygon/overworld_normal.pal diff --git a/graphics/pokemon/porygon/follow_shiny.pal b/graphics/pokemon/porygon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/porygon/follow_shiny.pal rename to graphics/pokemon/porygon/overworld_shiny.pal diff --git a/graphics/pokemon/porygon2/follower.png b/graphics/pokemon/porygon2/overworld.png similarity index 100% rename from graphics/pokemon/porygon2/follower.png rename to graphics/pokemon/porygon2/overworld.png diff --git a/graphics/pokemon/porygon2/follow_normal.pal b/graphics/pokemon/porygon2/overworld_normal.pal similarity index 100% rename from graphics/pokemon/porygon2/follow_normal.pal rename to graphics/pokemon/porygon2/overworld_normal.pal diff --git a/graphics/pokemon/porygon2/follow_shiny.pal b/graphics/pokemon/porygon2/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/porygon2/follow_shiny.pal rename to graphics/pokemon/porygon2/overworld_shiny.pal diff --git a/graphics/pokemon/porygon_z/follower.png b/graphics/pokemon/porygon_z/overworld.png similarity index 100% rename from graphics/pokemon/porygon_z/follower.png rename to graphics/pokemon/porygon_z/overworld.png diff --git a/graphics/pokemon/porygon_z/follow_normal.pal b/graphics/pokemon/porygon_z/overworld_normal.pal similarity index 100% rename from graphics/pokemon/porygon_z/follow_normal.pal rename to graphics/pokemon/porygon_z/overworld_normal.pal diff --git a/graphics/pokemon/porygon_z/follow_shiny.pal b/graphics/pokemon/porygon_z/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/porygon_z/follow_shiny.pal rename to graphics/pokemon/porygon_z/overworld_shiny.pal diff --git a/graphics/pokemon/primarina/follower.png b/graphics/pokemon/primarina/overworld.png similarity index 100% rename from graphics/pokemon/primarina/follower.png rename to graphics/pokemon/primarina/overworld.png diff --git a/graphics/pokemon/primarina/follow_normal.pal b/graphics/pokemon/primarina/overworld_normal.pal similarity index 100% rename from graphics/pokemon/primarina/follow_normal.pal rename to graphics/pokemon/primarina/overworld_normal.pal diff --git a/graphics/pokemon/primarina/follow_shiny.pal b/graphics/pokemon/primarina/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/primarina/follow_shiny.pal rename to graphics/pokemon/primarina/overworld_shiny.pal diff --git a/graphics/pokemon/primeape/follower.png b/graphics/pokemon/primeape/overworld.png similarity index 100% rename from graphics/pokemon/primeape/follower.png rename to graphics/pokemon/primeape/overworld.png diff --git a/graphics/pokemon/primeape/follow_normal.pal b/graphics/pokemon/primeape/overworld_normal.pal similarity index 100% rename from graphics/pokemon/primeape/follow_normal.pal rename to graphics/pokemon/primeape/overworld_normal.pal diff --git a/graphics/pokemon/primeape/follow_shiny.pal b/graphics/pokemon/primeape/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/primeape/follow_shiny.pal rename to graphics/pokemon/primeape/overworld_shiny.pal diff --git a/graphics/pokemon/prinplup/follower.png b/graphics/pokemon/prinplup/overworld.png similarity index 100% rename from graphics/pokemon/prinplup/follower.png rename to graphics/pokemon/prinplup/overworld.png diff --git a/graphics/pokemon/prinplup/follow_normal.pal b/graphics/pokemon/prinplup/overworld_normal.pal similarity index 100% rename from graphics/pokemon/prinplup/follow_normal.pal rename to graphics/pokemon/prinplup/overworld_normal.pal diff --git a/graphics/pokemon/prinplup/follow_shiny.pal b/graphics/pokemon/prinplup/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/prinplup/follow_shiny.pal rename to graphics/pokemon/prinplup/overworld_shiny.pal diff --git a/graphics/pokemon/probopass/follower.png b/graphics/pokemon/probopass/overworld.png similarity index 100% rename from graphics/pokemon/probopass/follower.png rename to graphics/pokemon/probopass/overworld.png diff --git a/graphics/pokemon/probopass/follow_normal.pal b/graphics/pokemon/probopass/overworld_normal.pal similarity index 100% rename from graphics/pokemon/probopass/follow_normal.pal rename to graphics/pokemon/probopass/overworld_normal.pal diff --git a/graphics/pokemon/probopass/follow_shiny.pal b/graphics/pokemon/probopass/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/probopass/follow_shiny.pal rename to graphics/pokemon/probopass/overworld_shiny.pal diff --git a/graphics/pokemon/psyduck/follower.png b/graphics/pokemon/psyduck/overworld.png similarity index 100% rename from graphics/pokemon/psyduck/follower.png rename to graphics/pokemon/psyduck/overworld.png diff --git a/graphics/pokemon/psyduck/follow_normal.pal b/graphics/pokemon/psyduck/overworld_normal.pal similarity index 100% rename from graphics/pokemon/psyduck/follow_normal.pal rename to graphics/pokemon/psyduck/overworld_normal.pal diff --git a/graphics/pokemon/psyduck/follow_shiny.pal b/graphics/pokemon/psyduck/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/psyduck/follow_shiny.pal rename to graphics/pokemon/psyduck/overworld_shiny.pal diff --git a/graphics/pokemon/pumpkaboo/follower.png b/graphics/pokemon/pumpkaboo/overworld.png similarity index 100% rename from graphics/pokemon/pumpkaboo/follower.png rename to graphics/pokemon/pumpkaboo/overworld.png diff --git a/graphics/pokemon/pumpkaboo/follow_normal.pal b/graphics/pokemon/pumpkaboo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pumpkaboo/follow_normal.pal rename to graphics/pokemon/pumpkaboo/overworld_normal.pal diff --git a/graphics/pokemon/pumpkaboo/follow_shiny.pal b/graphics/pokemon/pumpkaboo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pumpkaboo/follow_shiny.pal rename to graphics/pokemon/pumpkaboo/overworld_shiny.pal diff --git a/graphics/pokemon/pupitar/follower.png b/graphics/pokemon/pupitar/overworld.png similarity index 100% rename from graphics/pokemon/pupitar/follower.png rename to graphics/pokemon/pupitar/overworld.png diff --git a/graphics/pokemon/pupitar/follow_normal.pal b/graphics/pokemon/pupitar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pupitar/follow_normal.pal rename to graphics/pokemon/pupitar/overworld_normal.pal diff --git a/graphics/pokemon/pupitar/follow_shiny.pal b/graphics/pokemon/pupitar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pupitar/follow_shiny.pal rename to graphics/pokemon/pupitar/overworld_shiny.pal diff --git a/graphics/pokemon/purrloin/follower.png b/graphics/pokemon/purrloin/overworld.png similarity index 100% rename from graphics/pokemon/purrloin/follower.png rename to graphics/pokemon/purrloin/overworld.png diff --git a/graphics/pokemon/purrloin/follow_normal.pal b/graphics/pokemon/purrloin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/purrloin/follow_normal.pal rename to graphics/pokemon/purrloin/overworld_normal.pal diff --git a/graphics/pokemon/purrloin/follow_shiny.pal b/graphics/pokemon/purrloin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/purrloin/follow_shiny.pal rename to graphics/pokemon/purrloin/overworld_shiny.pal diff --git a/graphics/pokemon/purugly/follower.png b/graphics/pokemon/purugly/overworld.png similarity index 100% rename from graphics/pokemon/purugly/follower.png rename to graphics/pokemon/purugly/overworld.png diff --git a/graphics/pokemon/purugly/follow_normal.pal b/graphics/pokemon/purugly/overworld_normal.pal similarity index 100% rename from graphics/pokemon/purugly/follow_normal.pal rename to graphics/pokemon/purugly/overworld_normal.pal diff --git a/graphics/pokemon/purugly/follow_shiny.pal b/graphics/pokemon/purugly/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/purugly/follow_shiny.pal rename to graphics/pokemon/purugly/overworld_shiny.pal diff --git a/graphics/pokemon/pyroar/follower.png b/graphics/pokemon/pyroar/overworld.png similarity index 100% rename from graphics/pokemon/pyroar/follower.png rename to graphics/pokemon/pyroar/overworld.png diff --git a/graphics/pokemon/pyroar/follow_normal.pal b/graphics/pokemon/pyroar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pyroar/follow_normal.pal rename to graphics/pokemon/pyroar/overworld_normal.pal diff --git a/graphics/pokemon/pyroar/follow_shiny.pal b/graphics/pokemon/pyroar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pyroar/follow_shiny.pal rename to graphics/pokemon/pyroar/overworld_shiny.pal diff --git a/graphics/pokemon/pyukumuku/follower.png b/graphics/pokemon/pyukumuku/overworld.png similarity index 100% rename from graphics/pokemon/pyukumuku/follower.png rename to graphics/pokemon/pyukumuku/overworld.png diff --git a/graphics/pokemon/pyukumuku/follow_normal.pal b/graphics/pokemon/pyukumuku/overworld_normal.pal similarity index 100% rename from graphics/pokemon/pyukumuku/follow_normal.pal rename to graphics/pokemon/pyukumuku/overworld_normal.pal diff --git a/graphics/pokemon/pyukumuku/follow_shiny.pal b/graphics/pokemon/pyukumuku/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/pyukumuku/follow_shiny.pal rename to graphics/pokemon/pyukumuku/overworld_shiny.pal diff --git a/graphics/pokemon/quagsire/follower.png b/graphics/pokemon/quagsire/overworld.png similarity index 100% rename from graphics/pokemon/quagsire/follower.png rename to graphics/pokemon/quagsire/overworld.png diff --git a/graphics/pokemon/quagsire/follow_normal.pal b/graphics/pokemon/quagsire/overworld_normal.pal similarity index 100% rename from graphics/pokemon/quagsire/follow_normal.pal rename to graphics/pokemon/quagsire/overworld_normal.pal diff --git a/graphics/pokemon/quagsire/follow_shiny.pal b/graphics/pokemon/quagsire/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/quagsire/follow_shiny.pal rename to graphics/pokemon/quagsire/overworld_shiny.pal diff --git a/graphics/pokemon/question_mark/follower.png b/graphics/pokemon/question_mark/overworld.png similarity index 100% rename from graphics/pokemon/question_mark/follower.png rename to graphics/pokemon/question_mark/overworld.png diff --git a/graphics/pokemon/quilava/follower.png b/graphics/pokemon/quilava/overworld.png similarity index 100% rename from graphics/pokemon/quilava/follower.png rename to graphics/pokemon/quilava/overworld.png diff --git a/graphics/pokemon/quilava/follow_normal.pal b/graphics/pokemon/quilava/overworld_normal.pal similarity index 100% rename from graphics/pokemon/quilava/follow_normal.pal rename to graphics/pokemon/quilava/overworld_normal.pal diff --git a/graphics/pokemon/quilava/follow_shiny.pal b/graphics/pokemon/quilava/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/quilava/follow_shiny.pal rename to graphics/pokemon/quilava/overworld_shiny.pal diff --git a/graphics/pokemon/quilladin/follower.png b/graphics/pokemon/quilladin/overworld.png similarity index 100% rename from graphics/pokemon/quilladin/follower.png rename to graphics/pokemon/quilladin/overworld.png diff --git a/graphics/pokemon/quilladin/follow_normal.pal b/graphics/pokemon/quilladin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/quilladin/follow_normal.pal rename to graphics/pokemon/quilladin/overworld_normal.pal diff --git a/graphics/pokemon/quilladin/follow_shiny.pal b/graphics/pokemon/quilladin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/quilladin/follow_shiny.pal rename to graphics/pokemon/quilladin/overworld_shiny.pal diff --git a/graphics/pokemon/qwilfish/hisuian/follower.png b/graphics/pokemon/qwilfish/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/follower.png rename to graphics/pokemon/qwilfish/hisuian/overworld.png diff --git a/graphics/pokemon/qwilfish/hisuian/follow_normal.pal b/graphics/pokemon/qwilfish/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/follow_normal.pal rename to graphics/pokemon/qwilfish/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/qwilfish/hisuian/follow_shiny.pal b/graphics/pokemon/qwilfish/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/qwilfish/hisuian/follow_shiny.pal rename to graphics/pokemon/qwilfish/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/qwilfish/follower.png b/graphics/pokemon/qwilfish/overworld.png similarity index 100% rename from graphics/pokemon/qwilfish/follower.png rename to graphics/pokemon/qwilfish/overworld.png diff --git a/graphics/pokemon/qwilfish/follow_normal.pal b/graphics/pokemon/qwilfish/overworld_normal.pal similarity index 100% rename from graphics/pokemon/qwilfish/follow_normal.pal rename to graphics/pokemon/qwilfish/overworld_normal.pal diff --git a/graphics/pokemon/qwilfish/follow_shiny.pal b/graphics/pokemon/qwilfish/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/qwilfish/follow_shiny.pal rename to graphics/pokemon/qwilfish/overworld_shiny.pal diff --git a/graphics/pokemon/raboot/follower.png b/graphics/pokemon/raboot/overworld.png similarity index 100% rename from graphics/pokemon/raboot/follower.png rename to graphics/pokemon/raboot/overworld.png diff --git a/graphics/pokemon/raboot/follow_normal.pal b/graphics/pokemon/raboot/overworld_normal.pal similarity index 100% rename from graphics/pokemon/raboot/follow_normal.pal rename to graphics/pokemon/raboot/overworld_normal.pal diff --git a/graphics/pokemon/raboot/follow_shiny.pal b/graphics/pokemon/raboot/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/raboot/follow_shiny.pal rename to graphics/pokemon/raboot/overworld_shiny.pal diff --git a/graphics/pokemon/raichu/alolan/follower.png b/graphics/pokemon/raichu/alolan/overworld.png similarity index 100% rename from graphics/pokemon/raichu/alolan/follower.png rename to graphics/pokemon/raichu/alolan/overworld.png diff --git a/graphics/pokemon/raichu/alolan/follow_normal.pal b/graphics/pokemon/raichu/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/raichu/alolan/follow_normal.pal rename to graphics/pokemon/raichu/alolan/overworld_normal.pal diff --git a/graphics/pokemon/raichu/alolan/follow_shiny.pal b/graphics/pokemon/raichu/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/raichu/alolan/follow_shiny.pal rename to graphics/pokemon/raichu/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/raichu/follower.png b/graphics/pokemon/raichu/overworld.png similarity index 100% rename from graphics/pokemon/raichu/follower.png rename to graphics/pokemon/raichu/overworld.png diff --git a/graphics/pokemon/raichu/follow_normal.pal b/graphics/pokemon/raichu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/raichu/follow_normal.pal rename to graphics/pokemon/raichu/overworld_normal.pal diff --git a/graphics/pokemon/raichu/follow_shiny.pal b/graphics/pokemon/raichu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/raichu/follow_shiny.pal rename to graphics/pokemon/raichu/overworld_shiny.pal diff --git a/graphics/pokemon/raikou/follower.png b/graphics/pokemon/raikou/overworld.png similarity index 100% rename from graphics/pokemon/raikou/follower.png rename to graphics/pokemon/raikou/overworld.png diff --git a/graphics/pokemon/raikou/follow_normal.pal b/graphics/pokemon/raikou/overworld_normal.pal similarity index 100% rename from graphics/pokemon/raikou/follow_normal.pal rename to graphics/pokemon/raikou/overworld_normal.pal diff --git a/graphics/pokemon/raikou/follow_shiny.pal b/graphics/pokemon/raikou/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/raikou/follow_shiny.pal rename to graphics/pokemon/raikou/overworld_shiny.pal diff --git a/graphics/pokemon/ralts/follower.png b/graphics/pokemon/ralts/overworld.png similarity index 100% rename from graphics/pokemon/ralts/follower.png rename to graphics/pokemon/ralts/overworld.png diff --git a/graphics/pokemon/ralts/follow_normal.pal b/graphics/pokemon/ralts/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ralts/follow_normal.pal rename to graphics/pokemon/ralts/overworld_normal.pal diff --git a/graphics/pokemon/ralts/follow_shiny.pal b/graphics/pokemon/ralts/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ralts/follow_shiny.pal rename to graphics/pokemon/ralts/overworld_shiny.pal diff --git a/graphics/pokemon/rampardos/follower.png b/graphics/pokemon/rampardos/overworld.png similarity index 100% rename from graphics/pokemon/rampardos/follower.png rename to graphics/pokemon/rampardos/overworld.png diff --git a/graphics/pokemon/rampardos/follow_normal.pal b/graphics/pokemon/rampardos/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rampardos/follow_normal.pal rename to graphics/pokemon/rampardos/overworld_normal.pal diff --git a/graphics/pokemon/rampardos/follow_shiny.pal b/graphics/pokemon/rampardos/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rampardos/follow_shiny.pal rename to graphics/pokemon/rampardos/overworld_shiny.pal diff --git a/graphics/pokemon/rapidash/galarian/follower.png b/graphics/pokemon/rapidash/galarian/overworld.png similarity index 100% rename from graphics/pokemon/rapidash/galarian/follower.png rename to graphics/pokemon/rapidash/galarian/overworld.png diff --git a/graphics/pokemon/rapidash/galarian/follow_normal.pal b/graphics/pokemon/rapidash/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rapidash/galarian/follow_normal.pal rename to graphics/pokemon/rapidash/galarian/overworld_normal.pal diff --git a/graphics/pokemon/rapidash/galarian/follow_shiny.pal b/graphics/pokemon/rapidash/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rapidash/galarian/follow_shiny.pal rename to graphics/pokemon/rapidash/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/rapidash/follower.png b/graphics/pokemon/rapidash/overworld.png similarity index 100% rename from graphics/pokemon/rapidash/follower.png rename to graphics/pokemon/rapidash/overworld.png diff --git a/graphics/pokemon/rapidash/follow_normal.pal b/graphics/pokemon/rapidash/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rapidash/follow_normal.pal rename to graphics/pokemon/rapidash/overworld_normal.pal diff --git a/graphics/pokemon/rapidash/follow_shiny.pal b/graphics/pokemon/rapidash/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rapidash/follow_shiny.pal rename to graphics/pokemon/rapidash/overworld_shiny.pal diff --git a/graphics/pokemon/raticate/alolan/follower.png b/graphics/pokemon/raticate/alolan/overworld.png similarity index 100% rename from graphics/pokemon/raticate/alolan/follower.png rename to graphics/pokemon/raticate/alolan/overworld.png diff --git a/graphics/pokemon/raticate/alolan/follow_normal.pal b/graphics/pokemon/raticate/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/raticate/alolan/follow_normal.pal rename to graphics/pokemon/raticate/alolan/overworld_normal.pal diff --git a/graphics/pokemon/raticate/alolan/follow_shiny.pal b/graphics/pokemon/raticate/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/raticate/alolan/follow_shiny.pal rename to graphics/pokemon/raticate/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/raticate/follower.png b/graphics/pokemon/raticate/overworld.png similarity index 100% rename from graphics/pokemon/raticate/follower.png rename to graphics/pokemon/raticate/overworld.png diff --git a/graphics/pokemon/raticate/follow_normal.pal b/graphics/pokemon/raticate/overworld_normal.pal similarity index 100% rename from graphics/pokemon/raticate/follow_normal.pal rename to graphics/pokemon/raticate/overworld_normal.pal diff --git a/graphics/pokemon/raticate/follow_shiny.pal b/graphics/pokemon/raticate/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/raticate/follow_shiny.pal rename to graphics/pokemon/raticate/overworld_shiny.pal diff --git a/graphics/pokemon/rattata/alolan/follower.png b/graphics/pokemon/rattata/alolan/overworld.png similarity index 100% rename from graphics/pokemon/rattata/alolan/follower.png rename to graphics/pokemon/rattata/alolan/overworld.png diff --git a/graphics/pokemon/rattata/alolan/follow_normal.pal b/graphics/pokemon/rattata/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rattata/alolan/follow_normal.pal rename to graphics/pokemon/rattata/alolan/overworld_normal.pal diff --git a/graphics/pokemon/rattata/alolan/follow_shiny.pal b/graphics/pokemon/rattata/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rattata/alolan/follow_shiny.pal rename to graphics/pokemon/rattata/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/rattata/follower.png b/graphics/pokemon/rattata/overworld.png similarity index 100% rename from graphics/pokemon/rattata/follower.png rename to graphics/pokemon/rattata/overworld.png diff --git a/graphics/pokemon/rattata/follow_normal.pal b/graphics/pokemon/rattata/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rattata/follow_normal.pal rename to graphics/pokemon/rattata/overworld_normal.pal diff --git a/graphics/pokemon/rattata/follow_shiny.pal b/graphics/pokemon/rattata/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rattata/follow_shiny.pal rename to graphics/pokemon/rattata/overworld_shiny.pal diff --git a/graphics/pokemon/rayquaza/follower.png b/graphics/pokemon/rayquaza/overworld.png similarity index 100% rename from graphics/pokemon/rayquaza/follower.png rename to graphics/pokemon/rayquaza/overworld.png diff --git a/graphics/pokemon/rayquaza/follow_normal.pal b/graphics/pokemon/rayquaza/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rayquaza/follow_normal.pal rename to graphics/pokemon/rayquaza/overworld_normal.pal diff --git a/graphics/pokemon/rayquaza/follow_shiny.pal b/graphics/pokemon/rayquaza/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rayquaza/follow_shiny.pal rename to graphics/pokemon/rayquaza/overworld_shiny.pal diff --git a/graphics/pokemon/regice/follower.png b/graphics/pokemon/regice/overworld.png similarity index 100% rename from graphics/pokemon/regice/follower.png rename to graphics/pokemon/regice/overworld.png diff --git a/graphics/pokemon/regice/follow_normal.pal b/graphics/pokemon/regice/overworld_normal.pal similarity index 100% rename from graphics/pokemon/regice/follow_normal.pal rename to graphics/pokemon/regice/overworld_normal.pal diff --git a/graphics/pokemon/regice/follow_shiny.pal b/graphics/pokemon/regice/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/regice/follow_shiny.pal rename to graphics/pokemon/regice/overworld_shiny.pal diff --git a/graphics/pokemon/regidrago/follower.png b/graphics/pokemon/regidrago/overworld.png similarity index 100% rename from graphics/pokemon/regidrago/follower.png rename to graphics/pokemon/regidrago/overworld.png diff --git a/graphics/pokemon/regidrago/follow_normal.pal b/graphics/pokemon/regidrago/overworld_normal.pal similarity index 100% rename from graphics/pokemon/regidrago/follow_normal.pal rename to graphics/pokemon/regidrago/overworld_normal.pal diff --git a/graphics/pokemon/regidrago/follow_shiny.pal b/graphics/pokemon/regidrago/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/regidrago/follow_shiny.pal rename to graphics/pokemon/regidrago/overworld_shiny.pal diff --git a/graphics/pokemon/regieleki/follower.png b/graphics/pokemon/regieleki/overworld.png similarity index 100% rename from graphics/pokemon/regieleki/follower.png rename to graphics/pokemon/regieleki/overworld.png diff --git a/graphics/pokemon/regieleki/follow_normal.pal b/graphics/pokemon/regieleki/overworld_normal.pal similarity index 100% rename from graphics/pokemon/regieleki/follow_normal.pal rename to graphics/pokemon/regieleki/overworld_normal.pal diff --git a/graphics/pokemon/regieleki/follow_shiny.pal b/graphics/pokemon/regieleki/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/regieleki/follow_shiny.pal rename to graphics/pokemon/regieleki/overworld_shiny.pal diff --git a/graphics/pokemon/regigigas/follower.png b/graphics/pokemon/regigigas/overworld.png similarity index 100% rename from graphics/pokemon/regigigas/follower.png rename to graphics/pokemon/regigigas/overworld.png diff --git a/graphics/pokemon/regigigas/follow_normal.pal b/graphics/pokemon/regigigas/overworld_normal.pal similarity index 100% rename from graphics/pokemon/regigigas/follow_normal.pal rename to graphics/pokemon/regigigas/overworld_normal.pal diff --git a/graphics/pokemon/regigigas/follow_shiny.pal b/graphics/pokemon/regigigas/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/regigigas/follow_shiny.pal rename to graphics/pokemon/regigigas/overworld_shiny.pal diff --git a/graphics/pokemon/regirock/follower.png b/graphics/pokemon/regirock/overworld.png similarity index 100% rename from graphics/pokemon/regirock/follower.png rename to graphics/pokemon/regirock/overworld.png diff --git a/graphics/pokemon/regirock/follow_normal.pal b/graphics/pokemon/regirock/overworld_normal.pal similarity index 100% rename from graphics/pokemon/regirock/follow_normal.pal rename to graphics/pokemon/regirock/overworld_normal.pal diff --git a/graphics/pokemon/regirock/follow_shiny.pal b/graphics/pokemon/regirock/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/regirock/follow_shiny.pal rename to graphics/pokemon/regirock/overworld_shiny.pal diff --git a/graphics/pokemon/registeel/follower.png b/graphics/pokemon/registeel/overworld.png similarity index 100% rename from graphics/pokemon/registeel/follower.png rename to graphics/pokemon/registeel/overworld.png diff --git a/graphics/pokemon/registeel/follow_normal.pal b/graphics/pokemon/registeel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/registeel/follow_normal.pal rename to graphics/pokemon/registeel/overworld_normal.pal diff --git a/graphics/pokemon/registeel/follow_shiny.pal b/graphics/pokemon/registeel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/registeel/follow_shiny.pal rename to graphics/pokemon/registeel/overworld_shiny.pal diff --git a/graphics/pokemon/relicanth/follower.png b/graphics/pokemon/relicanth/overworld.png similarity index 100% rename from graphics/pokemon/relicanth/follower.png rename to graphics/pokemon/relicanth/overworld.png diff --git a/graphics/pokemon/relicanth/follow_normal.pal b/graphics/pokemon/relicanth/overworld_normal.pal similarity index 100% rename from graphics/pokemon/relicanth/follow_normal.pal rename to graphics/pokemon/relicanth/overworld_normal.pal diff --git a/graphics/pokemon/relicanth/follow_shiny.pal b/graphics/pokemon/relicanth/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/relicanth/follow_shiny.pal rename to graphics/pokemon/relicanth/overworld_shiny.pal diff --git a/graphics/pokemon/remoraid/follower.png b/graphics/pokemon/remoraid/overworld.png similarity index 100% rename from graphics/pokemon/remoraid/follower.png rename to graphics/pokemon/remoraid/overworld.png diff --git a/graphics/pokemon/remoraid/follow_normal.pal b/graphics/pokemon/remoraid/overworld_normal.pal similarity index 100% rename from graphics/pokemon/remoraid/follow_normal.pal rename to graphics/pokemon/remoraid/overworld_normal.pal diff --git a/graphics/pokemon/remoraid/follow_shiny.pal b/graphics/pokemon/remoraid/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/remoraid/follow_shiny.pal rename to graphics/pokemon/remoraid/overworld_shiny.pal diff --git a/graphics/pokemon/reshiram/follower.png b/graphics/pokemon/reshiram/overworld.png similarity index 100% rename from graphics/pokemon/reshiram/follower.png rename to graphics/pokemon/reshiram/overworld.png diff --git a/graphics/pokemon/reshiram/follow_normal.pal b/graphics/pokemon/reshiram/overworld_normal.pal similarity index 100% rename from graphics/pokemon/reshiram/follow_normal.pal rename to graphics/pokemon/reshiram/overworld_normal.pal diff --git a/graphics/pokemon/reshiram/follow_shiny.pal b/graphics/pokemon/reshiram/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/reshiram/follow_shiny.pal rename to graphics/pokemon/reshiram/overworld_shiny.pal diff --git a/graphics/pokemon/reuniclus/follower.png b/graphics/pokemon/reuniclus/overworld.png similarity index 100% rename from graphics/pokemon/reuniclus/follower.png rename to graphics/pokemon/reuniclus/overworld.png diff --git a/graphics/pokemon/reuniclus/follow_normal.pal b/graphics/pokemon/reuniclus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/reuniclus/follow_normal.pal rename to graphics/pokemon/reuniclus/overworld_normal.pal diff --git a/graphics/pokemon/reuniclus/follow_shiny.pal b/graphics/pokemon/reuniclus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/reuniclus/follow_shiny.pal rename to graphics/pokemon/reuniclus/overworld_shiny.pal diff --git a/graphics/pokemon/rhydon/follower.png b/graphics/pokemon/rhydon/overworld.png similarity index 100% rename from graphics/pokemon/rhydon/follower.png rename to graphics/pokemon/rhydon/overworld.png diff --git a/graphics/pokemon/rhydon/follow_normal.pal b/graphics/pokemon/rhydon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rhydon/follow_normal.pal rename to graphics/pokemon/rhydon/overworld_normal.pal diff --git a/graphics/pokemon/rhydon/follow_shiny.pal b/graphics/pokemon/rhydon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rhydon/follow_shiny.pal rename to graphics/pokemon/rhydon/overworld_shiny.pal diff --git a/graphics/pokemon/rhyhorn/follower.png b/graphics/pokemon/rhyhorn/overworld.png similarity index 100% rename from graphics/pokemon/rhyhorn/follower.png rename to graphics/pokemon/rhyhorn/overworld.png diff --git a/graphics/pokemon/rhyhorn/follow_normal.pal b/graphics/pokemon/rhyhorn/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rhyhorn/follow_normal.pal rename to graphics/pokemon/rhyhorn/overworld_normal.pal diff --git a/graphics/pokemon/rhyhorn/follow_shiny.pal b/graphics/pokemon/rhyhorn/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rhyhorn/follow_shiny.pal rename to graphics/pokemon/rhyhorn/overworld_shiny.pal diff --git a/graphics/pokemon/rhyperior/follower.png b/graphics/pokemon/rhyperior/overworld.png similarity index 100% rename from graphics/pokemon/rhyperior/follower.png rename to graphics/pokemon/rhyperior/overworld.png diff --git a/graphics/pokemon/rhyperior/follow_normal.pal b/graphics/pokemon/rhyperior/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rhyperior/follow_normal.pal rename to graphics/pokemon/rhyperior/overworld_normal.pal diff --git a/graphics/pokemon/rhyperior/follow_shiny.pal b/graphics/pokemon/rhyperior/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rhyperior/follow_shiny.pal rename to graphics/pokemon/rhyperior/overworld_shiny.pal diff --git a/graphics/pokemon/ribombee/follower.png b/graphics/pokemon/ribombee/overworld.png similarity index 100% rename from graphics/pokemon/ribombee/follower.png rename to graphics/pokemon/ribombee/overworld.png diff --git a/graphics/pokemon/ribombee/follow_normal.pal b/graphics/pokemon/ribombee/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ribombee/follow_normal.pal rename to graphics/pokemon/ribombee/overworld_normal.pal diff --git a/graphics/pokemon/ribombee/follow_shiny.pal b/graphics/pokemon/ribombee/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ribombee/follow_shiny.pal rename to graphics/pokemon/ribombee/overworld_shiny.pal diff --git a/graphics/pokemon/rillaboom/follower.png b/graphics/pokemon/rillaboom/overworld.png similarity index 100% rename from graphics/pokemon/rillaboom/follower.png rename to graphics/pokemon/rillaboom/overworld.png diff --git a/graphics/pokemon/rillaboom/follow_normal.pal b/graphics/pokemon/rillaboom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rillaboom/follow_normal.pal rename to graphics/pokemon/rillaboom/overworld_normal.pal diff --git a/graphics/pokemon/rillaboom/follow_shiny.pal b/graphics/pokemon/rillaboom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rillaboom/follow_shiny.pal rename to graphics/pokemon/rillaboom/overworld_shiny.pal diff --git a/graphics/pokemon/riolu/follower.png b/graphics/pokemon/riolu/overworld.png similarity index 100% rename from graphics/pokemon/riolu/follower.png rename to graphics/pokemon/riolu/overworld.png diff --git a/graphics/pokemon/riolu/follow_normal.pal b/graphics/pokemon/riolu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/riolu/follow_normal.pal rename to graphics/pokemon/riolu/overworld_normal.pal diff --git a/graphics/pokemon/riolu/follow_shiny.pal b/graphics/pokemon/riolu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/riolu/follow_shiny.pal rename to graphics/pokemon/riolu/overworld_shiny.pal diff --git a/graphics/pokemon/rockruff/follower.png b/graphics/pokemon/rockruff/overworld.png similarity index 100% rename from graphics/pokemon/rockruff/follower.png rename to graphics/pokemon/rockruff/overworld.png diff --git a/graphics/pokemon/rockruff/follow_normal.pal b/graphics/pokemon/rockruff/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rockruff/follow_normal.pal rename to graphics/pokemon/rockruff/overworld_normal.pal diff --git a/graphics/pokemon/rockruff/follow_shiny.pal b/graphics/pokemon/rockruff/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rockruff/follow_shiny.pal rename to graphics/pokemon/rockruff/overworld_shiny.pal diff --git a/graphics/pokemon/roggenrola/follower.png b/graphics/pokemon/roggenrola/overworld.png similarity index 100% rename from graphics/pokemon/roggenrola/follower.png rename to graphics/pokemon/roggenrola/overworld.png diff --git a/graphics/pokemon/roggenrola/follow_normal.pal b/graphics/pokemon/roggenrola/overworld_normal.pal similarity index 100% rename from graphics/pokemon/roggenrola/follow_normal.pal rename to graphics/pokemon/roggenrola/overworld_normal.pal diff --git a/graphics/pokemon/roggenrola/follow_shiny.pal b/graphics/pokemon/roggenrola/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/roggenrola/follow_shiny.pal rename to graphics/pokemon/roggenrola/overworld_shiny.pal diff --git a/graphics/pokemon/rolycoly/follower.png b/graphics/pokemon/rolycoly/overworld.png similarity index 100% rename from graphics/pokemon/rolycoly/follower.png rename to graphics/pokemon/rolycoly/overworld.png diff --git a/graphics/pokemon/rolycoly/follow_normal.pal b/graphics/pokemon/rolycoly/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rolycoly/follow_normal.pal rename to graphics/pokemon/rolycoly/overworld_normal.pal diff --git a/graphics/pokemon/rolycoly/follow_shiny.pal b/graphics/pokemon/rolycoly/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rolycoly/follow_shiny.pal rename to graphics/pokemon/rolycoly/overworld_shiny.pal diff --git a/graphics/pokemon/rookidee/follower.png b/graphics/pokemon/rookidee/overworld.png similarity index 100% rename from graphics/pokemon/rookidee/follower.png rename to graphics/pokemon/rookidee/overworld.png diff --git a/graphics/pokemon/rookidee/follow_normal.pal b/graphics/pokemon/rookidee/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rookidee/follow_normal.pal rename to graphics/pokemon/rookidee/overworld_normal.pal diff --git a/graphics/pokemon/rookidee/follow_shiny.pal b/graphics/pokemon/rookidee/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rookidee/follow_shiny.pal rename to graphics/pokemon/rookidee/overworld_shiny.pal diff --git a/graphics/pokemon/roselia/follower.png b/graphics/pokemon/roselia/overworld.png similarity index 100% rename from graphics/pokemon/roselia/follower.png rename to graphics/pokemon/roselia/overworld.png diff --git a/graphics/pokemon/roselia/follow_normal.pal b/graphics/pokemon/roselia/overworld_normal.pal similarity index 100% rename from graphics/pokemon/roselia/follow_normal.pal rename to graphics/pokemon/roselia/overworld_normal.pal diff --git a/graphics/pokemon/roselia/follow_shiny.pal b/graphics/pokemon/roselia/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/roselia/follow_shiny.pal rename to graphics/pokemon/roselia/overworld_shiny.pal diff --git a/graphics/pokemon/roserade/follower.png b/graphics/pokemon/roserade/overworld.png similarity index 100% rename from graphics/pokemon/roserade/follower.png rename to graphics/pokemon/roserade/overworld.png diff --git a/graphics/pokemon/roserade/follow_normal.pal b/graphics/pokemon/roserade/overworld_normal.pal similarity index 100% rename from graphics/pokemon/roserade/follow_normal.pal rename to graphics/pokemon/roserade/overworld_normal.pal diff --git a/graphics/pokemon/roserade/follow_shiny.pal b/graphics/pokemon/roserade/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/roserade/follow_shiny.pal rename to graphics/pokemon/roserade/overworld_shiny.pal diff --git a/graphics/pokemon/rotom/fan/follower.png b/graphics/pokemon/rotom/fan/overworld.png similarity index 100% rename from graphics/pokemon/rotom/fan/follower.png rename to graphics/pokemon/rotom/fan/overworld.png diff --git a/graphics/pokemon/rotom/fan/follow_normal.pal b/graphics/pokemon/rotom/fan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rotom/fan/follow_normal.pal rename to graphics/pokemon/rotom/fan/overworld_normal.pal diff --git a/graphics/pokemon/rotom/fan/follow_shiny.pal b/graphics/pokemon/rotom/fan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rotom/fan/follow_shiny.pal rename to graphics/pokemon/rotom/fan/overworld_shiny.pal diff --git a/graphics/pokemon/rotom/frost/follower.png b/graphics/pokemon/rotom/frost/overworld.png similarity index 100% rename from graphics/pokemon/rotom/frost/follower.png rename to graphics/pokemon/rotom/frost/overworld.png diff --git a/graphics/pokemon/rotom/frost/follow_normal.pal b/graphics/pokemon/rotom/frost/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rotom/frost/follow_normal.pal rename to graphics/pokemon/rotom/frost/overworld_normal.pal diff --git a/graphics/pokemon/rotom/frost/follow_shiny.pal b/graphics/pokemon/rotom/frost/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rotom/frost/follow_shiny.pal rename to graphics/pokemon/rotom/frost/overworld_shiny.pal diff --git a/graphics/pokemon/rotom/heat/follower.png b/graphics/pokemon/rotom/heat/overworld.png similarity index 100% rename from graphics/pokemon/rotom/heat/follower.png rename to graphics/pokemon/rotom/heat/overworld.png diff --git a/graphics/pokemon/rotom/heat/follow_normal.pal b/graphics/pokemon/rotom/heat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rotom/heat/follow_normal.pal rename to graphics/pokemon/rotom/heat/overworld_normal.pal diff --git a/graphics/pokemon/rotom/heat/follow_shiny.pal b/graphics/pokemon/rotom/heat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rotom/heat/follow_shiny.pal rename to graphics/pokemon/rotom/heat/overworld_shiny.pal diff --git a/graphics/pokemon/rotom/mow/follower.png b/graphics/pokemon/rotom/mow/overworld.png similarity index 100% rename from graphics/pokemon/rotom/mow/follower.png rename to graphics/pokemon/rotom/mow/overworld.png diff --git a/graphics/pokemon/rotom/mow/follow_normal.pal b/graphics/pokemon/rotom/mow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rotom/mow/follow_normal.pal rename to graphics/pokemon/rotom/mow/overworld_normal.pal diff --git a/graphics/pokemon/rotom/mow/follow_shiny.pal b/graphics/pokemon/rotom/mow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rotom/mow/follow_shiny.pal rename to graphics/pokemon/rotom/mow/overworld_shiny.pal diff --git a/graphics/pokemon/rotom/follower.png b/graphics/pokemon/rotom/overworld.png similarity index 100% rename from graphics/pokemon/rotom/follower.png rename to graphics/pokemon/rotom/overworld.png diff --git a/graphics/pokemon/rotom/follow_normal.pal b/graphics/pokemon/rotom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rotom/follow_normal.pal rename to graphics/pokemon/rotom/overworld_normal.pal diff --git a/graphics/pokemon/rotom/follow_shiny.pal b/graphics/pokemon/rotom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rotom/follow_shiny.pal rename to graphics/pokemon/rotom/overworld_shiny.pal diff --git a/graphics/pokemon/rotom/wash/follower.png b/graphics/pokemon/rotom/wash/overworld.png similarity index 100% rename from graphics/pokemon/rotom/wash/follower.png rename to graphics/pokemon/rotom/wash/overworld.png diff --git a/graphics/pokemon/rotom/wash/follow_normal.pal b/graphics/pokemon/rotom/wash/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rotom/wash/follow_normal.pal rename to graphics/pokemon/rotom/wash/overworld_normal.pal diff --git a/graphics/pokemon/rotom/wash/follow_shiny.pal b/graphics/pokemon/rotom/wash/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rotom/wash/follow_shiny.pal rename to graphics/pokemon/rotom/wash/overworld_shiny.pal diff --git a/graphics/pokemon/rowlet/follower.png b/graphics/pokemon/rowlet/overworld.png similarity index 100% rename from graphics/pokemon/rowlet/follower.png rename to graphics/pokemon/rowlet/overworld.png diff --git a/graphics/pokemon/rowlet/follow_normal.pal b/graphics/pokemon/rowlet/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rowlet/follow_normal.pal rename to graphics/pokemon/rowlet/overworld_normal.pal diff --git a/graphics/pokemon/rowlet/follow_shiny.pal b/graphics/pokemon/rowlet/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rowlet/follow_shiny.pal rename to graphics/pokemon/rowlet/overworld_shiny.pal diff --git a/graphics/pokemon/rufflet/follower.png b/graphics/pokemon/rufflet/overworld.png similarity index 100% rename from graphics/pokemon/rufflet/follower.png rename to graphics/pokemon/rufflet/overworld.png diff --git a/graphics/pokemon/rufflet/follow_normal.pal b/graphics/pokemon/rufflet/overworld_normal.pal similarity index 100% rename from graphics/pokemon/rufflet/follow_normal.pal rename to graphics/pokemon/rufflet/overworld_normal.pal diff --git a/graphics/pokemon/rufflet/follow_shiny.pal b/graphics/pokemon/rufflet/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/rufflet/follow_shiny.pal rename to graphics/pokemon/rufflet/overworld_shiny.pal diff --git a/graphics/pokemon/runerigus/follower.png b/graphics/pokemon/runerigus/overworld.png similarity index 100% rename from graphics/pokemon/runerigus/follower.png rename to graphics/pokemon/runerigus/overworld.png diff --git a/graphics/pokemon/runerigus/follow_normal.pal b/graphics/pokemon/runerigus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/runerigus/follow_normal.pal rename to graphics/pokemon/runerigus/overworld_normal.pal diff --git a/graphics/pokemon/runerigus/follow_shiny.pal b/graphics/pokemon/runerigus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/runerigus/follow_shiny.pal rename to graphics/pokemon/runerigus/overworld_shiny.pal diff --git a/graphics/pokemon/sableye/follower.png b/graphics/pokemon/sableye/overworld.png similarity index 100% rename from graphics/pokemon/sableye/follower.png rename to graphics/pokemon/sableye/overworld.png diff --git a/graphics/pokemon/sableye/follow_normal.pal b/graphics/pokemon/sableye/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sableye/follow_normal.pal rename to graphics/pokemon/sableye/overworld_normal.pal diff --git a/graphics/pokemon/sableye/follow_shiny.pal b/graphics/pokemon/sableye/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sableye/follow_shiny.pal rename to graphics/pokemon/sableye/overworld_shiny.pal diff --git a/graphics/pokemon/salamence/follower.png b/graphics/pokemon/salamence/overworld.png similarity index 100% rename from graphics/pokemon/salamence/follower.png rename to graphics/pokemon/salamence/overworld.png diff --git a/graphics/pokemon/salamence/follow_normal.pal b/graphics/pokemon/salamence/overworld_normal.pal similarity index 100% rename from graphics/pokemon/salamence/follow_normal.pal rename to graphics/pokemon/salamence/overworld_normal.pal diff --git a/graphics/pokemon/salamence/follow_shiny.pal b/graphics/pokemon/salamence/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/salamence/follow_shiny.pal rename to graphics/pokemon/salamence/overworld_shiny.pal diff --git a/graphics/pokemon/salandit/follower.png b/graphics/pokemon/salandit/overworld.png similarity index 100% rename from graphics/pokemon/salandit/follower.png rename to graphics/pokemon/salandit/overworld.png diff --git a/graphics/pokemon/salandit/follow_normal.pal b/graphics/pokemon/salandit/overworld_normal.pal similarity index 100% rename from graphics/pokemon/salandit/follow_normal.pal rename to graphics/pokemon/salandit/overworld_normal.pal diff --git a/graphics/pokemon/salandit/follow_shiny.pal b/graphics/pokemon/salandit/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/salandit/follow_shiny.pal rename to graphics/pokemon/salandit/overworld_shiny.pal diff --git a/graphics/pokemon/salazzle/follower.png b/graphics/pokemon/salazzle/overworld.png similarity index 100% rename from graphics/pokemon/salazzle/follower.png rename to graphics/pokemon/salazzle/overworld.png diff --git a/graphics/pokemon/salazzle/follow_normal.pal b/graphics/pokemon/salazzle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/salazzle/follow_normal.pal rename to graphics/pokemon/salazzle/overworld_normal.pal diff --git a/graphics/pokemon/salazzle/follow_shiny.pal b/graphics/pokemon/salazzle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/salazzle/follow_shiny.pal rename to graphics/pokemon/salazzle/overworld_shiny.pal diff --git a/graphics/pokemon/samurott/hisuian/follower.png b/graphics/pokemon/samurott/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/samurott/hisuian/follower.png rename to graphics/pokemon/samurott/hisuian/overworld.png diff --git a/graphics/pokemon/samurott/hisuian/follow_normal.pal b/graphics/pokemon/samurott/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/samurott/hisuian/follow_normal.pal rename to graphics/pokemon/samurott/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/samurott/hisuian/follow_shiny.pal b/graphics/pokemon/samurott/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/samurott/hisuian/follow_shiny.pal rename to graphics/pokemon/samurott/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/samurott/follower.png b/graphics/pokemon/samurott/overworld.png similarity index 100% rename from graphics/pokemon/samurott/follower.png rename to graphics/pokemon/samurott/overworld.png diff --git a/graphics/pokemon/samurott/follow_normal.pal b/graphics/pokemon/samurott/overworld_normal.pal similarity index 100% rename from graphics/pokemon/samurott/follow_normal.pal rename to graphics/pokemon/samurott/overworld_normal.pal diff --git a/graphics/pokemon/samurott/follow_shiny.pal b/graphics/pokemon/samurott/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/samurott/follow_shiny.pal rename to graphics/pokemon/samurott/overworld_shiny.pal diff --git a/graphics/pokemon/sandaconda/follower.png b/graphics/pokemon/sandaconda/overworld.png similarity index 100% rename from graphics/pokemon/sandaconda/follower.png rename to graphics/pokemon/sandaconda/overworld.png diff --git a/graphics/pokemon/sandaconda/follow_normal.pal b/graphics/pokemon/sandaconda/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sandaconda/follow_normal.pal rename to graphics/pokemon/sandaconda/overworld_normal.pal diff --git a/graphics/pokemon/sandaconda/follow_shiny.pal b/graphics/pokemon/sandaconda/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sandaconda/follow_shiny.pal rename to graphics/pokemon/sandaconda/overworld_shiny.pal diff --git a/graphics/pokemon/sandile/follower.png b/graphics/pokemon/sandile/overworld.png similarity index 100% rename from graphics/pokemon/sandile/follower.png rename to graphics/pokemon/sandile/overworld.png diff --git a/graphics/pokemon/sandile/follow_normal.pal b/graphics/pokemon/sandile/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sandile/follow_normal.pal rename to graphics/pokemon/sandile/overworld_normal.pal diff --git a/graphics/pokemon/sandile/follow_shiny.pal b/graphics/pokemon/sandile/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sandile/follow_shiny.pal rename to graphics/pokemon/sandile/overworld_shiny.pal diff --git a/graphics/pokemon/sandshrew/alolan/follower.png b/graphics/pokemon/sandshrew/alolan/overworld.png similarity index 100% rename from graphics/pokemon/sandshrew/alolan/follower.png rename to graphics/pokemon/sandshrew/alolan/overworld.png diff --git a/graphics/pokemon/sandshrew/alolan/follow_normal.pal b/graphics/pokemon/sandshrew/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sandshrew/alolan/follow_normal.pal rename to graphics/pokemon/sandshrew/alolan/overworld_normal.pal diff --git a/graphics/pokemon/sandshrew/alolan/follow_shiny.pal b/graphics/pokemon/sandshrew/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sandshrew/alolan/follow_shiny.pal rename to graphics/pokemon/sandshrew/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/sandshrew/follower.png b/graphics/pokemon/sandshrew/overworld.png similarity index 100% rename from graphics/pokemon/sandshrew/follower.png rename to graphics/pokemon/sandshrew/overworld.png diff --git a/graphics/pokemon/sandshrew/follow_normal.pal b/graphics/pokemon/sandshrew/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sandshrew/follow_normal.pal rename to graphics/pokemon/sandshrew/overworld_normal.pal diff --git a/graphics/pokemon/sandshrew/follow_shiny.pal b/graphics/pokemon/sandshrew/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sandshrew/follow_shiny.pal rename to graphics/pokemon/sandshrew/overworld_shiny.pal diff --git a/graphics/pokemon/sandslash/alolan/follower.png b/graphics/pokemon/sandslash/alolan/overworld.png similarity index 100% rename from graphics/pokemon/sandslash/alolan/follower.png rename to graphics/pokemon/sandslash/alolan/overworld.png diff --git a/graphics/pokemon/sandslash/alolan/follow_normal.pal b/graphics/pokemon/sandslash/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sandslash/alolan/follow_normal.pal rename to graphics/pokemon/sandslash/alolan/overworld_normal.pal diff --git a/graphics/pokemon/sandslash/alolan/follow_shiny.pal b/graphics/pokemon/sandslash/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sandslash/alolan/follow_shiny.pal rename to graphics/pokemon/sandslash/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/sandslash/follower.png b/graphics/pokemon/sandslash/overworld.png similarity index 100% rename from graphics/pokemon/sandslash/follower.png rename to graphics/pokemon/sandslash/overworld.png diff --git a/graphics/pokemon/sandslash/follow_normal.pal b/graphics/pokemon/sandslash/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sandslash/follow_normal.pal rename to graphics/pokemon/sandslash/overworld_normal.pal diff --git a/graphics/pokemon/sandslash/follow_shiny.pal b/graphics/pokemon/sandslash/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sandslash/follow_shiny.pal rename to graphics/pokemon/sandslash/overworld_shiny.pal diff --git a/graphics/pokemon/sandygast/follower.png b/graphics/pokemon/sandygast/overworld.png similarity index 100% rename from graphics/pokemon/sandygast/follower.png rename to graphics/pokemon/sandygast/overworld.png diff --git a/graphics/pokemon/sandygast/follow_normal.pal b/graphics/pokemon/sandygast/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sandygast/follow_normal.pal rename to graphics/pokemon/sandygast/overworld_normal.pal diff --git a/graphics/pokemon/sandygast/follow_shiny.pal b/graphics/pokemon/sandygast/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sandygast/follow_shiny.pal rename to graphics/pokemon/sandygast/overworld_shiny.pal diff --git a/graphics/pokemon/sawk/follower.png b/graphics/pokemon/sawk/overworld.png similarity index 100% rename from graphics/pokemon/sawk/follower.png rename to graphics/pokemon/sawk/overworld.png diff --git a/graphics/pokemon/sawk/follow_normal.pal b/graphics/pokemon/sawk/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sawk/follow_normal.pal rename to graphics/pokemon/sawk/overworld_normal.pal diff --git a/graphics/pokemon/sawk/follow_shiny.pal b/graphics/pokemon/sawk/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sawk/follow_shiny.pal rename to graphics/pokemon/sawk/overworld_shiny.pal diff --git a/graphics/pokemon/sawsbuck/autumn/follower.png b/graphics/pokemon/sawsbuck/autumn/overworld.png similarity index 100% rename from graphics/pokemon/sawsbuck/autumn/follower.png rename to graphics/pokemon/sawsbuck/autumn/overworld.png diff --git a/graphics/pokemon/sawsbuck/autumn/follow_normal.pal b/graphics/pokemon/sawsbuck/autumn/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sawsbuck/autumn/follow_normal.pal rename to graphics/pokemon/sawsbuck/autumn/overworld_normal.pal diff --git a/graphics/pokemon/sawsbuck/autumn/follow_shiny.pal b/graphics/pokemon/sawsbuck/autumn/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sawsbuck/autumn/follow_shiny.pal rename to graphics/pokemon/sawsbuck/autumn/overworld_shiny.pal diff --git a/graphics/pokemon/sawsbuck/follower.png b/graphics/pokemon/sawsbuck/overworld.png similarity index 100% rename from graphics/pokemon/sawsbuck/follower.png rename to graphics/pokemon/sawsbuck/overworld.png diff --git a/graphics/pokemon/sawsbuck/follow_normal.pal b/graphics/pokemon/sawsbuck/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sawsbuck/follow_normal.pal rename to graphics/pokemon/sawsbuck/overworld_normal.pal diff --git a/graphics/pokemon/sawsbuck/follow_shiny.pal b/graphics/pokemon/sawsbuck/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sawsbuck/follow_shiny.pal rename to graphics/pokemon/sawsbuck/overworld_shiny.pal diff --git a/graphics/pokemon/sawsbuck/summer/follower.png b/graphics/pokemon/sawsbuck/summer/overworld.png similarity index 100% rename from graphics/pokemon/sawsbuck/summer/follower.png rename to graphics/pokemon/sawsbuck/summer/overworld.png diff --git a/graphics/pokemon/sawsbuck/summer/follow_normal.pal b/graphics/pokemon/sawsbuck/summer/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sawsbuck/summer/follow_normal.pal rename to graphics/pokemon/sawsbuck/summer/overworld_normal.pal diff --git a/graphics/pokemon/sawsbuck/summer/follow_shiny.pal b/graphics/pokemon/sawsbuck/summer/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sawsbuck/summer/follow_shiny.pal rename to graphics/pokemon/sawsbuck/summer/overworld_shiny.pal diff --git a/graphics/pokemon/sawsbuck/winter/follower.png b/graphics/pokemon/sawsbuck/winter/overworld.png similarity index 100% rename from graphics/pokemon/sawsbuck/winter/follower.png rename to graphics/pokemon/sawsbuck/winter/overworld.png diff --git a/graphics/pokemon/sawsbuck/winter/follow_normal.pal b/graphics/pokemon/sawsbuck/winter/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sawsbuck/winter/follow_normal.pal rename to graphics/pokemon/sawsbuck/winter/overworld_normal.pal diff --git a/graphics/pokemon/sawsbuck/winter/follow_shiny.pal b/graphics/pokemon/sawsbuck/winter/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sawsbuck/winter/follow_shiny.pal rename to graphics/pokemon/sawsbuck/winter/overworld_shiny.pal diff --git a/graphics/pokemon/scatterbug/follower.png b/graphics/pokemon/scatterbug/overworld.png similarity index 100% rename from graphics/pokemon/scatterbug/follower.png rename to graphics/pokemon/scatterbug/overworld.png diff --git a/graphics/pokemon/scatterbug/follow_normal.pal b/graphics/pokemon/scatterbug/overworld_normal.pal similarity index 100% rename from graphics/pokemon/scatterbug/follow_normal.pal rename to graphics/pokemon/scatterbug/overworld_normal.pal diff --git a/graphics/pokemon/scatterbug/follow_shiny.pal b/graphics/pokemon/scatterbug/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/scatterbug/follow_shiny.pal rename to graphics/pokemon/scatterbug/overworld_shiny.pal diff --git a/graphics/pokemon/sceptile/follower.png b/graphics/pokemon/sceptile/overworld.png similarity index 100% rename from graphics/pokemon/sceptile/follower.png rename to graphics/pokemon/sceptile/overworld.png diff --git a/graphics/pokemon/sceptile/follow_normal.pal b/graphics/pokemon/sceptile/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sceptile/follow_normal.pal rename to graphics/pokemon/sceptile/overworld_normal.pal diff --git a/graphics/pokemon/sceptile/follow_shiny.pal b/graphics/pokemon/sceptile/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sceptile/follow_shiny.pal rename to graphics/pokemon/sceptile/overworld_shiny.pal diff --git a/graphics/pokemon/scizor/follower.png b/graphics/pokemon/scizor/overworld.png similarity index 100% rename from graphics/pokemon/scizor/follower.png rename to graphics/pokemon/scizor/overworld.png diff --git a/graphics/pokemon/scizor/follow_normal.pal b/graphics/pokemon/scizor/overworld_normal.pal similarity index 100% rename from graphics/pokemon/scizor/follow_normal.pal rename to graphics/pokemon/scizor/overworld_normal.pal diff --git a/graphics/pokemon/scizor/follow_shiny.pal b/graphics/pokemon/scizor/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/scizor/follow_shiny.pal rename to graphics/pokemon/scizor/overworld_shiny.pal diff --git a/graphics/pokemon/scolipede/follower.png b/graphics/pokemon/scolipede/overworld.png similarity index 100% rename from graphics/pokemon/scolipede/follower.png rename to graphics/pokemon/scolipede/overworld.png diff --git a/graphics/pokemon/scolipede/follow_normal.pal b/graphics/pokemon/scolipede/overworld_normal.pal similarity index 100% rename from graphics/pokemon/scolipede/follow_normal.pal rename to graphics/pokemon/scolipede/overworld_normal.pal diff --git a/graphics/pokemon/scolipede/follow_shiny.pal b/graphics/pokemon/scolipede/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/scolipede/follow_shiny.pal rename to graphics/pokemon/scolipede/overworld_shiny.pal diff --git a/graphics/pokemon/scorbunny/follower.png b/graphics/pokemon/scorbunny/overworld.png similarity index 100% rename from graphics/pokemon/scorbunny/follower.png rename to graphics/pokemon/scorbunny/overworld.png diff --git a/graphics/pokemon/scorbunny/follow_normal.pal b/graphics/pokemon/scorbunny/overworld_normal.pal similarity index 100% rename from graphics/pokemon/scorbunny/follow_normal.pal rename to graphics/pokemon/scorbunny/overworld_normal.pal diff --git a/graphics/pokemon/scorbunny/follow_shiny.pal b/graphics/pokemon/scorbunny/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/scorbunny/follow_shiny.pal rename to graphics/pokemon/scorbunny/overworld_shiny.pal diff --git a/graphics/pokemon/scrafty/follower.png b/graphics/pokemon/scrafty/overworld.png similarity index 100% rename from graphics/pokemon/scrafty/follower.png rename to graphics/pokemon/scrafty/overworld.png diff --git a/graphics/pokemon/scrafty/follow_normal.pal b/graphics/pokemon/scrafty/overworld_normal.pal similarity index 100% rename from graphics/pokemon/scrafty/follow_normal.pal rename to graphics/pokemon/scrafty/overworld_normal.pal diff --git a/graphics/pokemon/scrafty/follow_shiny.pal b/graphics/pokemon/scrafty/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/scrafty/follow_shiny.pal rename to graphics/pokemon/scrafty/overworld_shiny.pal diff --git a/graphics/pokemon/scraggy/follower.png b/graphics/pokemon/scraggy/overworld.png similarity index 100% rename from graphics/pokemon/scraggy/follower.png rename to graphics/pokemon/scraggy/overworld.png diff --git a/graphics/pokemon/scraggy/follow_normal.pal b/graphics/pokemon/scraggy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/scraggy/follow_normal.pal rename to graphics/pokemon/scraggy/overworld_normal.pal diff --git a/graphics/pokemon/scraggy/follow_shiny.pal b/graphics/pokemon/scraggy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/scraggy/follow_shiny.pal rename to graphics/pokemon/scraggy/overworld_shiny.pal diff --git a/graphics/pokemon/scyther/follower.png b/graphics/pokemon/scyther/overworld.png similarity index 100% rename from graphics/pokemon/scyther/follower.png rename to graphics/pokemon/scyther/overworld.png diff --git a/graphics/pokemon/scyther/follow_normal.pal b/graphics/pokemon/scyther/overworld_normal.pal similarity index 100% rename from graphics/pokemon/scyther/follow_normal.pal rename to graphics/pokemon/scyther/overworld_normal.pal diff --git a/graphics/pokemon/scyther/follow_shiny.pal b/graphics/pokemon/scyther/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/scyther/follow_shiny.pal rename to graphics/pokemon/scyther/overworld_shiny.pal diff --git a/graphics/pokemon/seadra/follower.png b/graphics/pokemon/seadra/overworld.png similarity index 100% rename from graphics/pokemon/seadra/follower.png rename to graphics/pokemon/seadra/overworld.png diff --git a/graphics/pokemon/seadra/follow_normal.pal b/graphics/pokemon/seadra/overworld_normal.pal similarity index 100% rename from graphics/pokemon/seadra/follow_normal.pal rename to graphics/pokemon/seadra/overworld_normal.pal diff --git a/graphics/pokemon/seadra/follow_shiny.pal b/graphics/pokemon/seadra/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/seadra/follow_shiny.pal rename to graphics/pokemon/seadra/overworld_shiny.pal diff --git a/graphics/pokemon/seaking/follower.png b/graphics/pokemon/seaking/overworld.png similarity index 100% rename from graphics/pokemon/seaking/follower.png rename to graphics/pokemon/seaking/overworld.png diff --git a/graphics/pokemon/seaking/follow_normal.pal b/graphics/pokemon/seaking/overworld_normal.pal similarity index 100% rename from graphics/pokemon/seaking/follow_normal.pal rename to graphics/pokemon/seaking/overworld_normal.pal diff --git a/graphics/pokemon/seaking/follow_shiny.pal b/graphics/pokemon/seaking/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/seaking/follow_shiny.pal rename to graphics/pokemon/seaking/overworld_shiny.pal diff --git a/graphics/pokemon/sealeo/follower.png b/graphics/pokemon/sealeo/overworld.png similarity index 100% rename from graphics/pokemon/sealeo/follower.png rename to graphics/pokemon/sealeo/overworld.png diff --git a/graphics/pokemon/sealeo/follow_normal.pal b/graphics/pokemon/sealeo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sealeo/follow_normal.pal rename to graphics/pokemon/sealeo/overworld_normal.pal diff --git a/graphics/pokemon/sealeo/follow_shiny.pal b/graphics/pokemon/sealeo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sealeo/follow_shiny.pal rename to graphics/pokemon/sealeo/overworld_shiny.pal diff --git a/graphics/pokemon/seedot/follower.png b/graphics/pokemon/seedot/overworld.png similarity index 100% rename from graphics/pokemon/seedot/follower.png rename to graphics/pokemon/seedot/overworld.png diff --git a/graphics/pokemon/seedot/follow_normal.pal b/graphics/pokemon/seedot/overworld_normal.pal similarity index 100% rename from graphics/pokemon/seedot/follow_normal.pal rename to graphics/pokemon/seedot/overworld_normal.pal diff --git a/graphics/pokemon/seedot/follow_shiny.pal b/graphics/pokemon/seedot/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/seedot/follow_shiny.pal rename to graphics/pokemon/seedot/overworld_shiny.pal diff --git a/graphics/pokemon/seel/follower.png b/graphics/pokemon/seel/overworld.png similarity index 100% rename from graphics/pokemon/seel/follower.png rename to graphics/pokemon/seel/overworld.png diff --git a/graphics/pokemon/seel/follow_normal.pal b/graphics/pokemon/seel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/seel/follow_normal.pal rename to graphics/pokemon/seel/overworld_normal.pal diff --git a/graphics/pokemon/seel/follow_shiny.pal b/graphics/pokemon/seel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/seel/follow_shiny.pal rename to graphics/pokemon/seel/overworld_shiny.pal diff --git a/graphics/pokemon/seismitoad/follower.png b/graphics/pokemon/seismitoad/overworld.png similarity index 100% rename from graphics/pokemon/seismitoad/follower.png rename to graphics/pokemon/seismitoad/overworld.png diff --git a/graphics/pokemon/seismitoad/follow_normal.pal b/graphics/pokemon/seismitoad/overworld_normal.pal similarity index 100% rename from graphics/pokemon/seismitoad/follow_normal.pal rename to graphics/pokemon/seismitoad/overworld_normal.pal diff --git a/graphics/pokemon/seismitoad/follow_shiny.pal b/graphics/pokemon/seismitoad/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/seismitoad/follow_shiny.pal rename to graphics/pokemon/seismitoad/overworld_shiny.pal diff --git a/graphics/pokemon/sentret/follower.png b/graphics/pokemon/sentret/overworld.png similarity index 100% rename from graphics/pokemon/sentret/follower.png rename to graphics/pokemon/sentret/overworld.png diff --git a/graphics/pokemon/sentret/follow_normal.pal b/graphics/pokemon/sentret/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sentret/follow_normal.pal rename to graphics/pokemon/sentret/overworld_normal.pal diff --git a/graphics/pokemon/sentret/follow_shiny.pal b/graphics/pokemon/sentret/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sentret/follow_shiny.pal rename to graphics/pokemon/sentret/overworld_shiny.pal diff --git a/graphics/pokemon/serperior/follower.png b/graphics/pokemon/serperior/overworld.png similarity index 100% rename from graphics/pokemon/serperior/follower.png rename to graphics/pokemon/serperior/overworld.png diff --git a/graphics/pokemon/serperior/follow_normal.pal b/graphics/pokemon/serperior/overworld_normal.pal similarity index 100% rename from graphics/pokemon/serperior/follow_normal.pal rename to graphics/pokemon/serperior/overworld_normal.pal diff --git a/graphics/pokemon/serperior/follow_shiny.pal b/graphics/pokemon/serperior/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/serperior/follow_shiny.pal rename to graphics/pokemon/serperior/overworld_shiny.pal diff --git a/graphics/pokemon/servine/follower.png b/graphics/pokemon/servine/overworld.png similarity index 100% rename from graphics/pokemon/servine/follower.png rename to graphics/pokemon/servine/overworld.png diff --git a/graphics/pokemon/servine/follow_normal.pal b/graphics/pokemon/servine/overworld_normal.pal similarity index 100% rename from graphics/pokemon/servine/follow_normal.pal rename to graphics/pokemon/servine/overworld_normal.pal diff --git a/graphics/pokemon/servine/follow_shiny.pal b/graphics/pokemon/servine/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/servine/follow_shiny.pal rename to graphics/pokemon/servine/overworld_shiny.pal diff --git a/graphics/pokemon/seviper/follower.png b/graphics/pokemon/seviper/overworld.png similarity index 100% rename from graphics/pokemon/seviper/follower.png rename to graphics/pokemon/seviper/overworld.png diff --git a/graphics/pokemon/seviper/follow_normal.pal b/graphics/pokemon/seviper/overworld_normal.pal similarity index 100% rename from graphics/pokemon/seviper/follow_normal.pal rename to graphics/pokemon/seviper/overworld_normal.pal diff --git a/graphics/pokemon/seviper/follow_shiny.pal b/graphics/pokemon/seviper/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/seviper/follow_shiny.pal rename to graphics/pokemon/seviper/overworld_shiny.pal diff --git a/graphics/pokemon/sewaddle/follower.png b/graphics/pokemon/sewaddle/overworld.png similarity index 100% rename from graphics/pokemon/sewaddle/follower.png rename to graphics/pokemon/sewaddle/overworld.png diff --git a/graphics/pokemon/sewaddle/follow_normal.pal b/graphics/pokemon/sewaddle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sewaddle/follow_normal.pal rename to graphics/pokemon/sewaddle/overworld_normal.pal diff --git a/graphics/pokemon/sewaddle/follow_shiny.pal b/graphics/pokemon/sewaddle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sewaddle/follow_shiny.pal rename to graphics/pokemon/sewaddle/overworld_shiny.pal diff --git a/graphics/pokemon/sharpedo/follower.png b/graphics/pokemon/sharpedo/overworld.png similarity index 100% rename from graphics/pokemon/sharpedo/follower.png rename to graphics/pokemon/sharpedo/overworld.png diff --git a/graphics/pokemon/sharpedo/follow_normal.pal b/graphics/pokemon/sharpedo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sharpedo/follow_normal.pal rename to graphics/pokemon/sharpedo/overworld_normal.pal diff --git a/graphics/pokemon/sharpedo/follow_shiny.pal b/graphics/pokemon/sharpedo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sharpedo/follow_shiny.pal rename to graphics/pokemon/sharpedo/overworld_shiny.pal diff --git a/graphics/pokemon/shaymin/follower.png b/graphics/pokemon/shaymin/overworld.png similarity index 100% rename from graphics/pokemon/shaymin/follower.png rename to graphics/pokemon/shaymin/overworld.png diff --git a/graphics/pokemon/shaymin/follow_normal.pal b/graphics/pokemon/shaymin/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shaymin/follow_normal.pal rename to graphics/pokemon/shaymin/overworld_normal.pal diff --git a/graphics/pokemon/shaymin/follow_shiny.pal b/graphics/pokemon/shaymin/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shaymin/follow_shiny.pal rename to graphics/pokemon/shaymin/overworld_shiny.pal diff --git a/graphics/pokemon/shedinja/follower.png b/graphics/pokemon/shedinja/overworld.png similarity index 100% rename from graphics/pokemon/shedinja/follower.png rename to graphics/pokemon/shedinja/overworld.png diff --git a/graphics/pokemon/shedinja/follow_normal.pal b/graphics/pokemon/shedinja/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shedinja/follow_normal.pal rename to graphics/pokemon/shedinja/overworld_normal.pal diff --git a/graphics/pokemon/shedinja/follow_shiny.pal b/graphics/pokemon/shedinja/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shedinja/follow_shiny.pal rename to graphics/pokemon/shedinja/overworld_shiny.pal diff --git a/graphics/pokemon/shelgon/follower.png b/graphics/pokemon/shelgon/overworld.png similarity index 100% rename from graphics/pokemon/shelgon/follower.png rename to graphics/pokemon/shelgon/overworld.png diff --git a/graphics/pokemon/shelgon/follow_normal.pal b/graphics/pokemon/shelgon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shelgon/follow_normal.pal rename to graphics/pokemon/shelgon/overworld_normal.pal diff --git a/graphics/pokemon/shelgon/follow_shiny.pal b/graphics/pokemon/shelgon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shelgon/follow_shiny.pal rename to graphics/pokemon/shelgon/overworld_shiny.pal diff --git a/graphics/pokemon/shellder/follower.png b/graphics/pokemon/shellder/overworld.png similarity index 100% rename from graphics/pokemon/shellder/follower.png rename to graphics/pokemon/shellder/overworld.png diff --git a/graphics/pokemon/shellder/follow_normal.pal b/graphics/pokemon/shellder/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shellder/follow_normal.pal rename to graphics/pokemon/shellder/overworld_normal.pal diff --git a/graphics/pokemon/shellder/follow_shiny.pal b/graphics/pokemon/shellder/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shellder/follow_shiny.pal rename to graphics/pokemon/shellder/overworld_shiny.pal diff --git a/graphics/pokemon/shellos/east_sea/follower.png b/graphics/pokemon/shellos/east_sea/overworld.png similarity index 100% rename from graphics/pokemon/shellos/east_sea/follower.png rename to graphics/pokemon/shellos/east_sea/overworld.png diff --git a/graphics/pokemon/shellos/east_sea/follow_normal.pal b/graphics/pokemon/shellos/east_sea/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shellos/east_sea/follow_normal.pal rename to graphics/pokemon/shellos/east_sea/overworld_normal.pal diff --git a/graphics/pokemon/shellos/east_sea/follow_shiny.pal b/graphics/pokemon/shellos/east_sea/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shellos/east_sea/follow_shiny.pal rename to graphics/pokemon/shellos/east_sea/overworld_shiny.pal diff --git a/graphics/pokemon/shellos/follower.png b/graphics/pokemon/shellos/overworld.png similarity index 100% rename from graphics/pokemon/shellos/follower.png rename to graphics/pokemon/shellos/overworld.png diff --git a/graphics/pokemon/shellos/follow_normal.pal b/graphics/pokemon/shellos/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shellos/follow_normal.pal rename to graphics/pokemon/shellos/overworld_normal.pal diff --git a/graphics/pokemon/shellos/follow_shiny.pal b/graphics/pokemon/shellos/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shellos/follow_shiny.pal rename to graphics/pokemon/shellos/overworld_shiny.pal diff --git a/graphics/pokemon/shelmet/follower.png b/graphics/pokemon/shelmet/overworld.png similarity index 100% rename from graphics/pokemon/shelmet/follower.png rename to graphics/pokemon/shelmet/overworld.png diff --git a/graphics/pokemon/shelmet/follow_normal.pal b/graphics/pokemon/shelmet/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shelmet/follow_normal.pal rename to graphics/pokemon/shelmet/overworld_normal.pal diff --git a/graphics/pokemon/shelmet/follow_shiny.pal b/graphics/pokemon/shelmet/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shelmet/follow_shiny.pal rename to graphics/pokemon/shelmet/overworld_shiny.pal diff --git a/graphics/pokemon/shieldon/follower.png b/graphics/pokemon/shieldon/overworld.png similarity index 100% rename from graphics/pokemon/shieldon/follower.png rename to graphics/pokemon/shieldon/overworld.png diff --git a/graphics/pokemon/shieldon/follow_normal.pal b/graphics/pokemon/shieldon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shieldon/follow_normal.pal rename to graphics/pokemon/shieldon/overworld_normal.pal diff --git a/graphics/pokemon/shieldon/follow_shiny.pal b/graphics/pokemon/shieldon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shieldon/follow_shiny.pal rename to graphics/pokemon/shieldon/overworld_shiny.pal diff --git a/graphics/pokemon/shiftry/follower.png b/graphics/pokemon/shiftry/overworld.png similarity index 100% rename from graphics/pokemon/shiftry/follower.png rename to graphics/pokemon/shiftry/overworld.png diff --git a/graphics/pokemon/shiftry/follow_normal.pal b/graphics/pokemon/shiftry/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shiftry/follow_normal.pal rename to graphics/pokemon/shiftry/overworld_normal.pal diff --git a/graphics/pokemon/shiftry/follow_shiny.pal b/graphics/pokemon/shiftry/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shiftry/follow_shiny.pal rename to graphics/pokemon/shiftry/overworld_shiny.pal diff --git a/graphics/pokemon/shiinotic/follower.png b/graphics/pokemon/shiinotic/overworld.png similarity index 100% rename from graphics/pokemon/shiinotic/follower.png rename to graphics/pokemon/shiinotic/overworld.png diff --git a/graphics/pokemon/shiinotic/follow_normal.pal b/graphics/pokemon/shiinotic/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shiinotic/follow_normal.pal rename to graphics/pokemon/shiinotic/overworld_normal.pal diff --git a/graphics/pokemon/shiinotic/follow_shiny.pal b/graphics/pokemon/shiinotic/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shiinotic/follow_shiny.pal rename to graphics/pokemon/shiinotic/overworld_shiny.pal diff --git a/graphics/pokemon/shinx/follower.png b/graphics/pokemon/shinx/overworld.png similarity index 100% rename from graphics/pokemon/shinx/follower.png rename to graphics/pokemon/shinx/overworld.png diff --git a/graphics/pokemon/shinx/follow_normal.pal b/graphics/pokemon/shinx/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shinx/follow_normal.pal rename to graphics/pokemon/shinx/overworld_normal.pal diff --git a/graphics/pokemon/shinx/follow_shiny.pal b/graphics/pokemon/shinx/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shinx/follow_shiny.pal rename to graphics/pokemon/shinx/overworld_shiny.pal diff --git a/graphics/pokemon/shroomish/follower.png b/graphics/pokemon/shroomish/overworld.png similarity index 100% rename from graphics/pokemon/shroomish/follower.png rename to graphics/pokemon/shroomish/overworld.png diff --git a/graphics/pokemon/shroomish/follow_normal.pal b/graphics/pokemon/shroomish/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shroomish/follow_normal.pal rename to graphics/pokemon/shroomish/overworld_normal.pal diff --git a/graphics/pokemon/shroomish/follow_shiny.pal b/graphics/pokemon/shroomish/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shroomish/follow_shiny.pal rename to graphics/pokemon/shroomish/overworld_shiny.pal diff --git a/graphics/pokemon/shuckle/follower.png b/graphics/pokemon/shuckle/overworld.png similarity index 100% rename from graphics/pokemon/shuckle/follower.png rename to graphics/pokemon/shuckle/overworld.png diff --git a/graphics/pokemon/shuckle/follow_normal.pal b/graphics/pokemon/shuckle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shuckle/follow_normal.pal rename to graphics/pokemon/shuckle/overworld_normal.pal diff --git a/graphics/pokemon/shuckle/follow_shiny.pal b/graphics/pokemon/shuckle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shuckle/follow_shiny.pal rename to graphics/pokemon/shuckle/overworld_shiny.pal diff --git a/graphics/pokemon/shuppet/follower.png b/graphics/pokemon/shuppet/overworld.png similarity index 100% rename from graphics/pokemon/shuppet/follower.png rename to graphics/pokemon/shuppet/overworld.png diff --git a/graphics/pokemon/shuppet/follow_normal.pal b/graphics/pokemon/shuppet/overworld_normal.pal similarity index 100% rename from graphics/pokemon/shuppet/follow_normal.pal rename to graphics/pokemon/shuppet/overworld_normal.pal diff --git a/graphics/pokemon/shuppet/follow_shiny.pal b/graphics/pokemon/shuppet/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/shuppet/follow_shiny.pal rename to graphics/pokemon/shuppet/overworld_shiny.pal diff --git a/graphics/pokemon/sigilyph/follower.png b/graphics/pokemon/sigilyph/overworld.png similarity index 100% rename from graphics/pokemon/sigilyph/follower.png rename to graphics/pokemon/sigilyph/overworld.png diff --git a/graphics/pokemon/sigilyph/follow_normal.pal b/graphics/pokemon/sigilyph/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sigilyph/follow_normal.pal rename to graphics/pokemon/sigilyph/overworld_normal.pal diff --git a/graphics/pokemon/sigilyph/follow_shiny.pal b/graphics/pokemon/sigilyph/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sigilyph/follow_shiny.pal rename to graphics/pokemon/sigilyph/overworld_shiny.pal diff --git a/graphics/pokemon/silcoon/follower.png b/graphics/pokemon/silcoon/overworld.png similarity index 100% rename from graphics/pokemon/silcoon/follower.png rename to graphics/pokemon/silcoon/overworld.png diff --git a/graphics/pokemon/silcoon/follow_normal.pal b/graphics/pokemon/silcoon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/silcoon/follow_normal.pal rename to graphics/pokemon/silcoon/overworld_normal.pal diff --git a/graphics/pokemon/silcoon/follow_shiny.pal b/graphics/pokemon/silcoon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/silcoon/follow_shiny.pal rename to graphics/pokemon/silcoon/overworld_shiny.pal diff --git a/graphics/pokemon/silicobra/follower.png b/graphics/pokemon/silicobra/overworld.png similarity index 100% rename from graphics/pokemon/silicobra/follower.png rename to graphics/pokemon/silicobra/overworld.png diff --git a/graphics/pokemon/silicobra/follow_normal.pal b/graphics/pokemon/silicobra/overworld_normal.pal similarity index 100% rename from graphics/pokemon/silicobra/follow_normal.pal rename to graphics/pokemon/silicobra/overworld_normal.pal diff --git a/graphics/pokemon/silicobra/follow_shiny.pal b/graphics/pokemon/silicobra/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/silicobra/follow_shiny.pal rename to graphics/pokemon/silicobra/overworld_shiny.pal diff --git a/graphics/pokemon/silvally/follower.png b/graphics/pokemon/silvally/overworld.png similarity index 100% rename from graphics/pokemon/silvally/follower.png rename to graphics/pokemon/silvally/overworld.png diff --git a/graphics/pokemon/silvally/follow_normal.pal b/graphics/pokemon/silvally/overworld_normal.pal similarity index 100% rename from graphics/pokemon/silvally/follow_normal.pal rename to graphics/pokemon/silvally/overworld_normal.pal diff --git a/graphics/pokemon/silvally/follow_shiny.pal b/graphics/pokemon/silvally/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/silvally/follow_shiny.pal rename to graphics/pokemon/silvally/overworld_shiny.pal diff --git a/graphics/pokemon/simipour/follower.png b/graphics/pokemon/simipour/overworld.png similarity index 100% rename from graphics/pokemon/simipour/follower.png rename to graphics/pokemon/simipour/overworld.png diff --git a/graphics/pokemon/simipour/follow_normal.pal b/graphics/pokemon/simipour/overworld_normal.pal similarity index 100% rename from graphics/pokemon/simipour/follow_normal.pal rename to graphics/pokemon/simipour/overworld_normal.pal diff --git a/graphics/pokemon/simipour/follow_shiny.pal b/graphics/pokemon/simipour/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/simipour/follow_shiny.pal rename to graphics/pokemon/simipour/overworld_shiny.pal diff --git a/graphics/pokemon/simisage/follower.png b/graphics/pokemon/simisage/overworld.png similarity index 100% rename from graphics/pokemon/simisage/follower.png rename to graphics/pokemon/simisage/overworld.png diff --git a/graphics/pokemon/simisage/follow_normal.pal b/graphics/pokemon/simisage/overworld_normal.pal similarity index 100% rename from graphics/pokemon/simisage/follow_normal.pal rename to graphics/pokemon/simisage/overworld_normal.pal diff --git a/graphics/pokemon/simisage/follow_shiny.pal b/graphics/pokemon/simisage/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/simisage/follow_shiny.pal rename to graphics/pokemon/simisage/overworld_shiny.pal diff --git a/graphics/pokemon/simisear/follower.png b/graphics/pokemon/simisear/overworld.png similarity index 100% rename from graphics/pokemon/simisear/follower.png rename to graphics/pokemon/simisear/overworld.png diff --git a/graphics/pokemon/simisear/follow_normal.pal b/graphics/pokemon/simisear/overworld_normal.pal similarity index 100% rename from graphics/pokemon/simisear/follow_normal.pal rename to graphics/pokemon/simisear/overworld_normal.pal diff --git a/graphics/pokemon/simisear/follow_shiny.pal b/graphics/pokemon/simisear/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/simisear/follow_shiny.pal rename to graphics/pokemon/simisear/overworld_shiny.pal diff --git a/graphics/pokemon/sinistea/follower.png b/graphics/pokemon/sinistea/overworld.png similarity index 100% rename from graphics/pokemon/sinistea/follower.png rename to graphics/pokemon/sinistea/overworld.png diff --git a/graphics/pokemon/sinistea/follow_normal.pal b/graphics/pokemon/sinistea/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sinistea/follow_normal.pal rename to graphics/pokemon/sinistea/overworld_normal.pal diff --git a/graphics/pokemon/sinistea/follow_shiny.pal b/graphics/pokemon/sinistea/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sinistea/follow_shiny.pal rename to graphics/pokemon/sinistea/overworld_shiny.pal diff --git a/graphics/pokemon/sirfetchd/follower.png b/graphics/pokemon/sirfetchd/overworld.png similarity index 100% rename from graphics/pokemon/sirfetchd/follower.png rename to graphics/pokemon/sirfetchd/overworld.png diff --git a/graphics/pokemon/sirfetchd/follow_normal.pal b/graphics/pokemon/sirfetchd/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sirfetchd/follow_normal.pal rename to graphics/pokemon/sirfetchd/overworld_normal.pal diff --git a/graphics/pokemon/sirfetchd/follow_shiny.pal b/graphics/pokemon/sirfetchd/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sirfetchd/follow_shiny.pal rename to graphics/pokemon/sirfetchd/overworld_shiny.pal diff --git a/graphics/pokemon/sizzlipede/follower.png b/graphics/pokemon/sizzlipede/overworld.png similarity index 100% rename from graphics/pokemon/sizzlipede/follower.png rename to graphics/pokemon/sizzlipede/overworld.png diff --git a/graphics/pokemon/sizzlipede/follow_normal.pal b/graphics/pokemon/sizzlipede/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sizzlipede/follow_normal.pal rename to graphics/pokemon/sizzlipede/overworld_normal.pal diff --git a/graphics/pokemon/sizzlipede/follow_shiny.pal b/graphics/pokemon/sizzlipede/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sizzlipede/follow_shiny.pal rename to graphics/pokemon/sizzlipede/overworld_shiny.pal diff --git a/graphics/pokemon/skarmory/follower.png b/graphics/pokemon/skarmory/overworld.png similarity index 100% rename from graphics/pokemon/skarmory/follower.png rename to graphics/pokemon/skarmory/overworld.png diff --git a/graphics/pokemon/skarmory/follow_normal.pal b/graphics/pokemon/skarmory/overworld_normal.pal similarity index 100% rename from graphics/pokemon/skarmory/follow_normal.pal rename to graphics/pokemon/skarmory/overworld_normal.pal diff --git a/graphics/pokemon/skarmory/follow_shiny.pal b/graphics/pokemon/skarmory/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/skarmory/follow_shiny.pal rename to graphics/pokemon/skarmory/overworld_shiny.pal diff --git a/graphics/pokemon/skiddo/follower.png b/graphics/pokemon/skiddo/overworld.png similarity index 100% rename from graphics/pokemon/skiddo/follower.png rename to graphics/pokemon/skiddo/overworld.png diff --git a/graphics/pokemon/skiddo/follow_normal.pal b/graphics/pokemon/skiddo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/skiddo/follow_normal.pal rename to graphics/pokemon/skiddo/overworld_normal.pal diff --git a/graphics/pokemon/skiddo/follow_shiny.pal b/graphics/pokemon/skiddo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/skiddo/follow_shiny.pal rename to graphics/pokemon/skiddo/overworld_shiny.pal diff --git a/graphics/pokemon/skiploom/follower.png b/graphics/pokemon/skiploom/overworld.png similarity index 100% rename from graphics/pokemon/skiploom/follower.png rename to graphics/pokemon/skiploom/overworld.png diff --git a/graphics/pokemon/skiploom/follow_normal.pal b/graphics/pokemon/skiploom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/skiploom/follow_normal.pal rename to graphics/pokemon/skiploom/overworld_normal.pal diff --git a/graphics/pokemon/skiploom/follow_shiny.pal b/graphics/pokemon/skiploom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/skiploom/follow_shiny.pal rename to graphics/pokemon/skiploom/overworld_shiny.pal diff --git a/graphics/pokemon/skitty/follower.png b/graphics/pokemon/skitty/overworld.png similarity index 100% rename from graphics/pokemon/skitty/follower.png rename to graphics/pokemon/skitty/overworld.png diff --git a/graphics/pokemon/skitty/follow_normal.pal b/graphics/pokemon/skitty/overworld_normal.pal similarity index 100% rename from graphics/pokemon/skitty/follow_normal.pal rename to graphics/pokemon/skitty/overworld_normal.pal diff --git a/graphics/pokemon/skitty/follow_shiny.pal b/graphics/pokemon/skitty/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/skitty/follow_shiny.pal rename to graphics/pokemon/skitty/overworld_shiny.pal diff --git a/graphics/pokemon/skorupi/follower.png b/graphics/pokemon/skorupi/overworld.png similarity index 100% rename from graphics/pokemon/skorupi/follower.png rename to graphics/pokemon/skorupi/overworld.png diff --git a/graphics/pokemon/skorupi/follow_normal.pal b/graphics/pokemon/skorupi/overworld_normal.pal similarity index 100% rename from graphics/pokemon/skorupi/follow_normal.pal rename to graphics/pokemon/skorupi/overworld_normal.pal diff --git a/graphics/pokemon/skorupi/follow_shiny.pal b/graphics/pokemon/skorupi/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/skorupi/follow_shiny.pal rename to graphics/pokemon/skorupi/overworld_shiny.pal diff --git a/graphics/pokemon/skrelp/follower.png b/graphics/pokemon/skrelp/overworld.png similarity index 100% rename from graphics/pokemon/skrelp/follower.png rename to graphics/pokemon/skrelp/overworld.png diff --git a/graphics/pokemon/skrelp/follow_normal.pal b/graphics/pokemon/skrelp/overworld_normal.pal similarity index 100% rename from graphics/pokemon/skrelp/follow_normal.pal rename to graphics/pokemon/skrelp/overworld_normal.pal diff --git a/graphics/pokemon/skrelp/follow_shiny.pal b/graphics/pokemon/skrelp/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/skrelp/follow_shiny.pal rename to graphics/pokemon/skrelp/overworld_shiny.pal diff --git a/graphics/pokemon/skuntank/follower.png b/graphics/pokemon/skuntank/overworld.png similarity index 100% rename from graphics/pokemon/skuntank/follower.png rename to graphics/pokemon/skuntank/overworld.png diff --git a/graphics/pokemon/skuntank/follow_normal.pal b/graphics/pokemon/skuntank/overworld_normal.pal similarity index 100% rename from graphics/pokemon/skuntank/follow_normal.pal rename to graphics/pokemon/skuntank/overworld_normal.pal diff --git a/graphics/pokemon/skuntank/follow_shiny.pal b/graphics/pokemon/skuntank/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/skuntank/follow_shiny.pal rename to graphics/pokemon/skuntank/overworld_shiny.pal diff --git a/graphics/pokemon/skwovet/follower.png b/graphics/pokemon/skwovet/overworld.png similarity index 100% rename from graphics/pokemon/skwovet/follower.png rename to graphics/pokemon/skwovet/overworld.png diff --git a/graphics/pokemon/skwovet/follow_normal.pal b/graphics/pokemon/skwovet/overworld_normal.pal similarity index 100% rename from graphics/pokemon/skwovet/follow_normal.pal rename to graphics/pokemon/skwovet/overworld_normal.pal diff --git a/graphics/pokemon/skwovet/follow_shiny.pal b/graphics/pokemon/skwovet/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/skwovet/follow_shiny.pal rename to graphics/pokemon/skwovet/overworld_shiny.pal diff --git a/graphics/pokemon/slaking/follower.png b/graphics/pokemon/slaking/overworld.png similarity index 100% rename from graphics/pokemon/slaking/follower.png rename to graphics/pokemon/slaking/overworld.png diff --git a/graphics/pokemon/slaking/follow_normal.pal b/graphics/pokemon/slaking/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slaking/follow_normal.pal rename to graphics/pokemon/slaking/overworld_normal.pal diff --git a/graphics/pokemon/slaking/follow_shiny.pal b/graphics/pokemon/slaking/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slaking/follow_shiny.pal rename to graphics/pokemon/slaking/overworld_shiny.pal diff --git a/graphics/pokemon/slakoth/follower.png b/graphics/pokemon/slakoth/overworld.png similarity index 100% rename from graphics/pokemon/slakoth/follower.png rename to graphics/pokemon/slakoth/overworld.png diff --git a/graphics/pokemon/slakoth/follow_normal.pal b/graphics/pokemon/slakoth/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slakoth/follow_normal.pal rename to graphics/pokemon/slakoth/overworld_normal.pal diff --git a/graphics/pokemon/slakoth/follow_shiny.pal b/graphics/pokemon/slakoth/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slakoth/follow_shiny.pal rename to graphics/pokemon/slakoth/overworld_shiny.pal diff --git a/graphics/pokemon/sliggoo/hisuian/follower.png b/graphics/pokemon/sliggoo/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/follower.png rename to graphics/pokemon/sliggoo/hisuian/overworld.png diff --git a/graphics/pokemon/sliggoo/hisuian/follow_normal.pal b/graphics/pokemon/sliggoo/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/follow_normal.pal rename to graphics/pokemon/sliggoo/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/sliggoo/hisuian/follow_shiny.pal b/graphics/pokemon/sliggoo/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sliggoo/hisuian/follow_shiny.pal rename to graphics/pokemon/sliggoo/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/sliggoo/follower.png b/graphics/pokemon/sliggoo/overworld.png similarity index 100% rename from graphics/pokemon/sliggoo/follower.png rename to graphics/pokemon/sliggoo/overworld.png diff --git a/graphics/pokemon/sliggoo/follow_normal.pal b/graphics/pokemon/sliggoo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sliggoo/follow_normal.pal rename to graphics/pokemon/sliggoo/overworld_normal.pal diff --git a/graphics/pokemon/sliggoo/follow_shiny.pal b/graphics/pokemon/sliggoo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sliggoo/follow_shiny.pal rename to graphics/pokemon/sliggoo/overworld_shiny.pal diff --git a/graphics/pokemon/slowbro/galarian/follower.png b/graphics/pokemon/slowbro/galarian/overworld.png similarity index 100% rename from graphics/pokemon/slowbro/galarian/follower.png rename to graphics/pokemon/slowbro/galarian/overworld.png diff --git a/graphics/pokemon/slowbro/galarian/follow_normal.pal b/graphics/pokemon/slowbro/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slowbro/galarian/follow_normal.pal rename to graphics/pokemon/slowbro/galarian/overworld_normal.pal diff --git a/graphics/pokemon/slowbro/galarian/follow_shiny.pal b/graphics/pokemon/slowbro/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slowbro/galarian/follow_shiny.pal rename to graphics/pokemon/slowbro/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/slowbro/follower.png b/graphics/pokemon/slowbro/overworld.png similarity index 100% rename from graphics/pokemon/slowbro/follower.png rename to graphics/pokemon/slowbro/overworld.png diff --git a/graphics/pokemon/slowbro/follow_normal.pal b/graphics/pokemon/slowbro/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slowbro/follow_normal.pal rename to graphics/pokemon/slowbro/overworld_normal.pal diff --git a/graphics/pokemon/slowbro/follow_shiny.pal b/graphics/pokemon/slowbro/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slowbro/follow_shiny.pal rename to graphics/pokemon/slowbro/overworld_shiny.pal diff --git a/graphics/pokemon/slowking/galarian/follower.png b/graphics/pokemon/slowking/galarian/overworld.png similarity index 100% rename from graphics/pokemon/slowking/galarian/follower.png rename to graphics/pokemon/slowking/galarian/overworld.png diff --git a/graphics/pokemon/slowking/galarian/follow_normal.pal b/graphics/pokemon/slowking/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slowking/galarian/follow_normal.pal rename to graphics/pokemon/slowking/galarian/overworld_normal.pal diff --git a/graphics/pokemon/slowking/galarian/follow_shiny.pal b/graphics/pokemon/slowking/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slowking/galarian/follow_shiny.pal rename to graphics/pokemon/slowking/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/slowking/follower.png b/graphics/pokemon/slowking/overworld.png similarity index 100% rename from graphics/pokemon/slowking/follower.png rename to graphics/pokemon/slowking/overworld.png diff --git a/graphics/pokemon/slowking/follow_normal.pal b/graphics/pokemon/slowking/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slowking/follow_normal.pal rename to graphics/pokemon/slowking/overworld_normal.pal diff --git a/graphics/pokemon/slowking/follow_shiny.pal b/graphics/pokemon/slowking/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slowking/follow_shiny.pal rename to graphics/pokemon/slowking/overworld_shiny.pal diff --git a/graphics/pokemon/slowpoke/galarian/follower.png b/graphics/pokemon/slowpoke/galarian/overworld.png similarity index 100% rename from graphics/pokemon/slowpoke/galarian/follower.png rename to graphics/pokemon/slowpoke/galarian/overworld.png diff --git a/graphics/pokemon/slowpoke/galarian/follow_normal.pal b/graphics/pokemon/slowpoke/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slowpoke/galarian/follow_normal.pal rename to graphics/pokemon/slowpoke/galarian/overworld_normal.pal diff --git a/graphics/pokemon/slowpoke/galarian/follow_shiny.pal b/graphics/pokemon/slowpoke/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slowpoke/galarian/follow_shiny.pal rename to graphics/pokemon/slowpoke/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/slowpoke/follower.png b/graphics/pokemon/slowpoke/overworld.png similarity index 100% rename from graphics/pokemon/slowpoke/follower.png rename to graphics/pokemon/slowpoke/overworld.png diff --git a/graphics/pokemon/slowpoke/follow_normal.pal b/graphics/pokemon/slowpoke/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slowpoke/follow_normal.pal rename to graphics/pokemon/slowpoke/overworld_normal.pal diff --git a/graphics/pokemon/slowpoke/follow_shiny.pal b/graphics/pokemon/slowpoke/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slowpoke/follow_shiny.pal rename to graphics/pokemon/slowpoke/overworld_shiny.pal diff --git a/graphics/pokemon/slugma/follower.png b/graphics/pokemon/slugma/overworld.png similarity index 100% rename from graphics/pokemon/slugma/follower.png rename to graphics/pokemon/slugma/overworld.png diff --git a/graphics/pokemon/slugma/follow_normal.pal b/graphics/pokemon/slugma/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slugma/follow_normal.pal rename to graphics/pokemon/slugma/overworld_normal.pal diff --git a/graphics/pokemon/slugma/follow_shiny.pal b/graphics/pokemon/slugma/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slugma/follow_shiny.pal rename to graphics/pokemon/slugma/overworld_shiny.pal diff --git a/graphics/pokemon/slurpuff/follower.png b/graphics/pokemon/slurpuff/overworld.png similarity index 100% rename from graphics/pokemon/slurpuff/follower.png rename to graphics/pokemon/slurpuff/overworld.png diff --git a/graphics/pokemon/slurpuff/follow_normal.pal b/graphics/pokemon/slurpuff/overworld_normal.pal similarity index 100% rename from graphics/pokemon/slurpuff/follow_normal.pal rename to graphics/pokemon/slurpuff/overworld_normal.pal diff --git a/graphics/pokemon/slurpuff/follow_shiny.pal b/graphics/pokemon/slurpuff/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/slurpuff/follow_shiny.pal rename to graphics/pokemon/slurpuff/overworld_shiny.pal diff --git a/graphics/pokemon/smeargle/follower.png b/graphics/pokemon/smeargle/overworld.png similarity index 100% rename from graphics/pokemon/smeargle/follower.png rename to graphics/pokemon/smeargle/overworld.png diff --git a/graphics/pokemon/smeargle/follow_normal.pal b/graphics/pokemon/smeargle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/smeargle/follow_normal.pal rename to graphics/pokemon/smeargle/overworld_normal.pal diff --git a/graphics/pokemon/smeargle/follow_shiny.pal b/graphics/pokemon/smeargle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/smeargle/follow_shiny.pal rename to graphics/pokemon/smeargle/overworld_shiny.pal diff --git a/graphics/pokemon/smoochum/follower.png b/graphics/pokemon/smoochum/overworld.png similarity index 100% rename from graphics/pokemon/smoochum/follower.png rename to graphics/pokemon/smoochum/overworld.png diff --git a/graphics/pokemon/smoochum/follow_normal.pal b/graphics/pokemon/smoochum/overworld_normal.pal similarity index 100% rename from graphics/pokemon/smoochum/follow_normal.pal rename to graphics/pokemon/smoochum/overworld_normal.pal diff --git a/graphics/pokemon/smoochum/follow_shiny.pal b/graphics/pokemon/smoochum/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/smoochum/follow_shiny.pal rename to graphics/pokemon/smoochum/overworld_shiny.pal diff --git a/graphics/pokemon/sneasel/hisuian/follower.png b/graphics/pokemon/sneasel/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/sneasel/hisuian/follower.png rename to graphics/pokemon/sneasel/hisuian/overworld.png diff --git a/graphics/pokemon/sneasel/hisuian/follow_normal.pal b/graphics/pokemon/sneasel/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sneasel/hisuian/follow_normal.pal rename to graphics/pokemon/sneasel/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/sneasel/hisuian/follow_shiny.pal b/graphics/pokemon/sneasel/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sneasel/hisuian/follow_shiny.pal rename to graphics/pokemon/sneasel/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/sneasel/follower.png b/graphics/pokemon/sneasel/overworld.png similarity index 100% rename from graphics/pokemon/sneasel/follower.png rename to graphics/pokemon/sneasel/overworld.png diff --git a/graphics/pokemon/sneasel/follow_normal.pal b/graphics/pokemon/sneasel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sneasel/follow_normal.pal rename to graphics/pokemon/sneasel/overworld_normal.pal diff --git a/graphics/pokemon/sneasel/follow_shiny.pal b/graphics/pokemon/sneasel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sneasel/follow_shiny.pal rename to graphics/pokemon/sneasel/overworld_shiny.pal diff --git a/graphics/pokemon/sneasler/follower.png b/graphics/pokemon/sneasler/overworld.png similarity index 100% rename from graphics/pokemon/sneasler/follower.png rename to graphics/pokemon/sneasler/overworld.png diff --git a/graphics/pokemon/sneasler/follow_normal.pal b/graphics/pokemon/sneasler/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sneasler/follow_normal.pal rename to graphics/pokemon/sneasler/overworld_normal.pal diff --git a/graphics/pokemon/sneasler/follow_shiny.pal b/graphics/pokemon/sneasler/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sneasler/follow_shiny.pal rename to graphics/pokemon/sneasler/overworld_shiny.pal diff --git a/graphics/pokemon/snivy/follower.png b/graphics/pokemon/snivy/overworld.png similarity index 100% rename from graphics/pokemon/snivy/follower.png rename to graphics/pokemon/snivy/overworld.png diff --git a/graphics/pokemon/snivy/follow_normal.pal b/graphics/pokemon/snivy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/snivy/follow_normal.pal rename to graphics/pokemon/snivy/overworld_normal.pal diff --git a/graphics/pokemon/snivy/follow_shiny.pal b/graphics/pokemon/snivy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/snivy/follow_shiny.pal rename to graphics/pokemon/snivy/overworld_shiny.pal diff --git a/graphics/pokemon/snom/follower.png b/graphics/pokemon/snom/overworld.png similarity index 100% rename from graphics/pokemon/snom/follower.png rename to graphics/pokemon/snom/overworld.png diff --git a/graphics/pokemon/snom/follow_normal.pal b/graphics/pokemon/snom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/snom/follow_normal.pal rename to graphics/pokemon/snom/overworld_normal.pal diff --git a/graphics/pokemon/snom/follow_shiny.pal b/graphics/pokemon/snom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/snom/follow_shiny.pal rename to graphics/pokemon/snom/overworld_shiny.pal diff --git a/graphics/pokemon/snorlax/follower.png b/graphics/pokemon/snorlax/overworld.png similarity index 100% rename from graphics/pokemon/snorlax/follower.png rename to graphics/pokemon/snorlax/overworld.png diff --git a/graphics/pokemon/snorlax/follow_normal.pal b/graphics/pokemon/snorlax/overworld_normal.pal similarity index 100% rename from graphics/pokemon/snorlax/follow_normal.pal rename to graphics/pokemon/snorlax/overworld_normal.pal diff --git a/graphics/pokemon/snorlax/follow_shiny.pal b/graphics/pokemon/snorlax/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/snorlax/follow_shiny.pal rename to graphics/pokemon/snorlax/overworld_shiny.pal diff --git a/graphics/pokemon/snorunt/follower.png b/graphics/pokemon/snorunt/overworld.png similarity index 100% rename from graphics/pokemon/snorunt/follower.png rename to graphics/pokemon/snorunt/overworld.png diff --git a/graphics/pokemon/snorunt/follow_normal.pal b/graphics/pokemon/snorunt/overworld_normal.pal similarity index 100% rename from graphics/pokemon/snorunt/follow_normal.pal rename to graphics/pokemon/snorunt/overworld_normal.pal diff --git a/graphics/pokemon/snorunt/follow_shiny.pal b/graphics/pokemon/snorunt/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/snorunt/follow_shiny.pal rename to graphics/pokemon/snorunt/overworld_shiny.pal diff --git a/graphics/pokemon/snover/follower.png b/graphics/pokemon/snover/overworld.png similarity index 100% rename from graphics/pokemon/snover/follower.png rename to graphics/pokemon/snover/overworld.png diff --git a/graphics/pokemon/snover/follow_normal.pal b/graphics/pokemon/snover/overworld_normal.pal similarity index 100% rename from graphics/pokemon/snover/follow_normal.pal rename to graphics/pokemon/snover/overworld_normal.pal diff --git a/graphics/pokemon/snover/follow_shiny.pal b/graphics/pokemon/snover/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/snover/follow_shiny.pal rename to graphics/pokemon/snover/overworld_shiny.pal diff --git a/graphics/pokemon/snubbull/follower.png b/graphics/pokemon/snubbull/overworld.png similarity index 100% rename from graphics/pokemon/snubbull/follower.png rename to graphics/pokemon/snubbull/overworld.png diff --git a/graphics/pokemon/snubbull/follow_normal.pal b/graphics/pokemon/snubbull/overworld_normal.pal similarity index 100% rename from graphics/pokemon/snubbull/follow_normal.pal rename to graphics/pokemon/snubbull/overworld_normal.pal diff --git a/graphics/pokemon/snubbull/follow_shiny.pal b/graphics/pokemon/snubbull/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/snubbull/follow_shiny.pal rename to graphics/pokemon/snubbull/overworld_shiny.pal diff --git a/graphics/pokemon/sobble/follower.png b/graphics/pokemon/sobble/overworld.png similarity index 100% rename from graphics/pokemon/sobble/follower.png rename to graphics/pokemon/sobble/overworld.png diff --git a/graphics/pokemon/sobble/follow_normal.pal b/graphics/pokemon/sobble/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sobble/follow_normal.pal rename to graphics/pokemon/sobble/overworld_normal.pal diff --git a/graphics/pokemon/sobble/follow_shiny.pal b/graphics/pokemon/sobble/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sobble/follow_shiny.pal rename to graphics/pokemon/sobble/overworld_shiny.pal diff --git a/graphics/pokemon/solgaleo/follower.png b/graphics/pokemon/solgaleo/overworld.png similarity index 100% rename from graphics/pokemon/solgaleo/follower.png rename to graphics/pokemon/solgaleo/overworld.png diff --git a/graphics/pokemon/solgaleo/follow_normal.pal b/graphics/pokemon/solgaleo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/solgaleo/follow_normal.pal rename to graphics/pokemon/solgaleo/overworld_normal.pal diff --git a/graphics/pokemon/solgaleo/follow_shiny.pal b/graphics/pokemon/solgaleo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/solgaleo/follow_shiny.pal rename to graphics/pokemon/solgaleo/overworld_shiny.pal diff --git a/graphics/pokemon/solosis/follower.png b/graphics/pokemon/solosis/overworld.png similarity index 100% rename from graphics/pokemon/solosis/follower.png rename to graphics/pokemon/solosis/overworld.png diff --git a/graphics/pokemon/solosis/follow_normal.pal b/graphics/pokemon/solosis/overworld_normal.pal similarity index 100% rename from graphics/pokemon/solosis/follow_normal.pal rename to graphics/pokemon/solosis/overworld_normal.pal diff --git a/graphics/pokemon/solosis/follow_shiny.pal b/graphics/pokemon/solosis/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/solosis/follow_shiny.pal rename to graphics/pokemon/solosis/overworld_shiny.pal diff --git a/graphics/pokemon/solrock/follower.png b/graphics/pokemon/solrock/overworld.png similarity index 100% rename from graphics/pokemon/solrock/follower.png rename to graphics/pokemon/solrock/overworld.png diff --git a/graphics/pokemon/solrock/follow_normal.pal b/graphics/pokemon/solrock/overworld_normal.pal similarity index 100% rename from graphics/pokemon/solrock/follow_normal.pal rename to graphics/pokemon/solrock/overworld_normal.pal diff --git a/graphics/pokemon/solrock/follow_shiny.pal b/graphics/pokemon/solrock/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/solrock/follow_shiny.pal rename to graphics/pokemon/solrock/overworld_shiny.pal diff --git a/graphics/pokemon/spearow/follower.png b/graphics/pokemon/spearow/overworld.png similarity index 100% rename from graphics/pokemon/spearow/follower.png rename to graphics/pokemon/spearow/overworld.png diff --git a/graphics/pokemon/spearow/follow_normal.pal b/graphics/pokemon/spearow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/spearow/follow_normal.pal rename to graphics/pokemon/spearow/overworld_normal.pal diff --git a/graphics/pokemon/spearow/follow_shiny.pal b/graphics/pokemon/spearow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/spearow/follow_shiny.pal rename to graphics/pokemon/spearow/overworld_shiny.pal diff --git a/graphics/pokemon/spectrier/follower.png b/graphics/pokemon/spectrier/overworld.png similarity index 100% rename from graphics/pokemon/spectrier/follower.png rename to graphics/pokemon/spectrier/overworld.png diff --git a/graphics/pokemon/spectrier/follow_normal.pal b/graphics/pokemon/spectrier/overworld_normal.pal similarity index 100% rename from graphics/pokemon/spectrier/follow_normal.pal rename to graphics/pokemon/spectrier/overworld_normal.pal diff --git a/graphics/pokemon/spectrier/follow_shiny.pal b/graphics/pokemon/spectrier/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/spectrier/follow_shiny.pal rename to graphics/pokemon/spectrier/overworld_shiny.pal diff --git a/graphics/pokemon/spewpa/follower.png b/graphics/pokemon/spewpa/overworld.png similarity index 100% rename from graphics/pokemon/spewpa/follower.png rename to graphics/pokemon/spewpa/overworld.png diff --git a/graphics/pokemon/spewpa/follow_normal.pal b/graphics/pokemon/spewpa/overworld_normal.pal similarity index 100% rename from graphics/pokemon/spewpa/follow_normal.pal rename to graphics/pokemon/spewpa/overworld_normal.pal diff --git a/graphics/pokemon/spewpa/follow_shiny.pal b/graphics/pokemon/spewpa/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/spewpa/follow_shiny.pal rename to graphics/pokemon/spewpa/overworld_shiny.pal diff --git a/graphics/pokemon/spheal/follower.png b/graphics/pokemon/spheal/overworld.png similarity index 100% rename from graphics/pokemon/spheal/follower.png rename to graphics/pokemon/spheal/overworld.png diff --git a/graphics/pokemon/spheal/follow_normal.pal b/graphics/pokemon/spheal/overworld_normal.pal similarity index 100% rename from graphics/pokemon/spheal/follow_normal.pal rename to graphics/pokemon/spheal/overworld_normal.pal diff --git a/graphics/pokemon/spheal/follow_shiny.pal b/graphics/pokemon/spheal/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/spheal/follow_shiny.pal rename to graphics/pokemon/spheal/overworld_shiny.pal diff --git a/graphics/pokemon/spinarak/follower.png b/graphics/pokemon/spinarak/overworld.png similarity index 100% rename from graphics/pokemon/spinarak/follower.png rename to graphics/pokemon/spinarak/overworld.png diff --git a/graphics/pokemon/spinarak/follow_normal.pal b/graphics/pokemon/spinarak/overworld_normal.pal similarity index 100% rename from graphics/pokemon/spinarak/follow_normal.pal rename to graphics/pokemon/spinarak/overworld_normal.pal diff --git a/graphics/pokemon/spinarak/follow_shiny.pal b/graphics/pokemon/spinarak/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/spinarak/follow_shiny.pal rename to graphics/pokemon/spinarak/overworld_shiny.pal diff --git a/graphics/pokemon/spinda/follower.png b/graphics/pokemon/spinda/overworld.png similarity index 100% rename from graphics/pokemon/spinda/follower.png rename to graphics/pokemon/spinda/overworld.png diff --git a/graphics/pokemon/spinda/follow_normal.pal b/graphics/pokemon/spinda/overworld_normal.pal similarity index 100% rename from graphics/pokemon/spinda/follow_normal.pal rename to graphics/pokemon/spinda/overworld_normal.pal diff --git a/graphics/pokemon/spinda/follow_shiny.pal b/graphics/pokemon/spinda/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/spinda/follow_shiny.pal rename to graphics/pokemon/spinda/overworld_shiny.pal diff --git a/graphics/pokemon/spiritomb/follower.png b/graphics/pokemon/spiritomb/overworld.png similarity index 100% rename from graphics/pokemon/spiritomb/follower.png rename to graphics/pokemon/spiritomb/overworld.png diff --git a/graphics/pokemon/spiritomb/follow_normal.pal b/graphics/pokemon/spiritomb/overworld_normal.pal similarity index 100% rename from graphics/pokemon/spiritomb/follow_normal.pal rename to graphics/pokemon/spiritomb/overworld_normal.pal diff --git a/graphics/pokemon/spiritomb/follow_shiny.pal b/graphics/pokemon/spiritomb/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/spiritomb/follow_shiny.pal rename to graphics/pokemon/spiritomb/overworld_shiny.pal diff --git a/graphics/pokemon/spoink/follower.png b/graphics/pokemon/spoink/overworld.png similarity index 100% rename from graphics/pokemon/spoink/follower.png rename to graphics/pokemon/spoink/overworld.png diff --git a/graphics/pokemon/spoink/follow_normal.pal b/graphics/pokemon/spoink/overworld_normal.pal similarity index 100% rename from graphics/pokemon/spoink/follow_normal.pal rename to graphics/pokemon/spoink/overworld_normal.pal diff --git a/graphics/pokemon/spoink/follow_shiny.pal b/graphics/pokemon/spoink/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/spoink/follow_shiny.pal rename to graphics/pokemon/spoink/overworld_shiny.pal diff --git a/graphics/pokemon/spritzee/follower.png b/graphics/pokemon/spritzee/overworld.png similarity index 100% rename from graphics/pokemon/spritzee/follower.png rename to graphics/pokemon/spritzee/overworld.png diff --git a/graphics/pokemon/spritzee/follow_normal.pal b/graphics/pokemon/spritzee/overworld_normal.pal similarity index 100% rename from graphics/pokemon/spritzee/follow_normal.pal rename to graphics/pokemon/spritzee/overworld_normal.pal diff --git a/graphics/pokemon/spritzee/follow_shiny.pal b/graphics/pokemon/spritzee/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/spritzee/follow_shiny.pal rename to graphics/pokemon/spritzee/overworld_shiny.pal diff --git a/graphics/pokemon/squirtle/follower.png b/graphics/pokemon/squirtle/overworld.png similarity index 100% rename from graphics/pokemon/squirtle/follower.png rename to graphics/pokemon/squirtle/overworld.png diff --git a/graphics/pokemon/squirtle/follow_normal.pal b/graphics/pokemon/squirtle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/squirtle/follow_normal.pal rename to graphics/pokemon/squirtle/overworld_normal.pal diff --git a/graphics/pokemon/squirtle/follow_shiny.pal b/graphics/pokemon/squirtle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/squirtle/follow_shiny.pal rename to graphics/pokemon/squirtle/overworld_shiny.pal diff --git a/graphics/pokemon/stakataka/follower.png b/graphics/pokemon/stakataka/overworld.png similarity index 100% rename from graphics/pokemon/stakataka/follower.png rename to graphics/pokemon/stakataka/overworld.png diff --git a/graphics/pokemon/stakataka/follow_normal.pal b/graphics/pokemon/stakataka/overworld_normal.pal similarity index 100% rename from graphics/pokemon/stakataka/follow_normal.pal rename to graphics/pokemon/stakataka/overworld_normal.pal diff --git a/graphics/pokemon/stakataka/follow_shiny.pal b/graphics/pokemon/stakataka/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/stakataka/follow_shiny.pal rename to graphics/pokemon/stakataka/overworld_shiny.pal diff --git a/graphics/pokemon/stantler/follower.png b/graphics/pokemon/stantler/overworld.png similarity index 100% rename from graphics/pokemon/stantler/follower.png rename to graphics/pokemon/stantler/overworld.png diff --git a/graphics/pokemon/stantler/follow_normal.pal b/graphics/pokemon/stantler/overworld_normal.pal similarity index 100% rename from graphics/pokemon/stantler/follow_normal.pal rename to graphics/pokemon/stantler/overworld_normal.pal diff --git a/graphics/pokemon/stantler/follow_shiny.pal b/graphics/pokemon/stantler/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/stantler/follow_shiny.pal rename to graphics/pokemon/stantler/overworld_shiny.pal diff --git a/graphics/pokemon/staraptor/follower.png b/graphics/pokemon/staraptor/overworld.png similarity index 100% rename from graphics/pokemon/staraptor/follower.png rename to graphics/pokemon/staraptor/overworld.png diff --git a/graphics/pokemon/staraptor/follow_normal.pal b/graphics/pokemon/staraptor/overworld_normal.pal similarity index 100% rename from graphics/pokemon/staraptor/follow_normal.pal rename to graphics/pokemon/staraptor/overworld_normal.pal diff --git a/graphics/pokemon/staraptor/follow_shiny.pal b/graphics/pokemon/staraptor/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/staraptor/follow_shiny.pal rename to graphics/pokemon/staraptor/overworld_shiny.pal diff --git a/graphics/pokemon/staravia/follower.png b/graphics/pokemon/staravia/overworld.png similarity index 100% rename from graphics/pokemon/staravia/follower.png rename to graphics/pokemon/staravia/overworld.png diff --git a/graphics/pokemon/staravia/follow_normal.pal b/graphics/pokemon/staravia/overworld_normal.pal similarity index 100% rename from graphics/pokemon/staravia/follow_normal.pal rename to graphics/pokemon/staravia/overworld_normal.pal diff --git a/graphics/pokemon/staravia/follow_shiny.pal b/graphics/pokemon/staravia/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/staravia/follow_shiny.pal rename to graphics/pokemon/staravia/overworld_shiny.pal diff --git a/graphics/pokemon/starly/follower.png b/graphics/pokemon/starly/overworld.png similarity index 100% rename from graphics/pokemon/starly/follower.png rename to graphics/pokemon/starly/overworld.png diff --git a/graphics/pokemon/starly/follow_normal.pal b/graphics/pokemon/starly/overworld_normal.pal similarity index 100% rename from graphics/pokemon/starly/follow_normal.pal rename to graphics/pokemon/starly/overworld_normal.pal diff --git a/graphics/pokemon/starly/follow_shiny.pal b/graphics/pokemon/starly/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/starly/follow_shiny.pal rename to graphics/pokemon/starly/overworld_shiny.pal diff --git a/graphics/pokemon/starmie/follower.png b/graphics/pokemon/starmie/overworld.png similarity index 100% rename from graphics/pokemon/starmie/follower.png rename to graphics/pokemon/starmie/overworld.png diff --git a/graphics/pokemon/starmie/follow_normal.pal b/graphics/pokemon/starmie/overworld_normal.pal similarity index 100% rename from graphics/pokemon/starmie/follow_normal.pal rename to graphics/pokemon/starmie/overworld_normal.pal diff --git a/graphics/pokemon/starmie/follow_shiny.pal b/graphics/pokemon/starmie/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/starmie/follow_shiny.pal rename to graphics/pokemon/starmie/overworld_shiny.pal diff --git a/graphics/pokemon/staryu/follower.png b/graphics/pokemon/staryu/overworld.png similarity index 100% rename from graphics/pokemon/staryu/follower.png rename to graphics/pokemon/staryu/overworld.png diff --git a/graphics/pokemon/staryu/follow_normal.pal b/graphics/pokemon/staryu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/staryu/follow_normal.pal rename to graphics/pokemon/staryu/overworld_normal.pal diff --git a/graphics/pokemon/staryu/follow_shiny.pal b/graphics/pokemon/staryu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/staryu/follow_shiny.pal rename to graphics/pokemon/staryu/overworld_shiny.pal diff --git a/graphics/pokemon/steelix/follower.png b/graphics/pokemon/steelix/overworld.png similarity index 100% rename from graphics/pokemon/steelix/follower.png rename to graphics/pokemon/steelix/overworld.png diff --git a/graphics/pokemon/steelix/follow_normal.pal b/graphics/pokemon/steelix/overworld_normal.pal similarity index 100% rename from graphics/pokemon/steelix/follow_normal.pal rename to graphics/pokemon/steelix/overworld_normal.pal diff --git a/graphics/pokemon/steelix/follow_shiny.pal b/graphics/pokemon/steelix/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/steelix/follow_shiny.pal rename to graphics/pokemon/steelix/overworld_shiny.pal diff --git a/graphics/pokemon/steenee/follower.png b/graphics/pokemon/steenee/overworld.png similarity index 100% rename from graphics/pokemon/steenee/follower.png rename to graphics/pokemon/steenee/overworld.png diff --git a/graphics/pokemon/steenee/follow_normal.pal b/graphics/pokemon/steenee/overworld_normal.pal similarity index 100% rename from graphics/pokemon/steenee/follow_normal.pal rename to graphics/pokemon/steenee/overworld_normal.pal diff --git a/graphics/pokemon/steenee/follow_shiny.pal b/graphics/pokemon/steenee/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/steenee/follow_shiny.pal rename to graphics/pokemon/steenee/overworld_shiny.pal diff --git a/graphics/pokemon/stonjourner/follower.png b/graphics/pokemon/stonjourner/overworld.png similarity index 100% rename from graphics/pokemon/stonjourner/follower.png rename to graphics/pokemon/stonjourner/overworld.png diff --git a/graphics/pokemon/stonjourner/follow_normal.pal b/graphics/pokemon/stonjourner/overworld_normal.pal similarity index 100% rename from graphics/pokemon/stonjourner/follow_normal.pal rename to graphics/pokemon/stonjourner/overworld_normal.pal diff --git a/graphics/pokemon/stonjourner/follow_shiny.pal b/graphics/pokemon/stonjourner/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/stonjourner/follow_shiny.pal rename to graphics/pokemon/stonjourner/overworld_shiny.pal diff --git a/graphics/pokemon/stoutland/follower.png b/graphics/pokemon/stoutland/overworld.png similarity index 100% rename from graphics/pokemon/stoutland/follower.png rename to graphics/pokemon/stoutland/overworld.png diff --git a/graphics/pokemon/stoutland/follow_normal.pal b/graphics/pokemon/stoutland/overworld_normal.pal similarity index 100% rename from graphics/pokemon/stoutland/follow_normal.pal rename to graphics/pokemon/stoutland/overworld_normal.pal diff --git a/graphics/pokemon/stoutland/follow_shiny.pal b/graphics/pokemon/stoutland/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/stoutland/follow_shiny.pal rename to graphics/pokemon/stoutland/overworld_shiny.pal diff --git a/graphics/pokemon/stufful/follower.png b/graphics/pokemon/stufful/overworld.png similarity index 100% rename from graphics/pokemon/stufful/follower.png rename to graphics/pokemon/stufful/overworld.png diff --git a/graphics/pokemon/stufful/follow_normal.pal b/graphics/pokemon/stufful/overworld_normal.pal similarity index 100% rename from graphics/pokemon/stufful/follow_normal.pal rename to graphics/pokemon/stufful/overworld_normal.pal diff --git a/graphics/pokemon/stufful/follow_shiny.pal b/graphics/pokemon/stufful/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/stufful/follow_shiny.pal rename to graphics/pokemon/stufful/overworld_shiny.pal diff --git a/graphics/pokemon/stunfisk/galarian/follower.png b/graphics/pokemon/stunfisk/galarian/overworld.png similarity index 100% rename from graphics/pokemon/stunfisk/galarian/follower.png rename to graphics/pokemon/stunfisk/galarian/overworld.png diff --git a/graphics/pokemon/stunfisk/galarian/follow_normal.pal b/graphics/pokemon/stunfisk/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/stunfisk/galarian/follow_normal.pal rename to graphics/pokemon/stunfisk/galarian/overworld_normal.pal diff --git a/graphics/pokemon/stunfisk/galarian/follow_shiny.pal b/graphics/pokemon/stunfisk/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/stunfisk/galarian/follow_shiny.pal rename to graphics/pokemon/stunfisk/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/stunfisk/follower.png b/graphics/pokemon/stunfisk/overworld.png similarity index 100% rename from graphics/pokemon/stunfisk/follower.png rename to graphics/pokemon/stunfisk/overworld.png diff --git a/graphics/pokemon/stunfisk/follow_normal.pal b/graphics/pokemon/stunfisk/overworld_normal.pal similarity index 100% rename from graphics/pokemon/stunfisk/follow_normal.pal rename to graphics/pokemon/stunfisk/overworld_normal.pal diff --git a/graphics/pokemon/stunfisk/follow_shiny.pal b/graphics/pokemon/stunfisk/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/stunfisk/follow_shiny.pal rename to graphics/pokemon/stunfisk/overworld_shiny.pal diff --git a/graphics/pokemon/stunky/follower.png b/graphics/pokemon/stunky/overworld.png similarity index 100% rename from graphics/pokemon/stunky/follower.png rename to graphics/pokemon/stunky/overworld.png diff --git a/graphics/pokemon/stunky/follow_normal.pal b/graphics/pokemon/stunky/overworld_normal.pal similarity index 100% rename from graphics/pokemon/stunky/follow_normal.pal rename to graphics/pokemon/stunky/overworld_normal.pal diff --git a/graphics/pokemon/stunky/follow_shiny.pal b/graphics/pokemon/stunky/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/stunky/follow_shiny.pal rename to graphics/pokemon/stunky/overworld_shiny.pal diff --git a/graphics/pokemon/sudowoodo/follower.png b/graphics/pokemon/sudowoodo/overworld.png similarity index 100% rename from graphics/pokemon/sudowoodo/follower.png rename to graphics/pokemon/sudowoodo/overworld.png diff --git a/graphics/pokemon/sudowoodo/follow_normal.pal b/graphics/pokemon/sudowoodo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sudowoodo/follow_normal.pal rename to graphics/pokemon/sudowoodo/overworld_normal.pal diff --git a/graphics/pokemon/sudowoodo/follow_shiny.pal b/graphics/pokemon/sudowoodo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sudowoodo/follow_shiny.pal rename to graphics/pokemon/sudowoodo/overworld_shiny.pal diff --git a/graphics/pokemon/suicune/follower.png b/graphics/pokemon/suicune/overworld.png similarity index 100% rename from graphics/pokemon/suicune/follower.png rename to graphics/pokemon/suicune/overworld.png diff --git a/graphics/pokemon/suicune/follow_normal.pal b/graphics/pokemon/suicune/overworld_normal.pal similarity index 100% rename from graphics/pokemon/suicune/follow_normal.pal rename to graphics/pokemon/suicune/overworld_normal.pal diff --git a/graphics/pokemon/suicune/follow_shiny.pal b/graphics/pokemon/suicune/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/suicune/follow_shiny.pal rename to graphics/pokemon/suicune/overworld_shiny.pal diff --git a/graphics/pokemon/sunflora/follower.png b/graphics/pokemon/sunflora/overworld.png similarity index 100% rename from graphics/pokemon/sunflora/follower.png rename to graphics/pokemon/sunflora/overworld.png diff --git a/graphics/pokemon/sunflora/follow_normal.pal b/graphics/pokemon/sunflora/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sunflora/follow_normal.pal rename to graphics/pokemon/sunflora/overworld_normal.pal diff --git a/graphics/pokemon/sunflora/follow_shiny.pal b/graphics/pokemon/sunflora/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sunflora/follow_shiny.pal rename to graphics/pokemon/sunflora/overworld_shiny.pal diff --git a/graphics/pokemon/sunkern/follower.png b/graphics/pokemon/sunkern/overworld.png similarity index 100% rename from graphics/pokemon/sunkern/follower.png rename to graphics/pokemon/sunkern/overworld.png diff --git a/graphics/pokemon/sunkern/follow_normal.pal b/graphics/pokemon/sunkern/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sunkern/follow_normal.pal rename to graphics/pokemon/sunkern/overworld_normal.pal diff --git a/graphics/pokemon/sunkern/follow_shiny.pal b/graphics/pokemon/sunkern/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sunkern/follow_shiny.pal rename to graphics/pokemon/sunkern/overworld_shiny.pal diff --git a/graphics/pokemon/surskit/follower.png b/graphics/pokemon/surskit/overworld.png similarity index 100% rename from graphics/pokemon/surskit/follower.png rename to graphics/pokemon/surskit/overworld.png diff --git a/graphics/pokemon/surskit/follow_normal.pal b/graphics/pokemon/surskit/overworld_normal.pal similarity index 100% rename from graphics/pokemon/surskit/follow_normal.pal rename to graphics/pokemon/surskit/overworld_normal.pal diff --git a/graphics/pokemon/surskit/follow_shiny.pal b/graphics/pokemon/surskit/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/surskit/follow_shiny.pal rename to graphics/pokemon/surskit/overworld_shiny.pal diff --git a/graphics/pokemon/swablu/follower.png b/graphics/pokemon/swablu/overworld.png similarity index 100% rename from graphics/pokemon/swablu/follower.png rename to graphics/pokemon/swablu/overworld.png diff --git a/graphics/pokemon/swablu/follow_normal.pal b/graphics/pokemon/swablu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/swablu/follow_normal.pal rename to graphics/pokemon/swablu/overworld_normal.pal diff --git a/graphics/pokemon/swablu/follow_shiny.pal b/graphics/pokemon/swablu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/swablu/follow_shiny.pal rename to graphics/pokemon/swablu/overworld_shiny.pal diff --git a/graphics/pokemon/swadloon/follower.png b/graphics/pokemon/swadloon/overworld.png similarity index 100% rename from graphics/pokemon/swadloon/follower.png rename to graphics/pokemon/swadloon/overworld.png diff --git a/graphics/pokemon/swadloon/follow_normal.pal b/graphics/pokemon/swadloon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/swadloon/follow_normal.pal rename to graphics/pokemon/swadloon/overworld_normal.pal diff --git a/graphics/pokemon/swadloon/follow_shiny.pal b/graphics/pokemon/swadloon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/swadloon/follow_shiny.pal rename to graphics/pokemon/swadloon/overworld_shiny.pal diff --git a/graphics/pokemon/swalot/follower.png b/graphics/pokemon/swalot/overworld.png similarity index 100% rename from graphics/pokemon/swalot/follower.png rename to graphics/pokemon/swalot/overworld.png diff --git a/graphics/pokemon/swalot/follow_normal.pal b/graphics/pokemon/swalot/overworld_normal.pal similarity index 100% rename from graphics/pokemon/swalot/follow_normal.pal rename to graphics/pokemon/swalot/overworld_normal.pal diff --git a/graphics/pokemon/swalot/follow_shiny.pal b/graphics/pokemon/swalot/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/swalot/follow_shiny.pal rename to graphics/pokemon/swalot/overworld_shiny.pal diff --git a/graphics/pokemon/swampert/follower.png b/graphics/pokemon/swampert/overworld.png similarity index 100% rename from graphics/pokemon/swampert/follower.png rename to graphics/pokemon/swampert/overworld.png diff --git a/graphics/pokemon/swampert/follow_normal.pal b/graphics/pokemon/swampert/overworld_normal.pal similarity index 100% rename from graphics/pokemon/swampert/follow_normal.pal rename to graphics/pokemon/swampert/overworld_normal.pal diff --git a/graphics/pokemon/swampert/follow_shiny.pal b/graphics/pokemon/swampert/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/swampert/follow_shiny.pal rename to graphics/pokemon/swampert/overworld_shiny.pal diff --git a/graphics/pokemon/swanna/follower.png b/graphics/pokemon/swanna/overworld.png similarity index 100% rename from graphics/pokemon/swanna/follower.png rename to graphics/pokemon/swanna/overworld.png diff --git a/graphics/pokemon/swanna/follow_normal.pal b/graphics/pokemon/swanna/overworld_normal.pal similarity index 100% rename from graphics/pokemon/swanna/follow_normal.pal rename to graphics/pokemon/swanna/overworld_normal.pal diff --git a/graphics/pokemon/swanna/follow_shiny.pal b/graphics/pokemon/swanna/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/swanna/follow_shiny.pal rename to graphics/pokemon/swanna/overworld_shiny.pal diff --git a/graphics/pokemon/swellow/follower.png b/graphics/pokemon/swellow/overworld.png similarity index 100% rename from graphics/pokemon/swellow/follower.png rename to graphics/pokemon/swellow/overworld.png diff --git a/graphics/pokemon/swellow/follow_normal.pal b/graphics/pokemon/swellow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/swellow/follow_normal.pal rename to graphics/pokemon/swellow/overworld_normal.pal diff --git a/graphics/pokemon/swellow/follow_shiny.pal b/graphics/pokemon/swellow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/swellow/follow_shiny.pal rename to graphics/pokemon/swellow/overworld_shiny.pal diff --git a/graphics/pokemon/swinub/follower.png b/graphics/pokemon/swinub/overworld.png similarity index 100% rename from graphics/pokemon/swinub/follower.png rename to graphics/pokemon/swinub/overworld.png diff --git a/graphics/pokemon/swinub/follow_normal.pal b/graphics/pokemon/swinub/overworld_normal.pal similarity index 100% rename from graphics/pokemon/swinub/follow_normal.pal rename to graphics/pokemon/swinub/overworld_normal.pal diff --git a/graphics/pokemon/swinub/follow_shiny.pal b/graphics/pokemon/swinub/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/swinub/follow_shiny.pal rename to graphics/pokemon/swinub/overworld_shiny.pal diff --git a/graphics/pokemon/swirlix/follower.png b/graphics/pokemon/swirlix/overworld.png similarity index 100% rename from graphics/pokemon/swirlix/follower.png rename to graphics/pokemon/swirlix/overworld.png diff --git a/graphics/pokemon/swirlix/follow_normal.pal b/graphics/pokemon/swirlix/overworld_normal.pal similarity index 100% rename from graphics/pokemon/swirlix/follow_normal.pal rename to graphics/pokemon/swirlix/overworld_normal.pal diff --git a/graphics/pokemon/swirlix/follow_shiny.pal b/graphics/pokemon/swirlix/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/swirlix/follow_shiny.pal rename to graphics/pokemon/swirlix/overworld_shiny.pal diff --git a/graphics/pokemon/swoobat/follower.png b/graphics/pokemon/swoobat/overworld.png similarity index 100% rename from graphics/pokemon/swoobat/follower.png rename to graphics/pokemon/swoobat/overworld.png diff --git a/graphics/pokemon/swoobat/follow_normal.pal b/graphics/pokemon/swoobat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/swoobat/follow_normal.pal rename to graphics/pokemon/swoobat/overworld_normal.pal diff --git a/graphics/pokemon/swoobat/follow_shiny.pal b/graphics/pokemon/swoobat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/swoobat/follow_shiny.pal rename to graphics/pokemon/swoobat/overworld_shiny.pal diff --git a/graphics/pokemon/sylveon/follower.png b/graphics/pokemon/sylveon/overworld.png similarity index 100% rename from graphics/pokemon/sylveon/follower.png rename to graphics/pokemon/sylveon/overworld.png diff --git a/graphics/pokemon/sylveon/follow_normal.pal b/graphics/pokemon/sylveon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/sylveon/follow_normal.pal rename to graphics/pokemon/sylveon/overworld_normal.pal diff --git a/graphics/pokemon/sylveon/follow_shiny.pal b/graphics/pokemon/sylveon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/sylveon/follow_shiny.pal rename to graphics/pokemon/sylveon/overworld_shiny.pal diff --git a/graphics/pokemon/taillow/follower.png b/graphics/pokemon/taillow/overworld.png similarity index 100% rename from graphics/pokemon/taillow/follower.png rename to graphics/pokemon/taillow/overworld.png diff --git a/graphics/pokemon/taillow/follow_normal.pal b/graphics/pokemon/taillow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/taillow/follow_normal.pal rename to graphics/pokemon/taillow/overworld_normal.pal diff --git a/graphics/pokemon/taillow/follow_shiny.pal b/graphics/pokemon/taillow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/taillow/follow_shiny.pal rename to graphics/pokemon/taillow/overworld_shiny.pal diff --git a/graphics/pokemon/talonflame/follower.png b/graphics/pokemon/talonflame/overworld.png similarity index 100% rename from graphics/pokemon/talonflame/follower.png rename to graphics/pokemon/talonflame/overworld.png diff --git a/graphics/pokemon/talonflame/follow_normal.pal b/graphics/pokemon/talonflame/overworld_normal.pal similarity index 100% rename from graphics/pokemon/talonflame/follow_normal.pal rename to graphics/pokemon/talonflame/overworld_normal.pal diff --git a/graphics/pokemon/talonflame/follow_shiny.pal b/graphics/pokemon/talonflame/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/talonflame/follow_shiny.pal rename to graphics/pokemon/talonflame/overworld_shiny.pal diff --git a/graphics/pokemon/tangela/follower.png b/graphics/pokemon/tangela/overworld.png similarity index 100% rename from graphics/pokemon/tangela/follower.png rename to graphics/pokemon/tangela/overworld.png diff --git a/graphics/pokemon/tangela/follow_normal.pal b/graphics/pokemon/tangela/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tangela/follow_normal.pal rename to graphics/pokemon/tangela/overworld_normal.pal diff --git a/graphics/pokemon/tangela/follow_shiny.pal b/graphics/pokemon/tangela/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tangela/follow_shiny.pal rename to graphics/pokemon/tangela/overworld_shiny.pal diff --git a/graphics/pokemon/tangrowth/follower.png b/graphics/pokemon/tangrowth/overworld.png similarity index 100% rename from graphics/pokemon/tangrowth/follower.png rename to graphics/pokemon/tangrowth/overworld.png diff --git a/graphics/pokemon/tangrowth/follow_normal.pal b/graphics/pokemon/tangrowth/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tangrowth/follow_normal.pal rename to graphics/pokemon/tangrowth/overworld_normal.pal diff --git a/graphics/pokemon/tangrowth/follow_shiny.pal b/graphics/pokemon/tangrowth/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tangrowth/follow_shiny.pal rename to graphics/pokemon/tangrowth/overworld_shiny.pal diff --git a/graphics/pokemon/tapu_bulu/follower.png b/graphics/pokemon/tapu_bulu/overworld.png similarity index 100% rename from graphics/pokemon/tapu_bulu/follower.png rename to graphics/pokemon/tapu_bulu/overworld.png diff --git a/graphics/pokemon/tapu_bulu/follow_normal.pal b/graphics/pokemon/tapu_bulu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tapu_bulu/follow_normal.pal rename to graphics/pokemon/tapu_bulu/overworld_normal.pal diff --git a/graphics/pokemon/tapu_bulu/follow_shiny.pal b/graphics/pokemon/tapu_bulu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tapu_bulu/follow_shiny.pal rename to graphics/pokemon/tapu_bulu/overworld_shiny.pal diff --git a/graphics/pokemon/tapu_fini/follower.png b/graphics/pokemon/tapu_fini/overworld.png similarity index 100% rename from graphics/pokemon/tapu_fini/follower.png rename to graphics/pokemon/tapu_fini/overworld.png diff --git a/graphics/pokemon/tapu_fini/follow_normal.pal b/graphics/pokemon/tapu_fini/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tapu_fini/follow_normal.pal rename to graphics/pokemon/tapu_fini/overworld_normal.pal diff --git a/graphics/pokemon/tapu_fini/follow_shiny.pal b/graphics/pokemon/tapu_fini/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tapu_fini/follow_shiny.pal rename to graphics/pokemon/tapu_fini/overworld_shiny.pal diff --git a/graphics/pokemon/tapu_koko/follower.png b/graphics/pokemon/tapu_koko/overworld.png similarity index 100% rename from graphics/pokemon/tapu_koko/follower.png rename to graphics/pokemon/tapu_koko/overworld.png diff --git a/graphics/pokemon/tapu_koko/follow_normal.pal b/graphics/pokemon/tapu_koko/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tapu_koko/follow_normal.pal rename to graphics/pokemon/tapu_koko/overworld_normal.pal diff --git a/graphics/pokemon/tapu_koko/follow_shiny.pal b/graphics/pokemon/tapu_koko/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tapu_koko/follow_shiny.pal rename to graphics/pokemon/tapu_koko/overworld_shiny.pal diff --git a/graphics/pokemon/tapu_lele/follower.png b/graphics/pokemon/tapu_lele/overworld.png similarity index 100% rename from graphics/pokemon/tapu_lele/follower.png rename to graphics/pokemon/tapu_lele/overworld.png diff --git a/graphics/pokemon/tapu_lele/follow_normal.pal b/graphics/pokemon/tapu_lele/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tapu_lele/follow_normal.pal rename to graphics/pokemon/tapu_lele/overworld_normal.pal diff --git a/graphics/pokemon/tapu_lele/follow_shiny.pal b/graphics/pokemon/tapu_lele/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tapu_lele/follow_shiny.pal rename to graphics/pokemon/tapu_lele/overworld_shiny.pal diff --git a/graphics/pokemon/tauros/follower.png b/graphics/pokemon/tauros/overworld.png similarity index 100% rename from graphics/pokemon/tauros/follower.png rename to graphics/pokemon/tauros/overworld.png diff --git a/graphics/pokemon/tauros/follow_normal.pal b/graphics/pokemon/tauros/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tauros/follow_normal.pal rename to graphics/pokemon/tauros/overworld_normal.pal diff --git a/graphics/pokemon/tauros/follow_shiny.pal b/graphics/pokemon/tauros/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tauros/follow_shiny.pal rename to graphics/pokemon/tauros/overworld_shiny.pal diff --git a/graphics/pokemon/teddiursa/follower.png b/graphics/pokemon/teddiursa/overworld.png similarity index 100% rename from graphics/pokemon/teddiursa/follower.png rename to graphics/pokemon/teddiursa/overworld.png diff --git a/graphics/pokemon/teddiursa/follow_normal.pal b/graphics/pokemon/teddiursa/overworld_normal.pal similarity index 100% rename from graphics/pokemon/teddiursa/follow_normal.pal rename to graphics/pokemon/teddiursa/overworld_normal.pal diff --git a/graphics/pokemon/teddiursa/follow_shiny.pal b/graphics/pokemon/teddiursa/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/teddiursa/follow_shiny.pal rename to graphics/pokemon/teddiursa/overworld_shiny.pal diff --git a/graphics/pokemon/tentacool/follower.png b/graphics/pokemon/tentacool/overworld.png similarity index 100% rename from graphics/pokemon/tentacool/follower.png rename to graphics/pokemon/tentacool/overworld.png diff --git a/graphics/pokemon/tentacool/follow_normal.pal b/graphics/pokemon/tentacool/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tentacool/follow_normal.pal rename to graphics/pokemon/tentacool/overworld_normal.pal diff --git a/graphics/pokemon/tentacool/follow_shiny.pal b/graphics/pokemon/tentacool/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tentacool/follow_shiny.pal rename to graphics/pokemon/tentacool/overworld_shiny.pal diff --git a/graphics/pokemon/tentacruel/follower.png b/graphics/pokemon/tentacruel/overworld.png similarity index 100% rename from graphics/pokemon/tentacruel/follower.png rename to graphics/pokemon/tentacruel/overworld.png diff --git a/graphics/pokemon/tentacruel/follow_normal.pal b/graphics/pokemon/tentacruel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tentacruel/follow_normal.pal rename to graphics/pokemon/tentacruel/overworld_normal.pal diff --git a/graphics/pokemon/tentacruel/follow_shiny.pal b/graphics/pokemon/tentacruel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tentacruel/follow_shiny.pal rename to graphics/pokemon/tentacruel/overworld_shiny.pal diff --git a/graphics/pokemon/tepig/follower.png b/graphics/pokemon/tepig/overworld.png similarity index 100% rename from graphics/pokemon/tepig/follower.png rename to graphics/pokemon/tepig/overworld.png diff --git a/graphics/pokemon/tepig/follow_normal.pal b/graphics/pokemon/tepig/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tepig/follow_normal.pal rename to graphics/pokemon/tepig/overworld_normal.pal diff --git a/graphics/pokemon/tepig/follow_shiny.pal b/graphics/pokemon/tepig/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tepig/follow_shiny.pal rename to graphics/pokemon/tepig/overworld_shiny.pal diff --git a/graphics/pokemon/terrakion/follower.png b/graphics/pokemon/terrakion/overworld.png similarity index 100% rename from graphics/pokemon/terrakion/follower.png rename to graphics/pokemon/terrakion/overworld.png diff --git a/graphics/pokemon/terrakion/follow_normal.pal b/graphics/pokemon/terrakion/overworld_normal.pal similarity index 100% rename from graphics/pokemon/terrakion/follow_normal.pal rename to graphics/pokemon/terrakion/overworld_normal.pal diff --git a/graphics/pokemon/terrakion/follow_shiny.pal b/graphics/pokemon/terrakion/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/terrakion/follow_shiny.pal rename to graphics/pokemon/terrakion/overworld_shiny.pal diff --git a/graphics/pokemon/thievul/follower.png b/graphics/pokemon/thievul/overworld.png similarity index 100% rename from graphics/pokemon/thievul/follower.png rename to graphics/pokemon/thievul/overworld.png diff --git a/graphics/pokemon/thievul/follow_normal.pal b/graphics/pokemon/thievul/overworld_normal.pal similarity index 100% rename from graphics/pokemon/thievul/follow_normal.pal rename to graphics/pokemon/thievul/overworld_normal.pal diff --git a/graphics/pokemon/thievul/follow_shiny.pal b/graphics/pokemon/thievul/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/thievul/follow_shiny.pal rename to graphics/pokemon/thievul/overworld_shiny.pal diff --git a/graphics/pokemon/throh/follower.png b/graphics/pokemon/throh/overworld.png similarity index 100% rename from graphics/pokemon/throh/follower.png rename to graphics/pokemon/throh/overworld.png diff --git a/graphics/pokemon/throh/follow_normal.pal b/graphics/pokemon/throh/overworld_normal.pal similarity index 100% rename from graphics/pokemon/throh/follow_normal.pal rename to graphics/pokemon/throh/overworld_normal.pal diff --git a/graphics/pokemon/throh/follow_shiny.pal b/graphics/pokemon/throh/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/throh/follow_shiny.pal rename to graphics/pokemon/throh/overworld_shiny.pal diff --git a/graphics/pokemon/thundurus/follower.png b/graphics/pokemon/thundurus/overworld.png similarity index 100% rename from graphics/pokemon/thundurus/follower.png rename to graphics/pokemon/thundurus/overworld.png diff --git a/graphics/pokemon/thundurus/follow_normal.pal b/graphics/pokemon/thundurus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/thundurus/follow_normal.pal rename to graphics/pokemon/thundurus/overworld_normal.pal diff --git a/graphics/pokemon/thundurus/follow_shiny.pal b/graphics/pokemon/thundurus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/thundurus/follow_shiny.pal rename to graphics/pokemon/thundurus/overworld_shiny.pal diff --git a/graphics/pokemon/thwackey/follower.png b/graphics/pokemon/thwackey/overworld.png similarity index 100% rename from graphics/pokemon/thwackey/follower.png rename to graphics/pokemon/thwackey/overworld.png diff --git a/graphics/pokemon/thwackey/follow_normal.pal b/graphics/pokemon/thwackey/overworld_normal.pal similarity index 100% rename from graphics/pokemon/thwackey/follow_normal.pal rename to graphics/pokemon/thwackey/overworld_normal.pal diff --git a/graphics/pokemon/thwackey/follow_shiny.pal b/graphics/pokemon/thwackey/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/thwackey/follow_shiny.pal rename to graphics/pokemon/thwackey/overworld_shiny.pal diff --git a/graphics/pokemon/timburr/follower.png b/graphics/pokemon/timburr/overworld.png similarity index 100% rename from graphics/pokemon/timburr/follower.png rename to graphics/pokemon/timburr/overworld.png diff --git a/graphics/pokemon/timburr/follow_normal.pal b/graphics/pokemon/timburr/overworld_normal.pal similarity index 100% rename from graphics/pokemon/timburr/follow_normal.pal rename to graphics/pokemon/timburr/overworld_normal.pal diff --git a/graphics/pokemon/timburr/follow_shiny.pal b/graphics/pokemon/timburr/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/timburr/follow_shiny.pal rename to graphics/pokemon/timburr/overworld_shiny.pal diff --git a/graphics/pokemon/tirtouga/follower.png b/graphics/pokemon/tirtouga/overworld.png similarity index 100% rename from graphics/pokemon/tirtouga/follower.png rename to graphics/pokemon/tirtouga/overworld.png diff --git a/graphics/pokemon/tirtouga/follow_normal.pal b/graphics/pokemon/tirtouga/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tirtouga/follow_normal.pal rename to graphics/pokemon/tirtouga/overworld_normal.pal diff --git a/graphics/pokemon/tirtouga/follow_shiny.pal b/graphics/pokemon/tirtouga/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tirtouga/follow_shiny.pal rename to graphics/pokemon/tirtouga/overworld_shiny.pal diff --git a/graphics/pokemon/togedemaru/follower.png b/graphics/pokemon/togedemaru/overworld.png similarity index 100% rename from graphics/pokemon/togedemaru/follower.png rename to graphics/pokemon/togedemaru/overworld.png diff --git a/graphics/pokemon/togedemaru/follow_normal.pal b/graphics/pokemon/togedemaru/overworld_normal.pal similarity index 100% rename from graphics/pokemon/togedemaru/follow_normal.pal rename to graphics/pokemon/togedemaru/overworld_normal.pal diff --git a/graphics/pokemon/togedemaru/follow_shiny.pal b/graphics/pokemon/togedemaru/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/togedemaru/follow_shiny.pal rename to graphics/pokemon/togedemaru/overworld_shiny.pal diff --git a/graphics/pokemon/togekiss/follower.png b/graphics/pokemon/togekiss/overworld.png similarity index 100% rename from graphics/pokemon/togekiss/follower.png rename to graphics/pokemon/togekiss/overworld.png diff --git a/graphics/pokemon/togekiss/follow_normal.pal b/graphics/pokemon/togekiss/overworld_normal.pal similarity index 100% rename from graphics/pokemon/togekiss/follow_normal.pal rename to graphics/pokemon/togekiss/overworld_normal.pal diff --git a/graphics/pokemon/togekiss/follow_shiny.pal b/graphics/pokemon/togekiss/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/togekiss/follow_shiny.pal rename to graphics/pokemon/togekiss/overworld_shiny.pal diff --git a/graphics/pokemon/togepi/follower.png b/graphics/pokemon/togepi/overworld.png similarity index 100% rename from graphics/pokemon/togepi/follower.png rename to graphics/pokemon/togepi/overworld.png diff --git a/graphics/pokemon/togepi/follow_normal.pal b/graphics/pokemon/togepi/overworld_normal.pal similarity index 100% rename from graphics/pokemon/togepi/follow_normal.pal rename to graphics/pokemon/togepi/overworld_normal.pal diff --git a/graphics/pokemon/togepi/follow_shiny.pal b/graphics/pokemon/togepi/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/togepi/follow_shiny.pal rename to graphics/pokemon/togepi/overworld_shiny.pal diff --git a/graphics/pokemon/togetic/follower.png b/graphics/pokemon/togetic/overworld.png similarity index 100% rename from graphics/pokemon/togetic/follower.png rename to graphics/pokemon/togetic/overworld.png diff --git a/graphics/pokemon/togetic/follow_normal.pal b/graphics/pokemon/togetic/overworld_normal.pal similarity index 100% rename from graphics/pokemon/togetic/follow_normal.pal rename to graphics/pokemon/togetic/overworld_normal.pal diff --git a/graphics/pokemon/togetic/follow_shiny.pal b/graphics/pokemon/togetic/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/togetic/follow_shiny.pal rename to graphics/pokemon/togetic/overworld_shiny.pal diff --git a/graphics/pokemon/torchic/follower.png b/graphics/pokemon/torchic/overworld.png similarity index 100% rename from graphics/pokemon/torchic/follower.png rename to graphics/pokemon/torchic/overworld.png diff --git a/graphics/pokemon/torchic/follow_normal.pal b/graphics/pokemon/torchic/overworld_normal.pal similarity index 100% rename from graphics/pokemon/torchic/follow_normal.pal rename to graphics/pokemon/torchic/overworld_normal.pal diff --git a/graphics/pokemon/torchic/follow_shiny.pal b/graphics/pokemon/torchic/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/torchic/follow_shiny.pal rename to graphics/pokemon/torchic/overworld_shiny.pal diff --git a/graphics/pokemon/torkoal/follower.png b/graphics/pokemon/torkoal/overworld.png similarity index 100% rename from graphics/pokemon/torkoal/follower.png rename to graphics/pokemon/torkoal/overworld.png diff --git a/graphics/pokemon/torkoal/follow_normal.pal b/graphics/pokemon/torkoal/overworld_normal.pal similarity index 100% rename from graphics/pokemon/torkoal/follow_normal.pal rename to graphics/pokemon/torkoal/overworld_normal.pal diff --git a/graphics/pokemon/torkoal/follow_shiny.pal b/graphics/pokemon/torkoal/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/torkoal/follow_shiny.pal rename to graphics/pokemon/torkoal/overworld_shiny.pal diff --git a/graphics/pokemon/tornadus/follower.png b/graphics/pokemon/tornadus/overworld.png similarity index 100% rename from graphics/pokemon/tornadus/follower.png rename to graphics/pokemon/tornadus/overworld.png diff --git a/graphics/pokemon/tornadus/follow_normal.pal b/graphics/pokemon/tornadus/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tornadus/follow_normal.pal rename to graphics/pokemon/tornadus/overworld_normal.pal diff --git a/graphics/pokemon/tornadus/follow_shiny.pal b/graphics/pokemon/tornadus/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tornadus/follow_shiny.pal rename to graphics/pokemon/tornadus/overworld_shiny.pal diff --git a/graphics/pokemon/torracat/follower.png b/graphics/pokemon/torracat/overworld.png similarity index 100% rename from graphics/pokemon/torracat/follower.png rename to graphics/pokemon/torracat/overworld.png diff --git a/graphics/pokemon/torracat/follow_normal.pal b/graphics/pokemon/torracat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/torracat/follow_normal.pal rename to graphics/pokemon/torracat/overworld_normal.pal diff --git a/graphics/pokemon/torracat/follow_shiny.pal b/graphics/pokemon/torracat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/torracat/follow_shiny.pal rename to graphics/pokemon/torracat/overworld_shiny.pal diff --git a/graphics/pokemon/torterra/follower.png b/graphics/pokemon/torterra/overworld.png similarity index 100% rename from graphics/pokemon/torterra/follower.png rename to graphics/pokemon/torterra/overworld.png diff --git a/graphics/pokemon/torterra/follow_normal.pal b/graphics/pokemon/torterra/overworld_normal.pal similarity index 100% rename from graphics/pokemon/torterra/follow_normal.pal rename to graphics/pokemon/torterra/overworld_normal.pal diff --git a/graphics/pokemon/torterra/follow_shiny.pal b/graphics/pokemon/torterra/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/torterra/follow_shiny.pal rename to graphics/pokemon/torterra/overworld_shiny.pal diff --git a/graphics/pokemon/totodile/follower.png b/graphics/pokemon/totodile/overworld.png similarity index 100% rename from graphics/pokemon/totodile/follower.png rename to graphics/pokemon/totodile/overworld.png diff --git a/graphics/pokemon/totodile/follow_normal.pal b/graphics/pokemon/totodile/overworld_normal.pal similarity index 100% rename from graphics/pokemon/totodile/follow_normal.pal rename to graphics/pokemon/totodile/overworld_normal.pal diff --git a/graphics/pokemon/totodile/follow_shiny.pal b/graphics/pokemon/totodile/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/totodile/follow_shiny.pal rename to graphics/pokemon/totodile/overworld_shiny.pal diff --git a/graphics/pokemon/toucannon/follower.png b/graphics/pokemon/toucannon/overworld.png similarity index 100% rename from graphics/pokemon/toucannon/follower.png rename to graphics/pokemon/toucannon/overworld.png diff --git a/graphics/pokemon/toucannon/follow_normal.pal b/graphics/pokemon/toucannon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/toucannon/follow_normal.pal rename to graphics/pokemon/toucannon/overworld_normal.pal diff --git a/graphics/pokemon/toucannon/follow_shiny.pal b/graphics/pokemon/toucannon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/toucannon/follow_shiny.pal rename to graphics/pokemon/toucannon/overworld_shiny.pal diff --git a/graphics/pokemon/toxapex/follower.png b/graphics/pokemon/toxapex/overworld.png similarity index 100% rename from graphics/pokemon/toxapex/follower.png rename to graphics/pokemon/toxapex/overworld.png diff --git a/graphics/pokemon/toxapex/follow_normal.pal b/graphics/pokemon/toxapex/overworld_normal.pal similarity index 100% rename from graphics/pokemon/toxapex/follow_normal.pal rename to graphics/pokemon/toxapex/overworld_normal.pal diff --git a/graphics/pokemon/toxapex/follow_shiny.pal b/graphics/pokemon/toxapex/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/toxapex/follow_shiny.pal rename to graphics/pokemon/toxapex/overworld_shiny.pal diff --git a/graphics/pokemon/toxel/follower.png b/graphics/pokemon/toxel/overworld.png similarity index 100% rename from graphics/pokemon/toxel/follower.png rename to graphics/pokemon/toxel/overworld.png diff --git a/graphics/pokemon/toxel/follow_normal.pal b/graphics/pokemon/toxel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/toxel/follow_normal.pal rename to graphics/pokemon/toxel/overworld_normal.pal diff --git a/graphics/pokemon/toxel/follow_shiny.pal b/graphics/pokemon/toxel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/toxel/follow_shiny.pal rename to graphics/pokemon/toxel/overworld_shiny.pal diff --git a/graphics/pokemon/toxicroak/follower.png b/graphics/pokemon/toxicroak/overworld.png similarity index 100% rename from graphics/pokemon/toxicroak/follower.png rename to graphics/pokemon/toxicroak/overworld.png diff --git a/graphics/pokemon/toxicroak/follow_normal.pal b/graphics/pokemon/toxicroak/overworld_normal.pal similarity index 100% rename from graphics/pokemon/toxicroak/follow_normal.pal rename to graphics/pokemon/toxicroak/overworld_normal.pal diff --git a/graphics/pokemon/toxicroak/follow_shiny.pal b/graphics/pokemon/toxicroak/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/toxicroak/follow_shiny.pal rename to graphics/pokemon/toxicroak/overworld_shiny.pal diff --git a/graphics/pokemon/toxtricity/low_key/follower.png b/graphics/pokemon/toxtricity/low_key/overworld.png similarity index 100% rename from graphics/pokemon/toxtricity/low_key/follower.png rename to graphics/pokemon/toxtricity/low_key/overworld.png diff --git a/graphics/pokemon/toxtricity/low_key/follow_normal.pal b/graphics/pokemon/toxtricity/low_key/overworld_normal.pal similarity index 100% rename from graphics/pokemon/toxtricity/low_key/follow_normal.pal rename to graphics/pokemon/toxtricity/low_key/overworld_normal.pal diff --git a/graphics/pokemon/toxtricity/low_key/follow_shiny.pal b/graphics/pokemon/toxtricity/low_key/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/toxtricity/low_key/follow_shiny.pal rename to graphics/pokemon/toxtricity/low_key/overworld_shiny.pal diff --git a/graphics/pokemon/toxtricity/follower.png b/graphics/pokemon/toxtricity/overworld.png similarity index 100% rename from graphics/pokemon/toxtricity/follower.png rename to graphics/pokemon/toxtricity/overworld.png diff --git a/graphics/pokemon/toxtricity/follow_normal.pal b/graphics/pokemon/toxtricity/overworld_normal.pal similarity index 100% rename from graphics/pokemon/toxtricity/follow_normal.pal rename to graphics/pokemon/toxtricity/overworld_normal.pal diff --git a/graphics/pokemon/toxtricity/follow_shiny.pal b/graphics/pokemon/toxtricity/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/toxtricity/follow_shiny.pal rename to graphics/pokemon/toxtricity/overworld_shiny.pal diff --git a/graphics/pokemon/tranquill/follower.png b/graphics/pokemon/tranquill/overworld.png similarity index 100% rename from graphics/pokemon/tranquill/follower.png rename to graphics/pokemon/tranquill/overworld.png diff --git a/graphics/pokemon/tranquill/follow_normal.pal b/graphics/pokemon/tranquill/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tranquill/follow_normal.pal rename to graphics/pokemon/tranquill/overworld_normal.pal diff --git a/graphics/pokemon/tranquill/follow_shiny.pal b/graphics/pokemon/tranquill/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tranquill/follow_shiny.pal rename to graphics/pokemon/tranquill/overworld_shiny.pal diff --git a/graphics/pokemon/trapinch/follower.png b/graphics/pokemon/trapinch/overworld.png similarity index 100% rename from graphics/pokemon/trapinch/follower.png rename to graphics/pokemon/trapinch/overworld.png diff --git a/graphics/pokemon/trapinch/follow_normal.pal b/graphics/pokemon/trapinch/overworld_normal.pal similarity index 100% rename from graphics/pokemon/trapinch/follow_normal.pal rename to graphics/pokemon/trapinch/overworld_normal.pal diff --git a/graphics/pokemon/trapinch/follow_shiny.pal b/graphics/pokemon/trapinch/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/trapinch/follow_shiny.pal rename to graphics/pokemon/trapinch/overworld_shiny.pal diff --git a/graphics/pokemon/treecko/follower.png b/graphics/pokemon/treecko/overworld.png similarity index 100% rename from graphics/pokemon/treecko/follower.png rename to graphics/pokemon/treecko/overworld.png diff --git a/graphics/pokemon/treecko/follow_normal.pal b/graphics/pokemon/treecko/overworld_normal.pal similarity index 100% rename from graphics/pokemon/treecko/follow_normal.pal rename to graphics/pokemon/treecko/overworld_normal.pal diff --git a/graphics/pokemon/treecko/follow_shiny.pal b/graphics/pokemon/treecko/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/treecko/follow_shiny.pal rename to graphics/pokemon/treecko/overworld_shiny.pal diff --git a/graphics/pokemon/trevenant/follower.png b/graphics/pokemon/trevenant/overworld.png similarity index 100% rename from graphics/pokemon/trevenant/follower.png rename to graphics/pokemon/trevenant/overworld.png diff --git a/graphics/pokemon/trevenant/follow_normal.pal b/graphics/pokemon/trevenant/overworld_normal.pal similarity index 100% rename from graphics/pokemon/trevenant/follow_normal.pal rename to graphics/pokemon/trevenant/overworld_normal.pal diff --git a/graphics/pokemon/trevenant/follow_shiny.pal b/graphics/pokemon/trevenant/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/trevenant/follow_shiny.pal rename to graphics/pokemon/trevenant/overworld_shiny.pal diff --git a/graphics/pokemon/tropius/follower.png b/graphics/pokemon/tropius/overworld.png similarity index 100% rename from graphics/pokemon/tropius/follower.png rename to graphics/pokemon/tropius/overworld.png diff --git a/graphics/pokemon/tropius/follow_normal.pal b/graphics/pokemon/tropius/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tropius/follow_normal.pal rename to graphics/pokemon/tropius/overworld_normal.pal diff --git a/graphics/pokemon/tropius/follow_shiny.pal b/graphics/pokemon/tropius/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tropius/follow_shiny.pal rename to graphics/pokemon/tropius/overworld_shiny.pal diff --git a/graphics/pokemon/trubbish/follower.png b/graphics/pokemon/trubbish/overworld.png similarity index 100% rename from graphics/pokemon/trubbish/follower.png rename to graphics/pokemon/trubbish/overworld.png diff --git a/graphics/pokemon/trubbish/follow_normal.pal b/graphics/pokemon/trubbish/overworld_normal.pal similarity index 100% rename from graphics/pokemon/trubbish/follow_normal.pal rename to graphics/pokemon/trubbish/overworld_normal.pal diff --git a/graphics/pokemon/trubbish/follow_shiny.pal b/graphics/pokemon/trubbish/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/trubbish/follow_shiny.pal rename to graphics/pokemon/trubbish/overworld_shiny.pal diff --git a/graphics/pokemon/trumbeak/follower.png b/graphics/pokemon/trumbeak/overworld.png similarity index 100% rename from graphics/pokemon/trumbeak/follower.png rename to graphics/pokemon/trumbeak/overworld.png diff --git a/graphics/pokemon/trumbeak/follow_normal.pal b/graphics/pokemon/trumbeak/overworld_normal.pal similarity index 100% rename from graphics/pokemon/trumbeak/follow_normal.pal rename to graphics/pokemon/trumbeak/overworld_normal.pal diff --git a/graphics/pokemon/trumbeak/follow_shiny.pal b/graphics/pokemon/trumbeak/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/trumbeak/follow_shiny.pal rename to graphics/pokemon/trumbeak/overworld_shiny.pal diff --git a/graphics/pokemon/tsareena/follower.png b/graphics/pokemon/tsareena/overworld.png similarity index 100% rename from graphics/pokemon/tsareena/follower.png rename to graphics/pokemon/tsareena/overworld.png diff --git a/graphics/pokemon/tsareena/follow_normal.pal b/graphics/pokemon/tsareena/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tsareena/follow_normal.pal rename to graphics/pokemon/tsareena/overworld_normal.pal diff --git a/graphics/pokemon/tsareena/follow_shiny.pal b/graphics/pokemon/tsareena/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tsareena/follow_shiny.pal rename to graphics/pokemon/tsareena/overworld_shiny.pal diff --git a/graphics/pokemon/turtonator/follower.png b/graphics/pokemon/turtonator/overworld.png similarity index 100% rename from graphics/pokemon/turtonator/follower.png rename to graphics/pokemon/turtonator/overworld.png diff --git a/graphics/pokemon/turtonator/follow_normal.pal b/graphics/pokemon/turtonator/overworld_normal.pal similarity index 100% rename from graphics/pokemon/turtonator/follow_normal.pal rename to graphics/pokemon/turtonator/overworld_normal.pal diff --git a/graphics/pokemon/turtonator/follow_shiny.pal b/graphics/pokemon/turtonator/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/turtonator/follow_shiny.pal rename to graphics/pokemon/turtonator/overworld_shiny.pal diff --git a/graphics/pokemon/turtwig/follower.png b/graphics/pokemon/turtwig/overworld.png similarity index 100% rename from graphics/pokemon/turtwig/follower.png rename to graphics/pokemon/turtwig/overworld.png diff --git a/graphics/pokemon/turtwig/follow_normal.pal b/graphics/pokemon/turtwig/overworld_normal.pal similarity index 100% rename from graphics/pokemon/turtwig/follow_normal.pal rename to graphics/pokemon/turtwig/overworld_normal.pal diff --git a/graphics/pokemon/turtwig/follow_shiny.pal b/graphics/pokemon/turtwig/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/turtwig/follow_shiny.pal rename to graphics/pokemon/turtwig/overworld_shiny.pal diff --git a/graphics/pokemon/tympole/follower.png b/graphics/pokemon/tympole/overworld.png similarity index 100% rename from graphics/pokemon/tympole/follower.png rename to graphics/pokemon/tympole/overworld.png diff --git a/graphics/pokemon/tympole/follow_normal.pal b/graphics/pokemon/tympole/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tympole/follow_normal.pal rename to graphics/pokemon/tympole/overworld_normal.pal diff --git a/graphics/pokemon/tympole/follow_shiny.pal b/graphics/pokemon/tympole/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tympole/follow_shiny.pal rename to graphics/pokemon/tympole/overworld_shiny.pal diff --git a/graphics/pokemon/tynamo/follower.png b/graphics/pokemon/tynamo/overworld.png similarity index 100% rename from graphics/pokemon/tynamo/follower.png rename to graphics/pokemon/tynamo/overworld.png diff --git a/graphics/pokemon/tynamo/follow_normal.pal b/graphics/pokemon/tynamo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tynamo/follow_normal.pal rename to graphics/pokemon/tynamo/overworld_normal.pal diff --git a/graphics/pokemon/tynamo/follow_shiny.pal b/graphics/pokemon/tynamo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tynamo/follow_shiny.pal rename to graphics/pokemon/tynamo/overworld_shiny.pal diff --git a/graphics/pokemon/type_null/follower.png b/graphics/pokemon/type_null/overworld.png similarity index 100% rename from graphics/pokemon/type_null/follower.png rename to graphics/pokemon/type_null/overworld.png diff --git a/graphics/pokemon/type_null/follow_normal.pal b/graphics/pokemon/type_null/overworld_normal.pal similarity index 100% rename from graphics/pokemon/type_null/follow_normal.pal rename to graphics/pokemon/type_null/overworld_normal.pal diff --git a/graphics/pokemon/type_null/follow_shiny.pal b/graphics/pokemon/type_null/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/type_null/follow_shiny.pal rename to graphics/pokemon/type_null/overworld_shiny.pal diff --git a/graphics/pokemon/typhlosion/hisuian/follower.png b/graphics/pokemon/typhlosion/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/follower.png rename to graphics/pokemon/typhlosion/hisuian/overworld.png diff --git a/graphics/pokemon/typhlosion/hisuian/follow_normal.pal b/graphics/pokemon/typhlosion/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/follow_normal.pal rename to graphics/pokemon/typhlosion/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/typhlosion/hisuian/follow_shiny.pal b/graphics/pokemon/typhlosion/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/typhlosion/hisuian/follow_shiny.pal rename to graphics/pokemon/typhlosion/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/typhlosion/follower.png b/graphics/pokemon/typhlosion/overworld.png similarity index 100% rename from graphics/pokemon/typhlosion/follower.png rename to graphics/pokemon/typhlosion/overworld.png diff --git a/graphics/pokemon/typhlosion/follow_normal.pal b/graphics/pokemon/typhlosion/overworld_normal.pal similarity index 100% rename from graphics/pokemon/typhlosion/follow_normal.pal rename to graphics/pokemon/typhlosion/overworld_normal.pal diff --git a/graphics/pokemon/typhlosion/follow_shiny.pal b/graphics/pokemon/typhlosion/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/typhlosion/follow_shiny.pal rename to graphics/pokemon/typhlosion/overworld_shiny.pal diff --git a/graphics/pokemon/tyranitar/follower.png b/graphics/pokemon/tyranitar/overworld.png similarity index 100% rename from graphics/pokemon/tyranitar/follower.png rename to graphics/pokemon/tyranitar/overworld.png diff --git a/graphics/pokemon/tyranitar/follow_normal.pal b/graphics/pokemon/tyranitar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tyranitar/follow_normal.pal rename to graphics/pokemon/tyranitar/overworld_normal.pal diff --git a/graphics/pokemon/tyranitar/follow_shiny.pal b/graphics/pokemon/tyranitar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tyranitar/follow_shiny.pal rename to graphics/pokemon/tyranitar/overworld_shiny.pal diff --git a/graphics/pokemon/tyrantrum/follower.png b/graphics/pokemon/tyrantrum/overworld.png similarity index 100% rename from graphics/pokemon/tyrantrum/follower.png rename to graphics/pokemon/tyrantrum/overworld.png diff --git a/graphics/pokemon/tyrantrum/follow_normal.pal b/graphics/pokemon/tyrantrum/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tyrantrum/follow_normal.pal rename to graphics/pokemon/tyrantrum/overworld_normal.pal diff --git a/graphics/pokemon/tyrantrum/follow_shiny.pal b/graphics/pokemon/tyrantrum/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tyrantrum/follow_shiny.pal rename to graphics/pokemon/tyrantrum/overworld_shiny.pal diff --git a/graphics/pokemon/tyrogue/follower.png b/graphics/pokemon/tyrogue/overworld.png similarity index 100% rename from graphics/pokemon/tyrogue/follower.png rename to graphics/pokemon/tyrogue/overworld.png diff --git a/graphics/pokemon/tyrogue/follow_normal.pal b/graphics/pokemon/tyrogue/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tyrogue/follow_normal.pal rename to graphics/pokemon/tyrogue/overworld_normal.pal diff --git a/graphics/pokemon/tyrogue/follow_shiny.pal b/graphics/pokemon/tyrogue/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tyrogue/follow_shiny.pal rename to graphics/pokemon/tyrogue/overworld_shiny.pal diff --git a/graphics/pokemon/tyrunt/follower.png b/graphics/pokemon/tyrunt/overworld.png similarity index 100% rename from graphics/pokemon/tyrunt/follower.png rename to graphics/pokemon/tyrunt/overworld.png diff --git a/graphics/pokemon/tyrunt/follow_normal.pal b/graphics/pokemon/tyrunt/overworld_normal.pal similarity index 100% rename from graphics/pokemon/tyrunt/follow_normal.pal rename to graphics/pokemon/tyrunt/overworld_normal.pal diff --git a/graphics/pokemon/tyrunt/follow_shiny.pal b/graphics/pokemon/tyrunt/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/tyrunt/follow_shiny.pal rename to graphics/pokemon/tyrunt/overworld_shiny.pal diff --git a/graphics/pokemon/umbreon/follower.png b/graphics/pokemon/umbreon/overworld.png similarity index 100% rename from graphics/pokemon/umbreon/follower.png rename to graphics/pokemon/umbreon/overworld.png diff --git a/graphics/pokemon/umbreon/follow_normal.pal b/graphics/pokemon/umbreon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/umbreon/follow_normal.pal rename to graphics/pokemon/umbreon/overworld_normal.pal diff --git a/graphics/pokemon/umbreon/follow_shiny.pal b/graphics/pokemon/umbreon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/umbreon/follow_shiny.pal rename to graphics/pokemon/umbreon/overworld_shiny.pal diff --git a/graphics/pokemon/unfezant/follower.png b/graphics/pokemon/unfezant/overworld.png similarity index 100% rename from graphics/pokemon/unfezant/follower.png rename to graphics/pokemon/unfezant/overworld.png diff --git a/graphics/pokemon/unfezant/follow_normal.pal b/graphics/pokemon/unfezant/overworld_normal.pal similarity index 100% rename from graphics/pokemon/unfezant/follow_normal.pal rename to graphics/pokemon/unfezant/overworld_normal.pal diff --git a/graphics/pokemon/unfezant/follow_shiny.pal b/graphics/pokemon/unfezant/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/unfezant/follow_shiny.pal rename to graphics/pokemon/unfezant/overworld_shiny.pal diff --git a/graphics/pokemon/unfezant_f/follower.png b/graphics/pokemon/unfezant_f/overworld.png similarity index 100% rename from graphics/pokemon/unfezant_f/follower.png rename to graphics/pokemon/unfezant_f/overworld.png diff --git a/graphics/pokemon/unown/b/follower.png b/graphics/pokemon/unown/b/overworld.png similarity index 100% rename from graphics/pokemon/unown/b/follower.png rename to graphics/pokemon/unown/b/overworld.png diff --git a/graphics/pokemon/unown/c/follower.png b/graphics/pokemon/unown/c/overworld.png similarity index 100% rename from graphics/pokemon/unown/c/follower.png rename to graphics/pokemon/unown/c/overworld.png diff --git a/graphics/pokemon/unown/d/follower.png b/graphics/pokemon/unown/d/overworld.png similarity index 100% rename from graphics/pokemon/unown/d/follower.png rename to graphics/pokemon/unown/d/overworld.png diff --git a/graphics/pokemon/unown/e/follower.png b/graphics/pokemon/unown/e/overworld.png similarity index 100% rename from graphics/pokemon/unown/e/follower.png rename to graphics/pokemon/unown/e/overworld.png diff --git a/graphics/pokemon/unown/exclamation_mark/follower.png b/graphics/pokemon/unown/exclamation_mark/overworld.png similarity index 100% rename from graphics/pokemon/unown/exclamation_mark/follower.png rename to graphics/pokemon/unown/exclamation_mark/overworld.png diff --git a/graphics/pokemon/unown/f/follower.png b/graphics/pokemon/unown/f/overworld.png similarity index 100% rename from graphics/pokemon/unown/f/follower.png rename to graphics/pokemon/unown/f/overworld.png diff --git a/graphics/pokemon/unown/g/follower.png b/graphics/pokemon/unown/g/overworld.png similarity index 100% rename from graphics/pokemon/unown/g/follower.png rename to graphics/pokemon/unown/g/overworld.png diff --git a/graphics/pokemon/unown/h/follower.png b/graphics/pokemon/unown/h/overworld.png similarity index 100% rename from graphics/pokemon/unown/h/follower.png rename to graphics/pokemon/unown/h/overworld.png diff --git a/graphics/pokemon/unown/i/follower.png b/graphics/pokemon/unown/i/overworld.png similarity index 100% rename from graphics/pokemon/unown/i/follower.png rename to graphics/pokemon/unown/i/overworld.png diff --git a/graphics/pokemon/unown/j/follower.png b/graphics/pokemon/unown/j/overworld.png similarity index 100% rename from graphics/pokemon/unown/j/follower.png rename to graphics/pokemon/unown/j/overworld.png diff --git a/graphics/pokemon/unown/k/follower.png b/graphics/pokemon/unown/k/overworld.png similarity index 100% rename from graphics/pokemon/unown/k/follower.png rename to graphics/pokemon/unown/k/overworld.png diff --git a/graphics/pokemon/unown/l/follower.png b/graphics/pokemon/unown/l/overworld.png similarity index 100% rename from graphics/pokemon/unown/l/follower.png rename to graphics/pokemon/unown/l/overworld.png diff --git a/graphics/pokemon/unown/m/follower.png b/graphics/pokemon/unown/m/overworld.png similarity index 100% rename from graphics/pokemon/unown/m/follower.png rename to graphics/pokemon/unown/m/overworld.png diff --git a/graphics/pokemon/unown/n/follower.png b/graphics/pokemon/unown/n/overworld.png similarity index 100% rename from graphics/pokemon/unown/n/follower.png rename to graphics/pokemon/unown/n/overworld.png diff --git a/graphics/pokemon/unown/o/follower.png b/graphics/pokemon/unown/o/overworld.png similarity index 100% rename from graphics/pokemon/unown/o/follower.png rename to graphics/pokemon/unown/o/overworld.png diff --git a/graphics/pokemon/unown/follower.png b/graphics/pokemon/unown/overworld.png similarity index 100% rename from graphics/pokemon/unown/follower.png rename to graphics/pokemon/unown/overworld.png diff --git a/graphics/pokemon/unown/follow_normal.pal b/graphics/pokemon/unown/overworld_normal.pal similarity index 100% rename from graphics/pokemon/unown/follow_normal.pal rename to graphics/pokemon/unown/overworld_normal.pal diff --git a/graphics/pokemon/unown/follow_shiny.pal b/graphics/pokemon/unown/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/unown/follow_shiny.pal rename to graphics/pokemon/unown/overworld_shiny.pal diff --git a/graphics/pokemon/unown/p/follower.png b/graphics/pokemon/unown/p/overworld.png similarity index 100% rename from graphics/pokemon/unown/p/follower.png rename to graphics/pokemon/unown/p/overworld.png diff --git a/graphics/pokemon/unown/q/follower.png b/graphics/pokemon/unown/q/overworld.png similarity index 100% rename from graphics/pokemon/unown/q/follower.png rename to graphics/pokemon/unown/q/overworld.png diff --git a/graphics/pokemon/unown/question_mark/follower.png b/graphics/pokemon/unown/question_mark/overworld.png similarity index 100% rename from graphics/pokemon/unown/question_mark/follower.png rename to graphics/pokemon/unown/question_mark/overworld.png diff --git a/graphics/pokemon/unown/r/follower.png b/graphics/pokemon/unown/r/overworld.png similarity index 100% rename from graphics/pokemon/unown/r/follower.png rename to graphics/pokemon/unown/r/overworld.png diff --git a/graphics/pokemon/unown/s/follower.png b/graphics/pokemon/unown/s/overworld.png similarity index 100% rename from graphics/pokemon/unown/s/follower.png rename to graphics/pokemon/unown/s/overworld.png diff --git a/graphics/pokemon/unown/t/follower.png b/graphics/pokemon/unown/t/overworld.png similarity index 100% rename from graphics/pokemon/unown/t/follower.png rename to graphics/pokemon/unown/t/overworld.png diff --git a/graphics/pokemon/unown/u/follower.png b/graphics/pokemon/unown/u/overworld.png similarity index 100% rename from graphics/pokemon/unown/u/follower.png rename to graphics/pokemon/unown/u/overworld.png diff --git a/graphics/pokemon/unown/v/follower.png b/graphics/pokemon/unown/v/overworld.png similarity index 100% rename from graphics/pokemon/unown/v/follower.png rename to graphics/pokemon/unown/v/overworld.png diff --git a/graphics/pokemon/unown/w/follower.png b/graphics/pokemon/unown/w/overworld.png similarity index 100% rename from graphics/pokemon/unown/w/follower.png rename to graphics/pokemon/unown/w/overworld.png diff --git a/graphics/pokemon/unown/x/follower.png b/graphics/pokemon/unown/x/overworld.png similarity index 100% rename from graphics/pokemon/unown/x/follower.png rename to graphics/pokemon/unown/x/overworld.png diff --git a/graphics/pokemon/unown/y/follower.png b/graphics/pokemon/unown/y/overworld.png similarity index 100% rename from graphics/pokemon/unown/y/follower.png rename to graphics/pokemon/unown/y/overworld.png diff --git a/graphics/pokemon/unown/z/follower.png b/graphics/pokemon/unown/z/overworld.png similarity index 100% rename from graphics/pokemon/unown/z/follower.png rename to graphics/pokemon/unown/z/overworld.png diff --git a/graphics/pokemon/ursaluna/bloodmoon/follower.png b/graphics/pokemon/ursaluna/bloodmoon/overworld.png similarity index 100% rename from graphics/pokemon/ursaluna/bloodmoon/follower.png rename to graphics/pokemon/ursaluna/bloodmoon/overworld.png diff --git a/graphics/pokemon/ursaluna/bloodmoon/follow_normal.pal b/graphics/pokemon/ursaluna/bloodmoon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ursaluna/bloodmoon/follow_normal.pal rename to graphics/pokemon/ursaluna/bloodmoon/overworld_normal.pal diff --git a/graphics/pokemon/ursaluna/follower.png b/graphics/pokemon/ursaluna/overworld.png similarity index 100% rename from graphics/pokemon/ursaluna/follower.png rename to graphics/pokemon/ursaluna/overworld.png diff --git a/graphics/pokemon/ursaluna/follow_normal.pal b/graphics/pokemon/ursaluna/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ursaluna/follow_normal.pal rename to graphics/pokemon/ursaluna/overworld_normal.pal diff --git a/graphics/pokemon/ursaluna/follow_shiny.pal b/graphics/pokemon/ursaluna/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ursaluna/follow_shiny.pal rename to graphics/pokemon/ursaluna/overworld_shiny.pal diff --git a/graphics/pokemon/ursaring/follower.png b/graphics/pokemon/ursaring/overworld.png similarity index 100% rename from graphics/pokemon/ursaring/follower.png rename to graphics/pokemon/ursaring/overworld.png diff --git a/graphics/pokemon/ursaring/follow_normal.pal b/graphics/pokemon/ursaring/overworld_normal.pal similarity index 100% rename from graphics/pokemon/ursaring/follow_normal.pal rename to graphics/pokemon/ursaring/overworld_normal.pal diff --git a/graphics/pokemon/ursaring/follow_shiny.pal b/graphics/pokemon/ursaring/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/ursaring/follow_shiny.pal rename to graphics/pokemon/ursaring/overworld_shiny.pal diff --git a/graphics/pokemon/urshifu/follower.png b/graphics/pokemon/urshifu/overworld.png similarity index 100% rename from graphics/pokemon/urshifu/follower.png rename to graphics/pokemon/urshifu/overworld.png diff --git a/graphics/pokemon/urshifu/follow_normal.pal b/graphics/pokemon/urshifu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/urshifu/follow_normal.pal rename to graphics/pokemon/urshifu/overworld_normal.pal diff --git a/graphics/pokemon/urshifu/follow_shiny.pal b/graphics/pokemon/urshifu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/urshifu/follow_shiny.pal rename to graphics/pokemon/urshifu/overworld_shiny.pal diff --git a/graphics/pokemon/uxie/follower.png b/graphics/pokemon/uxie/overworld.png similarity index 100% rename from graphics/pokemon/uxie/follower.png rename to graphics/pokemon/uxie/overworld.png diff --git a/graphics/pokemon/uxie/follow_normal.pal b/graphics/pokemon/uxie/overworld_normal.pal similarity index 100% rename from graphics/pokemon/uxie/follow_normal.pal rename to graphics/pokemon/uxie/overworld_normal.pal diff --git a/graphics/pokemon/uxie/follow_shiny.pal b/graphics/pokemon/uxie/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/uxie/follow_shiny.pal rename to graphics/pokemon/uxie/overworld_shiny.pal diff --git a/graphics/pokemon/vanillish/follower.png b/graphics/pokemon/vanillish/overworld.png similarity index 100% rename from graphics/pokemon/vanillish/follower.png rename to graphics/pokemon/vanillish/overworld.png diff --git a/graphics/pokemon/vanillish/follow_normal.pal b/graphics/pokemon/vanillish/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vanillish/follow_normal.pal rename to graphics/pokemon/vanillish/overworld_normal.pal diff --git a/graphics/pokemon/vanillish/follow_shiny.pal b/graphics/pokemon/vanillish/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vanillish/follow_shiny.pal rename to graphics/pokemon/vanillish/overworld_shiny.pal diff --git a/graphics/pokemon/vanillite/follower.png b/graphics/pokemon/vanillite/overworld.png similarity index 100% rename from graphics/pokemon/vanillite/follower.png rename to graphics/pokemon/vanillite/overworld.png diff --git a/graphics/pokemon/vanillite/follow_normal.pal b/graphics/pokemon/vanillite/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vanillite/follow_normal.pal rename to graphics/pokemon/vanillite/overworld_normal.pal diff --git a/graphics/pokemon/vanillite/follow_shiny.pal b/graphics/pokemon/vanillite/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vanillite/follow_shiny.pal rename to graphics/pokemon/vanillite/overworld_shiny.pal diff --git a/graphics/pokemon/vanilluxe/follower.png b/graphics/pokemon/vanilluxe/overworld.png similarity index 100% rename from graphics/pokemon/vanilluxe/follower.png rename to graphics/pokemon/vanilluxe/overworld.png diff --git a/graphics/pokemon/vanilluxe/follow_normal.pal b/graphics/pokemon/vanilluxe/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vanilluxe/follow_normal.pal rename to graphics/pokemon/vanilluxe/overworld_normal.pal diff --git a/graphics/pokemon/vanilluxe/follow_shiny.pal b/graphics/pokemon/vanilluxe/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vanilluxe/follow_shiny.pal rename to graphics/pokemon/vanilluxe/overworld_shiny.pal diff --git a/graphics/pokemon/vaporeon/follower.png b/graphics/pokemon/vaporeon/overworld.png similarity index 100% rename from graphics/pokemon/vaporeon/follower.png rename to graphics/pokemon/vaporeon/overworld.png diff --git a/graphics/pokemon/vaporeon/follow_normal.pal b/graphics/pokemon/vaporeon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vaporeon/follow_normal.pal rename to graphics/pokemon/vaporeon/overworld_normal.pal diff --git a/graphics/pokemon/vaporeon/follow_shiny.pal b/graphics/pokemon/vaporeon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vaporeon/follow_shiny.pal rename to graphics/pokemon/vaporeon/overworld_shiny.pal diff --git a/graphics/pokemon/venipede/follower.png b/graphics/pokemon/venipede/overworld.png similarity index 100% rename from graphics/pokemon/venipede/follower.png rename to graphics/pokemon/venipede/overworld.png diff --git a/graphics/pokemon/venipede/follow_normal.pal b/graphics/pokemon/venipede/overworld_normal.pal similarity index 100% rename from graphics/pokemon/venipede/follow_normal.pal rename to graphics/pokemon/venipede/overworld_normal.pal diff --git a/graphics/pokemon/venipede/follow_shiny.pal b/graphics/pokemon/venipede/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/venipede/follow_shiny.pal rename to graphics/pokemon/venipede/overworld_shiny.pal diff --git a/graphics/pokemon/venomoth/follower.png b/graphics/pokemon/venomoth/overworld.png similarity index 100% rename from graphics/pokemon/venomoth/follower.png rename to graphics/pokemon/venomoth/overworld.png diff --git a/graphics/pokemon/venomoth/follow_normal.pal b/graphics/pokemon/venomoth/overworld_normal.pal similarity index 100% rename from graphics/pokemon/venomoth/follow_normal.pal rename to graphics/pokemon/venomoth/overworld_normal.pal diff --git a/graphics/pokemon/venomoth/follow_shiny.pal b/graphics/pokemon/venomoth/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/venomoth/follow_shiny.pal rename to graphics/pokemon/venomoth/overworld_shiny.pal diff --git a/graphics/pokemon/venonat/follower.png b/graphics/pokemon/venonat/overworld.png similarity index 100% rename from graphics/pokemon/venonat/follower.png rename to graphics/pokemon/venonat/overworld.png diff --git a/graphics/pokemon/venonat/follow_normal.pal b/graphics/pokemon/venonat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/venonat/follow_normal.pal rename to graphics/pokemon/venonat/overworld_normal.pal diff --git a/graphics/pokemon/venonat/follow_shiny.pal b/graphics/pokemon/venonat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/venonat/follow_shiny.pal rename to graphics/pokemon/venonat/overworld_shiny.pal diff --git a/graphics/pokemon/venusaur/follower.png b/graphics/pokemon/venusaur/overworld.png similarity index 100% rename from graphics/pokemon/venusaur/follower.png rename to graphics/pokemon/venusaur/overworld.png diff --git a/graphics/pokemon/venusaur/follow_normal.pal b/graphics/pokemon/venusaur/overworld_normal.pal similarity index 100% rename from graphics/pokemon/venusaur/follow_normal.pal rename to graphics/pokemon/venusaur/overworld_normal.pal diff --git a/graphics/pokemon/venusaur/follow_shiny.pal b/graphics/pokemon/venusaur/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/venusaur/follow_shiny.pal rename to graphics/pokemon/venusaur/overworld_shiny.pal diff --git a/graphics/pokemon/vespiquen/follower.png b/graphics/pokemon/vespiquen/overworld.png similarity index 100% rename from graphics/pokemon/vespiquen/follower.png rename to graphics/pokemon/vespiquen/overworld.png diff --git a/graphics/pokemon/vespiquen/follow_normal.pal b/graphics/pokemon/vespiquen/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vespiquen/follow_normal.pal rename to graphics/pokemon/vespiquen/overworld_normal.pal diff --git a/graphics/pokemon/vespiquen/follow_shiny.pal b/graphics/pokemon/vespiquen/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vespiquen/follow_shiny.pal rename to graphics/pokemon/vespiquen/overworld_shiny.pal diff --git a/graphics/pokemon/vibrava/follower.png b/graphics/pokemon/vibrava/overworld.png similarity index 100% rename from graphics/pokemon/vibrava/follower.png rename to graphics/pokemon/vibrava/overworld.png diff --git a/graphics/pokemon/vibrava/follow_normal.pal b/graphics/pokemon/vibrava/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vibrava/follow_normal.pal rename to graphics/pokemon/vibrava/overworld_normal.pal diff --git a/graphics/pokemon/vibrava/follow_shiny.pal b/graphics/pokemon/vibrava/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vibrava/follow_shiny.pal rename to graphics/pokemon/vibrava/overworld_shiny.pal diff --git a/graphics/pokemon/victini/follower.png b/graphics/pokemon/victini/overworld.png similarity index 100% rename from graphics/pokemon/victini/follower.png rename to graphics/pokemon/victini/overworld.png diff --git a/graphics/pokemon/victini/follow_normal.pal b/graphics/pokemon/victini/overworld_normal.pal similarity index 100% rename from graphics/pokemon/victini/follow_normal.pal rename to graphics/pokemon/victini/overworld_normal.pal diff --git a/graphics/pokemon/victini/follow_shiny.pal b/graphics/pokemon/victini/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/victini/follow_shiny.pal rename to graphics/pokemon/victini/overworld_shiny.pal diff --git a/graphics/pokemon/victreebel/follower.png b/graphics/pokemon/victreebel/overworld.png similarity index 100% rename from graphics/pokemon/victreebel/follower.png rename to graphics/pokemon/victreebel/overworld.png diff --git a/graphics/pokemon/victreebel/follow_normal.pal b/graphics/pokemon/victreebel/overworld_normal.pal similarity index 100% rename from graphics/pokemon/victreebel/follow_normal.pal rename to graphics/pokemon/victreebel/overworld_normal.pal diff --git a/graphics/pokemon/victreebel/follow_shiny.pal b/graphics/pokemon/victreebel/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/victreebel/follow_shiny.pal rename to graphics/pokemon/victreebel/overworld_shiny.pal diff --git a/graphics/pokemon/vigoroth/follower.png b/graphics/pokemon/vigoroth/overworld.png similarity index 100% rename from graphics/pokemon/vigoroth/follower.png rename to graphics/pokemon/vigoroth/overworld.png diff --git a/graphics/pokemon/vigoroth/follow_normal.pal b/graphics/pokemon/vigoroth/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vigoroth/follow_normal.pal rename to graphics/pokemon/vigoroth/overworld_normal.pal diff --git a/graphics/pokemon/vigoroth/follow_shiny.pal b/graphics/pokemon/vigoroth/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vigoroth/follow_shiny.pal rename to graphics/pokemon/vigoroth/overworld_shiny.pal diff --git a/graphics/pokemon/vikavolt/follower.png b/graphics/pokemon/vikavolt/overworld.png similarity index 100% rename from graphics/pokemon/vikavolt/follower.png rename to graphics/pokemon/vikavolt/overworld.png diff --git a/graphics/pokemon/vikavolt/follow_normal.pal b/graphics/pokemon/vikavolt/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vikavolt/follow_normal.pal rename to graphics/pokemon/vikavolt/overworld_normal.pal diff --git a/graphics/pokemon/vikavolt/follow_shiny.pal b/graphics/pokemon/vikavolt/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vikavolt/follow_shiny.pal rename to graphics/pokemon/vikavolt/overworld_shiny.pal diff --git a/graphics/pokemon/vileplume/follower.png b/graphics/pokemon/vileplume/overworld.png similarity index 100% rename from graphics/pokemon/vileplume/follower.png rename to graphics/pokemon/vileplume/overworld.png diff --git a/graphics/pokemon/vileplume/follow_normal.pal b/graphics/pokemon/vileplume/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vileplume/follow_normal.pal rename to graphics/pokemon/vileplume/overworld_normal.pal diff --git a/graphics/pokemon/vileplume/follow_shiny.pal b/graphics/pokemon/vileplume/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vileplume/follow_shiny.pal rename to graphics/pokemon/vileplume/overworld_shiny.pal diff --git a/graphics/pokemon/virizion/follower.png b/graphics/pokemon/virizion/overworld.png similarity index 100% rename from graphics/pokemon/virizion/follower.png rename to graphics/pokemon/virizion/overworld.png diff --git a/graphics/pokemon/virizion/follow_normal.pal b/graphics/pokemon/virizion/overworld_normal.pal similarity index 100% rename from graphics/pokemon/virizion/follow_normal.pal rename to graphics/pokemon/virizion/overworld_normal.pal diff --git a/graphics/pokemon/virizion/follow_shiny.pal b/graphics/pokemon/virizion/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/virizion/follow_shiny.pal rename to graphics/pokemon/virizion/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/archipelago/follower.png b/graphics/pokemon/vivillon/archipelago/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/archipelago/follower.png rename to graphics/pokemon/vivillon/archipelago/overworld.png diff --git a/graphics/pokemon/vivillon/archipelago/follow_normal.pal b/graphics/pokemon/vivillon/archipelago/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/archipelago/follow_normal.pal rename to graphics/pokemon/vivillon/archipelago/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/archipelago/follow_shiny.pal b/graphics/pokemon/vivillon/archipelago/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/archipelago/follow_shiny.pal rename to graphics/pokemon/vivillon/archipelago/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/continental/follower.png b/graphics/pokemon/vivillon/continental/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/continental/follower.png rename to graphics/pokemon/vivillon/continental/overworld.png diff --git a/graphics/pokemon/vivillon/continental/follow_normal.pal b/graphics/pokemon/vivillon/continental/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/continental/follow_normal.pal rename to graphics/pokemon/vivillon/continental/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/continental/follow_shiny.pal b/graphics/pokemon/vivillon/continental/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/continental/follow_shiny.pal rename to graphics/pokemon/vivillon/continental/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/elegant/follower.png b/graphics/pokemon/vivillon/elegant/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/elegant/follower.png rename to graphics/pokemon/vivillon/elegant/overworld.png diff --git a/graphics/pokemon/vivillon/elegant/follow_normal.pal b/graphics/pokemon/vivillon/elegant/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/elegant/follow_normal.pal rename to graphics/pokemon/vivillon/elegant/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/elegant/follow_shiny.pal b/graphics/pokemon/vivillon/elegant/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/elegant/follow_shiny.pal rename to graphics/pokemon/vivillon/elegant/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/fancy/follower.png b/graphics/pokemon/vivillon/fancy/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/fancy/follower.png rename to graphics/pokemon/vivillon/fancy/overworld.png diff --git a/graphics/pokemon/vivillon/fancy/follow_normal.pal b/graphics/pokemon/vivillon/fancy/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/fancy/follow_normal.pal rename to graphics/pokemon/vivillon/fancy/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/fancy/follow_shiny.pal b/graphics/pokemon/vivillon/fancy/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/fancy/follow_shiny.pal rename to graphics/pokemon/vivillon/fancy/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/garden/follower.png b/graphics/pokemon/vivillon/garden/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/garden/follower.png rename to graphics/pokemon/vivillon/garden/overworld.png diff --git a/graphics/pokemon/vivillon/garden/follow_normal.pal b/graphics/pokemon/vivillon/garden/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/garden/follow_normal.pal rename to graphics/pokemon/vivillon/garden/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/garden/follow_shiny.pal b/graphics/pokemon/vivillon/garden/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/garden/follow_shiny.pal rename to graphics/pokemon/vivillon/garden/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/high_plains/follower.png b/graphics/pokemon/vivillon/high_plains/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/high_plains/follower.png rename to graphics/pokemon/vivillon/high_plains/overworld.png diff --git a/graphics/pokemon/vivillon/high_plains/follow_normal.pal b/graphics/pokemon/vivillon/high_plains/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/high_plains/follow_normal.pal rename to graphics/pokemon/vivillon/high_plains/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/high_plains/follow_shiny.pal b/graphics/pokemon/vivillon/high_plains/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/high_plains/follow_shiny.pal rename to graphics/pokemon/vivillon/high_plains/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/jungle/follower.png b/graphics/pokemon/vivillon/jungle/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/jungle/follower.png rename to graphics/pokemon/vivillon/jungle/overworld.png diff --git a/graphics/pokemon/vivillon/jungle/follow_normal.pal b/graphics/pokemon/vivillon/jungle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/jungle/follow_normal.pal rename to graphics/pokemon/vivillon/jungle/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/jungle/follow_shiny.pal b/graphics/pokemon/vivillon/jungle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/jungle/follow_shiny.pal rename to graphics/pokemon/vivillon/jungle/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/marine/follower.png b/graphics/pokemon/vivillon/marine/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/marine/follower.png rename to graphics/pokemon/vivillon/marine/overworld.png diff --git a/graphics/pokemon/vivillon/marine/follow_normal.pal b/graphics/pokemon/vivillon/marine/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/marine/follow_normal.pal rename to graphics/pokemon/vivillon/marine/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/marine/follow_shiny.pal b/graphics/pokemon/vivillon/marine/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/marine/follow_shiny.pal rename to graphics/pokemon/vivillon/marine/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/meadow/follower.png b/graphics/pokemon/vivillon/meadow/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/meadow/follower.png rename to graphics/pokemon/vivillon/meadow/overworld.png diff --git a/graphics/pokemon/vivillon/meadow/follow_normal.pal b/graphics/pokemon/vivillon/meadow/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/meadow/follow_normal.pal rename to graphics/pokemon/vivillon/meadow/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/meadow/follow_shiny.pal b/graphics/pokemon/vivillon/meadow/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/meadow/follow_shiny.pal rename to graphics/pokemon/vivillon/meadow/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/modern/follower.png b/graphics/pokemon/vivillon/modern/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/modern/follower.png rename to graphics/pokemon/vivillon/modern/overworld.png diff --git a/graphics/pokemon/vivillon/modern/follow_normal.pal b/graphics/pokemon/vivillon/modern/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/modern/follow_normal.pal rename to graphics/pokemon/vivillon/modern/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/modern/follow_shiny.pal b/graphics/pokemon/vivillon/modern/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/modern/follow_shiny.pal rename to graphics/pokemon/vivillon/modern/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/monsoon/follower.png b/graphics/pokemon/vivillon/monsoon/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/monsoon/follower.png rename to graphics/pokemon/vivillon/monsoon/overworld.png diff --git a/graphics/pokemon/vivillon/monsoon/follow_normal.pal b/graphics/pokemon/vivillon/monsoon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/monsoon/follow_normal.pal rename to graphics/pokemon/vivillon/monsoon/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/monsoon/follow_shiny.pal b/graphics/pokemon/vivillon/monsoon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/monsoon/follow_shiny.pal rename to graphics/pokemon/vivillon/monsoon/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/ocean/follower.png b/graphics/pokemon/vivillon/ocean/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/ocean/follower.png rename to graphics/pokemon/vivillon/ocean/overworld.png diff --git a/graphics/pokemon/vivillon/ocean/follow_normal.pal b/graphics/pokemon/vivillon/ocean/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/ocean/follow_normal.pal rename to graphics/pokemon/vivillon/ocean/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/ocean/follow_shiny.pal b/graphics/pokemon/vivillon/ocean/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/ocean/follow_shiny.pal rename to graphics/pokemon/vivillon/ocean/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/follower.png b/graphics/pokemon/vivillon/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/follower.png rename to graphics/pokemon/vivillon/overworld.png diff --git a/graphics/pokemon/vivillon/follow_normal.pal b/graphics/pokemon/vivillon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/follow_normal.pal rename to graphics/pokemon/vivillon/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/follow_shiny.pal b/graphics/pokemon/vivillon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/follow_shiny.pal rename to graphics/pokemon/vivillon/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/poke_ball/follower.png b/graphics/pokemon/vivillon/poke_ball/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/poke_ball/follower.png rename to graphics/pokemon/vivillon/poke_ball/overworld.png diff --git a/graphics/pokemon/vivillon/poke_ball/follow_normal.pal b/graphics/pokemon/vivillon/poke_ball/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/poke_ball/follow_normal.pal rename to graphics/pokemon/vivillon/poke_ball/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/poke_ball/follow_shiny.pal b/graphics/pokemon/vivillon/poke_ball/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/poke_ball/follow_shiny.pal rename to graphics/pokemon/vivillon/poke_ball/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/polar/follower.png b/graphics/pokemon/vivillon/polar/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/polar/follower.png rename to graphics/pokemon/vivillon/polar/overworld.png diff --git a/graphics/pokemon/vivillon/polar/follow_normal.pal b/graphics/pokemon/vivillon/polar/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/polar/follow_normal.pal rename to graphics/pokemon/vivillon/polar/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/polar/follow_shiny.pal b/graphics/pokemon/vivillon/polar/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/polar/follow_shiny.pal rename to graphics/pokemon/vivillon/polar/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/river/follower.png b/graphics/pokemon/vivillon/river/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/river/follower.png rename to graphics/pokemon/vivillon/river/overworld.png diff --git a/graphics/pokemon/vivillon/river/follow_normal.pal b/graphics/pokemon/vivillon/river/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/river/follow_normal.pal rename to graphics/pokemon/vivillon/river/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/river/follow_shiny.pal b/graphics/pokemon/vivillon/river/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/river/follow_shiny.pal rename to graphics/pokemon/vivillon/river/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/sandstorm/follower.png b/graphics/pokemon/vivillon/sandstorm/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/sandstorm/follower.png rename to graphics/pokemon/vivillon/sandstorm/overworld.png diff --git a/graphics/pokemon/vivillon/sandstorm/follow_normal.pal b/graphics/pokemon/vivillon/sandstorm/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/sandstorm/follow_normal.pal rename to graphics/pokemon/vivillon/sandstorm/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/sandstorm/follow_shiny.pal b/graphics/pokemon/vivillon/sandstorm/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/sandstorm/follow_shiny.pal rename to graphics/pokemon/vivillon/sandstorm/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/savanna/follower.png b/graphics/pokemon/vivillon/savanna/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/savanna/follower.png rename to graphics/pokemon/vivillon/savanna/overworld.png diff --git a/graphics/pokemon/vivillon/savanna/follow_normal.pal b/graphics/pokemon/vivillon/savanna/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/savanna/follow_normal.pal rename to graphics/pokemon/vivillon/savanna/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/savanna/follow_shiny.pal b/graphics/pokemon/vivillon/savanna/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/savanna/follow_shiny.pal rename to graphics/pokemon/vivillon/savanna/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/sun/follower.png b/graphics/pokemon/vivillon/sun/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/sun/follower.png rename to graphics/pokemon/vivillon/sun/overworld.png diff --git a/graphics/pokemon/vivillon/sun/follow_normal.pal b/graphics/pokemon/vivillon/sun/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/sun/follow_normal.pal rename to graphics/pokemon/vivillon/sun/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/sun/follow_shiny.pal b/graphics/pokemon/vivillon/sun/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/sun/follow_shiny.pal rename to graphics/pokemon/vivillon/sun/overworld_shiny.pal diff --git a/graphics/pokemon/vivillon/tundra/follower.png b/graphics/pokemon/vivillon/tundra/overworld.png similarity index 100% rename from graphics/pokemon/vivillon/tundra/follower.png rename to graphics/pokemon/vivillon/tundra/overworld.png diff --git a/graphics/pokemon/vivillon/tundra/follow_normal.pal b/graphics/pokemon/vivillon/tundra/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vivillon/tundra/follow_normal.pal rename to graphics/pokemon/vivillon/tundra/overworld_normal.pal diff --git a/graphics/pokemon/vivillon/tundra/follow_shiny.pal b/graphics/pokemon/vivillon/tundra/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vivillon/tundra/follow_shiny.pal rename to graphics/pokemon/vivillon/tundra/overworld_shiny.pal diff --git a/graphics/pokemon/volbeat/follower.png b/graphics/pokemon/volbeat/overworld.png similarity index 100% rename from graphics/pokemon/volbeat/follower.png rename to graphics/pokemon/volbeat/overworld.png diff --git a/graphics/pokemon/volbeat/follow_normal.pal b/graphics/pokemon/volbeat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/volbeat/follow_normal.pal rename to graphics/pokemon/volbeat/overworld_normal.pal diff --git a/graphics/pokemon/volbeat/follow_shiny.pal b/graphics/pokemon/volbeat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/volbeat/follow_shiny.pal rename to graphics/pokemon/volbeat/overworld_shiny.pal diff --git a/graphics/pokemon/volcanion/follower.png b/graphics/pokemon/volcanion/overworld.png similarity index 100% rename from graphics/pokemon/volcanion/follower.png rename to graphics/pokemon/volcanion/overworld.png diff --git a/graphics/pokemon/volcanion/follow_normal.pal b/graphics/pokemon/volcanion/overworld_normal.pal similarity index 100% rename from graphics/pokemon/volcanion/follow_normal.pal rename to graphics/pokemon/volcanion/overworld_normal.pal diff --git a/graphics/pokemon/volcanion/follow_shiny.pal b/graphics/pokemon/volcanion/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/volcanion/follow_shiny.pal rename to graphics/pokemon/volcanion/overworld_shiny.pal diff --git a/graphics/pokemon/volcarona/follower.png b/graphics/pokemon/volcarona/overworld.png similarity index 100% rename from graphics/pokemon/volcarona/follower.png rename to graphics/pokemon/volcarona/overworld.png diff --git a/graphics/pokemon/volcarona/follow_normal.pal b/graphics/pokemon/volcarona/overworld_normal.pal similarity index 100% rename from graphics/pokemon/volcarona/follow_normal.pal rename to graphics/pokemon/volcarona/overworld_normal.pal diff --git a/graphics/pokemon/volcarona/follow_shiny.pal b/graphics/pokemon/volcarona/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/volcarona/follow_shiny.pal rename to graphics/pokemon/volcarona/overworld_shiny.pal diff --git a/graphics/pokemon/voltorb/hisuian/follower.png b/graphics/pokemon/voltorb/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/voltorb/hisuian/follower.png rename to graphics/pokemon/voltorb/hisuian/overworld.png diff --git a/graphics/pokemon/voltorb/hisuian/follow_normal.pal b/graphics/pokemon/voltorb/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/voltorb/hisuian/follow_normal.pal rename to graphics/pokemon/voltorb/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/voltorb/hisuian/follow_shiny.pal b/graphics/pokemon/voltorb/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/voltorb/hisuian/follow_shiny.pal rename to graphics/pokemon/voltorb/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/voltorb/follower.png b/graphics/pokemon/voltorb/overworld.png similarity index 100% rename from graphics/pokemon/voltorb/follower.png rename to graphics/pokemon/voltorb/overworld.png diff --git a/graphics/pokemon/voltorb/follow_normal.pal b/graphics/pokemon/voltorb/overworld_normal.pal similarity index 100% rename from graphics/pokemon/voltorb/follow_normal.pal rename to graphics/pokemon/voltorb/overworld_normal.pal diff --git a/graphics/pokemon/voltorb/follow_shiny.pal b/graphics/pokemon/voltorb/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/voltorb/follow_shiny.pal rename to graphics/pokemon/voltorb/overworld_shiny.pal diff --git a/graphics/pokemon/vullaby/follower.png b/graphics/pokemon/vullaby/overworld.png similarity index 100% rename from graphics/pokemon/vullaby/follower.png rename to graphics/pokemon/vullaby/overworld.png diff --git a/graphics/pokemon/vullaby/follow_normal.pal b/graphics/pokemon/vullaby/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vullaby/follow_normal.pal rename to graphics/pokemon/vullaby/overworld_normal.pal diff --git a/graphics/pokemon/vullaby/follow_shiny.pal b/graphics/pokemon/vullaby/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vullaby/follow_shiny.pal rename to graphics/pokemon/vullaby/overworld_shiny.pal diff --git a/graphics/pokemon/vulpix/alolan/follower.png b/graphics/pokemon/vulpix/alolan/overworld.png similarity index 100% rename from graphics/pokemon/vulpix/alolan/follower.png rename to graphics/pokemon/vulpix/alolan/overworld.png diff --git a/graphics/pokemon/vulpix/alolan/follow_normal.pal b/graphics/pokemon/vulpix/alolan/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vulpix/alolan/follow_normal.pal rename to graphics/pokemon/vulpix/alolan/overworld_normal.pal diff --git a/graphics/pokemon/vulpix/alolan/follow_shiny.pal b/graphics/pokemon/vulpix/alolan/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vulpix/alolan/follow_shiny.pal rename to graphics/pokemon/vulpix/alolan/overworld_shiny.pal diff --git a/graphics/pokemon/vulpix/follower.png b/graphics/pokemon/vulpix/overworld.png similarity index 100% rename from graphics/pokemon/vulpix/follower.png rename to graphics/pokemon/vulpix/overworld.png diff --git a/graphics/pokemon/vulpix/follow_normal.pal b/graphics/pokemon/vulpix/overworld_normal.pal similarity index 100% rename from graphics/pokemon/vulpix/follow_normal.pal rename to graphics/pokemon/vulpix/overworld_normal.pal diff --git a/graphics/pokemon/vulpix/follow_shiny.pal b/graphics/pokemon/vulpix/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/vulpix/follow_shiny.pal rename to graphics/pokemon/vulpix/overworld_shiny.pal diff --git a/graphics/pokemon/wailmer/follower.png b/graphics/pokemon/wailmer/overworld.png similarity index 100% rename from graphics/pokemon/wailmer/follower.png rename to graphics/pokemon/wailmer/overworld.png diff --git a/graphics/pokemon/wailmer/follow_normal.pal b/graphics/pokemon/wailmer/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wailmer/follow_normal.pal rename to graphics/pokemon/wailmer/overworld_normal.pal diff --git a/graphics/pokemon/wailmer/follow_shiny.pal b/graphics/pokemon/wailmer/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wailmer/follow_shiny.pal rename to graphics/pokemon/wailmer/overworld_shiny.pal diff --git a/graphics/pokemon/wailord/follower.png b/graphics/pokemon/wailord/overworld.png similarity index 100% rename from graphics/pokemon/wailord/follower.png rename to graphics/pokemon/wailord/overworld.png diff --git a/graphics/pokemon/wailord/follow_normal.pal b/graphics/pokemon/wailord/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wailord/follow_normal.pal rename to graphics/pokemon/wailord/overworld_normal.pal diff --git a/graphics/pokemon/wailord/follow_shiny.pal b/graphics/pokemon/wailord/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wailord/follow_shiny.pal rename to graphics/pokemon/wailord/overworld_shiny.pal diff --git a/graphics/pokemon/walrein/follower.png b/graphics/pokemon/walrein/overworld.png similarity index 100% rename from graphics/pokemon/walrein/follower.png rename to graphics/pokemon/walrein/overworld.png diff --git a/graphics/pokemon/walrein/follow_normal.pal b/graphics/pokemon/walrein/overworld_normal.pal similarity index 100% rename from graphics/pokemon/walrein/follow_normal.pal rename to graphics/pokemon/walrein/overworld_normal.pal diff --git a/graphics/pokemon/walrein/follow_shiny.pal b/graphics/pokemon/walrein/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/walrein/follow_shiny.pal rename to graphics/pokemon/walrein/overworld_shiny.pal diff --git a/graphics/pokemon/wartortle/follower.png b/graphics/pokemon/wartortle/overworld.png similarity index 100% rename from graphics/pokemon/wartortle/follower.png rename to graphics/pokemon/wartortle/overworld.png diff --git a/graphics/pokemon/wartortle/follow_normal.pal b/graphics/pokemon/wartortle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wartortle/follow_normal.pal rename to graphics/pokemon/wartortle/overworld_normal.pal diff --git a/graphics/pokemon/wartortle/follow_shiny.pal b/graphics/pokemon/wartortle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wartortle/follow_shiny.pal rename to graphics/pokemon/wartortle/overworld_shiny.pal diff --git a/graphics/pokemon/watchog/follower.png b/graphics/pokemon/watchog/overworld.png similarity index 100% rename from graphics/pokemon/watchog/follower.png rename to graphics/pokemon/watchog/overworld.png diff --git a/graphics/pokemon/watchog/follow_normal.pal b/graphics/pokemon/watchog/overworld_normal.pal similarity index 100% rename from graphics/pokemon/watchog/follow_normal.pal rename to graphics/pokemon/watchog/overworld_normal.pal diff --git a/graphics/pokemon/watchog/follow_shiny.pal b/graphics/pokemon/watchog/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/watchog/follow_shiny.pal rename to graphics/pokemon/watchog/overworld_shiny.pal diff --git a/graphics/pokemon/weavile/follower.png b/graphics/pokemon/weavile/overworld.png similarity index 100% rename from graphics/pokemon/weavile/follower.png rename to graphics/pokemon/weavile/overworld.png diff --git a/graphics/pokemon/weavile/follow_normal.pal b/graphics/pokemon/weavile/overworld_normal.pal similarity index 100% rename from graphics/pokemon/weavile/follow_normal.pal rename to graphics/pokemon/weavile/overworld_normal.pal diff --git a/graphics/pokemon/weavile/follow_shiny.pal b/graphics/pokemon/weavile/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/weavile/follow_shiny.pal rename to graphics/pokemon/weavile/overworld_shiny.pal diff --git a/graphics/pokemon/weedle/follower.png b/graphics/pokemon/weedle/overworld.png similarity index 100% rename from graphics/pokemon/weedle/follower.png rename to graphics/pokemon/weedle/overworld.png diff --git a/graphics/pokemon/weedle/follow_normal.pal b/graphics/pokemon/weedle/overworld_normal.pal similarity index 100% rename from graphics/pokemon/weedle/follow_normal.pal rename to graphics/pokemon/weedle/overworld_normal.pal diff --git a/graphics/pokemon/weedle/follow_shiny.pal b/graphics/pokemon/weedle/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/weedle/follow_shiny.pal rename to graphics/pokemon/weedle/overworld_shiny.pal diff --git a/graphics/pokemon/weepinbell/follower.png b/graphics/pokemon/weepinbell/overworld.png similarity index 100% rename from graphics/pokemon/weepinbell/follower.png rename to graphics/pokemon/weepinbell/overworld.png diff --git a/graphics/pokemon/weepinbell/follow_normal.pal b/graphics/pokemon/weepinbell/overworld_normal.pal similarity index 100% rename from graphics/pokemon/weepinbell/follow_normal.pal rename to graphics/pokemon/weepinbell/overworld_normal.pal diff --git a/graphics/pokemon/weepinbell/follow_shiny.pal b/graphics/pokemon/weepinbell/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/weepinbell/follow_shiny.pal rename to graphics/pokemon/weepinbell/overworld_shiny.pal diff --git a/graphics/pokemon/weezing/galarian/follower.png b/graphics/pokemon/weezing/galarian/overworld.png similarity index 100% rename from graphics/pokemon/weezing/galarian/follower.png rename to graphics/pokemon/weezing/galarian/overworld.png diff --git a/graphics/pokemon/weezing/galarian/follow_normal.pal b/graphics/pokemon/weezing/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/weezing/galarian/follow_normal.pal rename to graphics/pokemon/weezing/galarian/overworld_normal.pal diff --git a/graphics/pokemon/weezing/galarian/follow_shiny.pal b/graphics/pokemon/weezing/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/weezing/galarian/follow_shiny.pal rename to graphics/pokemon/weezing/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/weezing/follower.png b/graphics/pokemon/weezing/overworld.png similarity index 100% rename from graphics/pokemon/weezing/follower.png rename to graphics/pokemon/weezing/overworld.png diff --git a/graphics/pokemon/weezing/follow_normal.pal b/graphics/pokemon/weezing/overworld_normal.pal similarity index 100% rename from graphics/pokemon/weezing/follow_normal.pal rename to graphics/pokemon/weezing/overworld_normal.pal diff --git a/graphics/pokemon/weezing/follow_shiny.pal b/graphics/pokemon/weezing/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/weezing/follow_shiny.pal rename to graphics/pokemon/weezing/overworld_shiny.pal diff --git a/graphics/pokemon/whimsicott/follower.png b/graphics/pokemon/whimsicott/overworld.png similarity index 100% rename from graphics/pokemon/whimsicott/follower.png rename to graphics/pokemon/whimsicott/overworld.png diff --git a/graphics/pokemon/whimsicott/follow_normal.pal b/graphics/pokemon/whimsicott/overworld_normal.pal similarity index 100% rename from graphics/pokemon/whimsicott/follow_normal.pal rename to graphics/pokemon/whimsicott/overworld_normal.pal diff --git a/graphics/pokemon/whimsicott/follow_shiny.pal b/graphics/pokemon/whimsicott/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/whimsicott/follow_shiny.pal rename to graphics/pokemon/whimsicott/overworld_shiny.pal diff --git a/graphics/pokemon/whirlipede/follower.png b/graphics/pokemon/whirlipede/overworld.png similarity index 100% rename from graphics/pokemon/whirlipede/follower.png rename to graphics/pokemon/whirlipede/overworld.png diff --git a/graphics/pokemon/whirlipede/follow_normal.pal b/graphics/pokemon/whirlipede/overworld_normal.pal similarity index 100% rename from graphics/pokemon/whirlipede/follow_normal.pal rename to graphics/pokemon/whirlipede/overworld_normal.pal diff --git a/graphics/pokemon/whirlipede/follow_shiny.pal b/graphics/pokemon/whirlipede/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/whirlipede/follow_shiny.pal rename to graphics/pokemon/whirlipede/overworld_shiny.pal diff --git a/graphics/pokemon/whiscash/follower.png b/graphics/pokemon/whiscash/overworld.png similarity index 100% rename from graphics/pokemon/whiscash/follower.png rename to graphics/pokemon/whiscash/overworld.png diff --git a/graphics/pokemon/whiscash/follow_normal.pal b/graphics/pokemon/whiscash/overworld_normal.pal similarity index 100% rename from graphics/pokemon/whiscash/follow_normal.pal rename to graphics/pokemon/whiscash/overworld_normal.pal diff --git a/graphics/pokemon/whiscash/follow_shiny.pal b/graphics/pokemon/whiscash/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/whiscash/follow_shiny.pal rename to graphics/pokemon/whiscash/overworld_shiny.pal diff --git a/graphics/pokemon/whismur/follower.png b/graphics/pokemon/whismur/overworld.png similarity index 100% rename from graphics/pokemon/whismur/follower.png rename to graphics/pokemon/whismur/overworld.png diff --git a/graphics/pokemon/whismur/follow_normal.pal b/graphics/pokemon/whismur/overworld_normal.pal similarity index 100% rename from graphics/pokemon/whismur/follow_normal.pal rename to graphics/pokemon/whismur/overworld_normal.pal diff --git a/graphics/pokemon/whismur/follow_shiny.pal b/graphics/pokemon/whismur/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/whismur/follow_shiny.pal rename to graphics/pokemon/whismur/overworld_shiny.pal diff --git a/graphics/pokemon/wigglytuff/follower.png b/graphics/pokemon/wigglytuff/overworld.png similarity index 100% rename from graphics/pokemon/wigglytuff/follower.png rename to graphics/pokemon/wigglytuff/overworld.png diff --git a/graphics/pokemon/wigglytuff/follow_normal.pal b/graphics/pokemon/wigglytuff/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wigglytuff/follow_normal.pal rename to graphics/pokemon/wigglytuff/overworld_normal.pal diff --git a/graphics/pokemon/wigglytuff/follow_shiny.pal b/graphics/pokemon/wigglytuff/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wigglytuff/follow_shiny.pal rename to graphics/pokemon/wigglytuff/overworld_shiny.pal diff --git a/graphics/pokemon/wimpod/follower.png b/graphics/pokemon/wimpod/overworld.png similarity index 100% rename from graphics/pokemon/wimpod/follower.png rename to graphics/pokemon/wimpod/overworld.png diff --git a/graphics/pokemon/wimpod/follow_normal.pal b/graphics/pokemon/wimpod/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wimpod/follow_normal.pal rename to graphics/pokemon/wimpod/overworld_normal.pal diff --git a/graphics/pokemon/wimpod/follow_shiny.pal b/graphics/pokemon/wimpod/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wimpod/follow_shiny.pal rename to graphics/pokemon/wimpod/overworld_shiny.pal diff --git a/graphics/pokemon/wingull/follower.png b/graphics/pokemon/wingull/overworld.png similarity index 100% rename from graphics/pokemon/wingull/follower.png rename to graphics/pokemon/wingull/overworld.png diff --git a/graphics/pokemon/wingull/follow_normal.pal b/graphics/pokemon/wingull/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wingull/follow_normal.pal rename to graphics/pokemon/wingull/overworld_normal.pal diff --git a/graphics/pokemon/wingull/follow_shiny.pal b/graphics/pokemon/wingull/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wingull/follow_shiny.pal rename to graphics/pokemon/wingull/overworld_shiny.pal diff --git a/graphics/pokemon/wishiwashi/follower.png b/graphics/pokemon/wishiwashi/overworld.png similarity index 100% rename from graphics/pokemon/wishiwashi/follower.png rename to graphics/pokemon/wishiwashi/overworld.png diff --git a/graphics/pokemon/wishiwashi/follow_normal.pal b/graphics/pokemon/wishiwashi/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wishiwashi/follow_normal.pal rename to graphics/pokemon/wishiwashi/overworld_normal.pal diff --git a/graphics/pokemon/wishiwashi/follow_shiny.pal b/graphics/pokemon/wishiwashi/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wishiwashi/follow_shiny.pal rename to graphics/pokemon/wishiwashi/overworld_shiny.pal diff --git a/graphics/pokemon/wobbuffet/follower.png b/graphics/pokemon/wobbuffet/overworld.png similarity index 100% rename from graphics/pokemon/wobbuffet/follower.png rename to graphics/pokemon/wobbuffet/overworld.png diff --git a/graphics/pokemon/wobbuffet/follow_normal.pal b/graphics/pokemon/wobbuffet/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wobbuffet/follow_normal.pal rename to graphics/pokemon/wobbuffet/overworld_normal.pal diff --git a/graphics/pokemon/wobbuffet/follow_shiny.pal b/graphics/pokemon/wobbuffet/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wobbuffet/follow_shiny.pal rename to graphics/pokemon/wobbuffet/overworld_shiny.pal diff --git a/graphics/pokemon/woobat/follower.png b/graphics/pokemon/woobat/overworld.png similarity index 100% rename from graphics/pokemon/woobat/follower.png rename to graphics/pokemon/woobat/overworld.png diff --git a/graphics/pokemon/woobat/follow_normal.pal b/graphics/pokemon/woobat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/woobat/follow_normal.pal rename to graphics/pokemon/woobat/overworld_normal.pal diff --git a/graphics/pokemon/woobat/follow_shiny.pal b/graphics/pokemon/woobat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/woobat/follow_shiny.pal rename to graphics/pokemon/woobat/overworld_shiny.pal diff --git a/graphics/pokemon/wooloo/follower.png b/graphics/pokemon/wooloo/overworld.png similarity index 100% rename from graphics/pokemon/wooloo/follower.png rename to graphics/pokemon/wooloo/overworld.png diff --git a/graphics/pokemon/wooloo/follow_normal.pal b/graphics/pokemon/wooloo/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wooloo/follow_normal.pal rename to graphics/pokemon/wooloo/overworld_normal.pal diff --git a/graphics/pokemon/wooloo/follow_shiny.pal b/graphics/pokemon/wooloo/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wooloo/follow_shiny.pal rename to graphics/pokemon/wooloo/overworld_shiny.pal diff --git a/graphics/pokemon/wooper/follower.png b/graphics/pokemon/wooper/overworld.png similarity index 100% rename from graphics/pokemon/wooper/follower.png rename to graphics/pokemon/wooper/overworld.png diff --git a/graphics/pokemon/wooper/follow_normal.pal b/graphics/pokemon/wooper/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wooper/follow_normal.pal rename to graphics/pokemon/wooper/overworld_normal.pal diff --git a/graphics/pokemon/wooper/follow_shiny.pal b/graphics/pokemon/wooper/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wooper/follow_shiny.pal rename to graphics/pokemon/wooper/overworld_shiny.pal diff --git a/graphics/pokemon/wormadam/follower.png b/graphics/pokemon/wormadam/overworld.png similarity index 100% rename from graphics/pokemon/wormadam/follower.png rename to graphics/pokemon/wormadam/overworld.png diff --git a/graphics/pokemon/wormadam/follow_normal.pal b/graphics/pokemon/wormadam/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wormadam/follow_normal.pal rename to graphics/pokemon/wormadam/overworld_normal.pal diff --git a/graphics/pokemon/wormadam/follow_shiny.pal b/graphics/pokemon/wormadam/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wormadam/follow_shiny.pal rename to graphics/pokemon/wormadam/overworld_shiny.pal diff --git a/graphics/pokemon/wormadam/sandy_cloak/follower.png b/graphics/pokemon/wormadam/sandy_cloak/overworld.png similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/follower.png rename to graphics/pokemon/wormadam/sandy_cloak/overworld.png diff --git a/graphics/pokemon/wormadam/sandy_cloak/follow_normal.pal b/graphics/pokemon/wormadam/sandy_cloak/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/follow_normal.pal rename to graphics/pokemon/wormadam/sandy_cloak/overworld_normal.pal diff --git a/graphics/pokemon/wormadam/sandy_cloak/follow_shiny.pal b/graphics/pokemon/wormadam/sandy_cloak/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wormadam/sandy_cloak/follow_shiny.pal rename to graphics/pokemon/wormadam/sandy_cloak/overworld_shiny.pal diff --git a/graphics/pokemon/wormadam/trash_cloak/follower.png b/graphics/pokemon/wormadam/trash_cloak/overworld.png similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/follower.png rename to graphics/pokemon/wormadam/trash_cloak/overworld.png diff --git a/graphics/pokemon/wormadam/trash_cloak/follow_normal.pal b/graphics/pokemon/wormadam/trash_cloak/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/follow_normal.pal rename to graphics/pokemon/wormadam/trash_cloak/overworld_normal.pal diff --git a/graphics/pokemon/wormadam/trash_cloak/follow_shiny.pal b/graphics/pokemon/wormadam/trash_cloak/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wormadam/trash_cloak/follow_shiny.pal rename to graphics/pokemon/wormadam/trash_cloak/overworld_shiny.pal diff --git a/graphics/pokemon/wurmple/follower.png b/graphics/pokemon/wurmple/overworld.png similarity index 100% rename from graphics/pokemon/wurmple/follower.png rename to graphics/pokemon/wurmple/overworld.png diff --git a/graphics/pokemon/wurmple/follow_normal.pal b/graphics/pokemon/wurmple/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wurmple/follow_normal.pal rename to graphics/pokemon/wurmple/overworld_normal.pal diff --git a/graphics/pokemon/wurmple/follow_shiny.pal b/graphics/pokemon/wurmple/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wurmple/follow_shiny.pal rename to graphics/pokemon/wurmple/overworld_shiny.pal diff --git a/graphics/pokemon/wynaut/follower.png b/graphics/pokemon/wynaut/overworld.png similarity index 100% rename from graphics/pokemon/wynaut/follower.png rename to graphics/pokemon/wynaut/overworld.png diff --git a/graphics/pokemon/wynaut/follow_normal.pal b/graphics/pokemon/wynaut/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wynaut/follow_normal.pal rename to graphics/pokemon/wynaut/overworld_normal.pal diff --git a/graphics/pokemon/wynaut/follow_shiny.pal b/graphics/pokemon/wynaut/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wynaut/follow_shiny.pal rename to graphics/pokemon/wynaut/overworld_shiny.pal diff --git a/graphics/pokemon/wyrdeer/follower.png b/graphics/pokemon/wyrdeer/overworld.png similarity index 100% rename from graphics/pokemon/wyrdeer/follower.png rename to graphics/pokemon/wyrdeer/overworld.png diff --git a/graphics/pokemon/wyrdeer/follow_normal.pal b/graphics/pokemon/wyrdeer/overworld_normal.pal similarity index 100% rename from graphics/pokemon/wyrdeer/follow_normal.pal rename to graphics/pokemon/wyrdeer/overworld_normal.pal diff --git a/graphics/pokemon/wyrdeer/follow_shiny.pal b/graphics/pokemon/wyrdeer/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/wyrdeer/follow_shiny.pal rename to graphics/pokemon/wyrdeer/overworld_shiny.pal diff --git a/graphics/pokemon/xatu/follower.png b/graphics/pokemon/xatu/overworld.png similarity index 100% rename from graphics/pokemon/xatu/follower.png rename to graphics/pokemon/xatu/overworld.png diff --git a/graphics/pokemon/xatu/follow_normal.pal b/graphics/pokemon/xatu/overworld_normal.pal similarity index 100% rename from graphics/pokemon/xatu/follow_normal.pal rename to graphics/pokemon/xatu/overworld_normal.pal diff --git a/graphics/pokemon/xatu/follow_shiny.pal b/graphics/pokemon/xatu/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/xatu/follow_shiny.pal rename to graphics/pokemon/xatu/overworld_shiny.pal diff --git a/graphics/pokemon/xerneas/follower.png b/graphics/pokemon/xerneas/overworld.png similarity index 100% rename from graphics/pokemon/xerneas/follower.png rename to graphics/pokemon/xerneas/overworld.png diff --git a/graphics/pokemon/xerneas/follow_normal.pal b/graphics/pokemon/xerneas/overworld_normal.pal similarity index 100% rename from graphics/pokemon/xerneas/follow_normal.pal rename to graphics/pokemon/xerneas/overworld_normal.pal diff --git a/graphics/pokemon/xerneas/follow_shiny.pal b/graphics/pokemon/xerneas/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/xerneas/follow_shiny.pal rename to graphics/pokemon/xerneas/overworld_shiny.pal diff --git a/graphics/pokemon/xurkitree/follower.png b/graphics/pokemon/xurkitree/overworld.png similarity index 100% rename from graphics/pokemon/xurkitree/follower.png rename to graphics/pokemon/xurkitree/overworld.png diff --git a/graphics/pokemon/xurkitree/follow_normal.pal b/graphics/pokemon/xurkitree/overworld_normal.pal similarity index 100% rename from graphics/pokemon/xurkitree/follow_normal.pal rename to graphics/pokemon/xurkitree/overworld_normal.pal diff --git a/graphics/pokemon/xurkitree/follow_shiny.pal b/graphics/pokemon/xurkitree/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/xurkitree/follow_shiny.pal rename to graphics/pokemon/xurkitree/overworld_shiny.pal diff --git a/graphics/pokemon/yamask/galarian/follower.png b/graphics/pokemon/yamask/galarian/overworld.png similarity index 100% rename from graphics/pokemon/yamask/galarian/follower.png rename to graphics/pokemon/yamask/galarian/overworld.png diff --git a/graphics/pokemon/yamask/galarian/follow_normal.pal b/graphics/pokemon/yamask/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/yamask/galarian/follow_normal.pal rename to graphics/pokemon/yamask/galarian/overworld_normal.pal diff --git a/graphics/pokemon/yamask/galarian/follow_shiny.pal b/graphics/pokemon/yamask/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/yamask/galarian/follow_shiny.pal rename to graphics/pokemon/yamask/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/yamask/follower.png b/graphics/pokemon/yamask/overworld.png similarity index 100% rename from graphics/pokemon/yamask/follower.png rename to graphics/pokemon/yamask/overworld.png diff --git a/graphics/pokemon/yamask/follow_normal.pal b/graphics/pokemon/yamask/overworld_normal.pal similarity index 100% rename from graphics/pokemon/yamask/follow_normal.pal rename to graphics/pokemon/yamask/overworld_normal.pal diff --git a/graphics/pokemon/yamask/follow_shiny.pal b/graphics/pokemon/yamask/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/yamask/follow_shiny.pal rename to graphics/pokemon/yamask/overworld_shiny.pal diff --git a/graphics/pokemon/yamper/follower.png b/graphics/pokemon/yamper/overworld.png similarity index 100% rename from graphics/pokemon/yamper/follower.png rename to graphics/pokemon/yamper/overworld.png diff --git a/graphics/pokemon/yamper/follow_normal.pal b/graphics/pokemon/yamper/overworld_normal.pal similarity index 100% rename from graphics/pokemon/yamper/follow_normal.pal rename to graphics/pokemon/yamper/overworld_normal.pal diff --git a/graphics/pokemon/yamper/follow_shiny.pal b/graphics/pokemon/yamper/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/yamper/follow_shiny.pal rename to graphics/pokemon/yamper/overworld_shiny.pal diff --git a/graphics/pokemon/yanma/follower.png b/graphics/pokemon/yanma/overworld.png similarity index 100% rename from graphics/pokemon/yanma/follower.png rename to graphics/pokemon/yanma/overworld.png diff --git a/graphics/pokemon/yanma/follow_normal.pal b/graphics/pokemon/yanma/overworld_normal.pal similarity index 100% rename from graphics/pokemon/yanma/follow_normal.pal rename to graphics/pokemon/yanma/overworld_normal.pal diff --git a/graphics/pokemon/yanma/follow_shiny.pal b/graphics/pokemon/yanma/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/yanma/follow_shiny.pal rename to graphics/pokemon/yanma/overworld_shiny.pal diff --git a/graphics/pokemon/yanmega/follower.png b/graphics/pokemon/yanmega/overworld.png similarity index 100% rename from graphics/pokemon/yanmega/follower.png rename to graphics/pokemon/yanmega/overworld.png diff --git a/graphics/pokemon/yanmega/follow_normal.pal b/graphics/pokemon/yanmega/overworld_normal.pal similarity index 100% rename from graphics/pokemon/yanmega/follow_normal.pal rename to graphics/pokemon/yanmega/overworld_normal.pal diff --git a/graphics/pokemon/yanmega/follow_shiny.pal b/graphics/pokemon/yanmega/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/yanmega/follow_shiny.pal rename to graphics/pokemon/yanmega/overworld_shiny.pal diff --git a/graphics/pokemon/yungoos/follower.png b/graphics/pokemon/yungoos/overworld.png similarity index 100% rename from graphics/pokemon/yungoos/follower.png rename to graphics/pokemon/yungoos/overworld.png diff --git a/graphics/pokemon/yungoos/follow_normal.pal b/graphics/pokemon/yungoos/overworld_normal.pal similarity index 100% rename from graphics/pokemon/yungoos/follow_normal.pal rename to graphics/pokemon/yungoos/overworld_normal.pal diff --git a/graphics/pokemon/yungoos/follow_shiny.pal b/graphics/pokemon/yungoos/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/yungoos/follow_shiny.pal rename to graphics/pokemon/yungoos/overworld_shiny.pal diff --git a/graphics/pokemon/yveltal/follower.png b/graphics/pokemon/yveltal/overworld.png similarity index 100% rename from graphics/pokemon/yveltal/follower.png rename to graphics/pokemon/yveltal/overworld.png diff --git a/graphics/pokemon/yveltal/follow_normal.pal b/graphics/pokemon/yveltal/overworld_normal.pal similarity index 100% rename from graphics/pokemon/yveltal/follow_normal.pal rename to graphics/pokemon/yveltal/overworld_normal.pal diff --git a/graphics/pokemon/yveltal/follow_shiny.pal b/graphics/pokemon/yveltal/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/yveltal/follow_shiny.pal rename to graphics/pokemon/yveltal/overworld_shiny.pal diff --git a/graphics/pokemon/zacian/crowned_sword/follower.png b/graphics/pokemon/zacian/crowned_sword/overworld.png similarity index 100% rename from graphics/pokemon/zacian/crowned_sword/follower.png rename to graphics/pokemon/zacian/crowned_sword/overworld.png diff --git a/graphics/pokemon/zacian/crowned_sword/follow_normal.pal b/graphics/pokemon/zacian/crowned_sword/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zacian/crowned_sword/follow_normal.pal rename to graphics/pokemon/zacian/crowned_sword/overworld_normal.pal diff --git a/graphics/pokemon/zacian/crowned_sword/follow_shiny.pal b/graphics/pokemon/zacian/crowned_sword/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zacian/crowned_sword/follow_shiny.pal rename to graphics/pokemon/zacian/crowned_sword/overworld_shiny.pal diff --git a/graphics/pokemon/zacian/follower.png b/graphics/pokemon/zacian/overworld.png similarity index 100% rename from graphics/pokemon/zacian/follower.png rename to graphics/pokemon/zacian/overworld.png diff --git a/graphics/pokemon/zacian/follow_normal.pal b/graphics/pokemon/zacian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zacian/follow_normal.pal rename to graphics/pokemon/zacian/overworld_normal.pal diff --git a/graphics/pokemon/zacian/follow_shiny.pal b/graphics/pokemon/zacian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zacian/follow_shiny.pal rename to graphics/pokemon/zacian/overworld_shiny.pal diff --git a/graphics/pokemon/zamazenta/crowned_shield/follower.png b/graphics/pokemon/zamazenta/crowned_shield/overworld.png similarity index 100% rename from graphics/pokemon/zamazenta/crowned_shield/follower.png rename to graphics/pokemon/zamazenta/crowned_shield/overworld.png diff --git a/graphics/pokemon/zamazenta/crowned_shield/follow_normal.pal b/graphics/pokemon/zamazenta/crowned_shield/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zamazenta/crowned_shield/follow_normal.pal rename to graphics/pokemon/zamazenta/crowned_shield/overworld_normal.pal diff --git a/graphics/pokemon/zamazenta/crowned_shield/follow_shiny.pal b/graphics/pokemon/zamazenta/crowned_shield/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zamazenta/crowned_shield/follow_shiny.pal rename to graphics/pokemon/zamazenta/crowned_shield/overworld_shiny.pal diff --git a/graphics/pokemon/zamazenta/follower.png b/graphics/pokemon/zamazenta/overworld.png similarity index 100% rename from graphics/pokemon/zamazenta/follower.png rename to graphics/pokemon/zamazenta/overworld.png diff --git a/graphics/pokemon/zamazenta/follow_normal.pal b/graphics/pokemon/zamazenta/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zamazenta/follow_normal.pal rename to graphics/pokemon/zamazenta/overworld_normal.pal diff --git a/graphics/pokemon/zamazenta/follow_shiny.pal b/graphics/pokemon/zamazenta/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zamazenta/follow_shiny.pal rename to graphics/pokemon/zamazenta/overworld_shiny.pal diff --git a/graphics/pokemon/zangoose/follower.png b/graphics/pokemon/zangoose/overworld.png similarity index 100% rename from graphics/pokemon/zangoose/follower.png rename to graphics/pokemon/zangoose/overworld.png diff --git a/graphics/pokemon/zangoose/follow_normal.pal b/graphics/pokemon/zangoose/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zangoose/follow_normal.pal rename to graphics/pokemon/zangoose/overworld_normal.pal diff --git a/graphics/pokemon/zangoose/follow_shiny.pal b/graphics/pokemon/zangoose/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zangoose/follow_shiny.pal rename to graphics/pokemon/zangoose/overworld_shiny.pal diff --git a/graphics/pokemon/zapdos/galarian/follower.png b/graphics/pokemon/zapdos/galarian/overworld.png similarity index 100% rename from graphics/pokemon/zapdos/galarian/follower.png rename to graphics/pokemon/zapdos/galarian/overworld.png diff --git a/graphics/pokemon/zapdos/galarian/follow_normal.pal b/graphics/pokemon/zapdos/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zapdos/galarian/follow_normal.pal rename to graphics/pokemon/zapdos/galarian/overworld_normal.pal diff --git a/graphics/pokemon/zapdos/galarian/follow_shiny.pal b/graphics/pokemon/zapdos/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zapdos/galarian/follow_shiny.pal rename to graphics/pokemon/zapdos/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/zapdos/follower.png b/graphics/pokemon/zapdos/overworld.png similarity index 100% rename from graphics/pokemon/zapdos/follower.png rename to graphics/pokemon/zapdos/overworld.png diff --git a/graphics/pokemon/zapdos/follow_normal.pal b/graphics/pokemon/zapdos/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zapdos/follow_normal.pal rename to graphics/pokemon/zapdos/overworld_normal.pal diff --git a/graphics/pokemon/zapdos/follow_shiny.pal b/graphics/pokemon/zapdos/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zapdos/follow_shiny.pal rename to graphics/pokemon/zapdos/overworld_shiny.pal diff --git a/graphics/pokemon/zarude/follower.png b/graphics/pokemon/zarude/overworld.png similarity index 100% rename from graphics/pokemon/zarude/follower.png rename to graphics/pokemon/zarude/overworld.png diff --git a/graphics/pokemon/zarude/follow_normal.pal b/graphics/pokemon/zarude/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zarude/follow_normal.pal rename to graphics/pokemon/zarude/overworld_normal.pal diff --git a/graphics/pokemon/zarude/follow_shiny.pal b/graphics/pokemon/zarude/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zarude/follow_shiny.pal rename to graphics/pokemon/zarude/overworld_shiny.pal diff --git a/graphics/pokemon/zebstrika/follower.png b/graphics/pokemon/zebstrika/overworld.png similarity index 100% rename from graphics/pokemon/zebstrika/follower.png rename to graphics/pokemon/zebstrika/overworld.png diff --git a/graphics/pokemon/zebstrika/follow_normal.pal b/graphics/pokemon/zebstrika/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zebstrika/follow_normal.pal rename to graphics/pokemon/zebstrika/overworld_normal.pal diff --git a/graphics/pokemon/zebstrika/follow_shiny.pal b/graphics/pokemon/zebstrika/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zebstrika/follow_shiny.pal rename to graphics/pokemon/zebstrika/overworld_shiny.pal diff --git a/graphics/pokemon/zekrom/follower.png b/graphics/pokemon/zekrom/overworld.png similarity index 100% rename from graphics/pokemon/zekrom/follower.png rename to graphics/pokemon/zekrom/overworld.png diff --git a/graphics/pokemon/zekrom/follow_normal.pal b/graphics/pokemon/zekrom/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zekrom/follow_normal.pal rename to graphics/pokemon/zekrom/overworld_normal.pal diff --git a/graphics/pokemon/zekrom/follow_shiny.pal b/graphics/pokemon/zekrom/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zekrom/follow_shiny.pal rename to graphics/pokemon/zekrom/overworld_shiny.pal diff --git a/graphics/pokemon/zeraora/follower.png b/graphics/pokemon/zeraora/overworld.png similarity index 100% rename from graphics/pokemon/zeraora/follower.png rename to graphics/pokemon/zeraora/overworld.png diff --git a/graphics/pokemon/zeraora/follow_normal.pal b/graphics/pokemon/zeraora/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zeraora/follow_normal.pal rename to graphics/pokemon/zeraora/overworld_normal.pal diff --git a/graphics/pokemon/zeraora/follow_shiny.pal b/graphics/pokemon/zeraora/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zeraora/follow_shiny.pal rename to graphics/pokemon/zeraora/overworld_shiny.pal diff --git a/graphics/pokemon/zigzagoon/galarian/follower.png b/graphics/pokemon/zigzagoon/galarian/overworld.png similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/follower.png rename to graphics/pokemon/zigzagoon/galarian/overworld.png diff --git a/graphics/pokemon/zigzagoon/galarian/follow_normal.pal b/graphics/pokemon/zigzagoon/galarian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/follow_normal.pal rename to graphics/pokemon/zigzagoon/galarian/overworld_normal.pal diff --git a/graphics/pokemon/zigzagoon/galarian/follow_shiny.pal b/graphics/pokemon/zigzagoon/galarian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zigzagoon/galarian/follow_shiny.pal rename to graphics/pokemon/zigzagoon/galarian/overworld_shiny.pal diff --git a/graphics/pokemon/zigzagoon/follower.png b/graphics/pokemon/zigzagoon/overworld.png similarity index 100% rename from graphics/pokemon/zigzagoon/follower.png rename to graphics/pokemon/zigzagoon/overworld.png diff --git a/graphics/pokemon/zigzagoon/follow_normal.pal b/graphics/pokemon/zigzagoon/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zigzagoon/follow_normal.pal rename to graphics/pokemon/zigzagoon/overworld_normal.pal diff --git a/graphics/pokemon/zigzagoon/follow_shiny.pal b/graphics/pokemon/zigzagoon/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zigzagoon/follow_shiny.pal rename to graphics/pokemon/zigzagoon/overworld_shiny.pal diff --git a/graphics/pokemon/zoroark/hisuian/follower.png b/graphics/pokemon/zoroark/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/zoroark/hisuian/follower.png rename to graphics/pokemon/zoroark/hisuian/overworld.png diff --git a/graphics/pokemon/zoroark/hisuian/follow_normal.pal b/graphics/pokemon/zoroark/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zoroark/hisuian/follow_normal.pal rename to graphics/pokemon/zoroark/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/zoroark/hisuian/follow_shiny.pal b/graphics/pokemon/zoroark/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zoroark/hisuian/follow_shiny.pal rename to graphics/pokemon/zoroark/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/zoroark/follower.png b/graphics/pokemon/zoroark/overworld.png similarity index 100% rename from graphics/pokemon/zoroark/follower.png rename to graphics/pokemon/zoroark/overworld.png diff --git a/graphics/pokemon/zoroark/follow_normal.pal b/graphics/pokemon/zoroark/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zoroark/follow_normal.pal rename to graphics/pokemon/zoroark/overworld_normal.pal diff --git a/graphics/pokemon/zoroark/follow_shiny.pal b/graphics/pokemon/zoroark/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zoroark/follow_shiny.pal rename to graphics/pokemon/zoroark/overworld_shiny.pal diff --git a/graphics/pokemon/zorua/hisuian/follower.png b/graphics/pokemon/zorua/hisuian/overworld.png similarity index 100% rename from graphics/pokemon/zorua/hisuian/follower.png rename to graphics/pokemon/zorua/hisuian/overworld.png diff --git a/graphics/pokemon/zorua/hisuian/follow_normal.pal b/graphics/pokemon/zorua/hisuian/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zorua/hisuian/follow_normal.pal rename to graphics/pokemon/zorua/hisuian/overworld_normal.pal diff --git a/graphics/pokemon/zorua/hisuian/follow_shiny.pal b/graphics/pokemon/zorua/hisuian/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zorua/hisuian/follow_shiny.pal rename to graphics/pokemon/zorua/hisuian/overworld_shiny.pal diff --git a/graphics/pokemon/zorua/follower.png b/graphics/pokemon/zorua/overworld.png similarity index 100% rename from graphics/pokemon/zorua/follower.png rename to graphics/pokemon/zorua/overworld.png diff --git a/graphics/pokemon/zorua/follow_normal.pal b/graphics/pokemon/zorua/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zorua/follow_normal.pal rename to graphics/pokemon/zorua/overworld_normal.pal diff --git a/graphics/pokemon/zorua/follow_shiny.pal b/graphics/pokemon/zorua/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zorua/follow_shiny.pal rename to graphics/pokemon/zorua/overworld_shiny.pal diff --git a/graphics/pokemon/zubat/follower.png b/graphics/pokemon/zubat/overworld.png similarity index 100% rename from graphics/pokemon/zubat/follower.png rename to graphics/pokemon/zubat/overworld.png diff --git a/graphics/pokemon/zubat/follow_normal.pal b/graphics/pokemon/zubat/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zubat/follow_normal.pal rename to graphics/pokemon/zubat/overworld_normal.pal diff --git a/graphics/pokemon/zubat/follow_shiny.pal b/graphics/pokemon/zubat/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zubat/follow_shiny.pal rename to graphics/pokemon/zubat/overworld_shiny.pal diff --git a/graphics/pokemon/zweilous/follower.png b/graphics/pokemon/zweilous/overworld.png similarity index 100% rename from graphics/pokemon/zweilous/follower.png rename to graphics/pokemon/zweilous/overworld.png diff --git a/graphics/pokemon/zweilous/follow_normal.pal b/graphics/pokemon/zweilous/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zweilous/follow_normal.pal rename to graphics/pokemon/zweilous/overworld_normal.pal diff --git a/graphics/pokemon/zweilous/follow_shiny.pal b/graphics/pokemon/zweilous/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zweilous/follow_shiny.pal rename to graphics/pokemon/zweilous/overworld_shiny.pal diff --git a/graphics/pokemon/zygarde/follower.png b/graphics/pokemon/zygarde/overworld.png similarity index 100% rename from graphics/pokemon/zygarde/follower.png rename to graphics/pokemon/zygarde/overworld.png diff --git a/graphics/pokemon/zygarde/follow_normal.pal b/graphics/pokemon/zygarde/overworld_normal.pal similarity index 100% rename from graphics/pokemon/zygarde/follow_normal.pal rename to graphics/pokemon/zygarde/overworld_normal.pal diff --git a/graphics/pokemon/zygarde/follow_shiny.pal b/graphics/pokemon/zygarde/overworld_shiny.pal similarity index 100% rename from graphics/pokemon/zygarde/follow_shiny.pal rename to graphics/pokemon/zygarde/overworld_shiny.pal diff --git a/include/config/overworld.h b/include/config/overworld.h index 856d2c37f7..77ad62f652 100644 --- a/include/config/overworld.h +++ b/include/config/overworld.h @@ -34,17 +34,19 @@ #define OW_BERRY_YIELD_RATE GEN_3 // Presets for how many Berries each plant can yield. #define OW_BERRY_DRAIN_RATE GEN_6_ORAS // If OW_BERRY_MOISTURE is enabled, this setting changes how fast the soil dries out. GEN_4 uses a Berry-dependent drain rate, GEN_6_XY dries out in 24 hours (4 hours with the relevant Mulch) and GEN_6_ORAS dries out in 4 hours. Other values are illegal. -// Follower Pokémon -#define OW_FOLLOWERS_ENABLED TRUE // Enables follower Pokémon, HGSS style. -#define OW_MON_BOBBING TRUE // If true, follower pokemon will bob up and down during their idle & walking animations +// Overworld Pokémon +#define OW_POKEMON_OBJECT_EVENTS TRUE // Adds Object Event fields for every species. Can be used for NPCs using the OBJ_EVENT_GFX_SPECIES macro (eg. OBJ_EVENT_GFX_SPECIES(BULBASAUR)) +#define OW_SUBSTITUTE_PLACEHOLDER TRUE // Use a substitute OW for Pokémon that are missing overworld sprites #define OW_LARGE_OW_SUPPORT TRUE // If true, adds a small amount of overhead to OW code so that large (48x48, 64x64) OWs will display correctly under bridges, etc. -#define OW_FOLLOWERS_SHARE_PALETTE FALSE // [WIP!! NOT ALL PALETTES HAVE BEEN ADJUSTED FOR THIS!!] If TRUE, follower palettes are taken from battle sprites. -#define OW_MON_POKEBALLS TRUE // Followers will emerge from the pokeball they are stored in, instead of a normal pokeball +#define OW_PKMN_OBJECTS_SHARE_PALETTES FALSE // [WIP!! NOT ALL PALETTES HAVE BEEN ADJUSTED FOR THIS!!] If TRUE, follower palettes are taken from battle sprites. #define OW_GFX_COMPRESS TRUE // Adds support for compressed OW graphics, (Also compresses pokemon follower graphics). // Compressed gfx are incompatible with non-power-of-two sprite sizes: // (You should not use 48x48 sprites/tables for compressed gfx) // 16x32, 32x32, 64x64 etc are fine -#define OW_SUBSTITUTE_PLACEHOLDER TRUE // Use a substitute OW for Pokémon that are missing overworld sprites +// Follower Pokémon +#define OW_FOLLOWERS_ENABLED TRUE // Enables follower Pokémon, HGSS style. Requires OW_POKEMON_OBJECT_EVENTS. +#define OW_FOLLOWERS_BOBBING TRUE // If true, follower pokemon will bob up and down during their idle & walking animations +#define OW_FOLLOWERS_POKEBALLS TRUE // Followers will emerge from the pokeball they are stored in, instead of a normal pokeball // Out-of-battle Ability effects #define OW_SYNCHRONIZE_NATURE GEN_LATEST // In Gen8+, if a Pokémon with Synchronize leads the party, wild Pokémon will always have their same Nature as opposed to the 50% chance in previous games. Gift Pokémon excluded. diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index a6a777c1bc..f4268d9f02 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -374,7 +374,7 @@ #define OBJ_EVENT_PAL_TAG_RS_MAY 0x1123 #define OBJ_EVENT_PAL_TAG_DYNAMIC 0x1124 -#if OW_MON_POKEBALLS +#if OW_FOLLOWERS_POKEBALLS // Vanilla #define OBJ_EVENT_PAL_TAG_BALL_MASTER 0x1150 #define OBJ_EVENT_PAL_TAG_BALL_ULTRA 0x1151 @@ -408,7 +408,7 @@ #define OBJ_EVENT_PAL_TAG_BALL_BEAST 0x1169 // Gen VIII #define OBJ_EVENT_PAL_TAG_BALL_STRANGE 0x116A -#endif //OW_MON_POKEBALLS +#endif //OW_FOLLOWERS_POKEBALLS // Used as a placeholder follower graphic #define OBJ_EVENT_PAL_TAG_SUBSTITUTE 0x7611 #define OBJ_EVENT_PAL_TAG_EMOTES 0x8002 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index eea757cf4f..2906789b37 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -3,6 +3,10 @@ #include "constants/event_object_movement.h" +#if OW_POKEMON_OBJECT_EVENTS == FALSE && OW_FOLLOWERS_ENABLED == TRUE +#error "OW_POKEMON_OBJECT_EVENTS needs to be TRUE in order for OW_FOLLOWERS_ENABLED to work." +#endif + // Palette slots for overworld NPCs. // The same standard set of palettes for overworld objects are normally always loaded at the same // time while walking around the overworld. The only exceptions are the palettes for the player and diff --git a/include/pokemon.h b/include/pokemon.h index 84ddb084a3..e0abb75884 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -449,13 +449,13 @@ struct SpeciesInfo /*0x8C*/ /* 0x88 */ const struct Evolution *evolutions; /* 0x84 */ const u16 *formSpeciesIdTable; /* 0x84 */ const struct FormChange *formChangeTable; -#if OW_FOLLOWERS_ENABLED - struct ObjectEventGraphicsInfo followerData; -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const void* followerPalette; - const void* followerShinyPalette; -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + struct ObjectEventGraphicsInfo overworldData; +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const void* overworldPalette; + const void* overworldShinyPalette; +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS }; struct MoveInfo diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index a96fd34c6e..a50f48c707 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -732,3265 +732,3265 @@ $(FLDEFFGFXDIR)/secret_power_tree.4bpp: %.4bpp: %.png $(FLDEFFGFXDIR)/record_mix_lights.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 1 -$(POKEMONGFXDIR)/question_mark/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/question_mark/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bulbasaur/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bulbasaur/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ivysaur/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ivysaur/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/venusaur/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/venusaur/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/charmander/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/charmander/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/charmeleon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/charmeleon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/charizard/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/charizard/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/squirtle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/squirtle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wartortle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wartortle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/blastoise/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/blastoise/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/caterpie/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/caterpie/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/metapod/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/metapod/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/butterfree/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/butterfree/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/weedle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/weedle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kakuna/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kakuna/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/beedrill/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/beedrill/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pidgey/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pidgey/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pidgeotto/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pidgeotto/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pidgeot/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pidgeot/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rattata/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rattata/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/raticate/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/raticate/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/spearow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/spearow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/fearow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/fearow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ekans/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ekans/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/arbok/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arbok/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pikachu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pikachu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/raichu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/raichu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sandshrew/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sandshrew/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sandslash/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sandslash/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nidoran_f/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nidoran_f/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nidorina/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nidorina/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nidoqueen/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nidoqueen/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nidoran_m/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nidoran_m/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nidorino/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nidorino/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nidoking/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nidoking/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/clefairy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/clefairy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/clefable/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/clefable/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vulpix/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vulpix/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ninetales/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ninetales/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/jigglypuff/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/jigglypuff/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wigglytuff/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wigglytuff/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zubat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zubat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/golbat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/golbat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/oddish/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/oddish/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gloom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gloom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vileplume/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vileplume/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/paras/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/paras/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/parasect/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/parasect/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/venonat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/venonat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/venomoth/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/venomoth/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/diglett/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/diglett/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dugtrio/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dugtrio/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meowth/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meowth/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/persian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/persian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/psyduck/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/psyduck/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/golduck/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/golduck/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mankey/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mankey/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/primeape/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/primeape/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/growlithe/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/growlithe/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/arcanine/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arcanine/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/poliwag/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/poliwag/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/poliwhirl/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/poliwhirl/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/poliwrath/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/poliwrath/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/abra/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/abra/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kadabra/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kadabra/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/alakazam/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/alakazam/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/machop/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/machop/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/machoke/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/machoke/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/machamp/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/machamp/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bellsprout/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bellsprout/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/weepinbell/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/weepinbell/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/victreebel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/victreebel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tentacool/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tentacool/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tentacruel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tentacruel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/geodude/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/geodude/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/graveler/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/graveler/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/golem/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/golem/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ponyta/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ponyta/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rapidash/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rapidash/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slowpoke/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slowpoke/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slowbro/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slowbro/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/magnemite/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/magnemite/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/magneton/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/magneton/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/farfetchd/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/farfetchd/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/doduo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/doduo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dodrio/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dodrio/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/seel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/seel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dewgong/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dewgong/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/grimer/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/grimer/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/muk/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/muk/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shellder/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shellder/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cloyster/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cloyster/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gastly/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gastly/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/haunter/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/haunter/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gengar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gengar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/onix/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/onix/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/drowzee/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/drowzee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hypno/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hypno/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/krabby/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/krabby/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kingler/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kingler/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/voltorb/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/voltorb/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/electrode/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/electrode/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/exeggcute/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/exeggcute/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/exeggutor/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/exeggutor/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cubone/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cubone/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/marowak/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/marowak/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hitmonlee/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hitmonlee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hitmonchan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hitmonchan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lickitung/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lickitung/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/koffing/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/koffing/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/weezing/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/weezing/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rhyhorn/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rhyhorn/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rhydon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rhydon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chansey/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chansey/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tangela/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tangela/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kangaskhan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kangaskhan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/horsea/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/horsea/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/seadra/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/seadra/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/goldeen/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/goldeen/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/seaking/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/seaking/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/staryu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/staryu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/starmie/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/starmie/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mr_mime/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mr_mime/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/scyther/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/scyther/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/jynx/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/jynx/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/electabuzz/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/electabuzz/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/magmar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/magmar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pinsir/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pinsir/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tauros/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tauros/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/magikarp/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/magikarp/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gyarados/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gyarados/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lapras/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lapras/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ditto/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ditto/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/eevee/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/eevee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vaporeon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vaporeon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/jolteon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/jolteon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flareon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flareon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/porygon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/porygon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/omanyte/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/omanyte/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/omastar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/omastar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kabuto/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kabuto/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kabutops/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kabutops/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/aerodactyl/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/aerodactyl/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/snorlax/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/snorlax/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/articuno/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/articuno/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zapdos/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zapdos/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/moltres/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/moltres/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dratini/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dratini/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dragonair/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dragonair/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dragonite/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dragonite/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mewtwo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mewtwo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mew/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mew/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chikorita/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chikorita/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bayleef/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bayleef/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meganium/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meganium/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cyndaquil/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cyndaquil/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/quilava/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/quilava/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/typhlosion/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/typhlosion/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/totodile/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/totodile/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/croconaw/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/croconaw/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/feraligatr/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/feraligatr/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sentret/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sentret/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furret/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furret/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hoothoot/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hoothoot/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/noctowl/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/noctowl/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ledyba/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ledyba/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ledian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ledian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/spinarak/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/spinarak/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ariados/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ariados/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/crobat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/crobat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chinchou/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chinchou/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lanturn/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lanturn/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pichu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pichu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cleffa/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cleffa/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/igglybuff/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/igglybuff/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/togepi/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/togepi/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/togetic/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/togetic/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/natu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/natu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/xatu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/xatu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mareep/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mareep/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flaaffy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flaaffy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ampharos/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ampharos/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bellossom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bellossom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/marill/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/marill/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/azumarill/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/azumarill/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sudowoodo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sudowoodo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/politoed/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/politoed/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hoppip/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hoppip/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/skiploom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/skiploom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/jumpluff/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/jumpluff/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/aipom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/aipom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sunkern/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sunkern/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sunflora/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sunflora/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/yanma/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/yanma/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wooper/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wooper/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/quagsire/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/quagsire/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/espeon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/espeon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/umbreon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/umbreon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/murkrow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/murkrow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slowking/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slowking/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/misdreavus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/misdreavus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/b/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/b/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/c/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/c/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/d/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/d/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/e/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/e/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/f/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/f/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/g/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/g/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/h/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/h/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/i/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/i/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/j/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/j/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/k/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/k/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/l/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/l/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/m/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/m/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/n/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/n/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/o/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/o/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/p/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/p/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/q/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/q/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/r/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/r/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/s/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/s/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/t/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/t/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/u/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/u/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/v/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/v/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/w/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/w/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/x/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/x/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/y/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/y/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/z/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/z/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/exclamation_mark/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/exclamation_mark/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unown/question_mark/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unown/question_mark/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wobbuffet/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wobbuffet/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/girafarig/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/girafarig/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pineco/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pineco/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/forretress/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/forretress/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dunsparce/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dunsparce/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gligar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gligar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/steelix/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/steelix/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/snubbull/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/snubbull/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/granbull/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/granbull/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/qwilfish/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/qwilfish/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/scizor/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/scizor/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shuckle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shuckle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/heracross/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/heracross/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sneasel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sneasel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/teddiursa/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/teddiursa/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ursaring/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ursaring/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slugma/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slugma/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/magcargo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/magcargo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/swinub/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/swinub/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/piloswine/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/piloswine/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/corsola/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/corsola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/remoraid/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/remoraid/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/octillery/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/octillery/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/delibird/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/delibird/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mantine/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mantine/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/skarmory/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/skarmory/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/houndour/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/houndour/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/houndoom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/houndoom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kingdra/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kingdra/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/phanpy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/phanpy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/donphan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/donphan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/porygon2/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/porygon2/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/stantler/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/stantler/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/smeargle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/smeargle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tyrogue/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tyrogue/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hitmontop/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hitmontop/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/smoochum/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/smoochum/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/elekid/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/elekid/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/magby/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/magby/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/miltank/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/miltank/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/blissey/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/blissey/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/raikou/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/raikou/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/entei/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/entei/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/suicune/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/suicune/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/larvitar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/larvitar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pupitar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pupitar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tyranitar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tyranitar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lugia/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lugia/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/ho_oh/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ho_oh/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/celebi/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/celebi/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/treecko/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/treecko/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/grovyle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/grovyle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sceptile/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sceptile/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/torchic/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/torchic/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/combusken/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/combusken/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/blaziken/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/blaziken/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mudkip/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mudkip/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/marshtomp/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/marshtomp/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/swampert/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/swampert/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/poochyena/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/poochyena/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mightyena/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mightyena/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zigzagoon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zigzagoon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/linoone/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/linoone/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wurmple/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wurmple/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/silcoon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/silcoon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/beautifly/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/beautifly/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cascoon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cascoon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dustox/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dustox/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lotad/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lotad/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lombre/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lombre/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ludicolo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ludicolo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/seedot/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/seedot/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nuzleaf/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nuzleaf/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shiftry/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shiftry/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/taillow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/taillow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/swellow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/swellow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wingull/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wingull/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pelipper/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pelipper/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ralts/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ralts/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kirlia/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kirlia/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gardevoir/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gardevoir/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/surskit/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/surskit/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/masquerain/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/masquerain/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shroomish/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shroomish/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/breloom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/breloom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slakoth/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slakoth/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vigoroth/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vigoroth/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slaking/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slaking/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nincada/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nincada/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ninjask/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ninjask/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shedinja/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shedinja/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/whismur/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/whismur/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/loudred/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/loudred/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/exploud/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/exploud/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/makuhita/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/makuhita/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hariyama/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hariyama/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/azurill/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/azurill/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nosepass/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nosepass/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/skitty/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/skitty/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/delcatty/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/delcatty/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sableye/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sableye/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mawile/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mawile/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/aron/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/aron/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lairon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lairon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/aggron/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/aggron/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meditite/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meditite/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/medicham/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/medicham/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/electrike/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/electrike/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/manectric/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/manectric/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/plusle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/plusle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/minun/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/minun/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/volbeat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/volbeat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/illumise/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/illumise/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/roselia/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/roselia/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gulpin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gulpin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/swalot/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/swalot/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/carvanha/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/carvanha/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sharpedo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sharpedo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wailmer/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wailmer/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wailord/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wailord/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/numel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/numel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/camerupt/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/camerupt/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/torkoal/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/torkoal/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/spoink/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/spoink/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/grumpig/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/grumpig/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/spinda/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/spinda/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/trapinch/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/trapinch/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vibrava/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vibrava/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flygon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flygon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cacnea/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cacnea/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cacturne/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cacturne/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/swablu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/swablu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/altaria/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/altaria/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zangoose/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zangoose/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/seviper/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/seviper/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lunatone/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lunatone/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/solrock/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/solrock/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/barboach/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/barboach/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/whiscash/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/whiscash/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/corphish/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/corphish/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/crawdaunt/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/crawdaunt/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/baltoy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/baltoy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/claydol/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/claydol/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lileep/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lileep/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cradily/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cradily/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/anorith/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/anorith/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/armaldo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/armaldo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/feebas/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/feebas/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/milotic/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/milotic/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/castform/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/castform/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/castform/sunny/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/castform/sunny/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/castform/rainy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/castform/rainy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/castform/snowy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/castform/snowy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kecleon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kecleon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shuppet/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shuppet/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/banette/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/banette/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/duskull/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/duskull/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dusclops/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dusclops/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tropius/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tropius/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chimecho/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chimecho/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/absol/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/absol/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wynaut/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wynaut/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/snorunt/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/snorunt/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/glalie/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/glalie/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/spheal/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/spheal/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sealeo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sealeo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/walrein/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/walrein/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/clamperl/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/clamperl/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/huntail/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/huntail/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gorebyss/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gorebyss/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/relicanth/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/relicanth/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/luvdisc/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/luvdisc/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bagon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bagon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shelgon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shelgon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/salamence/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/salamence/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/beldum/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/beldum/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/metang/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/metang/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/metagross/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/metagross/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/regirock/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/regirock/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/regice/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/regice/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/registeel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/registeel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/latias/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/latias/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/latios/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/latios/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kyogre/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kyogre/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/groudon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/groudon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/rayquaza/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rayquaza/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/jirachi/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/jirachi/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/deoxys/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/deoxys/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/turtwig/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/turtwig/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/grotle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/grotle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/torterra/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/torterra/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chimchar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chimchar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/monferno/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/monferno/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/infernape/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/infernape/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/piplup/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/piplup/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/prinplup/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/prinplup/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/empoleon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/empoleon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/starly/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/starly/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/staravia/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/staravia/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/staraptor/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/staraptor/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bidoof/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bidoof/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bibarel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bibarel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kricketot/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kricketot/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kricketune/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kricketune/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shinx/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shinx/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/luxio/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/luxio/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/luxray/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/luxray/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/budew/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/budew/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/roserade/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/roserade/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cranidos/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cranidos/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rampardos/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rampardos/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shieldon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shieldon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bastiodon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bastiodon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/burmy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/burmy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wormadam/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wormadam/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mothim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mothim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/combee/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/combee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vespiquen/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vespiquen/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pachirisu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pachirisu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/buizel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/buizel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floatzel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floatzel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cherubi/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cherubi/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cherrim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cherrim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shellos/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shellos/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gastrodon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gastrodon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ambipom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ambipom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/drifloon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/drifloon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/drifblim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/drifblim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/buneary/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/buneary/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lopunny/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lopunny/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mismagius/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mismagius/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/honchkrow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/honchkrow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/glameow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/glameow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/purugly/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/purugly/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chingling/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chingling/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/stunky/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/stunky/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/skuntank/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/skuntank/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bronzor/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bronzor/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bronzong/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bronzong/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bonsly/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bonsly/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mime_jr/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mime_jr/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/happiny/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/happiny/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chatot/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chatot/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/spiritomb/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/spiritomb/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gible/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gible/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gabite/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gabite/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/garchomp/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/garchomp/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/munchlax/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/munchlax/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/riolu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/riolu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lucario/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lucario/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hippopotas/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hippopotas/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hippowdon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hippowdon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/skorupi/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/skorupi/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/drapion/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/drapion/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/croagunk/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/croagunk/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/toxicroak/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/toxicroak/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/carnivine/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/carnivine/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/finneon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/finneon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lumineon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lumineon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mantyke/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mantyke/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/snover/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/snover/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/abomasnow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/abomasnow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/weavile/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/weavile/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/magnezone/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/magnezone/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lickilicky/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lickilicky/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rhyperior/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rhyperior/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tangrowth/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tangrowth/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/electivire/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/electivire/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/magmortar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/magmortar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/togekiss/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/togekiss/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/yanmega/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/yanmega/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/leafeon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/leafeon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/glaceon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/glaceon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gliscor/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gliscor/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mamoswine/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mamoswine/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/porygon_z/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/porygon_z/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gallade/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gallade/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/probopass/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/probopass/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dusknoir/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dusknoir/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/froslass/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/froslass/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rotom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rotom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/uxie/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/uxie/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mesprit/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mesprit/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/azelf/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/azelf/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dialga/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dialga/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/palkia/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/palkia/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/heatran/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/heatran/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/regigigas/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/regigigas/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/giratina/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/giratina/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/cresselia/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cresselia/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/phione/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/phione/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/manaphy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/manaphy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/darkrai/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/darkrai/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shaymin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shaymin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/arceus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/victini/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/victini/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/snivy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/snivy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/servine/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/servine/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/serperior/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/serperior/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tepig/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tepig/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pignite/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pignite/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/emboar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/emboar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/oshawott/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/oshawott/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dewott/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dewott/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/samurott/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/samurott/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/patrat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/patrat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/watchog/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/watchog/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lillipup/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lillipup/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/herdier/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/herdier/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/stoutland/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/stoutland/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/purrloin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/purrloin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/liepard/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/liepard/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pansage/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pansage/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/simisage/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/simisage/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pansear/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pansear/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/simisear/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/simisear/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/panpour/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/panpour/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/simipour/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/simipour/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/munna/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/munna/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/musharna/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/musharna/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pidove/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pidove/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tranquill/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tranquill/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/unfezant/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/unfezant/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/blitzle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/blitzle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zebstrika/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zebstrika/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/roggenrola/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/roggenrola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/boldore/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/boldore/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gigalith/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gigalith/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/woobat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/woobat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/swoobat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/swoobat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/drilbur/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/drilbur/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/excadrill/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/excadrill/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/audino/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/audino/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/timburr/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/timburr/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gurdurr/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gurdurr/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/conkeldurr/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/conkeldurr/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tympole/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tympole/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/palpitoad/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/palpitoad/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/seismitoad/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/seismitoad/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/throh/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/throh/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sawk/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sawk/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sewaddle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sewaddle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/swadloon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/swadloon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/leavanny/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/leavanny/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/venipede/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/venipede/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/whirlipede/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/whirlipede/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/scolipede/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/scolipede/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cottonee/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cottonee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/whimsicott/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/whimsicott/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/petilil/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/petilil/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lilligant/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lilligant/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/basculin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/basculin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sandile/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sandile/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/krokorok/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/krokorok/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/krookodile/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/krookodile/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/darumaka/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/darumaka/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/darmanitan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/darmanitan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/maractus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/maractus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dwebble/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dwebble/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/crustle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/crustle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/scraggy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/scraggy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/scrafty/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/scrafty/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sigilyph/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sigilyph/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/yamask/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/yamask/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cofagrigus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cofagrigus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tirtouga/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tirtouga/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/carracosta/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/carracosta/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/archen/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/archen/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/archeops/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/archeops/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/trubbish/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/trubbish/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/garbodor/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/garbodor/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zorua/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zorua/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zoroark/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zoroark/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/minccino/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/minccino/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cinccino/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cinccino/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gothita/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gothita/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gothorita/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gothorita/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gothitelle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gothitelle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/solosis/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/solosis/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/duosion/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/duosion/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/reuniclus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/reuniclus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ducklett/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ducklett/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/swanna/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/swanna/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vanillite/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vanillite/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vanillish/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vanillish/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vanilluxe/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vanilluxe/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/deerling/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/deerling/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sawsbuck/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sawsbuck/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/emolga/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/emolga/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/karrablast/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/karrablast/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/escavalier/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/escavalier/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/foongus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/foongus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/amoonguss/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/amoonguss/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/frillish/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/frillish/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/jellicent/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/jellicent/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/alomomola/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/alomomola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/joltik/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/joltik/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/galvantula/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/galvantula/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ferroseed/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ferroseed/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ferrothorn/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ferrothorn/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/klink/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/klink/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/klang/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/klang/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/klinklang/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/klinklang/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tynamo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tynamo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/eelektrik/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/eelektrik/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/eelektross/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/eelektross/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/elgyem/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/elgyem/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/beheeyem/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/beheeyem/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/litwick/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/litwick/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lampent/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lampent/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chandelure/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chandelure/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/axew/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/axew/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/fraxure/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/fraxure/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/haxorus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/haxorus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cubchoo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cubchoo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/beartic/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/beartic/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cryogonal/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cryogonal/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shelmet/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shelmet/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/accelgor/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/accelgor/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/stunfisk/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/stunfisk/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mienfoo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mienfoo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mienshao/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mienshao/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/druddigon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/druddigon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/golett/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/golett/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/golurk/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/golurk/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pawniard/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pawniard/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bisharp/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bisharp/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bouffalant/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bouffalant/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rufflet/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rufflet/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/braviary/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/braviary/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vullaby/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vullaby/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mandibuzz/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mandibuzz/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/heatmor/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/heatmor/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/durant/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/durant/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/deino/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/deino/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zweilous/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zweilous/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hydreigon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hydreigon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/larvesta/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/larvesta/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/volcarona/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/volcarona/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cobalion/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cobalion/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/terrakion/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/terrakion/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/virizion/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/virizion/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tornadus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tornadus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/thundurus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/thundurus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/reshiram/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/reshiram/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/zekrom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zekrom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/landorus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/landorus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kyurem/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kyurem/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/keldeo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/keldeo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meloetta/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meloetta/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/genesect/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/genesect/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chespin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chespin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/quilladin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/quilladin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chesnaught/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chesnaught/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/fennekin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/fennekin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/braixen/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/braixen/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/delphox/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/delphox/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/froakie/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/froakie/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/frogadier/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/frogadier/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/greninja/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/greninja/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bunnelby/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bunnelby/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/diggersby/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/diggersby/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/fletchling/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/fletchling/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/fletchinder/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/fletchinder/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/talonflame/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/talonflame/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/scatterbug/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/scatterbug/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/spewpa/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/spewpa/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/litleo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/litleo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pyroar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pyroar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flabebe/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flabebe/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/florges/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/florges/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/skiddo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/skiddo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gogoat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gogoat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pancham/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pancham/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pangoro/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pangoro/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furfrou/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furfrou/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/espurr/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/espurr/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meowstic/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meowstic/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meowstic/female/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meowstic/female/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/honedge/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/honedge/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/doublade/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/doublade/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/aegislash/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/aegislash/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/spritzee/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/spritzee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/aromatisse/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/aromatisse/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/swirlix/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/swirlix/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slurpuff/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slurpuff/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/inkay/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/inkay/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/malamar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/malamar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/binacle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/binacle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/barbaracle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/barbaracle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/skrelp/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/skrelp/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dragalge/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dragalge/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/clauncher/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/clauncher/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/clawitzer/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/clawitzer/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/helioptile/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/helioptile/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/heliolisk/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/heliolisk/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tyrunt/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tyrunt/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tyrantrum/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tyrantrum/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/amaura/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/amaura/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/aurorus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/aurorus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sylveon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sylveon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hawlucha/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hawlucha/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dedenne/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dedenne/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/carbink/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/carbink/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/goomy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/goomy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sliggoo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sliggoo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/goodra/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/goodra/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/klefki/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/klefki/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/phantump/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/phantump/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/trevenant/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/trevenant/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pumpkaboo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pumpkaboo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gourgeist/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gourgeist/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bergmite/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bergmite/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/avalugg/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/avalugg/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/noibat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/noibat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/noivern/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/noivern/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/xerneas/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/xerneas/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/yveltal/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/yveltal/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/zygarde/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zygarde/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/diancie/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/diancie/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hoopa/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hoopa/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/volcanion/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/volcanion/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rowlet/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rowlet/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dartrix/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dartrix/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/decidueye/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/decidueye/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/litten/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/litten/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/torracat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/torracat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/incineroar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/incineroar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/popplio/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/popplio/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/brionne/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/brionne/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/primarina/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/primarina/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pikipek/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pikipek/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/trumbeak/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/trumbeak/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/toucannon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/toucannon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/yungoos/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/yungoos/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gumshoos/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gumshoos/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/grubbin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/grubbin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/charjabug/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/charjabug/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vikavolt/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vikavolt/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/crabrawler/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/crabrawler/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/crabominable/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/crabominable/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/oricorio/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/oricorio/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cutiefly/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cutiefly/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ribombee/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ribombee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rockruff/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rockruff/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lycanroc/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lycanroc/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lycanroc/dusk/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lycanroc/dusk/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lycanroc/midnight/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lycanroc/midnight/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wishiwashi/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wishiwashi/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mareanie/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mareanie/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/toxapex/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/toxapex/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mudbray/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mudbray/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mudsdale/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mudsdale/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dewpider/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dewpider/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/araquanid/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/araquanid/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/fomantis/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/fomantis/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lurantis/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lurantis/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/morelull/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/morelull/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shiinotic/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shiinotic/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/salandit/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/salandit/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/salazzle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/salazzle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/stufful/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/stufful/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bewear/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bewear/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bounsweet/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bounsweet/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/steenee/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/steenee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tsareena/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tsareena/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/comfey/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/comfey/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/oranguru/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/oranguru/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/passimian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/passimian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wimpod/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wimpod/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/golisopod/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/golisopod/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sandygast/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sandygast/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/palossand/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/palossand/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pyukumuku/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pyukumuku/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/type_null/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/type_null/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/silvally/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/silvally/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/minior/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/minior/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/komala/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/komala/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/turtonator/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/turtonator/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/togedemaru/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/togedemaru/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mimikyu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mimikyu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/bruxish/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/bruxish/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/drampa/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/drampa/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dhelmise/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dhelmise/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/jangmo_o/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/jangmo_o/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hakamo_o/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hakamo_o/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kommo_o/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kommo_o/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tapu_koko/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tapu_koko/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tapu_lele/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tapu_lele/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tapu_bulu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tapu_bulu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/tapu_fini/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/tapu_fini/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cosmog/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cosmog/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cosmoem/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cosmoem/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/solgaleo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/solgaleo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lunala/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lunala/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nihilego/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nihilego/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/buzzwole/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/buzzwole/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pheromosa/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pheromosa/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/xurkitree/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/xurkitree/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/celesteela/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/celesteela/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kartana/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kartana/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/guzzlord/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/guzzlord/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/necrozma/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/necrozma/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/necrozma/dawn_wings/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/necrozma/dawn_wings/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/necrozma/dusk_mane/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/necrozma/dusk_mane/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/magearna/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/magearna/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/marshadow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/marshadow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/poipole/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/poipole/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/naganadel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/naganadel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/stakataka/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/stakataka/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/blacephalon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/blacephalon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zeraora/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zeraora/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meltan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meltan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/melmetal/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/melmetal/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/grookey/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/grookey/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/thwackey/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/thwackey/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rillaboom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rillaboom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/scorbunny/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/scorbunny/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/raboot/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/raboot/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cinderace/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cinderace/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sobble/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sobble/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/drizzile/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/drizzile/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/inteleon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/inteleon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/skwovet/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/skwovet/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/greedent/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/greedent/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rookidee/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rookidee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/corvisquire/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/corvisquire/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/corviknight/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/corviknight/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/blipbug/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/blipbug/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dottler/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dottler/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/orbeetle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/orbeetle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/nickit/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/nickit/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/thievul/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/thievul/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gossifleur/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gossifleur/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/eldegoss/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/eldegoss/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wooloo/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wooloo/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dubwool/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dubwool/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/chewtle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/chewtle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/drednaw/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/drednaw/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/yamper/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/yamper/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/boltund/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/boltund/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rolycoly/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rolycoly/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/carkol/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/carkol/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/coalossal/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/coalossal/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/applin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/applin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flapple/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flapple/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/appletun/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/appletun/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/silicobra/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/silicobra/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sandaconda/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sandaconda/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cramorant/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cramorant/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/arrokuda/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arrokuda/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/barraskewda/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/barraskewda/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/toxel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/toxel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/toxtricity/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/toxtricity/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/toxtricity/low_key/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/toxtricity/low_key/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sizzlipede/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sizzlipede/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/centiskorch/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/centiskorch/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/clobbopus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/clobbopus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/grapploct/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/grapploct/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sinistea/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sinistea/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/polteageist/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/polteageist/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hatenna/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hatenna/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hattrem/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hattrem/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hatterene/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hatterene/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/impidimp/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/impidimp/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/morgrem/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/morgrem/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/grimmsnarl/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/grimmsnarl/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/obstagoon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/obstagoon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/perrserker/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/perrserker/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cursola/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cursola/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sirfetchd/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sirfetchd/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mr_rime/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mr_rime/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/runerigus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/runerigus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/milcery/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/milcery/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/alcremie/strawberry/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/alcremie/strawberry/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/falinks/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/falinks/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/pincurchin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pincurchin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/snom/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/snom/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/frosmoth/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/frosmoth/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/stonjourner/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/stonjourner/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/eiscue/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/eiscue/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/indeedee/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/indeedee/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/morpeko/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/morpeko/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/cufant/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/cufant/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/copperajah/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/copperajah/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dracozolt/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dracozolt/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/arctozolt/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arctozolt/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dracovish/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dracovish/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/arctovish/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arctovish/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/duraludon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/duraludon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dreepy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dreepy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/drakloak/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/drakloak/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dragapult/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dragapult/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zacian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zacian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zacian/crowned_sword/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zacian/crowned_sword/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zamazenta/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zamazenta/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zamazenta/crowned_shield/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zamazenta/crowned_shield/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/eternatus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/eternatus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kubfu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kubfu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/urshifu/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/urshifu/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zarude/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zarude/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/regieleki/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/regieleki/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/regidrago/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/regidrago/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/glastrier/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/glastrier/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/spectrier/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/spectrier/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/calyrex/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/calyrex/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/calyrex/shadow_rider/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/calyrex/shadow_rider/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/calyrex/ice_rider/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/calyrex/ice_rider/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zapdos/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zapdos/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meowth/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meowth/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ponyta/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ponyta/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rapidash/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rapidash/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slowpoke/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slowpoke/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slowbro/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slowbro/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/farfetchd/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/farfetchd/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/weezing/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/weezing/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/mr_mime/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/mr_mime/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/articuno/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/articuno/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/moltres/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/moltres/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/slowking/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/slowking/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/corsola/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/corsola/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zigzagoon/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zigzagoon/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/linoone/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/linoone/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/darumaka/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/darumaka/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/darmanitan/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/darmanitan/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/yamask/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/yamask/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/stunfisk/galarian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/stunfisk/galarian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/growlithe/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/growlithe/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/arcanine/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arcanine/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/voltorb/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/voltorb/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/electrode/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/electrode/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/braviary/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/braviary/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/qwilfish/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/qwilfish/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sneasel/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sneasel/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zorua/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zorua/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/zoroark/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/zoroark/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/samurott/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/samurott/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/lilligant/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/lilligant/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sliggoo/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sliggoo/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/goodra/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/goodra/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/avalugg/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/avalugg/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/decidueye/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/decidueye/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/typhlosion/hisuian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/typhlosion/hisuian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dialga/origin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dialga/origin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/palkia/origin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/palkia/origin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/wyrdeer/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wyrdeer/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/kleavor/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/kleavor/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/basculin/white_striped/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/basculin/white_striped/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/basculegion/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/basculegion/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/basculegion/female/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/basculegion/female/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ursaluna/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ursaluna/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sneasler/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sneasler/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/overqwil/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/overqwil/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/enamorus/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/enamorus/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/enamorus/therian/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/enamorus/therian/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/pichu/spiky_eared/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/pichu/spiky_eared/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/deoxys/attack/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/deoxys/attack/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/deoxys/defense/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/deoxys/defense/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/deoxys/speed/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/deoxys/speed/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/burmy/sandy_cloak/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/burmy/sandy_cloak/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/burmy/trash_cloak/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/burmy/trash_cloak/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wormadam/sandy_cloak/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wormadam/sandy_cloak/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/wormadam/trash_cloak/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/wormadam/trash_cloak/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/shellos/east_sea/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/shellos/east_sea/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/gastrodon/east_sea/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/gastrodon/east_sea/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rotom/heat/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rotom/heat/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rotom/wash/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rotom/wash/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rotom/frost/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rotom/frost/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rotom/fan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rotom/fan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/rotom/mow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rotom/mow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/giratina/origin/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/giratina/origin/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/fighting/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/fighting/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/flying/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/flying/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/poison/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/poison/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/ground/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/ground/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/rock/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/rock/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/bug/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/bug/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/ghost/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/ghost/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/steel/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/steel/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/fire/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/fire/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/water/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/water/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/grass/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/grass/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/electric/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/electric/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/psychic/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/psychic/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/ice/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/ice/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/dragon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/dragon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/dark/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/dark/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/arceus/fairy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/arceus/fairy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/basculin/blue_striped/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/basculin/blue_striped/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/deerling/autumn/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/deerling/autumn/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/deerling/summer/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/deerling/summer/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/deerling/winter/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/deerling/winter/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sawsbuck/autumn/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sawsbuck/autumn/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sawsbuck/summer/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sawsbuck/summer/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sawsbuck/winter/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sawsbuck/winter/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meloetta/pirouette/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meloetta/pirouette/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/polar/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/polar/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/tundra/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/tundra/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/continental/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/continental/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/garden/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/garden/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/elegant/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/elegant/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/modern/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/modern/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/marine/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/marine/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/archipelago/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/archipelago/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/high_plains/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/high_plains/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/sandstorm/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/sandstorm/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/river/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/river/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/monsoon/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/monsoon/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/savanna/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/savanna/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/sun/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/sun/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/ocean/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/ocean/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/jungle/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/jungle/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/fancy/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/fancy/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/poke_ball/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/poke_ball/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vivillon/meadow/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vivillon/meadow/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flabebe/yellow_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flabebe/yellow_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flabebe/blue_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flabebe/blue_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flabebe/orange_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flabebe/orange_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/flabebe/white_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/flabebe/white_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/yellow_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/yellow_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/blue_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/blue_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/orange_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/orange_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/white_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/white_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/floette/eternal_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/floette/eternal_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/florges/yellow_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/florges/yellow_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/florges/blue_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/florges/blue_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/florges/orange_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/florges/orange_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/florges/white_flower/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/florges/white_flower/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furfrou/heart_trim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furfrou/heart_trim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furfrou/star_trim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furfrou/star_trim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furfrou/diamond_trim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furfrou/diamond_trim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furfrou/debutante_trim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furfrou/debutante_trim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furfrou/matron_trim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furfrou/matron_trim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furfrou/dandy_trim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furfrou/dandy_trim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furfrou/la_reine_trim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furfrou/la_reine_trim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furfrou/kabuki_trim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furfrou/kabuki_trim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/furfrou/pharaoh_trim/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/furfrou/pharaoh_trim/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/hoopa/unbound/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/hoopa/unbound/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/rattata/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/rattata/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/raticate/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/raticate/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/raichu/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/raichu/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sandshrew/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sandshrew/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/sandslash/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/sandslash/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/vulpix/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/vulpix/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/ninetales/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/ninetales/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/diglett/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/diglett/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/dugtrio/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/dugtrio/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/meowth/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/meowth/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/persian/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/persian/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/geodude/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/geodude/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/graveler/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/graveler/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/golem/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/golem/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/grimer/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/grimer/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/muk/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/muk/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(POKEMONGFXDIR)/exeggutor/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/exeggutor/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(POKEMONGFXDIR)/marowak/alolan/follower.4bpp: %.4bpp: %.png +$(POKEMONGFXDIR)/marowak/alolan/overworld.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(MISCGFXDIR)/emotes.4bpp: %.4bpp: %.png diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index bbcf22e258..4e3cccba1e 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -1,5 +1,5 @@ // Normally, INCBIN_COMP acts like INCBIN_U32, but appends `.lz` to the file, compressing it; -// If not compressing follower gfx, make this an alias to INCBIN_32, so gfx will *not* be compressed +// If not compressing overworld gfx, make this an alias to INCBIN_32, so gfx will *not* be compressed #if !(OW_GFX_COMPRESS) #define INCBIN_COMP INCBIN_U32 #endif @@ -12,7 +12,7 @@ const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/ico #if P_FOOTPRINTS const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp"); #endif //P_FOOTPRINTS -const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_mark/follower.4bpp"); +const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_mark/overworld.4bpp"); #if P_FAMILY_BULBASAUR const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz"); @@ -23,13 +23,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bulbasaur[] = INCBIN_COMP("graphics/pokemon/bulbasaur/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bulbasaur[] = INCBIN_COMP("graphics/pokemon/bulbasaur/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/anim_front.4bpp.lz"); const u32 gMonPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/normal.gbapal.lz"); @@ -39,13 +39,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ivysaur[] = INCBIN_COMP("graphics/pokemon/ivysaur/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ivysaur[] = INCBIN_COMP("graphics/pokemon/ivysaur/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/anim_front.4bpp.lz"); const u32 gMonPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/normal.gbapal.lz"); @@ -55,13 +55,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Venusaur[] = INCBIN_COMP("graphics/pokemon/venusaur/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Venusaur[] = INCBIN_COMP("graphics/pokemon/venusaur/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/venusaur/anim_frontf.4bpp.lz"); const u32 gMonBackPic_VenusaurF[] = INCBIN_U32("graphics/pokemon/venusaur/backf.4bpp.lz"); @@ -72,13 +72,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/back.4bpp.lz"); const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/shiny.gbapal.lz"); const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/venusaur/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_VenusaurMega[] = INCBIN_COMP("graphics/pokemon/venusaur/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_VenusaurMega[] = INCBIN_COMP("graphics/pokemon/venusaur/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/venusaur/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS @@ -87,13 +87,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_VenusaurGigantamax[] = INCBIN_COMP("graphics/pokemon/venusaur/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_VenusaurGigantamax[] = INCBIN_U32("graphics/pokemon/venusaur/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_VenusaurGigantamax[] = INCBIN_COMP("graphics/pokemon/venusaur/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BULBASAUR @@ -106,13 +106,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Charmander[] = INCBIN_COMP("graphics/pokemon/charmander/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Charmander[] = INCBIN_COMP("graphics/pokemon/charmander/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/anim_front.4bpp.lz"); const u32 gMonPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/normal.gbapal.lz"); @@ -122,13 +122,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Charmeleon[] = INCBIN_COMP("graphics/pokemon/charmeleon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Charmeleon[] = INCBIN_COMP("graphics/pokemon/charmeleon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/anim_front.4bpp.lz"); const u32 gMonPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/normal.gbapal.lz"); @@ -138,13 +138,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Charizard[] = INCBIN_COMP("graphics/pokemon/charizard/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Charizard[] = INCBIN_COMP("graphics/pokemon/charizard/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/front.4bpp.lz"); @@ -152,26 +152,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/back.4bpp.lz"); const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/shiny.gbapal.lz"); const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/charizard/mega_x/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CharizardMegaX[] = INCBIN_COMP("graphics/pokemon/charizard/mega_x/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CharizardMegaX[] = INCBIN_COMP("graphics/pokemon/charizard/mega_x/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/charizard/mega_x/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/front.4bpp.lz"); const u32 gMonPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/normal.gbapal.lz"); const u32 gMonBackPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/back.4bpp.lz"); const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/shiny.gbapal.lz"); const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/charizard/mega_y/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CharizardMegaY[] = INCBIN_COMP("graphics/pokemon/charizard/mega_y/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CharizardMegaY[] = INCBIN_COMP("graphics/pokemon/charizard/mega_y/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/charizard/mega_y/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS @@ -180,13 +180,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CharizardGigantamax[] = INCBIN_COMP("graphics/pokemon/charizard/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CharizardGigantamax[] = INCBIN_U32("graphics/pokemon/charizard/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CharizardGigantamax[] = INCBIN_COMP("graphics/pokemon/charizard/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHARMANDER @@ -199,13 +199,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Squirtle[] = INCBIN_COMP("graphics/pokemon/squirtle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Squirtle[] = INCBIN_COMP("graphics/pokemon/squirtle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/anim_front.4bpp.lz"); const u32 gMonPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/normal.gbapal.lz"); @@ -215,13 +215,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wartortle[] = INCBIN_COMP("graphics/pokemon/wartortle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wartortle[] = INCBIN_COMP("graphics/pokemon/wartortle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/anim_front.4bpp.lz"); const u32 gMonPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/normal.gbapal.lz"); @@ -231,13 +231,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Blastoise[] = INCBIN_COMP("graphics/pokemon/blastoise/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Blastoise[] = INCBIN_COMP("graphics/pokemon/blastoise/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/front.4bpp.lz"); @@ -245,13 +245,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/back.4bpp.lz"); const u32 gMonShinyPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/shiny.gbapal.lz"); const u8 gMonIcon_BlastoiseMega[] = INCBIN_U8("graphics/pokemon/blastoise/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_BlastoiseMega[] = INCBIN_COMP("graphics/pokemon/blastoise/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_BlastoiseMega[] = INCBIN_COMP("graphics/pokemon/blastoise/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/blastoise/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS @@ -260,13 +260,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_BlastoiseGigantamax[] = INCBIN_COMP("graphics/pokemon/blastoise/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_BlastoiseGigantamax[] = INCBIN_U32("graphics/pokemon/blastoise/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_BlastoiseGigantamax[] = INCBIN_COMP("graphics/pokemon/blastoise/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SQUIRTLE @@ -279,13 +279,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Caterpie[] = INCBIN_COMP("graphics/pokemon/caterpie/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Caterpie[] = INCBIN_COMP("graphics/pokemon/caterpie/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/anim_front.4bpp.lz"); const u32 gMonPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/normal.gbapal.lz"); @@ -295,13 +295,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Metapod[] = INCBIN_U8("graphics/pokemon/metapod/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Metapod[] = INCBIN_COMP("graphics/pokemon/metapod/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Metapod[] = INCBIN_COMP("graphics/pokemon/metapod/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/anim_front.4bpp.lz"); const u32 gMonPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/normal.gbapal.lz"); @@ -311,13 +311,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Butterfree[] = INCBIN_COMP("graphics/pokemon/butterfree/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Butterfree[] = INCBIN_COMP("graphics/pokemon/butterfree/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/butterfree/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ButterfreeF[] = INCBIN_U32("graphics/pokemon/butterfree/backf.4bpp.lz"); @@ -328,13 +328,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_ButterfreeGigantamax[] = INCBIN_COMP("graphics/pokemon/butterfree/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_ButterfreeGigantamax[] = INCBIN_U32("graphics/pokemon/butterfree/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_ButterfreeGigantamax[] = INCBIN_COMP("graphics/pokemon/butterfree/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CATERPIE @@ -347,13 +347,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Weedle[] = INCBIN_COMP("graphics/pokemon/weedle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Weedle[] = INCBIN_COMP("graphics/pokemon/weedle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/anim_front.4bpp.lz"); const u32 gMonPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/normal.gbapal.lz"); @@ -363,13 +363,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kakuna[] = INCBIN_COMP("graphics/pokemon/kakuna/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kakuna[] = INCBIN_COMP("graphics/pokemon/kakuna/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/anim_front.4bpp.lz"); const u32 gMonPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/normal.gbapal.lz"); @@ -379,13 +379,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Beedrill[] = INCBIN_COMP("graphics/pokemon/beedrill/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Beedrill[] = INCBIN_COMP("graphics/pokemon/beedrill/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/front.4bpp.lz"); @@ -393,13 +393,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/back.4bpp.lz"); const u32 gMonShinyPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/shiny.gbapal.lz"); const u8 gMonIcon_BeedrillMega[] = INCBIN_U8("graphics/pokemon/beedrill/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_BeedrillMega[] = INCBIN_COMP("graphics/pokemon/beedrill/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_BeedrillMega[] = INCBIN_COMP("graphics/pokemon/beedrill/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_BeedrillMega[] = INCBIN_U32("graphics/pokemon/beedrill/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_WEEDLE @@ -412,13 +412,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pidgey[] = INCBIN_COMP("graphics/pokemon/pidgey/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pidgey[] = INCBIN_COMP("graphics/pokemon/pidgey/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/anim_front.4bpp.lz"); const u32 gMonPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/normal.gbapal.lz"); @@ -428,13 +428,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pidgeotto[] = INCBIN_COMP("graphics/pokemon/pidgeotto/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pidgeotto[] = INCBIN_COMP("graphics/pokemon/pidgeotto/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/anim_front.4bpp.lz"); const u32 gMonPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/normal.gbapal.lz"); @@ -444,13 +444,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pidgeot[] = INCBIN_COMP("graphics/pokemon/pidgeot/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pidgeot[] = INCBIN_COMP("graphics/pokemon/pidgeot/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/front.4bpp.lz"); @@ -458,13 +458,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/back.4bpp.lz"); const u32 gMonShinyPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/shiny.gbapal.lz"); const u8 gMonIcon_PidgeotMega[] = INCBIN_U8("graphics/pokemon/pidgeot/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_PidgeotMega[] = INCBIN_COMP("graphics/pokemon/pidgeot/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_PidgeotMega[] = INCBIN_COMP("graphics/pokemon/pidgeot/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_PidgeotMega[] = INCBIN_U32("graphics/pokemon/pidgeot/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_PIDGEY @@ -477,13 +477,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rattata[] = INCBIN_COMP("graphics/pokemon/rattata/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rattata[] = INCBIN_COMP("graphics/pokemon/rattata/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_RattataF[] = INCBIN_U32("graphics/pokemon/rattata/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RattataF[] = INCBIN_U32("graphics/pokemon/rattata/backf.4bpp.lz"); @@ -496,13 +496,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Raticate[] = INCBIN_COMP("graphics/pokemon/raticate/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Raticate[] = INCBIN_COMP("graphics/pokemon/raticate/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_RaticateF[] = INCBIN_U32("graphics/pokemon/raticate/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RaticateF[] = INCBIN_U32("graphics/pokemon/raticate/backf.4bpp.lz"); @@ -513,26 +513,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_RattataAlolan[] = INCBIN_COMP("graphics/pokemon/rattata/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_RattataAlolan[] = INCBIN_U32("graphics/pokemon/rattata/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_RattataAlolan[] = INCBIN_COMP("graphics/pokemon/rattata/alolan/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_RaticateAlolan[] = INCBIN_COMP("graphics/pokemon/raticate/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_RaticateAlolan[] = INCBIN_U32("graphics/pokemon/raticate/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_RaticateAlolan[] = INCBIN_COMP("graphics/pokemon/raticate/alolan/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #endif //P_FAMILY_RATTATA @@ -545,13 +545,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Spearow[] = INCBIN_COMP("graphics/pokemon/spearow/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Spearow[] = INCBIN_COMP("graphics/pokemon/spearow/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/anim_front.4bpp.lz"); const u32 gMonPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/normal.gbapal.lz"); @@ -561,13 +561,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Fearow[] = INCBIN_COMP("graphics/pokemon/fearow/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Fearow[] = INCBIN_COMP("graphics/pokemon/fearow/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SPEAROW #if P_FAMILY_EKANS @@ -579,13 +579,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ekans[] = INCBIN_COMP("graphics/pokemon/ekans/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ekans[] = INCBIN_COMP("graphics/pokemon/ekans/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/anim_front.4bpp.lz"); const u32 gMonPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/normal.gbapal.lz"); @@ -595,13 +595,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Arbok[] = INCBIN_COMP("graphics/pokemon/arbok/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Arbok[] = INCBIN_COMP("graphics/pokemon/arbok/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_EKANS #if P_FAMILY_PIKACHU @@ -614,26 +614,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pichu[] = INCBIN_COMP("graphics/pokemon/pichu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pichu[] = INCBIN_COMP("graphics/pokemon/pichu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/anim_front.4bpp.lz"); const u32 gMonPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/normal.gbapal.lz"); const u32 gMonBackPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/back.4bpp.lz"); const u32 gMonShinyPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/shiny.gbapal.lz"); const u8 gMonIcon_PichuSpikyEared[] = INCBIN_U8("graphics/pokemon/pichu/spiky_eared/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_PichuSpikyEared[] = INCBIN_COMP("graphics/pokemon/pichu/spiky_eared/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_PichuSpikyEared[] = INCBIN_COMP("graphics/pokemon/pichu/spiky_eared/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/anim_front.4bpp.lz"); @@ -644,13 +644,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pikachu[] = INCBIN_COMP("graphics/pokemon/pikachu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pikachu[] = INCBIN_COMP("graphics/pokemon/pikachu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_PikachuF[] = INCBIN_U32("graphics/pokemon/pikachu/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PikachuF[] = INCBIN_U32("graphics/pokemon/pikachu/backf.4bpp.lz"); @@ -695,14 +695,14 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_PikachuLibre[] = INCBIN_U32("graphics/pokemon/pikachu/libre/shiny.gbapal.lz"); const u8 gMonIcon_PikachuLibre[] = INCBIN_U8("graphics/pokemon/pikachu/libre/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_PikachuCosplay[] = INCBIN_COMP("graphics/pokemon/pikachu/cosplay/follower.4bpp"); - // const u32 gObjectEventPic_PikachuRockStar[] = INCBIN_COMP("graphics/pokemon/pikachu/rock_star/follower.4bpp"); - // const u32 gObjectEventPic_PikachuBelle[] = INCBIN_COMP("graphics/pokemon/pikachu/belle/follower.4bpp"); - // const u32 gObjectEventPic_PikachuPopStar[] = INCBIN_COMP("graphics/pokemon/pikachu/pop_star/follower.4bpp"); - // const u32 gObjectEventPic_PikachuPhD[] = INCBIN_COMP("graphics/pokemon/pikachu/ph_d/follower.4bpp"); - // const u32 gObjectEventPic_PikachuLibre[] = INCBIN_COMP("graphics/pokemon/pikachu/libre/follower.4bpp"); -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_PikachuCosplay[] = INCBIN_COMP("graphics/pokemon/pikachu/cosplay/overworld.4bpp"); + // 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_PikachuLibre[] = INCBIN_COMP("graphics/pokemon/pikachu/libre/overworld.4bpp"); +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_COSPLAY_PIKACHU_FORMS #if P_CAP_PIKACHU_FORMS @@ -754,16 +754,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_PikachuOriginalCap[] = INCBIN_COMP("graphics/pokemon/pikachu/original_cap/follower.4bpp"); - // const u32 gObjectEventPic_PikachuHoennCap[] = INCBIN_COMP("graphics/pokemon/pikachu/hoenn_cap/follower.4bpp"); - // const u32 gObjectEventPic_PikachuSinnohCap[] = INCBIN_COMP("graphics/pokemon/pikachu/sinnoh_cap/follower.4bpp"); - // const u32 gObjectEventPic_PikachuUnovaCap[] = INCBIN_COMP("graphics/pokemon/pikachu/unova_cap/follower.4bpp"); - // const u32 gObjectEventPic_PikachuKalosCap[] = INCBIN_COMP("graphics/pokemon/pikachu/kalos_cap/follower.4bpp"); - // const u32 gObjectEventPic_PikachuAlolaCap[] = INCBIN_COMP("graphics/pokemon/pikachu/alola_cap/follower.4bpp"); - // const u32 gObjectEventPic_PikachuPartnerCap[] = INCBIN_COMP("graphics/pokemon/pikachu/partner_cap/follower.4bpp"); - // const u32 gObjectEventPic_PikachuWorldCap[] = INCBIN_COMP("graphics/pokemon/pikachu/world_cap/follower.4bpp"); -#endif //OW_FOLLOWERS_ENABLED +#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"); +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_CAP_PIKACHU_FORMS #if P_GIGANTAMAX_FORMS @@ -772,13 +772,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_PikachuGigantamax[] = INCBIN_COMP("graphics/pokemon/pikachu/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_PikachuGigantamax[] = INCBIN_U32("graphics/pokemon/pikachu/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_PikachuGigantamax[] = INCBIN_COMP("graphics/pokemon/pikachu/gigantamax/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"); +#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"); @@ -794,13 +794,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Raichu[] = INCBIN_COMP("graphics/pokemon/raichu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Raichu[] = INCBIN_COMP("graphics/pokemon/raichu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_RaichuF[] = INCBIN_U32("graphics/pokemon/raichu/anim_frontf.4bpp.lz"); @@ -810,13 +810,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_RaichuAlolan[] = INCBIN_COMP("graphics/pokemon/raichu/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_RaichuAlolan[] = INCBIN_U32("graphics/pokemon/raichu/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_RaichuAlolan[] = INCBIN_COMP("graphics/pokemon/raichu/alolan/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #endif //P_FAMILY_PIKACHU @@ -829,13 +829,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sandshrew[] = INCBIN_COMP("graphics/pokemon/sandshrew/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sandshrew[] = INCBIN_COMP("graphics/pokemon/sandshrew/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/anim_front.4bpp.lz"); const u32 gMonPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/normal.gbapal.lz"); @@ -845,13 +845,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sandslash[] = INCBIN_COMP("graphics/pokemon/sandslash/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sandslash[] = INCBIN_COMP("graphics/pokemon/sandslash/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/front.4bpp.lz"); @@ -859,26 +859,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_SandshrewAlolan[] = INCBIN_COMP("graphics/pokemon/sandshrew/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_SandshrewAlolan[] = INCBIN_U32("graphics/pokemon/sandshrew/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_SandshrewAlolan[] = INCBIN_COMP("graphics/pokemon/sandshrew/alolan/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_SandslashAlolan[] = INCBIN_COMP("graphics/pokemon/sandslash/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_SandslashAlolan[] = INCBIN_U32("graphics/pokemon/sandslash/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_SandslashAlolan[] = INCBIN_COMP("graphics/pokemon/sandslash/alolan/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #endif //P_FAMILY_SANDSHREW @@ -891,13 +891,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_NidoranF[] = INCBIN_COMP("graphics/pokemon/nidoran_f/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_NidoranF[] = INCBIN_COMP("graphics/pokemon/nidoran_f/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/anim_front.4bpp.lz"); const u32 gMonPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/normal.gbapal.lz"); @@ -907,13 +907,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Nidorina[] = INCBIN_COMP("graphics/pokemon/nidorina/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Nidorina[] = INCBIN_COMP("graphics/pokemon/nidorina/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/anim_front.4bpp.lz"); const u32 gMonPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/normal.gbapal.lz"); @@ -923,13 +923,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Nidoqueen[] = INCBIN_COMP("graphics/pokemon/nidoqueen/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Nidoqueen[] = INCBIN_COMP("graphics/pokemon/nidoqueen/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/anim_front.4bpp.lz"); const u32 gMonPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/normal.gbapal.lz"); @@ -939,13 +939,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_NidoranM[] = INCBIN_COMP("graphics/pokemon/nidoran_m/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_NidoranM[] = INCBIN_COMP("graphics/pokemon/nidoran_m/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/anim_front.4bpp.lz"); const u32 gMonPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/normal.gbapal.lz"); @@ -955,13 +955,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Nidorino[] = INCBIN_COMP("graphics/pokemon/nidorino/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Nidorino[] = INCBIN_COMP("graphics/pokemon/nidorino/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/anim_front.4bpp.lz"); const u32 gMonPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/normal.gbapal.lz"); @@ -971,13 +971,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Nidoking[] = INCBIN_COMP("graphics/pokemon/nidoking/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Nidoking[] = INCBIN_COMP("graphics/pokemon/nidoking/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_NIDORAN #if P_FAMILY_CLEFAIRY @@ -990,13 +990,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cleffa[] = INCBIN_COMP("graphics/pokemon/cleffa/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cleffa[] = INCBIN_COMP("graphics/pokemon/cleffa/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/anim_front.4bpp.lz"); @@ -1007,13 +1007,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Clefairy[] = INCBIN_COMP("graphics/pokemon/clefairy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Clefairy[] = INCBIN_COMP("graphics/pokemon/clefairy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/anim_front.4bpp.lz"); const u32 gMonPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/normal.gbapal.lz"); @@ -1023,13 +1023,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Clefable[] = INCBIN_COMP("graphics/pokemon/clefable/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Clefable[] = INCBIN_COMP("graphics/pokemon/clefable/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CLEFAIRY #if P_FAMILY_VULPIX @@ -1041,13 +1041,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vulpix[] = INCBIN_COMP("graphics/pokemon/vulpix/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vulpix[] = INCBIN_COMP("graphics/pokemon/vulpix/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/anim_front.4bpp.lz"); const u32 gMonPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/normal.gbapal.lz"); @@ -1057,13 +1057,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ninetales[] = INCBIN_COMP("graphics/pokemon/ninetales/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ninetales[] = INCBIN_COMP("graphics/pokemon/ninetales/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/front.4bpp.lz"); @@ -1071,26 +1071,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_VulpixAlolan[] = INCBIN_COMP("graphics/pokemon/vulpix/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_VulpixAlolan[] = INCBIN_U32("graphics/pokemon/vulpix/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_VulpixAlolan[] = INCBIN_COMP("graphics/pokemon/vulpix/alolan/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_NinetalesAlolan[] = INCBIN_COMP("graphics/pokemon/ninetales/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_NinetalesAlolan[] = INCBIN_U32("graphics/pokemon/ninetales/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_NinetalesAlolan[] = INCBIN_COMP("graphics/pokemon/ninetales/alolan/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #endif //P_FAMILY_VULPIX @@ -1104,13 +1104,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Igglybuff[] = INCBIN_COMP("graphics/pokemon/igglybuff/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Igglybuff[] = INCBIN_COMP("graphics/pokemon/igglybuff/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/anim_front.4bpp.lz"); @@ -1121,13 +1121,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Jigglypuff[] = INCBIN_COMP("graphics/pokemon/jigglypuff/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Jigglypuff[] = INCBIN_COMP("graphics/pokemon/jigglypuff/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/anim_front.4bpp.lz"); const u32 gMonPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/normal.gbapal.lz"); @@ -1137,13 +1137,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wigglytuff[] = INCBIN_COMP("graphics/pokemon/wigglytuff/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wigglytuff[] = INCBIN_COMP("graphics/pokemon/wigglytuff/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_JIGGLYPUFF #if P_FAMILY_ZUBAT @@ -1155,13 +1155,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zubat[] = INCBIN_COMP("graphics/pokemon/zubat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zubat[] = INCBIN_COMP("graphics/pokemon/zubat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ZubatF[] = INCBIN_U32("graphics/pokemon/zubat/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ZubatF[] = INCBIN_U32("graphics/pokemon/zubat/backf.4bpp.lz"); @@ -1174,13 +1174,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Golbat[] = INCBIN_COMP("graphics/pokemon/golbat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Golbat[] = INCBIN_COMP("graphics/pokemon/golbat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GolbatF[] = INCBIN_U32("graphics/pokemon/golbat/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GolbatF[] = INCBIN_U32("graphics/pokemon/golbat/backf.4bpp.lz"); @@ -1194,13 +1194,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Crobat[] = INCBIN_COMP("graphics/pokemon/crobat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Crobat[] = INCBIN_COMP("graphics/pokemon/crobat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ZUBAT @@ -1213,13 +1213,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Oddish[] = INCBIN_COMP("graphics/pokemon/oddish/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Oddish[] = INCBIN_COMP("graphics/pokemon/oddish/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/anim_front.4bpp.lz"); const u32 gMonPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/normal.gbapal.lz"); @@ -1229,13 +1229,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gloom[] = INCBIN_COMP("graphics/pokemon/gloom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gloom[] = INCBIN_COMP("graphics/pokemon/gloom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GloomF[] = INCBIN_U32("graphics/pokemon/gloom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GloomF[] = INCBIN_U32("graphics/pokemon/gloom/backf.4bpp.lz"); @@ -1248,13 +1248,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vileplume[] = INCBIN_COMP("graphics/pokemon/vileplume/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vileplume[] = INCBIN_COMP("graphics/pokemon/vileplume/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/vileplume/anim_frontf.4bpp.lz"); const u32 gMonBackPic_VileplumeF[] = INCBIN_U32("graphics/pokemon/vileplume/backf.4bpp.lz"); @@ -1268,13 +1268,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bellossom[] = INCBIN_COMP("graphics/pokemon/bellossom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bellossom[] = INCBIN_COMP("graphics/pokemon/bellossom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ODDISH @@ -1287,13 +1287,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Paras[] = INCBIN_U8("graphics/pokemon/paras/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Paras[] = INCBIN_COMP("graphics/pokemon/paras/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Paras[] = INCBIN_COMP("graphics/pokemon/paras/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/anim_front.4bpp.lz"); const u32 gMonPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/normal.gbapal.lz"); @@ -1303,13 +1303,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Parasect[] = INCBIN_COMP("graphics/pokemon/parasect/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Parasect[] = INCBIN_COMP("graphics/pokemon/parasect/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PARAS #if P_FAMILY_VENONAT @@ -1321,13 +1321,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Venonat[] = INCBIN_COMP("graphics/pokemon/venonat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Venonat[] = INCBIN_COMP("graphics/pokemon/venonat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/anim_front.4bpp.lz"); const u32 gMonPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/normal.gbapal.lz"); @@ -1337,13 +1337,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Venomoth[] = INCBIN_COMP("graphics/pokemon/venomoth/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Venomoth[] = INCBIN_COMP("graphics/pokemon/venomoth/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_VENONAT #if P_FAMILY_DIGLETT @@ -1355,13 +1355,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Diglett[] = INCBIN_COMP("graphics/pokemon/diglett/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Diglett[] = INCBIN_COMP("graphics/pokemon/diglett/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/anim_front.4bpp.lz"); const u32 gMonPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/normal.gbapal.lz"); @@ -1371,13 +1371,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dugtrio[] = INCBIN_COMP("graphics/pokemon/dugtrio/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dugtrio[] = INCBIN_COMP("graphics/pokemon/dugtrio/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/front.4bpp.lz"); @@ -1385,26 +1385,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_DiglettAlolan[] = INCBIN_COMP("graphics/pokemon/diglett/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_DiglettAlolan[] = INCBIN_U32("graphics/pokemon/diglett/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_DiglettAlolan[] = INCBIN_COMP("graphics/pokemon/diglett/alolan/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_DugtrioAlolan[] = INCBIN_COMP("graphics/pokemon/dugtrio/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_DugtrioAlolan[] = INCBIN_U32("graphics/pokemon/dugtrio/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_DugtrioAlolan[] = INCBIN_COMP("graphics/pokemon/dugtrio/alolan/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #endif //P_FAMILY_DIGLETT @@ -1417,13 +1417,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Meowth[] = INCBIN_COMP("graphics/pokemon/meowth/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Meowth[] = INCBIN_COMP("graphics/pokemon/meowth/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/anim_front.4bpp.lz"); const u32 gMonPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/normal.gbapal.lz"); @@ -1433,13 +1433,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Persian[] = INCBIN_U8("graphics/pokemon/persian/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Persian[] = INCBIN_COMP("graphics/pokemon/persian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Persian[] = INCBIN_COMP("graphics/pokemon/persian/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/front.4bpp.lz"); @@ -1447,26 +1447,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MeowthAlolan[] = INCBIN_COMP("graphics/pokemon/meowth/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MeowthAlolan[] = INCBIN_U32("graphics/pokemon/meowth/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MeowthAlolan[] = INCBIN_COMP("graphics/pokemon/meowth/alolan/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_PersianAlolan[] = INCBIN_COMP("graphics/pokemon/persian/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_PersianAlolan[] = INCBIN_U32("graphics/pokemon/persian/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_PersianAlolan[] = INCBIN_COMP("graphics/pokemon/persian/alolan/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #if P_GALARIAN_FORMS @@ -1475,13 +1475,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MeowthGalarian[] = INCBIN_COMP("graphics/pokemon/meowth/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MeowthGalarian[] = INCBIN_U32("graphics/pokemon/meowth/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MeowthGalarian[] = INCBIN_COMP("graphics/pokemon/meowth/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/front.4bpp.lz"); const u32 gMonPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/normal.gbapal.lz"); @@ -1491,13 +1491,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Perrserker[] = INCBIN_U8("graphics/pokemon/perrserker/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Perrserker[] = INCBIN_COMP("graphics/pokemon/perrserker/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Perrserker[] = INCBIN_COMP("graphics/pokemon/perrserker/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #if P_GIGANTAMAX_FORMS @@ -1506,13 +1506,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MeowthGigantamax[] = INCBIN_COMP("graphics/pokemon/meowth/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MeowthGigantamax[] = INCBIN_U32("graphics/pokemon/meowth/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MeowthGigantamax[] = INCBIN_COMP("graphics/pokemon/meowth/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MEOWTH @@ -1525,13 +1525,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Psyduck[] = INCBIN_COMP("graphics/pokemon/psyduck/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Psyduck[] = INCBIN_COMP("graphics/pokemon/psyduck/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/anim_front.4bpp.lz"); const u32 gMonPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/normal.gbapal.lz"); @@ -1541,13 +1541,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Golduck[] = INCBIN_COMP("graphics/pokemon/golduck/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Golduck[] = INCBIN_COMP("graphics/pokemon/golduck/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PSYDUCK #if P_FAMILY_MANKEY @@ -1559,13 +1559,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mankey[] = INCBIN_COMP("graphics/pokemon/mankey/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mankey[] = INCBIN_COMP("graphics/pokemon/mankey/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/anim_front.4bpp.lz"); const u32 gMonPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/normal.gbapal.lz"); @@ -1575,13 +1575,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Primeape[] = INCBIN_COMP("graphics/pokemon/primeape/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Primeape[] = INCBIN_COMP("graphics/pokemon/primeape/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_9_CROSS_EVOS const u32 gMonFrontPic_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/front.4bpp.lz"); @@ -1592,13 +1592,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Annihilape[] = INCBIN_U8("graphics/pokemon/annihilape/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Annihilape[] = INCBIN_COMP("graphics/pokemon/annihilape/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Annihilape[] = INCBIN_COMP("graphics/pokemon/annihilape/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Annihilape[] = INCBIN_U32("graphics/pokemon/annihilape/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_MANKEY @@ -1611,13 +1611,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Growlithe[] = INCBIN_COMP("graphics/pokemon/growlithe/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Growlithe[] = INCBIN_COMP("graphics/pokemon/growlithe/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/anim_front.4bpp.lz"); const u32 gMonPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/normal.gbapal.lz"); @@ -1627,13 +1627,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Arcanine[] = INCBIN_COMP("graphics/pokemon/arcanine/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Arcanine[] = INCBIN_COMP("graphics/pokemon/arcanine/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/front.4bpp.lz"); @@ -1641,26 +1641,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_GrowlitheHisuian[] = INCBIN_COMP("graphics/pokemon/growlithe/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_GrowlitheHisuian[] = INCBIN_COMP("graphics/pokemon/growlithe/hisuian/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ArcanineHisuian[] = INCBIN_COMP("graphics/pokemon/arcanine/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ArcanineHisuian[] = INCBIN_COMP("graphics/pokemon/arcanine/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GROWLITHE @@ -1673,13 +1673,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Poliwag[] = INCBIN_COMP("graphics/pokemon/poliwag/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Poliwag[] = INCBIN_COMP("graphics/pokemon/poliwag/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/anim_front.4bpp.lz"); const u32 gMonPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/normal.gbapal.lz"); @@ -1689,13 +1689,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Poliwhirl[] = INCBIN_COMP("graphics/pokemon/poliwhirl/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Poliwhirl[] = INCBIN_COMP("graphics/pokemon/poliwhirl/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/anim_front.4bpp.lz"); const u32 gMonPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/normal.gbapal.lz"); @@ -1705,13 +1705,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Poliwrath[] = INCBIN_COMP("graphics/pokemon/poliwrath/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Poliwrath[] = INCBIN_COMP("graphics/pokemon/poliwrath/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/anim_front.4bpp.lz"); @@ -1722,13 +1722,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Politoed[] = INCBIN_COMP("graphics/pokemon/politoed/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Politoed[] = INCBIN_COMP("graphics/pokemon/politoed/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/politoed/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PolitoedF[] = INCBIN_U32("graphics/pokemon/politoed/backf.4bpp.lz"); @@ -1744,13 +1744,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Abra[] = INCBIN_U8("graphics/pokemon/abra/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Abra[] = INCBIN_COMP("graphics/pokemon/abra/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Abra[] = INCBIN_COMP("graphics/pokemon/abra/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/anim_front.4bpp.lz"); const u32 gMonPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/normal.gbapal.lz"); @@ -1760,13 +1760,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kadabra[] = INCBIN_COMP("graphics/pokemon/kadabra/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kadabra[] = INCBIN_COMP("graphics/pokemon/kadabra/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_KadabraF[] = INCBIN_U32("graphics/pokemon/kadabra/anim_frontf.4bpp.lz"); const u32 gMonBackPic_KadabraF[] = INCBIN_U32("graphics/pokemon/kadabra/backf.4bpp.lz"); @@ -1779,13 +1779,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Alakazam[] = INCBIN_COMP("graphics/pokemon/alakazam/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Alakazam[] = INCBIN_COMP("graphics/pokemon/alakazam/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/alakazam/anim_frontf.4bpp.lz"); const u32 gMonBackPic_AlakazamF[] = INCBIN_U32("graphics/pokemon/alakazam/backf.4bpp.lz"); @@ -1796,13 +1796,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/shiny.gbapal.lz"); const u8 gMonIcon_AlakazamMega[] = INCBIN_U8("graphics/pokemon/alakazam/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AlakazamMega[] = INCBIN_COMP("graphics/pokemon/alakazam/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AlakazamMega[] = INCBIN_COMP("graphics/pokemon/alakazam/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AlakazamMega[] = INCBIN_U32("graphics/pokemon/alakazam/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABRA @@ -1815,13 +1815,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Machop[] = INCBIN_U8("graphics/pokemon/machop/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Machop[] = INCBIN_COMP("graphics/pokemon/machop/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Machop[] = INCBIN_COMP("graphics/pokemon/machop/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/anim_front.4bpp.lz"); const u32 gMonPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/normal.gbapal.lz"); @@ -1831,13 +1831,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Machoke[] = INCBIN_COMP("graphics/pokemon/machoke/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Machoke[] = INCBIN_COMP("graphics/pokemon/machoke/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/anim_front.4bpp.lz"); const u32 gMonPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/normal.gbapal.lz"); @@ -1847,13 +1847,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Machamp[] = INCBIN_COMP("graphics/pokemon/machamp/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Machamp[] = INCBIN_COMP("graphics/pokemon/machamp/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/front.4bpp.lz"); @@ -1861,13 +1861,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MachampGigantamax[] = INCBIN_COMP("graphics/pokemon/machamp/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MachampGigantamax[] = INCBIN_U32("graphics/pokemon/machamp/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MachampGigantamax[] = INCBIN_COMP("graphics/pokemon/machamp/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MACHOP @@ -1880,13 +1880,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bellsprout[] = INCBIN_COMP("graphics/pokemon/bellsprout/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bellsprout[] = INCBIN_COMP("graphics/pokemon/bellsprout/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/anim_front.4bpp.lz"); const u32 gMonPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/normal.gbapal.lz"); @@ -1896,13 +1896,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Weepinbell[] = INCBIN_COMP("graphics/pokemon/weepinbell/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Weepinbell[] = INCBIN_COMP("graphics/pokemon/weepinbell/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/anim_front.4bpp.lz"); const u32 gMonPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/normal.gbapal.lz"); @@ -1912,13 +1912,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Victreebel[] = INCBIN_COMP("graphics/pokemon/victreebel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Victreebel[] = INCBIN_COMP("graphics/pokemon/victreebel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BELLSPROUT #if P_FAMILY_TENTACOOL @@ -1930,13 +1930,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tentacool[] = INCBIN_COMP("graphics/pokemon/tentacool/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tentacool[] = INCBIN_COMP("graphics/pokemon/tentacool/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/anim_front.4bpp.lz"); const u32 gMonPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/normal.gbapal.lz"); @@ -1946,13 +1946,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tentacruel[] = INCBIN_COMP("graphics/pokemon/tentacruel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tentacruel[] = INCBIN_COMP("graphics/pokemon/tentacruel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TENTACOOL #if P_FAMILY_GEODUDE @@ -1964,13 +1964,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Geodude[] = INCBIN_COMP("graphics/pokemon/geodude/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Geodude[] = INCBIN_COMP("graphics/pokemon/geodude/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/anim_front.4bpp.lz"); const u32 gMonPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/normal.gbapal.lz"); @@ -1980,13 +1980,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Graveler[] = INCBIN_COMP("graphics/pokemon/graveler/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Graveler[] = INCBIN_COMP("graphics/pokemon/graveler/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/anim_front.4bpp.lz"); const u32 gMonPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/normal.gbapal.lz"); @@ -1996,13 +1996,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Golem[] = INCBIN_U8("graphics/pokemon/golem/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Golem[] = INCBIN_COMP("graphics/pokemon/golem/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Golem[] = INCBIN_COMP("graphics/pokemon/golem/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/front.4bpp.lz"); @@ -2010,39 +2010,39 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_GeodudeAlolan[] = INCBIN_COMP("graphics/pokemon/geodude/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_GeodudeAlolan[] = INCBIN_U32("graphics/pokemon/geodude/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_GeodudeAlolan[] = INCBIN_COMP("graphics/pokemon/geodude/alolan/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_GravelerAlolan[] = INCBIN_COMP("graphics/pokemon/graveler/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_GravelerAlolan[] = INCBIN_U32("graphics/pokemon/graveler/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_GravelerAlolan[] = INCBIN_COMP("graphics/pokemon/graveler/alolan/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_GolemAlolan[] = INCBIN_COMP("graphics/pokemon/golem/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_GolemAlolan[] = INCBIN_U32("graphics/pokemon/golem/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_GolemAlolan[] = INCBIN_COMP("graphics/pokemon/golem/alolan/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GEODUDE @@ -2055,13 +2055,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ponyta[] = INCBIN_COMP("graphics/pokemon/ponyta/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ponyta[] = INCBIN_COMP("graphics/pokemon/ponyta/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/anim_front.4bpp.lz"); const u32 gMonPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/normal.gbapal.lz"); @@ -2071,13 +2071,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rapidash[] = INCBIN_COMP("graphics/pokemon/rapidash/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rapidash[] = INCBIN_COMP("graphics/pokemon/rapidash/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/front.4bpp.lz"); @@ -2085,26 +2085,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_PonytaGalarian[] = INCBIN_COMP("graphics/pokemon/ponyta/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_PonytaGalarian[] = INCBIN_U32("graphics/pokemon/ponyta/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_PonytaGalarian[] = INCBIN_COMP("graphics/pokemon/ponyta/galarian/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_RapidashGalarian[] = INCBIN_COMP("graphics/pokemon/rapidash/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_RapidashGalarian[] = INCBIN_U32("graphics/pokemon/rapidash/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_RapidashGalarian[] = INCBIN_COMP("graphics/pokemon/rapidash/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_PONYTA @@ -2117,13 +2117,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Slowpoke[] = INCBIN_COMP("graphics/pokemon/slowpoke/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Slowpoke[] = INCBIN_COMP("graphics/pokemon/slowpoke/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/anim_front.4bpp.lz"); const u32 gMonPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/normal.gbapal.lz"); @@ -2133,13 +2133,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Slowbro[] = INCBIN_COMP("graphics/pokemon/slowbro/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Slowbro[] = INCBIN_COMP("graphics/pokemon/slowbro/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/anim_front.4bpp.lz"); @@ -2150,13 +2150,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Slowking[] = INCBIN_COMP("graphics/pokemon/slowking/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Slowking[] = INCBIN_COMP("graphics/pokemon/slowking/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS #if P_MEGA_EVOLUTIONS @@ -2165,13 +2165,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/shiny.gbapal.lz"); const u8 gMonIcon_SlowbroMega[] = INCBIN_U8("graphics/pokemon/slowbro/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SlowbroMega[] = INCBIN_COMP("graphics/pokemon/slowbro/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SlowbroMega[] = INCBIN_COMP("graphics/pokemon/slowbro/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SlowbroMega[] = INCBIN_U32("graphics/pokemon/slowbro/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #if P_GALARIAN_FORMS @@ -2180,26 +2180,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_SlowpokeGalarian[] = INCBIN_COMP("graphics/pokemon/slowpoke/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_SlowpokeGalarian[] = INCBIN_U32("graphics/pokemon/slowpoke/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_SlowpokeGalarian[] = INCBIN_COMP("graphics/pokemon/slowpoke/galarian/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_SlowbroGalarian[] = INCBIN_COMP("graphics/pokemon/slowbro/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_SlowbroGalarian[] = INCBIN_U32("graphics/pokemon/slowbro/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_SlowbroGalarian[] = INCBIN_COMP("graphics/pokemon/slowbro/galarian/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"); +#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"); @@ -2207,13 +2207,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_SlowkingGalarian[] = INCBIN_COMP("graphics/pokemon/slowking/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_SlowkingGalarian[] = INCBIN_U32("graphics/pokemon/slowking/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_SlowkingGalarian[] = INCBIN_COMP("graphics/pokemon/slowking/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_SLOWPOKE @@ -2227,13 +2227,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Magnemite[] = INCBIN_COMP("graphics/pokemon/magnemite/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Magnemite[] = INCBIN_COMP("graphics/pokemon/magnemite/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/anim_front.4bpp.lz"); const u32 gMonPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/normal.gbapal.lz"); @@ -2243,13 +2243,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Magneton[] = INCBIN_COMP("graphics/pokemon/magneton/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Magneton[] = INCBIN_COMP("graphics/pokemon/magneton/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/anim_front.4bpp.lz"); @@ -2260,13 +2260,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Magnezone[] = INCBIN_U8("graphics/pokemon/magnezone/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Magnezone[] = INCBIN_COMP("graphics/pokemon/magnezone/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Magnezone[] = INCBIN_COMP("graphics/pokemon/magnezone/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Magnezone[] = INCBIN_U32("graphics/pokemon/magnezone/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MAGNEMITE @@ -2279,13 +2279,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Farfetchd[] = INCBIN_COMP("graphics/pokemon/farfetchd/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Farfetchd[] = INCBIN_COMP("graphics/pokemon/farfetchd/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/front.4bpp.lz"); @@ -2293,13 +2293,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_FarfetchdGalarian[] = INCBIN_COMP("graphics/pokemon/farfetchd/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_FarfetchdGalarian[] = INCBIN_U32("graphics/pokemon/farfetchd/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_FarfetchdGalarian[] = INCBIN_COMP("graphics/pokemon/farfetchd/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/front.4bpp.lz"); const u32 gMonPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/normal.gbapal.lz"); @@ -2309,13 +2309,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sirfetchd[] = INCBIN_U8("graphics/pokemon/sirfetchd/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sirfetchd[] = INCBIN_COMP("graphics/pokemon/sirfetchd/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sirfetchd[] = INCBIN_COMP("graphics/pokemon/sirfetchd/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_FARFETCHD @@ -2328,13 +2328,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Doduo[] = INCBIN_COMP("graphics/pokemon/doduo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Doduo[] = INCBIN_COMP("graphics/pokemon/doduo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_DoduoF[] = INCBIN_U32("graphics/pokemon/doduo/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DoduoF[] = INCBIN_U32("graphics/pokemon/doduo/backf.4bpp.lz"); @@ -2347,13 +2347,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dodrio[] = INCBIN_COMP("graphics/pokemon/dodrio/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dodrio[] = INCBIN_COMP("graphics/pokemon/dodrio/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_DodrioF[] = INCBIN_U32("graphics/pokemon/dodrio/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DodrioF[] = INCBIN_U32("graphics/pokemon/dodrio/backf.4bpp.lz"); @@ -2368,13 +2368,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Seel[] = INCBIN_U8("graphics/pokemon/seel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Seel[] = INCBIN_COMP("graphics/pokemon/seel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Seel[] = INCBIN_COMP("graphics/pokemon/seel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/anim_front.4bpp.lz"); const u32 gMonPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/normal.gbapal.lz"); @@ -2384,13 +2384,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dewgong[] = INCBIN_COMP("graphics/pokemon/dewgong/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dewgong[] = INCBIN_COMP("graphics/pokemon/dewgong/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SEEL #if P_FAMILY_GRIMER @@ -2402,13 +2402,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Grimer[] = INCBIN_COMP("graphics/pokemon/grimer/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Grimer[] = INCBIN_COMP("graphics/pokemon/grimer/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/anim_front.4bpp.lz"); const u32 gMonPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/normal.gbapal.lz"); @@ -2418,13 +2418,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Muk[] = INCBIN_U8("graphics/pokemon/muk/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Muk[] = INCBIN_COMP("graphics/pokemon/muk/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Muk[] = INCBIN_COMP("graphics/pokemon/muk/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/front.4bpp.lz"); @@ -2432,26 +2432,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_GrimerAlolan[] = INCBIN_COMP("graphics/pokemon/grimer/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_GrimerAlolan[] = INCBIN_U32("graphics/pokemon/grimer/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_GrimerAlolan[] = INCBIN_COMP("graphics/pokemon/grimer/alolan/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MukAlolan[] = INCBIN_COMP("graphics/pokemon/muk/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MukAlolan[] = INCBIN_U32("graphics/pokemon/muk/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MukAlolan[] = INCBIN_COMP("graphics/pokemon/muk/alolan/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #endif //P_FAMILY_GRIMER @@ -2464,13 +2464,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shellder[] = INCBIN_COMP("graphics/pokemon/shellder/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shellder[] = INCBIN_COMP("graphics/pokemon/shellder/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/anim_front.4bpp.lz"); const u32 gMonPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/normal.gbapal.lz"); @@ -2480,13 +2480,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cloyster[] = INCBIN_COMP("graphics/pokemon/cloyster/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cloyster[] = INCBIN_COMP("graphics/pokemon/cloyster/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SHELLDER #if P_FAMILY_GASTLY @@ -2498,13 +2498,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gastly[] = INCBIN_COMP("graphics/pokemon/gastly/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gastly[] = INCBIN_COMP("graphics/pokemon/gastly/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/anim_front.4bpp.lz"); const u32 gMonPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/normal.gbapal.lz"); @@ -2514,13 +2514,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Haunter[] = INCBIN_COMP("graphics/pokemon/haunter/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Haunter[] = INCBIN_COMP("graphics/pokemon/haunter/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/anim_front.4bpp.lz"); const u32 gMonPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/normal.gbapal.lz"); @@ -2530,13 +2530,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gengar[] = INCBIN_COMP("graphics/pokemon/gengar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gengar[] = INCBIN_COMP("graphics/pokemon/gengar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/front.4bpp.lz"); @@ -2544,13 +2544,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/shiny.gbapal.lz"); const u8 gMonIcon_GengarMega[] = INCBIN_U8("graphics/pokemon/gengar/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GengarMega[] = INCBIN_COMP("graphics/pokemon/gengar/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GengarMega[] = INCBIN_COMP("graphics/pokemon/gengar/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GengarMega[] = INCBIN_U32("graphics/pokemon/gengar/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #if P_GIGANTAMAX_FORMS @@ -2559,13 +2559,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GengarGigantamax[] = INCBIN_COMP("graphics/pokemon/gengar/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GengarGigantamax[] = INCBIN_U32("graphics/pokemon/gengar/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GengarGigantamax[] = INCBIN_COMP("graphics/pokemon/gengar/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GASTLY @@ -2578,13 +2578,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Onix[] = INCBIN_U8("graphics/pokemon/onix/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Onix[] = INCBIN_COMP("graphics/pokemon/onix/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Onix[] = INCBIN_COMP("graphics/pokemon/onix/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/anim_front.4bpp.lz"); @@ -2595,13 +2595,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Steelix[] = INCBIN_COMP("graphics/pokemon/steelix/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Steelix[] = INCBIN_COMP("graphics/pokemon/steelix/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_SteelixF[] = INCBIN_U32("graphics/pokemon/steelix/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SteelixF[] = INCBIN_U32("graphics/pokemon/steelix/backf.4bpp.lz"); @@ -2612,13 +2612,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/shiny.gbapal.lz"); const u8 gMonIcon_SteelixMega[] = INCBIN_U8("graphics/pokemon/steelix/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SteelixMega[] = INCBIN_COMP("graphics/pokemon/steelix/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SteelixMega[] = INCBIN_COMP("graphics/pokemon/steelix/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SteelixMega[] = INCBIN_U32("graphics/pokemon/steelix/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ONIX @@ -2632,13 +2632,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Drowzee[] = INCBIN_COMP("graphics/pokemon/drowzee/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Drowzee[] = INCBIN_COMP("graphics/pokemon/drowzee/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/anim_front.4bpp.lz"); const u32 gMonPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/normal.gbapal.lz"); @@ -2648,13 +2648,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hypno[] = INCBIN_COMP("graphics/pokemon/hypno/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hypno[] = INCBIN_COMP("graphics/pokemon/hypno/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_HypnoF[] = INCBIN_U32("graphics/pokemon/hypno/anim_frontf.4bpp.lz"); const u32 gMonBackPic_HypnoF[] = INCBIN_U32("graphics/pokemon/hypno/backf.4bpp.lz"); @@ -2669,13 +2669,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Krabby[] = INCBIN_COMP("graphics/pokemon/krabby/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Krabby[] = INCBIN_COMP("graphics/pokemon/krabby/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/anim_front.4bpp.lz"); const u32 gMonPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/normal.gbapal.lz"); @@ -2685,13 +2685,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kingler[] = INCBIN_COMP("graphics/pokemon/kingler/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kingler[] = INCBIN_COMP("graphics/pokemon/kingler/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/front.4bpp.lz"); @@ -2699,13 +2699,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_KinglerGigantamax[] = INCBIN_COMP("graphics/pokemon/kingler/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_KinglerGigantamax[] = INCBIN_U32("graphics/pokemon/kingler/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_KinglerGigantamax[] = INCBIN_COMP("graphics/pokemon/kingler/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KRABBY @@ -2718,13 +2718,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Voltorb[] = INCBIN_COMP("graphics/pokemon/voltorb/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Voltorb[] = INCBIN_COMP("graphics/pokemon/voltorb/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/anim_front.4bpp.lz"); const u32 gMonPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/normal.gbapal.lz"); @@ -2734,13 +2734,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Electrode[] = INCBIN_COMP("graphics/pokemon/electrode/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Electrode[] = INCBIN_COMP("graphics/pokemon/electrode/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/front.4bpp.lz"); @@ -2748,26 +2748,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_VoltorbHisuian[] = INCBIN_COMP("graphics/pokemon/voltorb/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_VoltorbHisuian[] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_VoltorbHisuian[] = INCBIN_COMP("graphics/pokemon/voltorb/hisuian/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ElectrodeHisuian[] = INCBIN_COMP("graphics/pokemon/electrode/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ElectrodeHisuian[] = INCBIN_U32("graphics/pokemon/electrode/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ElectrodeHisuian[] = INCBIN_COMP("graphics/pokemon/electrode/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_VOLTORB @@ -2780,13 +2780,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Exeggcute[] = INCBIN_COMP("graphics/pokemon/exeggcute/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Exeggcute[] = INCBIN_COMP("graphics/pokemon/exeggcute/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/anim_front.4bpp.lz"); const u32 gMonPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/normal.gbapal.lz"); @@ -2796,13 +2796,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Exeggutor[] = INCBIN_COMP("graphics/pokemon/exeggutor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Exeggutor[] = INCBIN_COMP("graphics/pokemon/exeggutor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/anim_front.4bpp.lz"); @@ -2810,13 +2810,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ExeggutorAlolan[] = INCBIN_COMP("graphics/pokemon/exeggutor/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ExeggutorAlolan[] = INCBIN_U32("graphics/pokemon/exeggutor/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ExeggutorAlolan[] = INCBIN_COMP("graphics/pokemon/exeggutor/alolan/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #endif //P_FAMILY_EXEGGCUTE @@ -2829,13 +2829,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cubone[] = INCBIN_COMP("graphics/pokemon/cubone/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cubone[] = INCBIN_COMP("graphics/pokemon/cubone/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/anim_front.4bpp.lz"); const u32 gMonPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/normal.gbapal.lz"); @@ -2845,13 +2845,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Marowak[] = INCBIN_COMP("graphics/pokemon/marowak/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Marowak[] = INCBIN_COMP("graphics/pokemon/marowak/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_ALOLAN_FORMS const u32 gMonFrontPic_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/front.4bpp.lz"); @@ -2859,13 +2859,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MarowakAlolan[] = INCBIN_COMP("graphics/pokemon/marowak/alolan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MarowakAlolan[] = INCBIN_U32("graphics/pokemon/marowak/alolan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MarowakAlolan[] = INCBIN_COMP("graphics/pokemon/marowak/alolan/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ALOLAN_FORMS #endif //P_FAMILY_CUBONE @@ -2879,13 +2879,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tyrogue[] = INCBIN_COMP("graphics/pokemon/tyrogue/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tyrogue[] = INCBIN_COMP("graphics/pokemon/tyrogue/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/anim_front.4bpp.lz"); @@ -2896,13 +2896,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hitmonlee[] = INCBIN_COMP("graphics/pokemon/hitmonlee/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hitmonlee[] = INCBIN_COMP("graphics/pokemon/hitmonlee/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/anim_front.4bpp.lz"); const u32 gMonPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/normal.gbapal.lz"); @@ -2912,13 +2912,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hitmonchan[] = INCBIN_COMP("graphics/pokemon/hitmonchan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hitmonchan[] = INCBIN_COMP("graphics/pokemon/hitmonchan/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/anim_front.4bpp.lz"); @@ -2929,13 +2929,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hitmontop[] = INCBIN_COMP("graphics/pokemon/hitmontop/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hitmontop[] = INCBIN_COMP("graphics/pokemon/hitmontop/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_HITMONS @@ -2948,13 +2948,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lickitung[] = INCBIN_COMP("graphics/pokemon/lickitung/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lickitung[] = INCBIN_COMP("graphics/pokemon/lickitung/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/anim_front.4bpp.lz"); @@ -2965,13 +2965,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lickilicky[] = INCBIN_U8("graphics/pokemon/lickilicky/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lickilicky[] = INCBIN_COMP("graphics/pokemon/lickilicky/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lickilicky[] = INCBIN_COMP("graphics/pokemon/lickilicky/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lickilicky[] = INCBIN_U32("graphics/pokemon/lickilicky/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_LICKITUNG @@ -2984,13 +2984,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Koffing[] = INCBIN_COMP("graphics/pokemon/koffing/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Koffing[] = INCBIN_COMP("graphics/pokemon/koffing/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/anim_front.4bpp.lz"); const u32 gMonPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/normal.gbapal.lz"); @@ -3000,13 +3000,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Weezing[] = INCBIN_COMP("graphics/pokemon/weezing/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Weezing[] = INCBIN_COMP("graphics/pokemon/weezing/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/front.4bpp.lz"); @@ -3014,13 +3014,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_WeezingGalarian[] = INCBIN_COMP("graphics/pokemon/weezing/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_WeezingGalarian[] = INCBIN_U32("graphics/pokemon/weezing/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_WeezingGalarian[] = INCBIN_COMP("graphics/pokemon/weezing/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_KOFFING @@ -3033,13 +3033,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rhyhorn[] = INCBIN_COMP("graphics/pokemon/rhyhorn/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rhyhorn[] = INCBIN_COMP("graphics/pokemon/rhyhorn/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RhyhornF[] = INCBIN_U32("graphics/pokemon/rhyhorn/backf.4bpp.lz"); @@ -3052,13 +3052,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rhydon[] = INCBIN_COMP("graphics/pokemon/rhydon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rhydon[] = INCBIN_COMP("graphics/pokemon/rhydon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_RhydonF[] = INCBIN_U32("graphics/pokemon/rhydon/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RhydonF[] = INCBIN_U32("graphics/pokemon/rhydon/backf.4bpp.lz"); @@ -3072,13 +3072,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rhyperior[] = INCBIN_U8("graphics/pokemon/rhyperior/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rhyperior[] = INCBIN_COMP("graphics/pokemon/rhyperior/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rhyperior[] = INCBIN_COMP("graphics/pokemon/rhyperior/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rhyperior[] = INCBIN_U32("graphics/pokemon/rhyperior/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/rhyperior/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RhyperiorF[] = INCBIN_U32("graphics/pokemon/rhyperior/backf.4bpp.lz"); @@ -3095,13 +3095,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Happiny[] = INCBIN_COMP("graphics/pokemon/happiny/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Happiny[] = INCBIN_COMP("graphics/pokemon/happiny/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/anim_front.4bpp.lz"); @@ -3112,13 +3112,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chansey[] = INCBIN_COMP("graphics/pokemon/chansey/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chansey[] = INCBIN_COMP("graphics/pokemon/chansey/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/anim_front.4bpp.lz"); @@ -3129,13 +3129,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Blissey[] = INCBIN_COMP("graphics/pokemon/blissey/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Blissey[] = INCBIN_COMP("graphics/pokemon/blissey/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_CHANSEY @@ -3148,13 +3148,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tangela[] = INCBIN_COMP("graphics/pokemon/tangela/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tangela[] = INCBIN_COMP("graphics/pokemon/tangela/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_front.4bpp.lz"); @@ -3165,13 +3165,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tangrowth[] = INCBIN_U8("graphics/pokemon/tangrowth/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tangrowth[] = INCBIN_COMP("graphics/pokemon/tangrowth/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tangrowth[] = INCBIN_COMP("graphics/pokemon/tangrowth/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tangrowth[] = INCBIN_U32("graphics/pokemon/tangrowth/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_TangrowthF[] = INCBIN_U32("graphics/pokemon/tangrowth/anim_frontf.4bpp.lz"); #endif //P_GEN_4_CROSS_EVOS @@ -3186,13 +3186,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kangaskhan[] = INCBIN_COMP("graphics/pokemon/kangaskhan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kangaskhan[] = INCBIN_COMP("graphics/pokemon/kangaskhan/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/front.4bpp.lz"); @@ -3200,13 +3200,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/back.4bpp.lz"); const u32 gMonShinyPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/shiny.gbapal.lz"); const u8 gMonIcon_KangaskhanMega[] = INCBIN_U8("graphics/pokemon/kangaskhan/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_KangaskhanMega[] = INCBIN_COMP("graphics/pokemon/kangaskhan/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_KangaskhanMega[] = INCBIN_COMP("graphics/pokemon/kangaskhan/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_KangaskhanMega[] = INCBIN_U32("graphics/pokemon/kangaskhan/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_KANGASKHAN @@ -3219,13 +3219,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Horsea[] = INCBIN_COMP("graphics/pokemon/horsea/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Horsea[] = INCBIN_COMP("graphics/pokemon/horsea/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/anim_front.4bpp.lz"); const u32 gMonPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/normal.gbapal.lz"); @@ -3235,13 +3235,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Seadra[] = INCBIN_COMP("graphics/pokemon/seadra/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Seadra[] = INCBIN_COMP("graphics/pokemon/seadra/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/anim_front.4bpp.lz"); @@ -3252,13 +3252,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kingdra[] = INCBIN_COMP("graphics/pokemon/kingdra/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kingdra[] = INCBIN_COMP("graphics/pokemon/kingdra/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_HORSEA @@ -3271,13 +3271,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Goldeen[] = INCBIN_COMP("graphics/pokemon/goldeen/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Goldeen[] = INCBIN_COMP("graphics/pokemon/goldeen/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/goldeen/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GoldeenF[] = INCBIN_U32("graphics/pokemon/goldeen/backf.4bpp.lz"); @@ -3290,13 +3290,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Seaking[] = INCBIN_COMP("graphics/pokemon/seaking/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Seaking[] = INCBIN_COMP("graphics/pokemon/seaking/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_SeakingF[] = INCBIN_U32("graphics/pokemon/seaking/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SeakingF[] = INCBIN_U32("graphics/pokemon/seaking/backf.4bpp.lz"); @@ -3311,13 +3311,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Staryu[] = INCBIN_COMP("graphics/pokemon/staryu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Staryu[] = INCBIN_COMP("graphics/pokemon/staryu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/anim_front.4bpp.lz"); const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/normal.gbapal.lz"); @@ -3327,13 +3327,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Starmie[] = INCBIN_COMP("graphics/pokemon/starmie/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Starmie[] = INCBIN_COMP("graphics/pokemon/starmie/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_STARYU #if P_FAMILY_MR_MIME @@ -3346,13 +3346,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MimeJr[] = INCBIN_COMP("graphics/pokemon/mime_jr/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MimeJr[] = INCBIN_COMP("graphics/pokemon/mime_jr/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); @@ -3363,13 +3363,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MrMime[] = INCBIN_COMP("graphics/pokemon/mr_mime/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MrMime[] = INCBIN_COMP("graphics/pokemon/mr_mime/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/front.4bpp.lz"); @@ -3377,13 +3377,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MrMimeGalarian[] = INCBIN_COMP("graphics/pokemon/mr_mime/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MrMimeGalarian[] = INCBIN_U32("graphics/pokemon/mr_mime/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MrMimeGalarian[] = INCBIN_COMP("graphics/pokemon/mr_mime/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/front.4bpp.lz"); const u32 gMonPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/normal.gbapal.lz"); @@ -3393,13 +3393,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_MrRime[] = INCBIN_U8("graphics/pokemon/mr_rime/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MrRime[] = INCBIN_COMP("graphics/pokemon/mr_rime/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MrRime[] = INCBIN_COMP("graphics/pokemon/mr_rime/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MR_MIME @@ -3412,13 +3412,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Scyther[] = INCBIN_COMP("graphics/pokemon/scyther/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Scyther[] = INCBIN_COMP("graphics/pokemon/scyther/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ScytherF[] = INCBIN_U32("graphics/pokemon/scyther/anim_frontf.4bpp.lz"); @@ -3431,13 +3431,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Scizor[] = INCBIN_COMP("graphics/pokemon/scizor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Scizor[] = INCBIN_COMP("graphics/pokemon/scizor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ScizorF[] = INCBIN_U32("graphics/pokemon/scizor/anim_frontf.4bpp.lz"); @@ -3447,13 +3447,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/back.4bpp.lz"); const u32 gMonShinyPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/shiny.gbapal.lz"); const u8 gMonIcon_ScizorMega[] = INCBIN_U8("graphics/pokemon/scizor/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_ScizorMega[] = INCBIN_COMP("graphics/pokemon/scizor/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_ScizorMega[] = INCBIN_COMP("graphics/pokemon/scizor/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_ScizorMega[] = INCBIN_U32("graphics/pokemon/scizor/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS @@ -3466,13 +3466,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kleavor[] = INCBIN_COMP("graphics/pokemon/kleavor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kleavor[] = INCBIN_COMP("graphics/pokemon/kleavor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_SCYTHER @@ -3486,13 +3486,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Smoochum[] = INCBIN_COMP("graphics/pokemon/smoochum/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Smoochum[] = INCBIN_COMP("graphics/pokemon/smoochum/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz"); @@ -3503,13 +3503,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Jynx[] = INCBIN_COMP("graphics/pokemon/jynx/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Jynx[] = INCBIN_COMP("graphics/pokemon/jynx/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_JYNX #if P_FAMILY_ELECTABUZZ @@ -3522,13 +3522,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Elekid[] = INCBIN_COMP("graphics/pokemon/elekid/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Elekid[] = INCBIN_COMP("graphics/pokemon/elekid/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz"); @@ -3539,13 +3539,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Electabuzz[] = INCBIN_COMP("graphics/pokemon/electabuzz/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Electabuzz[] = INCBIN_COMP("graphics/pokemon/electabuzz/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/anim_front.4bpp.lz"); @@ -3556,13 +3556,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Electivire[] = INCBIN_U8("graphics/pokemon/electivire/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Electivire[] = INCBIN_COMP("graphics/pokemon/electivire/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Electivire[] = INCBIN_COMP("graphics/pokemon/electivire/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Electivire[] = INCBIN_U32("graphics/pokemon/electivire/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_ELECTABUZZ @@ -3576,13 +3576,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Magby[] = INCBIN_U8("graphics/pokemon/magby/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Magby[] = INCBIN_COMP("graphics/pokemon/magby/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Magby[] = INCBIN_COMP("graphics/pokemon/magby/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/anim_front.4bpp.lz"); @@ -3593,13 +3593,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Magmar[] = INCBIN_COMP("graphics/pokemon/magmar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Magmar[] = INCBIN_COMP("graphics/pokemon/magmar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/anim_front.4bpp.lz"); @@ -3610,13 +3610,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Magmortar[] = INCBIN_U8("graphics/pokemon/magmortar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Magmortar[] = INCBIN_COMP("graphics/pokemon/magmortar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Magmortar[] = INCBIN_COMP("graphics/pokemon/magmortar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Magmortar[] = INCBIN_U32("graphics/pokemon/magmortar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MAGMAR @@ -3629,13 +3629,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pinsir[] = INCBIN_COMP("graphics/pokemon/pinsir/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pinsir[] = INCBIN_COMP("graphics/pokemon/pinsir/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/front.4bpp.lz"); @@ -3643,13 +3643,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/back.4bpp.lz"); const u32 gMonShinyPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/shiny.gbapal.lz"); const u8 gMonIcon_PinsirMega[] = INCBIN_U8("graphics/pokemon/pinsir/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_PinsirMega[] = INCBIN_COMP("graphics/pokemon/pinsir/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_PinsirMega[] = INCBIN_COMP("graphics/pokemon/pinsir/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_PinsirMega[] = INCBIN_U32("graphics/pokemon/pinsir/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_PINSIR @@ -3662,13 +3662,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tauros[] = INCBIN_COMP("graphics/pokemon/tauros/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tauros[] = INCBIN_COMP("graphics/pokemon/tauros/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_PALDEAN_FORMS const u32 gMonFrontPic_TaurosPaldeanCombatBreed[] = INCBIN_U32("graphics/pokemon/tauros/paldean_combat_breed/front.4bpp.lz"); @@ -3689,11 +3689,11 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_TaurosPaldeanCombatBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_combat_breed/follower.4bpp"); - // const u32 gObjectEventPic_TaurosPaldeanBlazeBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_blaze_breed/follower.4bpp"); - // const u32 gObjectEventPic_TaurosPaldeanAquaBreed[] = INCBIN_COMP("graphics/pokemon/tauros/paldean_aqua_breed/follower.4bpp"); -#endif //OW_FOLLOWERS_ENABLED +#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"); +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_PALDEAN_FORMS #endif //P_FAMILY_TAUROS @@ -3706,13 +3706,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Magikarp[] = INCBIN_COMP("graphics/pokemon/magikarp/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Magikarp[] = INCBIN_COMP("graphics/pokemon/magikarp/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MagikarpF[] = INCBIN_U32("graphics/pokemon/magikarp/backf.4bpp.lz"); @@ -3725,13 +3725,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gyarados[] = INCBIN_COMP("graphics/pokemon/gyarados/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gyarados[] = INCBIN_COMP("graphics/pokemon/gyarados/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gyarados/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GyaradosF[] = INCBIN_U32("graphics/pokemon/gyarados/backf.4bpp.lz"); @@ -3742,13 +3742,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/shiny.gbapal.lz"); const u8 gMonIcon_GyaradosMega[] = INCBIN_U8("graphics/pokemon/gyarados/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GyaradosMega[] = INCBIN_COMP("graphics/pokemon/gyarados/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GyaradosMega[] = INCBIN_COMP("graphics/pokemon/gyarados/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GyaradosMega[] = INCBIN_U32("graphics/pokemon/gyarados/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAGIKARP @@ -3761,13 +3761,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lapras[] = INCBIN_COMP("graphics/pokemon/lapras/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lapras[] = INCBIN_COMP("graphics/pokemon/lapras/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/front.4bpp.lz"); @@ -3775,13 +3775,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_LaprasGigantamax[] = INCBIN_COMP("graphics/pokemon/lapras/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_LaprasGigantamax[] = INCBIN_U32("graphics/pokemon/lapras/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_LaprasGigantamax[] = INCBIN_COMP("graphics/pokemon/lapras/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_LAPRAS @@ -3794,13 +3794,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ditto[] = INCBIN_COMP("graphics/pokemon/ditto/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ditto[] = INCBIN_COMP("graphics/pokemon/ditto/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DITTO #if P_FAMILY_EEVEE @@ -3812,13 +3812,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Eevee[] = INCBIN_COMP("graphics/pokemon/eevee/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Eevee[] = INCBIN_COMP("graphics/pokemon/eevee/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_EeveeF[] = INCBIN_U32("graphics/pokemon/eevee/anim_frontf.4bpp.lz"); const u32 gMonBackPic_EeveeF[] = INCBIN_U32("graphics/pokemon/eevee/backf.4bpp.lz"); @@ -3829,13 +3829,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_EeveeGigantamax[] = INCBIN_COMP("graphics/pokemon/eevee/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_EeveeGigantamax[] = INCBIN_U32("graphics/pokemon/eevee/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_EeveeGigantamax[] = INCBIN_COMP("graphics/pokemon/eevee/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS const u8 gMonIcon_EeveePartner[] = INCBIN_U8("graphics/pokemon/eevee/partner/icon.4bpp"); @@ -3851,13 +3851,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vaporeon[] = INCBIN_COMP("graphics/pokemon/vaporeon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vaporeon[] = INCBIN_COMP("graphics/pokemon/vaporeon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/anim_front.4bpp.lz"); const u32 gMonPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/normal.gbapal.lz"); @@ -3867,13 +3867,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Jolteon[] = INCBIN_COMP("graphics/pokemon/jolteon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Jolteon[] = INCBIN_COMP("graphics/pokemon/jolteon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/anim_front.4bpp.lz"); const u32 gMonPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/normal.gbapal.lz"); @@ -3883,13 +3883,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Flareon[] = INCBIN_COMP("graphics/pokemon/flareon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Flareon[] = INCBIN_COMP("graphics/pokemon/flareon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/anim_front.4bpp.lz"); @@ -3900,13 +3900,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Espeon[] = INCBIN_COMP("graphics/pokemon/espeon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Espeon[] = INCBIN_COMP("graphics/pokemon/espeon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/anim_front.4bpp.lz"); const u32 gMonPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/normal.gbapal.lz"); @@ -3916,13 +3916,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Umbreon[] = INCBIN_COMP("graphics/pokemon/umbreon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Umbreon[] = INCBIN_COMP("graphics/pokemon/umbreon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_2_CROSS_EVOS #if P_GEN_4_CROSS_EVOS @@ -3934,13 +3934,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Leafeon[] = INCBIN_U8("graphics/pokemon/leafeon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Leafeon[] = INCBIN_COMP("graphics/pokemon/leafeon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Leafeon[] = INCBIN_COMP("graphics/pokemon/leafeon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Leafeon[] = INCBIN_U32("graphics/pokemon/leafeon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/anim_front.4bpp.lz"); const u32 gMonPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/normal.gbapal.lz"); @@ -3950,13 +3950,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Glaceon[] = INCBIN_U8("graphics/pokemon/glaceon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Glaceon[] = INCBIN_COMP("graphics/pokemon/glaceon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Glaceon[] = INCBIN_COMP("graphics/pokemon/glaceon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Glaceon[] = INCBIN_U32("graphics/pokemon/glaceon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #if P_GEN_6_CROSS_EVOS @@ -3968,13 +3968,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sylveon[] = INCBIN_U8("graphics/pokemon/sylveon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sylveon[] = INCBIN_COMP("graphics/pokemon/sylveon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sylveon[] = INCBIN_COMP("graphics/pokemon/sylveon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sylveon[] = INCBIN_U32("graphics/pokemon/sylveon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_6_CROSS_EVOS #endif //P_FAMILY_EEVEE @@ -3987,13 +3987,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Porygon[] = INCBIN_COMP("graphics/pokemon/porygon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Porygon[] = INCBIN_COMP("graphics/pokemon/porygon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_2_CROSS_EVOS const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/anim_front.4bpp.lz"); @@ -4004,13 +4004,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Porygon2[] = INCBIN_COMP("graphics/pokemon/porygon2/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Porygon2[] = INCBIN_COMP("graphics/pokemon/porygon2/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/anim_front.4bpp.lz"); @@ -4021,13 +4021,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_PorygonZ[] = INCBIN_U8("graphics/pokemon/porygon_z/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_PorygonZ[] = INCBIN_COMP("graphics/pokemon/porygon_z/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_PorygonZ[] = INCBIN_COMP("graphics/pokemon/porygon_z/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_PorygonZ[] = INCBIN_U32("graphics/pokemon/porygon_z/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_PORYGON @@ -4041,13 +4041,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Omanyte[] = INCBIN_COMP("graphics/pokemon/omanyte/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Omanyte[] = INCBIN_COMP("graphics/pokemon/omanyte/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/anim_front.4bpp.lz"); const u32 gMonPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/normal.gbapal.lz"); @@ -4057,13 +4057,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Omastar[] = INCBIN_COMP("graphics/pokemon/omastar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Omastar[] = INCBIN_COMP("graphics/pokemon/omastar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_OMANYTE #if P_FAMILY_KABUTO @@ -4075,13 +4075,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kabuto[] = INCBIN_COMP("graphics/pokemon/kabuto/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kabuto[] = INCBIN_COMP("graphics/pokemon/kabuto/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/anim_front.4bpp.lz"); const u32 gMonPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/normal.gbapal.lz"); @@ -4091,13 +4091,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kabutops[] = INCBIN_COMP("graphics/pokemon/kabutops/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kabutops[] = INCBIN_COMP("graphics/pokemon/kabutops/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_KABUTO #if P_FAMILY_AERODACTYL @@ -4109,13 +4109,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Aerodactyl[] = INCBIN_COMP("graphics/pokemon/aerodactyl/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Aerodactyl[] = INCBIN_COMP("graphics/pokemon/aerodactyl/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/front.4bpp.lz"); @@ -4123,13 +4123,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/shiny.gbapal.lz"); const u8 gMonIcon_AerodactylMega[] = INCBIN_U8("graphics/pokemon/aerodactyl/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AerodactylMega[] = INCBIN_COMP("graphics/pokemon/aerodactyl/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AerodactylMega[] = INCBIN_COMP("graphics/pokemon/aerodactyl/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AerodactylMega[] = INCBIN_U32("graphics/pokemon/aerodactyl/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AERODACTYL @@ -4143,13 +4143,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Munchlax[] = INCBIN_U8("graphics/pokemon/munchlax/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Munchlax[] = INCBIN_COMP("graphics/pokemon/munchlax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Munchlax[] = INCBIN_COMP("graphics/pokemon/munchlax/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/anim_front.4bpp.lz"); @@ -4160,13 +4160,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Snorlax[] = INCBIN_COMP("graphics/pokemon/snorlax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Snorlax[] = INCBIN_COMP("graphics/pokemon/snorlax/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/front.4bpp.lz"); @@ -4174,13 +4174,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SnorlaxGigantamax[] = INCBIN_COMP("graphics/pokemon/snorlax/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SnorlaxGigantamax[] = INCBIN_U32("graphics/pokemon/snorlax/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SnorlaxGigantamax[] = INCBIN_COMP("graphics/pokemon/snorlax/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SNORLAX @@ -4193,13 +4193,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Articuno[] = INCBIN_COMP("graphics/pokemon/articuno/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Articuno[] = INCBIN_COMP("graphics/pokemon/articuno/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/front.4bpp.lz"); @@ -4207,13 +4207,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ArticunoGalarian[] = INCBIN_COMP("graphics/pokemon/articuno/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ArticunoGalarian[] = INCBIN_U32("graphics/pokemon/articuno/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ArticunoGalarian[] = INCBIN_COMP("graphics/pokemon/articuno/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ARTICUNO @@ -4226,13 +4226,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zapdos[] = INCBIN_COMP("graphics/pokemon/zapdos/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zapdos[] = INCBIN_COMP("graphics/pokemon/zapdos/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/front.4bpp.lz"); @@ -4240,13 +4240,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ZapdosGalarian[] = INCBIN_COMP("graphics/pokemon/zapdos/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ZapdosGalarian[] = INCBIN_U32("graphics/pokemon/zapdos/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ZapdosGalarian[] = INCBIN_COMP("graphics/pokemon/zapdos/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZAPDOS @@ -4259,13 +4259,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Moltres[] = INCBIN_COMP("graphics/pokemon/moltres/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Moltres[] = INCBIN_COMP("graphics/pokemon/moltres/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/front.4bpp.lz"); @@ -4273,13 +4273,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MoltresGalarian[] = INCBIN_COMP("graphics/pokemon/moltres/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MoltresGalarian[] = INCBIN_U32("graphics/pokemon/moltres/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MoltresGalarian[] = INCBIN_COMP("graphics/pokemon/moltres/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_MOLTRES @@ -4292,13 +4292,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dratini[] = INCBIN_COMP("graphics/pokemon/dratini/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dratini[] = INCBIN_COMP("graphics/pokemon/dratini/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/anim_front.4bpp.lz"); const u32 gMonPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/normal.gbapal.lz"); @@ -4308,13 +4308,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dragonair[] = INCBIN_COMP("graphics/pokemon/dragonair/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dragonair[] = INCBIN_COMP("graphics/pokemon/dragonair/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/anim_front.4bpp.lz"); const u32 gMonPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/normal.gbapal.lz"); @@ -4324,13 +4324,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dragonite[] = INCBIN_COMP("graphics/pokemon/dragonite/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dragonite[] = INCBIN_COMP("graphics/pokemon/dragonite/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DRATINI #if P_FAMILY_MEWTWO @@ -4342,13 +4342,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mewtwo[] = INCBIN_COMP("graphics/pokemon/mewtwo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mewtwo[] = INCBIN_COMP("graphics/pokemon/mewtwo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/front.4bpp.lz"); @@ -4356,26 +4356,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/back.4bpp.lz"); const u32 gMonShinyPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/shiny.gbapal.lz"); const u8 gMonIcon_MewtwoMegaX[] = INCBIN_U8("graphics/pokemon/mewtwo/mega_x/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MewtwoMegaX[] = INCBIN_COMP("graphics/pokemon/mewtwo/mega_x/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MewtwoMegaX[] = INCBIN_COMP("graphics/pokemon/mewtwo/mega_x/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_MewtwoMegaX[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_x/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/front.4bpp.lz"); const u32 gMonPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/normal.gbapal.lz"); const u32 gMonBackPic_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/back.4bpp.lz"); const u32 gMonShinyPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/shiny.gbapal.lz"); const u8 gMonIcon_MewtwoMegaY[] = INCBIN_U8("graphics/pokemon/mewtwo/mega_y/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MewtwoMegaY[] = INCBIN_COMP("graphics/pokemon/mewtwo/mega_y/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MewtwoMegaY[] = INCBIN_COMP("graphics/pokemon/mewtwo/mega_y/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_MewtwoMegaY[] = INCBIN_U32("graphics/pokemon/mewtwo/mega_y/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEWTWO @@ -4388,13 +4388,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mew[] = INCBIN_U8("graphics/pokemon/mew/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mew[] = INCBIN_COMP("graphics/pokemon/mew/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mew[] = INCBIN_COMP("graphics/pokemon/mew/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MEW #if P_FAMILY_CHIKORITA @@ -4406,13 +4406,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chikorita[] = INCBIN_COMP("graphics/pokemon/chikorita/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chikorita[] = INCBIN_COMP("graphics/pokemon/chikorita/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/anim_front.4bpp.lz"); const u32 gMonPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/normal.gbapal.lz"); @@ -4422,13 +4422,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bayleef[] = INCBIN_COMP("graphics/pokemon/bayleef/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bayleef[] = INCBIN_COMP("graphics/pokemon/bayleef/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/anim_front.4bpp.lz"); const u32 gMonPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/normal.gbapal.lz"); @@ -4438,13 +4438,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Meganium[] = INCBIN_COMP("graphics/pokemon/meganium/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Meganium[] = INCBIN_COMP("graphics/pokemon/meganium/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/meganium/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MeganiumF[] = INCBIN_U32("graphics/pokemon/meganium/backf.4bpp.lz"); @@ -4459,13 +4459,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cyndaquil[] = INCBIN_COMP("graphics/pokemon/cyndaquil/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cyndaquil[] = INCBIN_COMP("graphics/pokemon/cyndaquil/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/anim_front.4bpp.lz"); const u32 gMonPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/normal.gbapal.lz"); @@ -4475,13 +4475,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Quilava[] = INCBIN_COMP("graphics/pokemon/quilava/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Quilava[] = INCBIN_COMP("graphics/pokemon/quilava/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/anim_front.4bpp.lz"); const u32 gMonPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/normal.gbapal.lz"); @@ -4491,13 +4491,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Typhlosion[] = INCBIN_COMP("graphics/pokemon/typhlosion/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Typhlosion[] = INCBIN_COMP("graphics/pokemon/typhlosion/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/front.4bpp.lz"); @@ -4505,13 +4505,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_TyphlosionHisuian[] = INCBIN_COMP("graphics/pokemon/typhlosion/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_TyphlosionHisuian[] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_TyphlosionHisuian[] = INCBIN_COMP("graphics/pokemon/typhlosion/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_CYNDAQUIL @@ -4524,13 +4524,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Totodile[] = INCBIN_COMP("graphics/pokemon/totodile/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Totodile[] = INCBIN_COMP("graphics/pokemon/totodile/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/anim_front.4bpp.lz"); const u32 gMonPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/normal.gbapal.lz"); @@ -4540,13 +4540,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Croconaw[] = INCBIN_COMP("graphics/pokemon/croconaw/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Croconaw[] = INCBIN_COMP("graphics/pokemon/croconaw/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/anim_front.4bpp.lz"); const u32 gMonPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/normal.gbapal.lz"); @@ -4556,13 +4556,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Feraligatr[] = INCBIN_COMP("graphics/pokemon/feraligatr/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Feraligatr[] = INCBIN_COMP("graphics/pokemon/feraligatr/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TOTODILE #if P_FAMILY_SENTRET @@ -4574,13 +4574,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sentret[] = INCBIN_COMP("graphics/pokemon/sentret/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sentret[] = INCBIN_COMP("graphics/pokemon/sentret/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/anim_front.4bpp.lz"); const u32 gMonPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/normal.gbapal.lz"); @@ -4590,13 +4590,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Furret[] = INCBIN_U8("graphics/pokemon/furret/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Furret[] = INCBIN_COMP("graphics/pokemon/furret/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Furret[] = INCBIN_COMP("graphics/pokemon/furret/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SENTRET #if P_FAMILY_HOOTHOOT @@ -4608,13 +4608,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hoothoot[] = INCBIN_COMP("graphics/pokemon/hoothoot/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hoothoot[] = INCBIN_COMP("graphics/pokemon/hoothoot/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/anim_front.4bpp.lz"); const u32 gMonPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/normal.gbapal.lz"); @@ -4624,13 +4624,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Noctowl[] = INCBIN_COMP("graphics/pokemon/noctowl/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Noctowl[] = INCBIN_COMP("graphics/pokemon/noctowl/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_HOOTHOOT #if P_FAMILY_LEDYBA @@ -4642,13 +4642,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ledyba[] = INCBIN_COMP("graphics/pokemon/ledyba/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ledyba[] = INCBIN_COMP("graphics/pokemon/ledyba/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_LedybaF[] = INCBIN_U32("graphics/pokemon/ledyba/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LedybaF[] = INCBIN_U32("graphics/pokemon/ledyba/backf.4bpp.lz"); @@ -4661,13 +4661,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ledian[] = INCBIN_COMP("graphics/pokemon/ledian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ledian[] = INCBIN_COMP("graphics/pokemon/ledian/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_LedianF[] = INCBIN_U32("graphics/pokemon/ledian/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LedianF[] = INCBIN_U32("graphics/pokemon/ledian/backf.4bpp.lz"); @@ -4682,13 +4682,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Spinarak[] = INCBIN_COMP("graphics/pokemon/spinarak/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Spinarak[] = INCBIN_COMP("graphics/pokemon/spinarak/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/anim_front.4bpp.lz"); const u32 gMonPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/normal.gbapal.lz"); @@ -4698,13 +4698,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ariados[] = INCBIN_COMP("graphics/pokemon/ariados/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ariados[] = INCBIN_COMP("graphics/pokemon/ariados/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SPINARAK #if P_FAMILY_CHINCHOU @@ -4716,13 +4716,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chinchou[] = INCBIN_COMP("graphics/pokemon/chinchou/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chinchou[] = INCBIN_COMP("graphics/pokemon/chinchou/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/anim_front.4bpp.lz"); const u32 gMonPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/normal.gbapal.lz"); @@ -4732,13 +4732,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lanturn[] = INCBIN_COMP("graphics/pokemon/lanturn/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lanturn[] = INCBIN_COMP("graphics/pokemon/lanturn/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CHINCHOU #if P_FAMILY_TOGEPI @@ -4750,13 +4750,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Togepi[] = INCBIN_COMP("graphics/pokemon/togepi/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Togepi[] = INCBIN_COMP("graphics/pokemon/togepi/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/anim_front.4bpp.lz"); const u32 gMonPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/normal.gbapal.lz"); @@ -4766,13 +4766,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Togetic[] = INCBIN_COMP("graphics/pokemon/togetic/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Togetic[] = INCBIN_COMP("graphics/pokemon/togetic/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/anim_front.4bpp.lz"); @@ -4783,13 +4783,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Togekiss[] = INCBIN_U8("graphics/pokemon/togekiss/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Togekiss[] = INCBIN_COMP("graphics/pokemon/togekiss/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Togekiss[] = INCBIN_COMP("graphics/pokemon/togekiss/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Togekiss[] = INCBIN_U32("graphics/pokemon/togekiss/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_TOGEPI @@ -4802,13 +4802,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Natu[] = INCBIN_U8("graphics/pokemon/natu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Natu[] = INCBIN_COMP("graphics/pokemon/natu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Natu[] = INCBIN_COMP("graphics/pokemon/natu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/anim_front.4bpp.lz"); const u32 gMonPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/normal.gbapal.lz"); @@ -4818,13 +4818,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Xatu[] = INCBIN_COMP("graphics/pokemon/xatu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Xatu[] = INCBIN_COMP("graphics/pokemon/xatu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_XatuF[] = INCBIN_U32("graphics/pokemon/xatu/anim_frontf.4bpp.lz"); #endif //P_FAMILY_NATU @@ -4838,13 +4838,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mareep[] = INCBIN_COMP("graphics/pokemon/mareep/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mareep[] = INCBIN_COMP("graphics/pokemon/mareep/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/anim_front.4bpp.lz"); const u32 gMonPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/normal.gbapal.lz"); @@ -4854,13 +4854,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Flaaffy[] = INCBIN_COMP("graphics/pokemon/flaaffy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Flaaffy[] = INCBIN_COMP("graphics/pokemon/flaaffy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/anim_front.4bpp.lz"); const u32 gMonPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/normal.gbapal.lz"); @@ -4870,13 +4870,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ampharos[] = INCBIN_COMP("graphics/pokemon/ampharos/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ampharos[] = INCBIN_COMP("graphics/pokemon/ampharos/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/front.4bpp.lz"); @@ -4884,13 +4884,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/shiny.gbapal.lz"); const u8 gMonIcon_AmpharosMega[] = INCBIN_U8("graphics/pokemon/ampharos/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AmpharosMega[] = INCBIN_COMP("graphics/pokemon/ampharos/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AmpharosMega[] = INCBIN_COMP("graphics/pokemon/ampharos/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AmpharosMega[] = INCBIN_U32("graphics/pokemon/ampharos/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAREEP @@ -4904,13 +4904,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Azurill[] = INCBIN_COMP("graphics/pokemon/azurill/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Azurill[] = INCBIN_COMP("graphics/pokemon/azurill/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_3_CROSS_EVOS const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/anim_front.4bpp.lz"); @@ -4921,13 +4921,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Marill[] = INCBIN_U8("graphics/pokemon/marill/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Marill[] = INCBIN_COMP("graphics/pokemon/marill/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Marill[] = INCBIN_COMP("graphics/pokemon/marill/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/anim_front.4bpp.lz"); const u32 gMonPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/normal.gbapal.lz"); @@ -4937,13 +4937,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Azumarill[] = INCBIN_COMP("graphics/pokemon/azumarill/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Azumarill[] = INCBIN_COMP("graphics/pokemon/azumarill/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MARILL #if P_FAMILY_SUDOWOODO @@ -4956,13 +4956,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bonsly[] = INCBIN_COMP("graphics/pokemon/bonsly/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bonsly[] = INCBIN_COMP("graphics/pokemon/bonsly/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_front.4bpp.lz"); @@ -4973,13 +4973,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sudowoodo[] = INCBIN_COMP("graphics/pokemon/sudowoodo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sudowoodo[] = INCBIN_COMP("graphics/pokemon/sudowoodo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SudowoodoF[] = INCBIN_U32("graphics/pokemon/sudowoodo/backf.4bpp.lz"); @@ -4994,13 +4994,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hoppip[] = INCBIN_COMP("graphics/pokemon/hoppip/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hoppip[] = INCBIN_COMP("graphics/pokemon/hoppip/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/anim_front.4bpp.lz"); const u32 gMonPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/normal.gbapal.lz"); @@ -5010,13 +5010,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Skiploom[] = INCBIN_COMP("graphics/pokemon/skiploom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Skiploom[] = INCBIN_COMP("graphics/pokemon/skiploom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/anim_front.4bpp.lz"); const u32 gMonPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/normal.gbapal.lz"); @@ -5026,13 +5026,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Jumpluff[] = INCBIN_COMP("graphics/pokemon/jumpluff/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Jumpluff[] = INCBIN_COMP("graphics/pokemon/jumpluff/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_HOPPIP #if P_FAMILY_AIPOM @@ -5044,13 +5044,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Aipom[] = INCBIN_COMP("graphics/pokemon/aipom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Aipom[] = INCBIN_COMP("graphics/pokemon/aipom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_AipomF[] = INCBIN_U32("graphics/pokemon/aipom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_AipomF[] = INCBIN_U32("graphics/pokemon/aipom/backf.4bpp.lz"); @@ -5064,13 +5064,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ambipom[] = INCBIN_U8("graphics/pokemon/ambipom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ambipom[] = INCBIN_COMP("graphics/pokemon/ambipom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ambipom[] = INCBIN_COMP("graphics/pokemon/ambipom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_AmbipomF[] = INCBIN_U32("graphics/pokemon/ambipom/backf.4bpp.lz"); @@ -5086,13 +5086,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sunkern[] = INCBIN_COMP("graphics/pokemon/sunkern/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sunkern[] = INCBIN_COMP("graphics/pokemon/sunkern/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/anim_front.4bpp.lz"); const u32 gMonPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/normal.gbapal.lz"); @@ -5102,13 +5102,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sunflora[] = INCBIN_COMP("graphics/pokemon/sunflora/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sunflora[] = INCBIN_COMP("graphics/pokemon/sunflora/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SUNKERN #if P_FAMILY_YANMA @@ -5120,13 +5120,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Yanma[] = INCBIN_COMP("graphics/pokemon/yanma/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Yanma[] = INCBIN_COMP("graphics/pokemon/yanma/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/anim_front.4bpp.lz"); @@ -5137,13 +5137,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Yanmega[] = INCBIN_U8("graphics/pokemon/yanmega/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Yanmega[] = INCBIN_COMP("graphics/pokemon/yanmega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Yanmega[] = INCBIN_COMP("graphics/pokemon/yanmega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Yanmega[] = INCBIN_U32("graphics/pokemon/yanmega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_YANMA @@ -5156,13 +5156,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wooper[] = INCBIN_COMP("graphics/pokemon/wooper/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wooper[] = INCBIN_COMP("graphics/pokemon/wooper/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/anim_frontf.4bpp.lz"); const u32 gMonBackPic_WooperF[] = INCBIN_U32("graphics/pokemon/wooper/backf.4bpp.lz"); @@ -5175,13 +5175,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Quagsire[] = INCBIN_COMP("graphics/pokemon/quagsire/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Quagsire[] = INCBIN_COMP("graphics/pokemon/quagsire/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/anim_frontf.4bpp.lz"); const u32 gMonBackPic_QuagsireF[] = INCBIN_U32("graphics/pokemon/quagsire/backf.4bpp.lz"); @@ -5192,13 +5192,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_WooperPaldean[] = INCBIN_COMP("graphics/pokemon/wooper/wooper_paldean/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_WooperPaldean[] = INCBIN_U32("graphics/pokemon/wooper/wooper_paldean/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_WooperPaldean[] = INCBIN_COMP("graphics/pokemon/wooper/wooper_paldean/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/front.4bpp.lz"); const u32 gMonPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/normal.gbapal.lz"); @@ -5208,13 +5208,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Clodsire[] = INCBIN_U8("graphics/pokemon/clodsire/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Clodsire[] = INCBIN_COMP("graphics/pokemon/clodsire/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Clodsire[] = INCBIN_COMP("graphics/pokemon/clodsire/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Clodsire[] = INCBIN_U32("graphics/pokemon/clodsire/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_PALDEAN_FORMS #endif //P_FAMILY_WOOPER @@ -5227,13 +5227,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Murkrow[] = INCBIN_COMP("graphics/pokemon/murkrow/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Murkrow[] = INCBIN_COMP("graphics/pokemon/murkrow/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/murkrow/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MurkrowF[] = INCBIN_U32("graphics/pokemon/murkrow/backf.4bpp.lz"); @@ -5247,13 +5247,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Honchkrow[] = INCBIN_U8("graphics/pokemon/honchkrow/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Honchkrow[] = INCBIN_COMP("graphics/pokemon/honchkrow/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Honchkrow[] = INCBIN_COMP("graphics/pokemon/honchkrow/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Honchkrow[] = INCBIN_U32("graphics/pokemon/honchkrow/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MURKROW @@ -5266,13 +5266,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Misdreavus[] = INCBIN_COMP("graphics/pokemon/misdreavus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Misdreavus[] = INCBIN_COMP("graphics/pokemon/misdreavus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/anim_front.4bpp.lz"); @@ -5283,13 +5283,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mismagius[] = INCBIN_U8("graphics/pokemon/mismagius/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mismagius[] = INCBIN_COMP("graphics/pokemon/mismagius/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mismagius[] = INCBIN_COMP("graphics/pokemon/mismagius/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mismagius[] = INCBIN_U32("graphics/pokemon/mismagius/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MISDREAVUS @@ -5412,40 +5412,40 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_UnownA[] = INCBIN_COMP("graphics/pokemon/unown/follower.4bpp"); - const u32 gObjectEventPic_UnownB[] = INCBIN_COMP("graphics/pokemon/unown/b/follower.4bpp"); - const u32 gObjectEventPic_UnownC[] = INCBIN_COMP("graphics/pokemon/unown/c/follower.4bpp"); - const u32 gObjectEventPic_UnownD[] = INCBIN_COMP("graphics/pokemon/unown/d/follower.4bpp"); - const u32 gObjectEventPic_UnownE[] = INCBIN_COMP("graphics/pokemon/unown/e/follower.4bpp"); - const u32 gObjectEventPic_UnownF[] = INCBIN_COMP("graphics/pokemon/unown/f/follower.4bpp"); - const u32 gObjectEventPic_UnownG[] = INCBIN_COMP("graphics/pokemon/unown/g/follower.4bpp"); - const u32 gObjectEventPic_UnownH[] = INCBIN_COMP("graphics/pokemon/unown/h/follower.4bpp"); - const u32 gObjectEventPic_UnownI[] = INCBIN_COMP("graphics/pokemon/unown/i/follower.4bpp"); - const u32 gObjectEventPic_UnownJ[] = INCBIN_COMP("graphics/pokemon/unown/j/follower.4bpp"); - const u32 gObjectEventPic_UnownK[] = INCBIN_COMP("graphics/pokemon/unown/k/follower.4bpp"); - const u32 gObjectEventPic_UnownL[] = INCBIN_COMP("graphics/pokemon/unown/l/follower.4bpp"); - const u32 gObjectEventPic_UnownM[] = INCBIN_COMP("graphics/pokemon/unown/m/follower.4bpp"); - const u32 gObjectEventPic_UnownN[] = INCBIN_COMP("graphics/pokemon/unown/n/follower.4bpp"); - const u32 gObjectEventPic_UnownO[] = INCBIN_COMP("graphics/pokemon/unown/o/follower.4bpp"); - const u32 gObjectEventPic_UnownP[] = INCBIN_COMP("graphics/pokemon/unown/p/follower.4bpp"); - const u32 gObjectEventPic_UnownQ[] = INCBIN_COMP("graphics/pokemon/unown/q/follower.4bpp"); - const u32 gObjectEventPic_UnownR[] = INCBIN_COMP("graphics/pokemon/unown/r/follower.4bpp"); - const u32 gObjectEventPic_UnownS[] = INCBIN_COMP("graphics/pokemon/unown/s/follower.4bpp"); - const u32 gObjectEventPic_UnownT[] = INCBIN_COMP("graphics/pokemon/unown/t/follower.4bpp"); - const u32 gObjectEventPic_UnownU[] = INCBIN_COMP("graphics/pokemon/unown/u/follower.4bpp"); - const u32 gObjectEventPic_UnownV[] = INCBIN_COMP("graphics/pokemon/unown/v/follower.4bpp"); - const u32 gObjectEventPic_UnownW[] = INCBIN_COMP("graphics/pokemon/unown/w/follower.4bpp"); - const u32 gObjectEventPic_UnownX[] = INCBIN_COMP("graphics/pokemon/unown/x/follower.4bpp"); - const u32 gObjectEventPic_UnownY[] = INCBIN_COMP("graphics/pokemon/unown/y/follower.4bpp"); - const u32 gObjectEventPic_UnownZ[] = INCBIN_COMP("graphics/pokemon/unown/z/follower.4bpp"); - const u32 gObjectEventPic_UnownExclamationMark[] = INCBIN_COMP("graphics/pokemon/unown/exclamation_mark/follower.4bpp"); - const u32 gObjectEventPic_UnownQuestionMark[] = INCBIN_COMP("graphics/pokemon/unown/question_mark/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_UnownA[] = INCBIN_COMP("graphics/pokemon/unown/overworld.4bpp"); + const u32 gObjectEventPic_UnownB[] = INCBIN_COMP("graphics/pokemon/unown/b/overworld.4bpp"); + const u32 gObjectEventPic_UnownC[] = INCBIN_COMP("graphics/pokemon/unown/c/overworld.4bpp"); + const u32 gObjectEventPic_UnownD[] = INCBIN_COMP("graphics/pokemon/unown/d/overworld.4bpp"); + const u32 gObjectEventPic_UnownE[] = INCBIN_COMP("graphics/pokemon/unown/e/overworld.4bpp"); + const u32 gObjectEventPic_UnownF[] = INCBIN_COMP("graphics/pokemon/unown/f/overworld.4bpp"); + const u32 gObjectEventPic_UnownG[] = INCBIN_COMP("graphics/pokemon/unown/g/overworld.4bpp"); + const u32 gObjectEventPic_UnownH[] = INCBIN_COMP("graphics/pokemon/unown/h/overworld.4bpp"); + const u32 gObjectEventPic_UnownI[] = INCBIN_COMP("graphics/pokemon/unown/i/overworld.4bpp"); + const u32 gObjectEventPic_UnownJ[] = INCBIN_COMP("graphics/pokemon/unown/j/overworld.4bpp"); + const u32 gObjectEventPic_UnownK[] = INCBIN_COMP("graphics/pokemon/unown/k/overworld.4bpp"); + const u32 gObjectEventPic_UnownL[] = INCBIN_COMP("graphics/pokemon/unown/l/overworld.4bpp"); + const u32 gObjectEventPic_UnownM[] = INCBIN_COMP("graphics/pokemon/unown/m/overworld.4bpp"); + const u32 gObjectEventPic_UnownN[] = INCBIN_COMP("graphics/pokemon/unown/n/overworld.4bpp"); + const u32 gObjectEventPic_UnownO[] = INCBIN_COMP("graphics/pokemon/unown/o/overworld.4bpp"); + const u32 gObjectEventPic_UnownP[] = INCBIN_COMP("graphics/pokemon/unown/p/overworld.4bpp"); + const u32 gObjectEventPic_UnownQ[] = INCBIN_COMP("graphics/pokemon/unown/q/overworld.4bpp"); + const u32 gObjectEventPic_UnownR[] = INCBIN_COMP("graphics/pokemon/unown/r/overworld.4bpp"); + const u32 gObjectEventPic_UnownS[] = INCBIN_COMP("graphics/pokemon/unown/s/overworld.4bpp"); + const u32 gObjectEventPic_UnownT[] = INCBIN_COMP("graphics/pokemon/unown/t/overworld.4bpp"); + const u32 gObjectEventPic_UnownU[] = INCBIN_COMP("graphics/pokemon/unown/u/overworld.4bpp"); + const u32 gObjectEventPic_UnownV[] = INCBIN_COMP("graphics/pokemon/unown/v/overworld.4bpp"); + const u32 gObjectEventPic_UnownW[] = INCBIN_COMP("graphics/pokemon/unown/w/overworld.4bpp"); + 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"); +#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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_UNOWN #if P_FAMILY_WOBBUFFET @@ -5458,13 +5458,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wynaut[] = INCBIN_COMP("graphics/pokemon/wynaut/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wynaut[] = INCBIN_COMP("graphics/pokemon/wynaut/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_3_CROSS_EVOS const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_front.4bpp.lz"); @@ -5475,13 +5475,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wobbuffet[] = INCBIN_COMP("graphics/pokemon/wobbuffet/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wobbuffet[] = INCBIN_COMP("graphics/pokemon/wobbuffet/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_frontf.4bpp.lz"); const u32 gMonBackPic_WobbuffetF[] = INCBIN_U32("graphics/pokemon/wobbuffet/backf.4bpp.lz"); @@ -5499,13 +5499,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Girafarig[] = INCBIN_COMP("graphics/pokemon/girafarig/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Girafarig[] = INCBIN_COMP("graphics/pokemon/girafarig/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/girafarig/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GirafarigF[] = INCBIN_U32("graphics/pokemon/girafarig/backf.4bpp.lz"); @@ -5519,13 +5519,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Farigiraf[] = INCBIN_U8("graphics/pokemon/farigiraf/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Farigiraf[] = INCBIN_COMP("graphics/pokemon/farigiraf/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Farigiraf[] = INCBIN_COMP("graphics/pokemon/farigiraf/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Farigiraf[] = INCBIN_U32("graphics/pokemon/farigiraf/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_GIRAFARIG @@ -5538,13 +5538,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pineco[] = INCBIN_COMP("graphics/pokemon/pineco/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pineco[] = INCBIN_COMP("graphics/pokemon/pineco/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/anim_front.4bpp.lz"); const u32 gMonPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/normal.gbapal.lz"); @@ -5554,13 +5554,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Forretress[] = INCBIN_COMP("graphics/pokemon/forretress/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Forretress[] = INCBIN_COMP("graphics/pokemon/forretress/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PINECO #if P_FAMILY_DUNSPARCE @@ -5572,13 +5572,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dunsparce[] = INCBIN_COMP("graphics/pokemon/dunsparce/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dunsparce[] = INCBIN_COMP("graphics/pokemon/dunsparce/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_9_CROSS_EVOS const u32 gMonPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/normal.gbapal.lz"); @@ -5587,13 +5587,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dudunsparce[] = INCBIN_U8("graphics/pokemon/dudunsparce/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Dudunsparce[] = INCBIN_COMP("graphics/pokemon/dudunsparce/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Dudunsparce[] = INCBIN_COMP("graphics/pokemon/dudunsparce/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Dudunsparce[] = INCBIN_U32("graphics/pokemon/dudunsparce/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/front.4bpp.lz"); const u32 gMonBackPic_DudunsparceTwoSegment[] = INCBIN_U32("graphics/pokemon/dudunsparce/back.4bpp.lz"); @@ -5612,13 +5612,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gligar[] = INCBIN_COMP("graphics/pokemon/gligar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gligar[] = INCBIN_COMP("graphics/pokemon/gligar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GligarF[] = INCBIN_U32("graphics/pokemon/gligar/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GligarF[] = INCBIN_U32("graphics/pokemon/gligar/backf.4bpp.lz"); @@ -5632,13 +5632,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gliscor[] = INCBIN_U8("graphics/pokemon/gliscor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gliscor[] = INCBIN_COMP("graphics/pokemon/gliscor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gliscor[] = INCBIN_COMP("graphics/pokemon/gliscor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gliscor[] = INCBIN_U32("graphics/pokemon/gliscor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_GLIGAR @@ -5651,13 +5651,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Snubbull[] = INCBIN_COMP("graphics/pokemon/snubbull/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Snubbull[] = INCBIN_COMP("graphics/pokemon/snubbull/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/anim_front.4bpp.lz"); const u32 gMonPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/normal.gbapal.lz"); @@ -5667,13 +5667,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Granbull[] = INCBIN_COMP("graphics/pokemon/granbull/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Granbull[] = INCBIN_COMP("graphics/pokemon/granbull/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SNUBBULL #if P_FAMILY_QWILFISH @@ -5685,13 +5685,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Qwilfish[] = INCBIN_COMP("graphics/pokemon/qwilfish/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Qwilfish[] = INCBIN_COMP("graphics/pokemon/qwilfish/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz"); @@ -5699,13 +5699,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_QwilfishHisuian[] = INCBIN_COMP("graphics/pokemon/qwilfish/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_QwilfishHisuian[] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_QwilfishHisuian[] = INCBIN_COMP("graphics/pokemon/qwilfish/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz"); const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/normal.gbapal.lz"); @@ -5715,13 +5715,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Overqwil[] = INCBIN_COMP("graphics/pokemon/overqwil/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Overqwil[] = INCBIN_COMP("graphics/pokemon/overqwil/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_QWILFISH @@ -5734,13 +5734,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shuckle[] = INCBIN_COMP("graphics/pokemon/shuckle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shuckle[] = INCBIN_COMP("graphics/pokemon/shuckle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SHUCKLE #if P_FAMILY_HERACROSS @@ -5752,13 +5752,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Heracross[] = INCBIN_COMP("graphics/pokemon/heracross/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Heracross[] = INCBIN_COMP("graphics/pokemon/heracross/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/heracross/anim_frontf.4bpp.lz"); const u32 gMonBackPic_HeracrossF[] = INCBIN_U32("graphics/pokemon/heracross/backf.4bpp.lz"); @@ -5769,13 +5769,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/back.4bpp.lz"); const u32 gMonShinyPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/shiny.gbapal.lz"); const u8 gMonIcon_HeracrossMega[] = INCBIN_U8("graphics/pokemon/heracross/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_HeracrossMega[] = INCBIN_COMP("graphics/pokemon/heracross/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_HeracrossMega[] = INCBIN_COMP("graphics/pokemon/heracross/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_HeracrossMega[] = INCBIN_U32("graphics/pokemon/heracross/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HERACROSS @@ -5788,13 +5788,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sneasel[] = INCBIN_COMP("graphics/pokemon/sneasel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sneasel[] = INCBIN_COMP("graphics/pokemon/sneasel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_SneaselF[] = INCBIN_U32("graphics/pokemon/sneasel/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SneaselF[] = INCBIN_U32("graphics/pokemon/sneasel/backf.4bpp.lz"); @@ -5808,13 +5808,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Weavile[] = INCBIN_U8("graphics/pokemon/weavile/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Weavile[] = INCBIN_COMP("graphics/pokemon/weavile/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Weavile[] = INCBIN_COMP("graphics/pokemon/weavile/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Weavile[] = INCBIN_U32("graphics/pokemon/weavile/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_WeavileF[] = INCBIN_U32("graphics/pokemon/weavile/anim_frontf.4bpp.lz"); const u32 gMonBackPic_WeavileF[] = INCBIN_U32("graphics/pokemon/weavile/backf.4bpp.lz"); @@ -5826,13 +5826,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_SneaselHisuian[] = INCBIN_COMP("graphics/pokemon/sneasel/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_SneaselHisuian[] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_SneaselHisuian[] = INCBIN_COMP("graphics/pokemon/sneasel/hisuian/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"); +#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"); @@ -5845,13 +5845,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sneasler[] = INCBIN_COMP("graphics/pokemon/sneasler/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sneasler[] = INCBIN_COMP("graphics/pokemon/sneasler/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_SNEASEL @@ -5864,13 +5864,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Teddiursa[] = INCBIN_COMP("graphics/pokemon/teddiursa/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Teddiursa[] = INCBIN_COMP("graphics/pokemon/teddiursa/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/anim_front.4bpp.lz"); const u32 gMonPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/normal.gbapal.lz"); @@ -5880,13 +5880,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ursaring[] = INCBIN_COMP("graphics/pokemon/ursaring/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ursaring[] = INCBIN_COMP("graphics/pokemon/ursaring/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/ursaring/anim_frontf.4bpp.lz"); const u32 gMonBackPic_UrsaringF[] = INCBIN_U32("graphics/pokemon/ursaring/backf.4bpp.lz"); @@ -5900,26 +5900,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ursaluna[] = INCBIN_COMP("graphics/pokemon/ursaluna/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ursaluna[] = INCBIN_COMP("graphics/pokemon/ursaluna/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/front.4bpp.lz"); const u32 gMonPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/normal.gbapal.lz"); const u32 gMonBackPic_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/back.4bpp.lz"); const u32 gMonShinyPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/shiny.gbapal.lz"); const u8 gMonIcon_UrsalunaBloodmoon[] = INCBIN_U8("graphics/pokemon/ursaluna/bloodmoon/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_UrsalunaBloodmoon[] = INCBIN_COMP("graphics/pokemon/ursaluna/bloodmoon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_UrsalunaBloodmoon[] = INCBIN_COMP("graphics/pokemon/ursaluna/bloodmoon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_UrsalunaBloodmoon[] = INCBIN_U32("graphics/pokemon/ursaluna/bloodmoon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_TEDDIURSA @@ -5932,13 +5932,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Slugma[] = INCBIN_COMP("graphics/pokemon/slugma/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Slugma[] = INCBIN_COMP("graphics/pokemon/slugma/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/anim_front.4bpp.lz"); const u32 gMonPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/normal.gbapal.lz"); @@ -5948,13 +5948,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Magcargo[] = INCBIN_COMP("graphics/pokemon/magcargo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Magcargo[] = INCBIN_COMP("graphics/pokemon/magcargo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SLUGMA #if P_FAMILY_SWINUB @@ -5966,13 +5966,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Swinub[] = INCBIN_COMP("graphics/pokemon/swinub/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Swinub[] = INCBIN_COMP("graphics/pokemon/swinub/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/anim_front.4bpp.lz"); const u32 gMonPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/normal.gbapal.lz"); @@ -5982,13 +5982,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Piloswine[] = INCBIN_COMP("graphics/pokemon/piloswine/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Piloswine[] = INCBIN_COMP("graphics/pokemon/piloswine/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/piloswine/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PiloswineF[] = INCBIN_U32("graphics/pokemon/piloswine/backf.4bpp.lz"); @@ -6002,13 +6002,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mamoswine[] = INCBIN_U8("graphics/pokemon/mamoswine/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mamoswine[] = INCBIN_COMP("graphics/pokemon/mamoswine/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mamoswine[] = INCBIN_COMP("graphics/pokemon/mamoswine/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mamoswine[] = INCBIN_U32("graphics/pokemon/mamoswine/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MamoswineF[] = INCBIN_U32("graphics/pokemon/mamoswine/anim_frontf.4bpp.lz"); #endif //P_GEN_4_CROSS_EVOS @@ -6023,13 +6023,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Corsola[] = INCBIN_COMP("graphics/pokemon/corsola/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Corsola[] = INCBIN_COMP("graphics/pokemon/corsola/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/front.4bpp.lz"); @@ -6037,13 +6037,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_CorsolaGalarian[] = INCBIN_COMP("graphics/pokemon/corsola/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_CorsolaGalarian[] = INCBIN_U32("graphics/pokemon/corsola/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_CorsolaGalarian[] = INCBIN_COMP("graphics/pokemon/corsola/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/front.4bpp.lz"); const u32 gMonPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/normal.gbapal.lz"); @@ -6053,13 +6053,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cursola[] = INCBIN_U8("graphics/pokemon/cursola/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cursola[] = INCBIN_COMP("graphics/pokemon/cursola/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cursola[] = INCBIN_COMP("graphics/pokemon/cursola/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_CORSOLA @@ -6072,13 +6072,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Remoraid[] = INCBIN_COMP("graphics/pokemon/remoraid/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Remoraid[] = INCBIN_COMP("graphics/pokemon/remoraid/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/anim_front.4bpp.lz"); const u32 gMonPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/normal.gbapal.lz"); @@ -6088,13 +6088,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Octillery[] = INCBIN_COMP("graphics/pokemon/octillery/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Octillery[] = INCBIN_COMP("graphics/pokemon/octillery/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/octillery/anim_frontf.4bpp.lz"); const u32 gMonBackPic_OctilleryF[] = INCBIN_U32("graphics/pokemon/octillery/backf.4bpp.lz"); @@ -6109,13 +6109,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Delibird[] = INCBIN_COMP("graphics/pokemon/delibird/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Delibird[] = INCBIN_COMP("graphics/pokemon/delibird/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DELIBIRD #if P_FAMILY_MANTINE @@ -6128,13 +6128,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mantyke[] = INCBIN_U8("graphics/pokemon/mantyke/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mantyke[] = INCBIN_COMP("graphics/pokemon/mantyke/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mantyke[] = INCBIN_COMP("graphics/pokemon/mantyke/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mantyke[] = INCBIN_U32("graphics/pokemon/mantyke/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/anim_front.4bpp.lz"); @@ -6145,13 +6145,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mantine[] = INCBIN_COMP("graphics/pokemon/mantine/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mantine[] = INCBIN_COMP("graphics/pokemon/mantine/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MANTINE #if P_FAMILY_SKARMORY @@ -6163,13 +6163,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Skarmory[] = INCBIN_COMP("graphics/pokemon/skarmory/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Skarmory[] = INCBIN_COMP("graphics/pokemon/skarmory/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SKARMORY #if P_FAMILY_HOUNDOUR @@ -6181,13 +6181,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Houndour[] = INCBIN_COMP("graphics/pokemon/houndour/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Houndour[] = INCBIN_COMP("graphics/pokemon/houndour/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/anim_front.4bpp.lz"); const u32 gMonPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/normal.gbapal.lz"); @@ -6197,13 +6197,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Houndoom[] = INCBIN_COMP("graphics/pokemon/houndoom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Houndoom[] = INCBIN_COMP("graphics/pokemon/houndoom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/houndoom/anim_frontf.4bpp.lz"); const u32 gMonBackPic_HoundoomF[] = INCBIN_U32("graphics/pokemon/houndoom/backf.4bpp.lz"); @@ -6214,13 +6214,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/back.4bpp.lz"); const u32 gMonShinyPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/shiny.gbapal.lz"); const u8 gMonIcon_HoundoomMega[] = INCBIN_U8("graphics/pokemon/houndoom/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_HoundoomMega[] = INCBIN_COMP("graphics/pokemon/houndoom/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_HoundoomMega[] = INCBIN_COMP("graphics/pokemon/houndoom/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_HoundoomMega[] = INCBIN_U32("graphics/pokemon/houndoom/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HOUNDOUR @@ -6233,13 +6233,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Phanpy[] = INCBIN_COMP("graphics/pokemon/phanpy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Phanpy[] = INCBIN_COMP("graphics/pokemon/phanpy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/anim_front.4bpp.lz"); const u32 gMonPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/normal.gbapal.lz"); @@ -6249,13 +6249,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Donphan[] = INCBIN_COMP("graphics/pokemon/donphan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Donphan[] = INCBIN_COMP("graphics/pokemon/donphan/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_DonphanF[] = INCBIN_U32("graphics/pokemon/donphan/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DonphanF[] = INCBIN_U32("graphics/pokemon/donphan/backf.4bpp.lz"); @@ -6270,13 +6270,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Stantler[] = INCBIN_COMP("graphics/pokemon/stantler/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Stantler[] = INCBIN_COMP("graphics/pokemon/stantler/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_8_CROSS_EVOS const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz"); @@ -6287,13 +6287,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wyrdeer[] = INCBIN_COMP("graphics/pokemon/wyrdeer/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wyrdeer[] = INCBIN_COMP("graphics/pokemon/wyrdeer/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_STANTLER @@ -6306,13 +6306,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Smeargle[] = INCBIN_COMP("graphics/pokemon/smeargle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Smeargle[] = INCBIN_COMP("graphics/pokemon/smeargle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SMEARGLE #if P_FAMILY_MILTANK @@ -6324,13 +6324,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Miltank[] = INCBIN_COMP("graphics/pokemon/miltank/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Miltank[] = INCBIN_COMP("graphics/pokemon/miltank/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MILTANK #if P_FAMILY_RAIKOU @@ -6342,13 +6342,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Raikou[] = INCBIN_COMP("graphics/pokemon/raikou/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Raikou[] = INCBIN_COMP("graphics/pokemon/raikou/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_RAIKOU #if P_FAMILY_ENTEI @@ -6360,13 +6360,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Entei[] = INCBIN_U8("graphics/pokemon/entei/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Entei[] = INCBIN_COMP("graphics/pokemon/entei/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Entei[] = INCBIN_COMP("graphics/pokemon/entei/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ENTEI #if P_FAMILY_SUICUNE @@ -6378,13 +6378,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Suicune[] = INCBIN_COMP("graphics/pokemon/suicune/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Suicune[] = INCBIN_COMP("graphics/pokemon/suicune/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SUICUNE #if P_FAMILY_LARVITAR @@ -6396,13 +6396,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Larvitar[] = INCBIN_COMP("graphics/pokemon/larvitar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Larvitar[] = INCBIN_COMP("graphics/pokemon/larvitar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/anim_front.4bpp.lz"); const u32 gMonPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/normal.gbapal.lz"); @@ -6412,13 +6412,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pupitar[] = INCBIN_COMP("graphics/pokemon/pupitar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pupitar[] = INCBIN_COMP("graphics/pokemon/pupitar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/anim_front.4bpp.lz"); const u32 gMonPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/normal.gbapal.lz"); @@ -6428,13 +6428,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tyranitar[] = INCBIN_COMP("graphics/pokemon/tyranitar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tyranitar[] = INCBIN_COMP("graphics/pokemon/tyranitar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/front.4bpp.lz"); @@ -6442,13 +6442,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/back.4bpp.lz"); const u32 gMonShinyPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/shiny.gbapal.lz"); const u8 gMonIcon_TyranitarMega[] = INCBIN_U8("graphics/pokemon/tyranitar/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_TyranitarMega[] = INCBIN_COMP("graphics/pokemon/tyranitar/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_TyranitarMega[] = INCBIN_COMP("graphics/pokemon/tyranitar/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_TyranitarMega[] = INCBIN_U32("graphics/pokemon/tyranitar/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LARVITAR @@ -6461,13 +6461,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lugia[] = INCBIN_COMP("graphics/pokemon/lugia/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lugia[] = INCBIN_COMP("graphics/pokemon/lugia/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LUGIA #if P_FAMILY_HO_OH @@ -6479,13 +6479,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_HoOh[] = INCBIN_COMP("graphics/pokemon/ho_oh/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_HoOh[] = INCBIN_COMP("graphics/pokemon/ho_oh/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_HO_OH #if P_FAMILY_CELEBI @@ -6497,13 +6497,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Celebi[] = INCBIN_COMP("graphics/pokemon/celebi/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Celebi[] = INCBIN_COMP("graphics/pokemon/celebi/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CELEBI #if P_FAMILY_TREECKO @@ -6515,13 +6515,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Treecko[] = INCBIN_COMP("graphics/pokemon/treecko/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Treecko[] = INCBIN_COMP("graphics/pokemon/treecko/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/anim_front.4bpp.lz"); const u32 gMonPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/normal.gbapal.lz"); @@ -6531,13 +6531,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Grovyle[] = INCBIN_COMP("graphics/pokemon/grovyle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Grovyle[] = INCBIN_COMP("graphics/pokemon/grovyle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/anim_front.4bpp.lz"); const u32 gMonPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/normal.gbapal.lz"); @@ -6547,13 +6547,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sceptile[] = INCBIN_COMP("graphics/pokemon/sceptile/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sceptile[] = INCBIN_COMP("graphics/pokemon/sceptile/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/front.4bpp.lz"); @@ -6561,13 +6561,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/shiny.gbapal.lz"); const u8 gMonIcon_SceptileMega[] = INCBIN_U8("graphics/pokemon/sceptile/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SceptileMega[] = INCBIN_COMP("graphics/pokemon/sceptile/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SceptileMega[] = INCBIN_COMP("graphics/pokemon/sceptile/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SceptileMega[] = INCBIN_U32("graphics/pokemon/sceptile/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TREECKO @@ -6580,13 +6580,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Torchic[] = INCBIN_COMP("graphics/pokemon/torchic/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Torchic[] = INCBIN_COMP("graphics/pokemon/torchic/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonBackPic_TorchicF[] = INCBIN_U32("graphics/pokemon/torchic/backf.4bpp.lz"); @@ -6598,13 +6598,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Combusken[] = INCBIN_COMP("graphics/pokemon/combusken/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Combusken[] = INCBIN_COMP("graphics/pokemon/combusken/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/combusken/anim_frontf.4bpp.lz"); const u32 gMonBackPic_CombuskenF[] = INCBIN_U32("graphics/pokemon/combusken/backf.4bpp.lz"); @@ -6617,13 +6617,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Blaziken[] = INCBIN_COMP("graphics/pokemon/blaziken/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Blaziken[] = INCBIN_COMP("graphics/pokemon/blaziken/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/blaziken/anim_frontf.4bpp.lz"); const u32 gMonBackPic_BlazikenF[] = INCBIN_U32("graphics/pokemon/blaziken/backf.4bpp.lz"); @@ -6634,13 +6634,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/back.4bpp.lz"); const u32 gMonShinyPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/shiny.gbapal.lz"); const u8 gMonIcon_BlazikenMega[] = INCBIN_U8("graphics/pokemon/blaziken/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_BlazikenMega[] = INCBIN_COMP("graphics/pokemon/blaziken/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_BlazikenMega[] = INCBIN_COMP("graphics/pokemon/blaziken/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_BlazikenMega[] = INCBIN_U32("graphics/pokemon/blaziken/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TORCHIC @@ -6653,13 +6653,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mudkip[] = INCBIN_COMP("graphics/pokemon/mudkip/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mudkip[] = INCBIN_COMP("graphics/pokemon/mudkip/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/anim_front.4bpp.lz"); const u32 gMonPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/normal.gbapal.lz"); @@ -6669,13 +6669,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Marshtomp[] = INCBIN_COMP("graphics/pokemon/marshtomp/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Marshtomp[] = INCBIN_COMP("graphics/pokemon/marshtomp/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/anim_front.4bpp.lz"); const u32 gMonPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/normal.gbapal.lz"); @@ -6685,13 +6685,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Swampert[] = INCBIN_COMP("graphics/pokemon/swampert/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Swampert[] = INCBIN_COMP("graphics/pokemon/swampert/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/front.4bpp.lz"); @@ -6699,13 +6699,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/shiny.gbapal.lz"); const u8 gMonIcon_SwampertMega[] = INCBIN_U8("graphics/pokemon/swampert/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SwampertMega[] = INCBIN_COMP("graphics/pokemon/swampert/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SwampertMega[] = INCBIN_COMP("graphics/pokemon/swampert/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SwampertMega[] = INCBIN_U32("graphics/pokemon/swampert/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MUDKIP @@ -6718,13 +6718,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Poochyena[] = INCBIN_COMP("graphics/pokemon/poochyena/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Poochyena[] = INCBIN_COMP("graphics/pokemon/poochyena/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/anim_front.4bpp.lz"); const u32 gMonPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/normal.gbapal.lz"); @@ -6734,13 +6734,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mightyena[] = INCBIN_COMP("graphics/pokemon/mightyena/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mightyena[] = INCBIN_COMP("graphics/pokemon/mightyena/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_POOCHYENA #if P_FAMILY_ZIGZAGOON @@ -6752,13 +6752,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zigzagoon[] = INCBIN_COMP("graphics/pokemon/zigzagoon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zigzagoon[] = INCBIN_COMP("graphics/pokemon/zigzagoon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/anim_front.4bpp.lz"); const u32 gMonPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/normal.gbapal.lz"); @@ -6768,13 +6768,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Linoone[] = INCBIN_COMP("graphics/pokemon/linoone/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Linoone[] = INCBIN_COMP("graphics/pokemon/linoone/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/front.4bpp.lz"); @@ -6782,26 +6782,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ZigzagoonGalarian[] = INCBIN_COMP("graphics/pokemon/zigzagoon/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ZigzagoonGalarian[] = INCBIN_U32("graphics/pokemon/zigzagoon/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ZigzagoonGalarian[] = INCBIN_COMP("graphics/pokemon/zigzagoon/galarian/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_LinooneGalarian[] = INCBIN_COMP("graphics/pokemon/linoone/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_LinooneGalarian[] = INCBIN_U32("graphics/pokemon/linoone/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_LinooneGalarian[] = INCBIN_COMP("graphics/pokemon/linoone/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/front.4bpp.lz"); const u32 gMonPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/normal.gbapal.lz"); @@ -6811,13 +6811,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Obstagoon[] = INCBIN_U8("graphics/pokemon/obstagoon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Obstagoon[] = INCBIN_COMP("graphics/pokemon/obstagoon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Obstagoon[] = INCBIN_COMP("graphics/pokemon/obstagoon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZIGZAGOON @@ -6830,13 +6830,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wurmple[] = INCBIN_COMP("graphics/pokemon/wurmple/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wurmple[] = INCBIN_COMP("graphics/pokemon/wurmple/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/anim_front.4bpp.lz"); const u32 gMonPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/normal.gbapal.lz"); @@ -6846,13 +6846,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Silcoon[] = INCBIN_COMP("graphics/pokemon/silcoon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Silcoon[] = INCBIN_COMP("graphics/pokemon/silcoon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/anim_front.4bpp.lz"); const u32 gMonPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/normal.gbapal.lz"); @@ -6862,13 +6862,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Beautifly[] = INCBIN_COMP("graphics/pokemon/beautifly/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Beautifly[] = INCBIN_COMP("graphics/pokemon/beautifly/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/beautifly/anim_frontf.4bpp.lz"); const u32 gMonBackPic_BeautiflyF[] = INCBIN_U32("graphics/pokemon/beautifly/backf.4bpp.lz"); @@ -6881,13 +6881,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cascoon[] = INCBIN_COMP("graphics/pokemon/cascoon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cascoon[] = INCBIN_COMP("graphics/pokemon/cascoon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/anim_front.4bpp.lz"); const u32 gMonPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/normal.gbapal.lz"); @@ -6897,13 +6897,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dustox[] = INCBIN_COMP("graphics/pokemon/dustox/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dustox[] = INCBIN_COMP("graphics/pokemon/dustox/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_DustoxF[] = INCBIN_U32("graphics/pokemon/dustox/anim_frontf.4bpp.lz"); const u32 gMonBackPic_DustoxF[] = INCBIN_U32("graphics/pokemon/dustox/backf.4bpp.lz"); @@ -6918,13 +6918,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lotad[] = INCBIN_COMP("graphics/pokemon/lotad/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lotad[] = INCBIN_COMP("graphics/pokemon/lotad/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/anim_front.4bpp.lz"); const u32 gMonPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/normal.gbapal.lz"); @@ -6934,13 +6934,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lombre[] = INCBIN_COMP("graphics/pokemon/lombre/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lombre[] = INCBIN_COMP("graphics/pokemon/lombre/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_front.4bpp.lz"); const u32 gMonPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/normal.gbapal.lz"); @@ -6950,13 +6950,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ludicolo[] = INCBIN_COMP("graphics/pokemon/ludicolo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ludicolo[] = INCBIN_COMP("graphics/pokemon/ludicolo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LudicoloF[] = INCBIN_U32("graphics/pokemon/ludicolo/backf.4bpp.lz"); @@ -6971,13 +6971,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Seedot[] = INCBIN_COMP("graphics/pokemon/seedot/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Seedot[] = INCBIN_COMP("graphics/pokemon/seedot/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_front.4bpp.lz"); const u32 gMonPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/normal.gbapal.lz"); @@ -6987,13 +6987,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Nuzleaf[] = INCBIN_COMP("graphics/pokemon/nuzleaf/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Nuzleaf[] = INCBIN_COMP("graphics/pokemon/nuzleaf/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_frontf.4bpp.lz"); const u32 gMonBackPic_NuzleafF[] = INCBIN_U32("graphics/pokemon/nuzleaf/backf.4bpp.lz"); @@ -7006,13 +7006,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shiftry[] = INCBIN_COMP("graphics/pokemon/shiftry/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shiftry[] = INCBIN_COMP("graphics/pokemon/shiftry/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/shiftry/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ShiftryF[] = INCBIN_U32("graphics/pokemon/shiftry/backf.4bpp.lz"); @@ -7027,13 +7027,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Taillow[] = INCBIN_COMP("graphics/pokemon/taillow/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Taillow[] = INCBIN_COMP("graphics/pokemon/taillow/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/anim_front.4bpp.lz"); const u32 gMonPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/normal.gbapal.lz"); @@ -7043,13 +7043,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Swellow[] = INCBIN_COMP("graphics/pokemon/swellow/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Swellow[] = INCBIN_COMP("graphics/pokemon/swellow/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TAILLOW #if P_FAMILY_WINGULL @@ -7061,13 +7061,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wingull[] = INCBIN_COMP("graphics/pokemon/wingull/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wingull[] = INCBIN_COMP("graphics/pokemon/wingull/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/anim_front.4bpp.lz"); const u32 gMonPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/normal.gbapal.lz"); @@ -7077,13 +7077,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pelipper[] = INCBIN_COMP("graphics/pokemon/pelipper/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pelipper[] = INCBIN_COMP("graphics/pokemon/pelipper/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WINGULL #if P_FAMILY_RALTS @@ -7095,13 +7095,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ralts[] = INCBIN_COMP("graphics/pokemon/ralts/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ralts[] = INCBIN_COMP("graphics/pokemon/ralts/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/anim_front.4bpp.lz"); const u32 gMonPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/normal.gbapal.lz"); @@ -7111,13 +7111,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kirlia[] = INCBIN_COMP("graphics/pokemon/kirlia/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kirlia[] = INCBIN_COMP("graphics/pokemon/kirlia/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/anim_front.4bpp.lz"); const u32 gMonPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/normal.gbapal.lz"); @@ -7127,13 +7127,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gardevoir[] = INCBIN_COMP("graphics/pokemon/gardevoir/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gardevoir[] = INCBIN_COMP("graphics/pokemon/gardevoir/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/front.4bpp.lz"); @@ -7141,13 +7141,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/shiny.gbapal.lz"); const u8 gMonIcon_GardevoirMega[] = INCBIN_U8("graphics/pokemon/gardevoir/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GardevoirMega[] = INCBIN_COMP("graphics/pokemon/gardevoir/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GardevoirMega[] = INCBIN_COMP("graphics/pokemon/gardevoir/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GardevoirMega[] = INCBIN_U32("graphics/pokemon/gardevoir/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #if P_GEN_4_CROSS_EVOS @@ -7159,13 +7159,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gallade[] = INCBIN_U8("graphics/pokemon/gallade/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gallade[] = INCBIN_COMP("graphics/pokemon/gallade/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gallade[] = INCBIN_COMP("graphics/pokemon/gallade/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gallade[] = INCBIN_U32("graphics/pokemon/gallade/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/front.4bpp.lz"); @@ -7173,13 +7173,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/shiny.gbapal.lz"); const u8 gMonIcon_GalladeMega[] = INCBIN_U8("graphics/pokemon/gallade/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GalladeMega[] = INCBIN_COMP("graphics/pokemon/gallade/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GalladeMega[] = INCBIN_COMP("graphics/pokemon/gallade/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GalladeMega[] = INCBIN_U32("graphics/pokemon/gallade/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_RALTS @@ -7193,13 +7193,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Surskit[] = INCBIN_COMP("graphics/pokemon/surskit/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Surskit[] = INCBIN_COMP("graphics/pokemon/surskit/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/anim_front.4bpp.lz"); const u32 gMonPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/normal.gbapal.lz"); @@ -7209,13 +7209,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Masquerain[] = INCBIN_COMP("graphics/pokemon/masquerain/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Masquerain[] = INCBIN_COMP("graphics/pokemon/masquerain/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SURSKIT #if P_FAMILY_SHROOMISH @@ -7227,13 +7227,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shroomish[] = INCBIN_COMP("graphics/pokemon/shroomish/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shroomish[] = INCBIN_COMP("graphics/pokemon/shroomish/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/anim_front.4bpp.lz"); const u32 gMonPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/normal.gbapal.lz"); @@ -7243,13 +7243,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Breloom[] = INCBIN_COMP("graphics/pokemon/breloom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Breloom[] = INCBIN_COMP("graphics/pokemon/breloom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SHROOMISH #if P_FAMILY_SLAKOTH @@ -7261,13 +7261,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Slakoth[] = INCBIN_COMP("graphics/pokemon/slakoth/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Slakoth[] = INCBIN_COMP("graphics/pokemon/slakoth/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/anim_front.4bpp.lz"); const u32 gMonPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/normal.gbapal.lz"); @@ -7277,13 +7277,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vigoroth[] = INCBIN_COMP("graphics/pokemon/vigoroth/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vigoroth[] = INCBIN_COMP("graphics/pokemon/vigoroth/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/anim_front.4bpp.lz"); const u32 gMonPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/normal.gbapal.lz"); @@ -7293,13 +7293,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Slaking[] = INCBIN_COMP("graphics/pokemon/slaking/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Slaking[] = INCBIN_COMP("graphics/pokemon/slaking/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SLAKOTH #if P_FAMILY_NINCADA @@ -7311,13 +7311,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Nincada[] = INCBIN_COMP("graphics/pokemon/nincada/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Nincada[] = INCBIN_COMP("graphics/pokemon/nincada/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/anim_front.4bpp.lz"); const u32 gMonPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/normal.gbapal.lz"); @@ -7327,13 +7327,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ninjask[] = INCBIN_COMP("graphics/pokemon/ninjask/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ninjask[] = INCBIN_COMP("graphics/pokemon/ninjask/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/anim_front.4bpp.lz"); const u32 gMonPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/normal.gbapal.lz"); @@ -7343,13 +7343,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shedinja[] = INCBIN_COMP("graphics/pokemon/shedinja/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shedinja[] = INCBIN_COMP("graphics/pokemon/shedinja/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_NINCADA #if P_FAMILY_WHISMUR @@ -7361,13 +7361,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Whismur[] = INCBIN_COMP("graphics/pokemon/whismur/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Whismur[] = INCBIN_COMP("graphics/pokemon/whismur/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/anim_front.4bpp.lz"); const u32 gMonPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/normal.gbapal.lz"); @@ -7377,13 +7377,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Loudred[] = INCBIN_COMP("graphics/pokemon/loudred/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Loudred[] = INCBIN_COMP("graphics/pokemon/loudred/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/anim_front.4bpp.lz"); const u32 gMonPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/normal.gbapal.lz"); @@ -7393,13 +7393,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Exploud[] = INCBIN_COMP("graphics/pokemon/exploud/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Exploud[] = INCBIN_COMP("graphics/pokemon/exploud/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WHISMUR #if P_FAMILY_MAKUHITA @@ -7411,13 +7411,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Makuhita[] = INCBIN_COMP("graphics/pokemon/makuhita/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Makuhita[] = INCBIN_COMP("graphics/pokemon/makuhita/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/anim_front.4bpp.lz"); const u32 gMonPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/normal.gbapal.lz"); @@ -7427,13 +7427,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hariyama[] = INCBIN_COMP("graphics/pokemon/hariyama/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hariyama[] = INCBIN_COMP("graphics/pokemon/hariyama/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MAKUHITA #if P_FAMILY_NOSEPASS @@ -7445,13 +7445,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Nosepass[] = INCBIN_COMP("graphics/pokemon/nosepass/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Nosepass[] = INCBIN_COMP("graphics/pokemon/nosepass/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/anim_front.4bpp.lz"); @@ -7462,13 +7462,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Probopass[] = INCBIN_U8("graphics/pokemon/probopass/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Probopass[] = INCBIN_COMP("graphics/pokemon/probopass/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Probopass[] = INCBIN_COMP("graphics/pokemon/probopass/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Probopass[] = INCBIN_U32("graphics/pokemon/probopass/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_NOSEPASS @@ -7481,13 +7481,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Skitty[] = INCBIN_COMP("graphics/pokemon/skitty/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Skitty[] = INCBIN_COMP("graphics/pokemon/skitty/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/anim_front.4bpp.lz"); const u32 gMonPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/normal.gbapal.lz"); @@ -7497,13 +7497,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Delcatty[] = INCBIN_COMP("graphics/pokemon/delcatty/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Delcatty[] = INCBIN_COMP("graphics/pokemon/delcatty/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SKITTY #if P_FAMILY_SABLEYE @@ -7515,13 +7515,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sableye[] = INCBIN_COMP("graphics/pokemon/sableye/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sableye[] = INCBIN_COMP("graphics/pokemon/sableye/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/front.4bpp.lz"); @@ -7529,13 +7529,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/shiny.gbapal.lz"); const u8 gMonIcon_SableyeMega[] = INCBIN_U8("graphics/pokemon/sableye/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SableyeMega[] = INCBIN_COMP("graphics/pokemon/sableye/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SableyeMega[] = INCBIN_COMP("graphics/pokemon/sableye/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SableyeMega[] = INCBIN_U32("graphics/pokemon/sableye/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SABLEYE @@ -7548,13 +7548,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mawile[] = INCBIN_COMP("graphics/pokemon/mawile/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mawile[] = INCBIN_COMP("graphics/pokemon/mawile/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/front.4bpp.lz"); @@ -7562,13 +7562,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/back.4bpp.lz"); const u32 gMonShinyPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/shiny.gbapal.lz"); const u8 gMonIcon_MawileMega[] = INCBIN_U8("graphics/pokemon/mawile/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MawileMega[] = INCBIN_COMP("graphics/pokemon/mawile/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MawileMega[] = INCBIN_COMP("graphics/pokemon/mawile/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_MawileMega[] = INCBIN_U32("graphics/pokemon/mawile/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAWILE @@ -7581,13 +7581,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Aron[] = INCBIN_U8("graphics/pokemon/aron/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Aron[] = INCBIN_COMP("graphics/pokemon/aron/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Aron[] = INCBIN_COMP("graphics/pokemon/aron/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/anim_front.4bpp.lz"); const u32 gMonPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/normal.gbapal.lz"); @@ -7597,13 +7597,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lairon[] = INCBIN_COMP("graphics/pokemon/lairon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lairon[] = INCBIN_COMP("graphics/pokemon/lairon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/anim_front.4bpp.lz"); const u32 gMonPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/normal.gbapal.lz"); @@ -7613,13 +7613,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Aggron[] = INCBIN_COMP("graphics/pokemon/aggron/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Aggron[] = INCBIN_COMP("graphics/pokemon/aggron/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/front.4bpp.lz"); @@ -7627,13 +7627,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/shiny.gbapal.lz"); const u8 gMonIcon_AggronMega[] = INCBIN_U8("graphics/pokemon/aggron/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AggronMega[] = INCBIN_COMP("graphics/pokemon/aggron/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AggronMega[] = INCBIN_COMP("graphics/pokemon/aggron/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AggronMega[] = INCBIN_U32("graphics/pokemon/aggron/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ARON @@ -7646,13 +7646,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Meditite[] = INCBIN_COMP("graphics/pokemon/meditite/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Meditite[] = INCBIN_COMP("graphics/pokemon/meditite/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MedititeF[] = INCBIN_U32("graphics/pokemon/meditite/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MedititeF[] = INCBIN_U32("graphics/pokemon/meditite/backf.4bpp.lz"); @@ -7665,13 +7665,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Medicham[] = INCBIN_COMP("graphics/pokemon/medicham/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Medicham[] = INCBIN_COMP("graphics/pokemon/medicham/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MedichamF[] = INCBIN_U32("graphics/pokemon/medicham/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MedichamF[] = INCBIN_U32("graphics/pokemon/medicham/backf.4bpp.lz"); @@ -7682,13 +7682,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/back.4bpp.lz"); const u32 gMonShinyPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/shiny.gbapal.lz"); const u8 gMonIcon_MedichamMega[] = INCBIN_U8("graphics/pokemon/medicham/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MedichamMega[] = INCBIN_COMP("graphics/pokemon/medicham/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MedichamMega[] = INCBIN_COMP("graphics/pokemon/medicham/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_MedichamMega[] = INCBIN_U32("graphics/pokemon/medicham/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEDITITE @@ -7701,13 +7701,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Electrike[] = INCBIN_COMP("graphics/pokemon/electrike/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Electrike[] = INCBIN_COMP("graphics/pokemon/electrike/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/anim_front.4bpp.lz"); const u32 gMonPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/normal.gbapal.lz"); @@ -7717,13 +7717,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Manectric[] = INCBIN_COMP("graphics/pokemon/manectric/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Manectric[] = INCBIN_COMP("graphics/pokemon/manectric/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/front.4bpp.lz"); @@ -7731,13 +7731,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/back.4bpp.lz"); const u32 gMonShinyPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/shiny.gbapal.lz"); const u8 gMonIcon_ManectricMega[] = INCBIN_U8("graphics/pokemon/manectric/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_ManectricMega[] = INCBIN_COMP("graphics/pokemon/manectric/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_ManectricMega[] = INCBIN_COMP("graphics/pokemon/manectric/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_ManectricMega[] = INCBIN_U32("graphics/pokemon/manectric/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ELECTRIKE @@ -7750,13 +7750,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Plusle[] = INCBIN_COMP("graphics/pokemon/plusle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Plusle[] = INCBIN_COMP("graphics/pokemon/plusle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PLUSLE #if P_FAMILY_MINUN @@ -7768,13 +7768,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Minun[] = INCBIN_U8("graphics/pokemon/minun/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Minun[] = INCBIN_COMP("graphics/pokemon/minun/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Minun[] = INCBIN_COMP("graphics/pokemon/minun/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MINUN #if P_FAMILY_VOLBEAT_ILLUMISE @@ -7786,13 +7786,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Volbeat[] = INCBIN_COMP("graphics/pokemon/volbeat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Volbeat[] = INCBIN_COMP("graphics/pokemon/volbeat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/anim_front.4bpp.lz"); const u32 gMonPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/normal.gbapal.lz"); @@ -7802,13 +7802,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Illumise[] = INCBIN_COMP("graphics/pokemon/illumise/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Illumise[] = INCBIN_COMP("graphics/pokemon/illumise/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_VOLBEAT_ILLUMISE #if P_FAMILY_ROSELIA @@ -7821,13 +7821,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Budew[] = INCBIN_U8("graphics/pokemon/budew/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Budew[] = INCBIN_COMP("graphics/pokemon/budew/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Budew[] = INCBIN_U32("graphics/pokemon/budew/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Budew[] = INCBIN_U32("graphics/pokemon/budew/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Budew[] = INCBIN_COMP("graphics/pokemon/budew/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Budew[] = INCBIN_U32("graphics/pokemon/budew/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Budew[] = INCBIN_U32("graphics/pokemon/budew/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/anim_front.4bpp.lz"); @@ -7838,13 +7838,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Roselia[] = INCBIN_COMP("graphics/pokemon/roselia/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Roselia[] = INCBIN_COMP("graphics/pokemon/roselia/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/roselia/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RoseliaF[] = INCBIN_U32("graphics/pokemon/roselia/backf.4bpp.lz"); @@ -7858,13 +7858,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Roserade[] = INCBIN_U8("graphics/pokemon/roserade/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Roserade[] = INCBIN_COMP("graphics/pokemon/roserade/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Roserade[] = INCBIN_COMP("graphics/pokemon/roserade/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Roserade[] = INCBIN_U32("graphics/pokemon/roserade/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/roserade/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RoseradeF[] = INCBIN_U32("graphics/pokemon/roserade/backf.4bpp.lz"); @@ -7880,13 +7880,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gulpin[] = INCBIN_COMP("graphics/pokemon/gulpin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gulpin[] = INCBIN_COMP("graphics/pokemon/gulpin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gulpin/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GulpinF[] = INCBIN_U32("graphics/pokemon/gulpin/backf.4bpp.lz"); @@ -7899,13 +7899,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Swalot[] = INCBIN_COMP("graphics/pokemon/swalot/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Swalot[] = INCBIN_COMP("graphics/pokemon/swalot/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_SwalotF[] = INCBIN_U32("graphics/pokemon/swalot/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SwalotF[] = INCBIN_U32("graphics/pokemon/swalot/backf.4bpp.lz"); @@ -7920,13 +7920,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Carvanha[] = INCBIN_COMP("graphics/pokemon/carvanha/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Carvanha[] = INCBIN_COMP("graphics/pokemon/carvanha/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/anim_front.4bpp.lz"); const u32 gMonPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/normal.gbapal.lz"); @@ -7936,13 +7936,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sharpedo[] = INCBIN_COMP("graphics/pokemon/sharpedo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sharpedo[] = INCBIN_COMP("graphics/pokemon/sharpedo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/front.4bpp.lz"); @@ -7950,13 +7950,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/shiny.gbapal.lz"); const u8 gMonIcon_SharpedoMega[] = INCBIN_U8("graphics/pokemon/sharpedo/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SharpedoMega[] = INCBIN_COMP("graphics/pokemon/sharpedo/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SharpedoMega[] = INCBIN_COMP("graphics/pokemon/sharpedo/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SharpedoMega[] = INCBIN_U32("graphics/pokemon/sharpedo/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_CARVANHA @@ -7969,13 +7969,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wailmer[] = INCBIN_COMP("graphics/pokemon/wailmer/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wailmer[] = INCBIN_COMP("graphics/pokemon/wailmer/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/anim_front.4bpp.lz"); const u32 gMonPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/normal.gbapal.lz"); @@ -7985,13 +7985,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wailord[] = INCBIN_COMP("graphics/pokemon/wailord/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wailord[] = INCBIN_COMP("graphics/pokemon/wailord/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WAILMER #if P_FAMILY_NUMEL @@ -8003,13 +8003,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Numel[] = INCBIN_U8("graphics/pokemon/numel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Numel[] = INCBIN_COMP("graphics/pokemon/numel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Numel[] = INCBIN_COMP("graphics/pokemon/numel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_NumelF[] = INCBIN_U32("graphics/pokemon/numel/anim_frontf.4bpp.lz"); const u32 gMonBackPic_NumelF[] = INCBIN_U32("graphics/pokemon/numel/backf.4bpp.lz"); @@ -8022,13 +8022,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Camerupt[] = INCBIN_COMP("graphics/pokemon/camerupt/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Camerupt[] = INCBIN_COMP("graphics/pokemon/camerupt/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_CameruptF[] = INCBIN_U32("graphics/pokemon/camerupt/anim_frontf.4bpp.lz"); const u32 gMonBackPic_CameruptF[] = INCBIN_U32("graphics/pokemon/camerupt/backf.4bpp.lz"); @@ -8039,13 +8039,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/back.4bpp.lz"); const u32 gMonShinyPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/shiny.gbapal.lz"); const u8 gMonIcon_CameruptMega[] = INCBIN_U8("graphics/pokemon/camerupt/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CameruptMega[] = INCBIN_COMP("graphics/pokemon/camerupt/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CameruptMega[] = INCBIN_COMP("graphics/pokemon/camerupt/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CameruptMega[] = INCBIN_U32("graphics/pokemon/camerupt/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_NUMEL @@ -8058,13 +8058,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Torkoal[] = INCBIN_COMP("graphics/pokemon/torkoal/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Torkoal[] = INCBIN_COMP("graphics/pokemon/torkoal/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TORKOAL #if P_FAMILY_SPOINK @@ -8076,13 +8076,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Spoink[] = INCBIN_COMP("graphics/pokemon/spoink/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Spoink[] = INCBIN_COMP("graphics/pokemon/spoink/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/anim_front.4bpp.lz"); const u32 gMonPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/normal.gbapal.lz"); @@ -8092,13 +8092,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Grumpig[] = INCBIN_COMP("graphics/pokemon/grumpig/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Grumpig[] = INCBIN_COMP("graphics/pokemon/grumpig/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SPOINK #if P_FAMILY_SPINDA @@ -8110,13 +8110,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Spinda[] = INCBIN_COMP("graphics/pokemon/spinda/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Spinda[] = INCBIN_COMP("graphics/pokemon/spinda/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SPINDA #if P_FAMILY_TRAPINCH @@ -8128,13 +8128,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Trapinch[] = INCBIN_COMP("graphics/pokemon/trapinch/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Trapinch[] = INCBIN_COMP("graphics/pokemon/trapinch/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/anim_front.4bpp.lz"); const u32 gMonPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/normal.gbapal.lz"); @@ -8144,13 +8144,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vibrava[] = INCBIN_COMP("graphics/pokemon/vibrava/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vibrava[] = INCBIN_COMP("graphics/pokemon/vibrava/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/anim_front.4bpp.lz"); const u32 gMonPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/normal.gbapal.lz"); @@ -8160,13 +8160,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Flygon[] = INCBIN_COMP("graphics/pokemon/flygon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Flygon[] = INCBIN_COMP("graphics/pokemon/flygon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TRAPINCH #if P_FAMILY_CACNEA @@ -8178,13 +8178,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cacnea[] = INCBIN_COMP("graphics/pokemon/cacnea/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cacnea[] = INCBIN_COMP("graphics/pokemon/cacnea/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/anim_front.4bpp.lz"); const u32 gMonPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/normal.gbapal.lz"); @@ -8194,13 +8194,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cacturne[] = INCBIN_COMP("graphics/pokemon/cacturne/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cacturne[] = INCBIN_COMP("graphics/pokemon/cacturne/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_CacturneF[] = INCBIN_U32("graphics/pokemon/cacturne/anim_frontf.4bpp.lz"); #endif //P_FAMILY_CACNEA @@ -8214,13 +8214,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Swablu[] = INCBIN_COMP("graphics/pokemon/swablu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Swablu[] = INCBIN_COMP("graphics/pokemon/swablu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/anim_front.4bpp.lz"); const u32 gMonPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/normal.gbapal.lz"); @@ -8230,13 +8230,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Altaria[] = INCBIN_COMP("graphics/pokemon/altaria/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Altaria[] = INCBIN_COMP("graphics/pokemon/altaria/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/front.4bpp.lz"); @@ -8244,13 +8244,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/shiny.gbapal.lz"); const u8 gMonIcon_AltariaMega[] = INCBIN_U8("graphics/pokemon/altaria/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AltariaMega[] = INCBIN_COMP("graphics/pokemon/altaria/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AltariaMega[] = INCBIN_COMP("graphics/pokemon/altaria/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AltariaMega[] = INCBIN_U32("graphics/pokemon/altaria/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SWABLU @@ -8263,13 +8263,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zangoose[] = INCBIN_COMP("graphics/pokemon/zangoose/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zangoose[] = INCBIN_COMP("graphics/pokemon/zangoose/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ZANGOOSE #if P_FAMILY_SEVIPER @@ -8281,13 +8281,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Seviper[] = INCBIN_COMP("graphics/pokemon/seviper/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Seviper[] = INCBIN_COMP("graphics/pokemon/seviper/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SEVIPER #if P_FAMILY_LUNATONE @@ -8299,13 +8299,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lunatone[] = INCBIN_COMP("graphics/pokemon/lunatone/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lunatone[] = INCBIN_COMP("graphics/pokemon/lunatone/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LUNATONE #if P_FAMILY_SOLROCK @@ -8317,13 +8317,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Solrock[] = INCBIN_COMP("graphics/pokemon/solrock/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Solrock[] = INCBIN_COMP("graphics/pokemon/solrock/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SOLROCK #if P_FAMILY_BARBOACH @@ -8335,13 +8335,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Barboach[] = INCBIN_COMP("graphics/pokemon/barboach/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Barboach[] = INCBIN_COMP("graphics/pokemon/barboach/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/anim_front.4bpp.lz"); const u32 gMonPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/normal.gbapal.lz"); @@ -8351,13 +8351,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Whiscash[] = INCBIN_COMP("graphics/pokemon/whiscash/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Whiscash[] = INCBIN_COMP("graphics/pokemon/whiscash/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BARBOACH #if P_FAMILY_CORPHISH @@ -8369,13 +8369,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Corphish[] = INCBIN_COMP("graphics/pokemon/corphish/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Corphish[] = INCBIN_COMP("graphics/pokemon/corphish/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/anim_front.4bpp.lz"); const u32 gMonPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/normal.gbapal.lz"); @@ -8385,13 +8385,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Crawdaunt[] = INCBIN_COMP("graphics/pokemon/crawdaunt/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Crawdaunt[] = INCBIN_COMP("graphics/pokemon/crawdaunt/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CORPHISH #if P_FAMILY_BALTOY @@ -8403,13 +8403,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Baltoy[] = INCBIN_COMP("graphics/pokemon/baltoy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Baltoy[] = INCBIN_COMP("graphics/pokemon/baltoy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/anim_front.4bpp.lz"); const u32 gMonPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/normal.gbapal.lz"); @@ -8419,13 +8419,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Claydol[] = INCBIN_COMP("graphics/pokemon/claydol/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Claydol[] = INCBIN_COMP("graphics/pokemon/claydol/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BALTOY #if P_FAMILY_LILEEP @@ -8437,13 +8437,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lileep[] = INCBIN_COMP("graphics/pokemon/lileep/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lileep[] = INCBIN_COMP("graphics/pokemon/lileep/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/anim_front.4bpp.lz"); const u32 gMonPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/normal.gbapal.lz"); @@ -8453,13 +8453,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cradily[] = INCBIN_COMP("graphics/pokemon/cradily/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cradily[] = INCBIN_COMP("graphics/pokemon/cradily/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LILEEP #if P_FAMILY_ANORITH @@ -8471,13 +8471,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Anorith[] = INCBIN_COMP("graphics/pokemon/anorith/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Anorith[] = INCBIN_COMP("graphics/pokemon/anorith/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/anim_front.4bpp.lz"); const u32 gMonPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/normal.gbapal.lz"); @@ -8487,13 +8487,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Armaldo[] = INCBIN_COMP("graphics/pokemon/armaldo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Armaldo[] = INCBIN_COMP("graphics/pokemon/armaldo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ANORITH #if P_FAMILY_FEEBAS @@ -8505,13 +8505,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Feebas[] = INCBIN_COMP("graphics/pokemon/feebas/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Feebas[] = INCBIN_COMP("graphics/pokemon/feebas/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/anim_front.4bpp.lz"); const u32 gMonPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/normal.gbapal.lz"); @@ -8521,13 +8521,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Milotic[] = INCBIN_COMP("graphics/pokemon/milotic/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Milotic[] = INCBIN_COMP("graphics/pokemon/milotic/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/anim_frontf.4bpp.lz"); const u32 gMonBackPic_MiloticF[] = INCBIN_U32("graphics/pokemon/milotic/backf.4bpp.lz"); @@ -8561,22 +8561,22 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/shiny.gbapal.lz"); const u8 gMonIcon_CastformSnowy[] = INCBIN_U8("graphics/pokemon/castform/snowy/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_CastformNormal[] = INCBIN_COMP("graphics/pokemon/castform/follower.4bpp"); - const u32 gObjectEventPic_CastformSunny[] = INCBIN_COMP("graphics/pokemon/castform/sunny/follower.4bpp"); - const u32 gObjectEventPic_CastformRainy[] = INCBIN_COMP("graphics/pokemon/castform/rainy/follower.4bpp"); - const u32 gObjectEventPic_CastformSnowy[] = INCBIN_COMP("graphics/pokemon/castform/snowy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_CastformNormal[] = INCBIN_COMP("graphics/pokemon/castform/overworld.4bpp"); + const u32 gObjectEventPic_CastformSunny[] = INCBIN_COMP("graphics/pokemon/castform/sunny/overworld.4bpp"); + const u32 gObjectEventPic_CastformRainy[] = INCBIN_COMP("graphics/pokemon/castform/rainy/overworld.4bpp"); + const u32 gObjectEventPic_CastformSnowy[] = INCBIN_COMP("graphics/pokemon/castform/snowy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CASTFORM #if P_FAMILY_KECLEON @@ -8588,13 +8588,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kecleon[] = INCBIN_COMP("graphics/pokemon/kecleon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kecleon[] = INCBIN_COMP("graphics/pokemon/kecleon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_KECLEON #if P_FAMILY_SHUPPET @@ -8606,13 +8606,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shuppet[] = INCBIN_COMP("graphics/pokemon/shuppet/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shuppet[] = INCBIN_COMP("graphics/pokemon/shuppet/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/anim_front.4bpp.lz"); const u32 gMonPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/normal.gbapal.lz"); @@ -8622,13 +8622,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Banette[] = INCBIN_U8("graphics/pokemon/banette/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Banette[] = INCBIN_COMP("graphics/pokemon/banette/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Banette[] = INCBIN_COMP("graphics/pokemon/banette/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/front.4bpp.lz"); @@ -8636,13 +8636,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/back.4bpp.lz"); const u32 gMonShinyPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/shiny.gbapal.lz"); const u8 gMonIcon_BanetteMega[] = INCBIN_U8("graphics/pokemon/banette/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_BanetteMega[] = INCBIN_COMP("graphics/pokemon/banette/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_BanetteMega[] = INCBIN_COMP("graphics/pokemon/banette/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_BanetteMega[] = INCBIN_U32("graphics/pokemon/banette/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SHUPPET @@ -8655,13 +8655,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Duskull[] = INCBIN_COMP("graphics/pokemon/duskull/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Duskull[] = INCBIN_COMP("graphics/pokemon/duskull/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/anim_front.4bpp.lz"); const u32 gMonPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/normal.gbapal.lz"); @@ -8671,13 +8671,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dusclops[] = INCBIN_COMP("graphics/pokemon/dusclops/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dusclops[] = INCBIN_COMP("graphics/pokemon/dusclops/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/anim_front.4bpp.lz"); @@ -8688,13 +8688,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dusknoir[] = INCBIN_U8("graphics/pokemon/dusknoir/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dusknoir[] = INCBIN_COMP("graphics/pokemon/dusknoir/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dusknoir[] = INCBIN_COMP("graphics/pokemon/dusknoir/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dusknoir[] = INCBIN_U32("graphics/pokemon/dusknoir/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_DUSKULL @@ -8707,13 +8707,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tropius[] = INCBIN_COMP("graphics/pokemon/tropius/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tropius[] = INCBIN_COMP("graphics/pokemon/tropius/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TROPIUS #if P_FAMILY_CHIMECHO @@ -8726,13 +8726,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chingling[] = INCBIN_U8("graphics/pokemon/chingling/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chingling[] = INCBIN_COMP("graphics/pokemon/chingling/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chingling[] = INCBIN_COMP("graphics/pokemon/chingling/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chingling[] = INCBIN_U32("graphics/pokemon/chingling/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/anim_front.4bpp.lz"); @@ -8743,13 +8743,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chimecho[] = INCBIN_COMP("graphics/pokemon/chimecho/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chimecho[] = INCBIN_COMP("graphics/pokemon/chimecho/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CHIMECHO #if P_FAMILY_ABSOL @@ -8761,13 +8761,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Absol[] = INCBIN_U8("graphics/pokemon/absol/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Absol[] = INCBIN_COMP("graphics/pokemon/absol/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Absol[] = INCBIN_COMP("graphics/pokemon/absol/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/front.4bpp.lz"); @@ -8775,13 +8775,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/shiny.gbapal.lz"); const u8 gMonIcon_AbsolMega[] = INCBIN_U8("graphics/pokemon/absol/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AbsolMega[] = INCBIN_COMP("graphics/pokemon/absol/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AbsolMega[] = INCBIN_COMP("graphics/pokemon/absol/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AbsolMega[] = INCBIN_U32("graphics/pokemon/absol/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABSOL @@ -8794,13 +8794,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Snorunt[] = INCBIN_COMP("graphics/pokemon/snorunt/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Snorunt[] = INCBIN_COMP("graphics/pokemon/snorunt/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/anim_front.4bpp.lz"); const u32 gMonPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/normal.gbapal.lz"); @@ -8810,13 +8810,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Glalie[] = INCBIN_COMP("graphics/pokemon/glalie/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Glalie[] = INCBIN_COMP("graphics/pokemon/glalie/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/front.4bpp.lz"); @@ -8824,13 +8824,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/shiny.gbapal.lz"); const u8 gMonIcon_GlalieMega[] = INCBIN_U8("graphics/pokemon/glalie/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GlalieMega[] = INCBIN_COMP("graphics/pokemon/glalie/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GlalieMega[] = INCBIN_COMP("graphics/pokemon/glalie/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GlalieMega[] = INCBIN_U32("graphics/pokemon/glalie/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #if P_GEN_4_CROSS_EVOS @@ -8842,13 +8842,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Froslass[] = INCBIN_U8("graphics/pokemon/froslass/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Froslass[] = INCBIN_COMP("graphics/pokemon/froslass/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Froslass[] = INCBIN_COMP("graphics/pokemon/froslass/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Froslass[] = INCBIN_U32("graphics/pokemon/froslass/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_SNORUNT @@ -8861,13 +8861,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Spheal[] = INCBIN_COMP("graphics/pokemon/spheal/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Spheal[] = INCBIN_COMP("graphics/pokemon/spheal/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/anim_front.4bpp.lz"); const u32 gMonPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/normal.gbapal.lz"); @@ -8877,13 +8877,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sealeo[] = INCBIN_COMP("graphics/pokemon/sealeo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sealeo[] = INCBIN_COMP("graphics/pokemon/sealeo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/anim_front.4bpp.lz"); const u32 gMonPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/normal.gbapal.lz"); @@ -8893,13 +8893,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Walrein[] = INCBIN_COMP("graphics/pokemon/walrein/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Walrein[] = INCBIN_COMP("graphics/pokemon/walrein/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SPHEAL #if P_FAMILY_CLAMPERL @@ -8911,13 +8911,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Clamperl[] = INCBIN_COMP("graphics/pokemon/clamperl/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Clamperl[] = INCBIN_COMP("graphics/pokemon/clamperl/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/anim_front.4bpp.lz"); const u32 gMonPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/normal.gbapal.lz"); @@ -8927,13 +8927,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Huntail[] = INCBIN_COMP("graphics/pokemon/huntail/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Huntail[] = INCBIN_COMP("graphics/pokemon/huntail/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/anim_front.4bpp.lz"); const u32 gMonPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/normal.gbapal.lz"); @@ -8943,13 +8943,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gorebyss[] = INCBIN_COMP("graphics/pokemon/gorebyss/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gorebyss[] = INCBIN_COMP("graphics/pokemon/gorebyss/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CLAMPERL #if P_FAMILY_RELICANTH @@ -8961,13 +8961,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Relicanth[] = INCBIN_COMP("graphics/pokemon/relicanth/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Relicanth[] = INCBIN_COMP("graphics/pokemon/relicanth/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/relicanth/anim_frontf.4bpp.lz"); const u32 gMonBackPic_RelicanthF[] = INCBIN_U32("graphics/pokemon/relicanth/backf.4bpp.lz"); @@ -8982,13 +8982,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Luvdisc[] = INCBIN_COMP("graphics/pokemon/luvdisc/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Luvdisc[] = INCBIN_COMP("graphics/pokemon/luvdisc/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LUVDISC #if P_FAMILY_BAGON @@ -9000,13 +9000,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bagon[] = INCBIN_COMP("graphics/pokemon/bagon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bagon[] = INCBIN_COMP("graphics/pokemon/bagon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/anim_front.4bpp.lz"); const u32 gMonPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/normal.gbapal.lz"); @@ -9016,13 +9016,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shelgon[] = INCBIN_COMP("graphics/pokemon/shelgon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shelgon[] = INCBIN_COMP("graphics/pokemon/shelgon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/anim_front.4bpp.lz"); const u32 gMonPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/normal.gbapal.lz"); @@ -9032,13 +9032,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Salamence[] = INCBIN_COMP("graphics/pokemon/salamence/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Salamence[] = INCBIN_COMP("graphics/pokemon/salamence/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/front.4bpp.lz"); @@ -9046,13 +9046,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/back.4bpp.lz"); const u32 gMonShinyPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/shiny.gbapal.lz"); const u8 gMonIcon_SalamenceMega[] = INCBIN_U8("graphics/pokemon/salamence/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SalamenceMega[] = INCBIN_COMP("graphics/pokemon/salamence/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SalamenceMega[] = INCBIN_COMP("graphics/pokemon/salamence/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SalamenceMega[] = INCBIN_U32("graphics/pokemon/salamence/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BAGON @@ -9065,13 +9065,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Beldum[] = INCBIN_COMP("graphics/pokemon/beldum/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Beldum[] = INCBIN_COMP("graphics/pokemon/beldum/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/anim_front.4bpp.lz"); const u32 gMonPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/normal.gbapal.lz"); @@ -9081,13 +9081,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Metang[] = INCBIN_U8("graphics/pokemon/metang/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Metang[] = INCBIN_COMP("graphics/pokemon/metang/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Metang[] = INCBIN_COMP("graphics/pokemon/metang/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/anim_front.4bpp.lz"); const u32 gMonPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/normal.gbapal.lz"); @@ -9097,13 +9097,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Metagross[] = INCBIN_COMP("graphics/pokemon/metagross/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Metagross[] = INCBIN_COMP("graphics/pokemon/metagross/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/front.4bpp.lz"); @@ -9111,13 +9111,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/back.4bpp.lz"); const u32 gMonShinyPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/shiny.gbapal.lz"); const u8 gMonIcon_MetagrossMega[] = INCBIN_U8("graphics/pokemon/metagross/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MetagrossMega[] = INCBIN_COMP("graphics/pokemon/metagross/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MetagrossMega[] = INCBIN_COMP("graphics/pokemon/metagross/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_MetagrossMega[] = INCBIN_U32("graphics/pokemon/metagross/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BELDUM @@ -9130,13 +9130,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Regirock[] = INCBIN_COMP("graphics/pokemon/regirock/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Regirock[] = INCBIN_COMP("graphics/pokemon/regirock/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_REGIROCK #if P_FAMILY_REGICE @@ -9148,13 +9148,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Regice[] = INCBIN_U8("graphics/pokemon/regice/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Regice[] = INCBIN_COMP("graphics/pokemon/regice/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Regice[] = INCBIN_COMP("graphics/pokemon/regice/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_REGICE #if P_FAMILY_REGISTEEL @@ -9166,13 +9166,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Registeel[] = INCBIN_COMP("graphics/pokemon/registeel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Registeel[] = INCBIN_COMP("graphics/pokemon/registeel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_REGISTEEL #if P_FAMILY_LATIAS @@ -9184,13 +9184,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Latias[] = INCBIN_U8("graphics/pokemon/latias/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Latias[] = INCBIN_COMP("graphics/pokemon/latias/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Latias[] = INCBIN_COMP("graphics/pokemon/latias/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/front.4bpp.lz"); @@ -9198,13 +9198,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/back.4bpp.lz"); const u32 gMonShinyPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/shiny.gbapal.lz"); const u8 gMonIcon_LatiasMega[] = INCBIN_U8("graphics/pokemon/latias/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_LatiasMega[] = INCBIN_COMP("graphics/pokemon/latias/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_LatiasMega[] = INCBIN_COMP("graphics/pokemon/latias/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_LatiasMega[] = INCBIN_U32("graphics/pokemon/latias/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIAS @@ -9217,13 +9217,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/latios/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Latios[] = INCBIN_COMP("graphics/pokemon/latios/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Latios[] = INCBIN_COMP("graphics/pokemon/latios/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/front.4bpp.lz"); @@ -9231,13 +9231,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/back.4bpp.lz"); const u32 gMonShinyPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/shiny.gbapal.lz"); const u8 gMonIcon_LatiosMega[] = INCBIN_U8("graphics/pokemon/latios/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_LatiosMega[] = INCBIN_COMP("graphics/pokemon/latios/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_LatiosMega[] = INCBIN_COMP("graphics/pokemon/latios/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_LatiosMega[] = INCBIN_U32("graphics/pokemon/latios/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIOS @@ -9250,13 +9250,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kyogre[] = INCBIN_COMP("graphics/pokemon/kyogre/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kyogre[] = INCBIN_COMP("graphics/pokemon/kyogre/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_PRIMAL_REVERSIONS const u32 gMonFrontPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/front.4bpp.lz"); @@ -9264,13 +9264,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/back.4bpp.lz"); const u32 gMonShinyPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/shiny.gbapal.lz"); const u8 gMonIcon_KyogrePrimal[] = INCBIN_U8("graphics/pokemon/kyogre/primal/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_KyogrePrimal[] = INCBIN_COMP("graphics/pokemon/kyogre/primal/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_KyogrePrimal[] = INCBIN_COMP("graphics/pokemon/kyogre/primal/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_KyogrePrimal[] = INCBIN_U32("graphics/pokemon/kyogre/primal/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_KYOGRE @@ -9283,13 +9283,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Groudon[] = INCBIN_COMP("graphics/pokemon/groudon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Groudon[] = INCBIN_COMP("graphics/pokemon/groudon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_PRIMAL_REVERSIONS const u32 gMonFrontPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/front.4bpp.lz"); @@ -9297,13 +9297,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/back.4bpp.lz"); const u32 gMonShinyPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/shiny.gbapal.lz"); const u8 gMonIcon_GroudonPrimal[] = INCBIN_U8("graphics/pokemon/groudon/primal/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GroudonPrimal[] = INCBIN_COMP("graphics/pokemon/groudon/primal/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GroudonPrimal[] = INCBIN_COMP("graphics/pokemon/groudon/primal/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GroudonPrimal[] = INCBIN_U32("graphics/pokemon/groudon/primal/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_GROUDON @@ -9316,13 +9316,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rayquaza[] = INCBIN_COMP("graphics/pokemon/rayquaza/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rayquaza[] = INCBIN_COMP("graphics/pokemon/rayquaza/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/front.4bpp.lz"); @@ -9330,13 +9330,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/back.4bpp.lz"); const u32 gMonShinyPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/shiny.gbapal.lz"); const u8 gMonIcon_RayquazaMega[] = INCBIN_U8("graphics/pokemon/rayquaza/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_RayquazaMega[] = INCBIN_COMP("graphics/pokemon/rayquaza/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_RayquazaMega[] = INCBIN_COMP("graphics/pokemon/rayquaza/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_RayquazaMega[] = INCBIN_U32("graphics/pokemon/rayquaza/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RAYQUAZA @@ -9349,13 +9349,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Jirachi[] = INCBIN_COMP("graphics/pokemon/jirachi/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Jirachi[] = INCBIN_COMP("graphics/pokemon/jirachi/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_JIRACHI #if P_FAMILY_DEOXYS @@ -9386,22 +9386,22 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/shiny.gbapal.lz"); const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/speed/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_DeoxysNormal[] = INCBIN_COMP("graphics/pokemon/deoxys/follower.4bpp"); - const u32 gObjectEventPic_DeoxysAttack[] = INCBIN_COMP("graphics/pokemon/deoxys/attack/follower.4bpp"); - const u32 gObjectEventPic_DeoxysDefense[] = INCBIN_COMP("graphics/pokemon/deoxys/defense/follower.4bpp"); - const u32 gObjectEventPic_DeoxysSpeed[] = INCBIN_COMP("graphics/pokemon/deoxys/speed/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_DeoxysNormal[] = INCBIN_COMP("graphics/pokemon/deoxys/overworld.4bpp"); + const u32 gObjectEventPic_DeoxysAttack[] = INCBIN_COMP("graphics/pokemon/deoxys/attack/overworld.4bpp"); + const u32 gObjectEventPic_DeoxysDefense[] = INCBIN_COMP("graphics/pokemon/deoxys/defense/overworld.4bpp"); + const u32 gObjectEventPic_DeoxysSpeed[] = INCBIN_COMP("graphics/pokemon/deoxys/speed/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DEOXYS #if P_FAMILY_TURTWIG @@ -9413,13 +9413,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Turtwig[] = INCBIN_COMP("graphics/pokemon/turtwig/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Turtwig[] = INCBIN_COMP("graphics/pokemon/turtwig/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/anim_front.4bpp.lz"); const u32 gMonPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/normal.gbapal.lz"); @@ -9429,13 +9429,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Grotle[] = INCBIN_COMP("graphics/pokemon/grotle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Grotle[] = INCBIN_COMP("graphics/pokemon/grotle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/anim_front.4bpp.lz"); const u32 gMonPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/normal.gbapal.lz"); @@ -9445,13 +9445,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Torterra[] = INCBIN_COMP("graphics/pokemon/torterra/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Torterra[] = INCBIN_COMP("graphics/pokemon/torterra/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TURTWIG #if P_FAMILY_CHIMCHAR @@ -9463,13 +9463,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chimchar[] = INCBIN_U8("graphics/pokemon/chimchar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chimchar[] = INCBIN_COMP("graphics/pokemon/chimchar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chimchar[] = INCBIN_COMP("graphics/pokemon/chimchar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chimchar[] = INCBIN_U32("graphics/pokemon/chimchar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/anim_front.4bpp.lz"); const u32 gMonPalette_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/normal.gbapal.lz"); @@ -9479,13 +9479,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Monferno[] = INCBIN_U8("graphics/pokemon/monferno/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Monferno[] = INCBIN_COMP("graphics/pokemon/monferno/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Monferno[] = INCBIN_COMP("graphics/pokemon/monferno/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Monferno[] = INCBIN_U32("graphics/pokemon/monferno/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/anim_front.4bpp.lz"); const u32 gMonPalette_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/normal.gbapal.lz"); @@ -9495,13 +9495,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Infernape[] = INCBIN_U8("graphics/pokemon/infernape/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Infernape[] = INCBIN_COMP("graphics/pokemon/infernape/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Infernape[] = INCBIN_COMP("graphics/pokemon/infernape/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Infernape[] = INCBIN_U32("graphics/pokemon/infernape/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CHIMCHAR #if P_FAMILY_PIPLUP @@ -9513,13 +9513,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Piplup[] = INCBIN_U8("graphics/pokemon/piplup/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Piplup[] = INCBIN_COMP("graphics/pokemon/piplup/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Piplup[] = INCBIN_COMP("graphics/pokemon/piplup/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Piplup[] = INCBIN_U32("graphics/pokemon/piplup/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/anim_front.4bpp.lz"); const u32 gMonPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/normal.gbapal.lz"); @@ -9529,13 +9529,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Prinplup[] = INCBIN_U8("graphics/pokemon/prinplup/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Prinplup[] = INCBIN_COMP("graphics/pokemon/prinplup/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Prinplup[] = INCBIN_COMP("graphics/pokemon/prinplup/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Prinplup[] = INCBIN_U32("graphics/pokemon/prinplup/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/anim_front.4bpp.lz"); const u32 gMonPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/normal.gbapal.lz"); @@ -9545,13 +9545,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Empoleon[] = INCBIN_U8("graphics/pokemon/empoleon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Empoleon[] = INCBIN_COMP("graphics/pokemon/empoleon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Empoleon[] = INCBIN_COMP("graphics/pokemon/empoleon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Empoleon[] = INCBIN_U32("graphics/pokemon/empoleon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PIPLUP #if P_FAMILY_STARLY @@ -9563,13 +9563,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Starly[] = INCBIN_U8("graphics/pokemon/starly/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Starly[] = INCBIN_COMP("graphics/pokemon/starly/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Starly[] = INCBIN_U32("graphics/pokemon/starly/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Starly[] = INCBIN_U32("graphics/pokemon/starly/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Starly[] = INCBIN_COMP("graphics/pokemon/starly/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Starly[] = INCBIN_U32("graphics/pokemon/starly/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Starly[] = INCBIN_U32("graphics/pokemon/starly/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_StarlyF[] = INCBIN_U32("graphics/pokemon/starly/anim_frontf.4bpp.lz"); const u32 gMonBackPic_StarlyF[] = INCBIN_U32("graphics/pokemon/starly/backf.4bpp.lz"); @@ -9582,13 +9582,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Staravia[] = INCBIN_U8("graphics/pokemon/staravia/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Staravia[] = INCBIN_COMP("graphics/pokemon/staravia/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Staravia[] = INCBIN_COMP("graphics/pokemon/staravia/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Staravia[] = INCBIN_U32("graphics/pokemon/staravia/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/staravia/anim_frontf.4bpp.lz"); const u32 gMonBackPic_StaraviaF[] = INCBIN_U32("graphics/pokemon/staravia/back.4bpp.lz"); @@ -9601,13 +9601,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Staraptor[] = INCBIN_U8("graphics/pokemon/staraptor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Staraptor[] = INCBIN_COMP("graphics/pokemon/staraptor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Staraptor[] = INCBIN_COMP("graphics/pokemon/staraptor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Staraptor[] = INCBIN_U32("graphics/pokemon/staraptor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_StaraptorF[] = INCBIN_U32("graphics/pokemon/staraptor/anim_frontf.4bpp.lz"); #endif //P_FAMILY_STARLY @@ -9621,13 +9621,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bidoof[] = INCBIN_U8("graphics/pokemon/bidoof/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bidoof[] = INCBIN_COMP("graphics/pokemon/bidoof/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bidoof[] = INCBIN_COMP("graphics/pokemon/bidoof/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bidoof[] = INCBIN_U32("graphics/pokemon/bidoof/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/anim_frontf.4bpp.lz"); const u32 gMonBackPic_BidoofF[] = INCBIN_U32("graphics/pokemon/bidoof/backf.4bpp.lz"); @@ -9640,13 +9640,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bibarel[] = INCBIN_U8("graphics/pokemon/bibarel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bibarel[] = INCBIN_COMP("graphics/pokemon/bibarel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bibarel[] = INCBIN_COMP("graphics/pokemon/bibarel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bibarel[] = INCBIN_U32("graphics/pokemon/bibarel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_BibarelF[] = INCBIN_U32("graphics/pokemon/bibarel/anim_frontf.4bpp.lz"); #endif //P_FAMILY_BIDOOF @@ -9660,13 +9660,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kricketot[] = INCBIN_U8("graphics/pokemon/kricketot/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kricketot[] = INCBIN_COMP("graphics/pokemon/kricketot/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kricketot[] = INCBIN_COMP("graphics/pokemon/kricketot/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kricketot[] = INCBIN_U32("graphics/pokemon/kricketot/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/anim_frontf.4bpp.lz"); const u32 gMonBackPic_KricketotF[] = INCBIN_U32("graphics/pokemon/kricketot/backf.4bpp.lz"); @@ -9679,13 +9679,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kricketune[] = INCBIN_U8("graphics/pokemon/kricketune/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kricketune[] = INCBIN_COMP("graphics/pokemon/kricketune/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kricketune[] = INCBIN_COMP("graphics/pokemon/kricketune/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kricketune[] = INCBIN_U32("graphics/pokemon/kricketune/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/anim_frontf.4bpp.lz"); const u32 gMonBackPic_KricketuneF[] = INCBIN_U32("graphics/pokemon/kricketune/backf.4bpp.lz"); @@ -9700,13 +9700,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shinx[] = INCBIN_U8("graphics/pokemon/shinx/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shinx[] = INCBIN_COMP("graphics/pokemon/shinx/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shinx[] = INCBIN_COMP("graphics/pokemon/shinx/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shinx[] = INCBIN_U32("graphics/pokemon/shinx/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ShinxF[] = INCBIN_U32("graphics/pokemon/shinx/backf.4bpp.lz"); @@ -9719,13 +9719,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Luxio[] = INCBIN_U8("graphics/pokemon/luxio/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Luxio[] = INCBIN_COMP("graphics/pokemon/luxio/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Luxio[] = INCBIN_COMP("graphics/pokemon/luxio/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Luxio[] = INCBIN_U32("graphics/pokemon/luxio/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_LuxioF[] = INCBIN_U32("graphics/pokemon/luxio/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LuxioF[] = INCBIN_U32("graphics/pokemon/luxio/backf.4bpp.lz"); @@ -9738,13 +9738,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Luxray[] = INCBIN_U8("graphics/pokemon/luxray/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Luxray[] = INCBIN_COMP("graphics/pokemon/luxray/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Luxray[] = INCBIN_COMP("graphics/pokemon/luxray/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Luxray[] = INCBIN_U32("graphics/pokemon/luxray/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/luxray/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LuxrayF[] = INCBIN_U32("graphics/pokemon/luxray/backf.4bpp.lz"); @@ -9759,13 +9759,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cranidos[] = INCBIN_U8("graphics/pokemon/cranidos/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cranidos[] = INCBIN_COMP("graphics/pokemon/cranidos/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cranidos[] = INCBIN_COMP("graphics/pokemon/cranidos/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cranidos[] = INCBIN_U32("graphics/pokemon/cranidos/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/anim_front.4bpp.lz"); const u32 gMonPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/normal.gbapal.lz"); @@ -9775,13 +9775,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rampardos[] = INCBIN_U8("graphics/pokemon/rampardos/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rampardos[] = INCBIN_COMP("graphics/pokemon/rampardos/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rampardos[] = INCBIN_COMP("graphics/pokemon/rampardos/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rampardos[] = INCBIN_U32("graphics/pokemon/rampardos/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CRANIDOS #if P_FAMILY_SHIELDON @@ -9793,13 +9793,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shieldon[] = INCBIN_U8("graphics/pokemon/shieldon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shieldon[] = INCBIN_COMP("graphics/pokemon/shieldon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shieldon[] = INCBIN_COMP("graphics/pokemon/shieldon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shieldon[] = INCBIN_U32("graphics/pokemon/shieldon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/anim_front.4bpp.lz"); const u32 gMonPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/normal.gbapal.lz"); @@ -9809,13 +9809,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bastiodon[] = INCBIN_U8("graphics/pokemon/bastiodon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bastiodon[] = INCBIN_COMP("graphics/pokemon/bastiodon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bastiodon[] = INCBIN_COMP("graphics/pokemon/bastiodon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SHIELDON #if P_FAMILY_BURMY @@ -9840,19 +9840,19 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_BurmyPlantCloak[] = INCBIN_COMP("graphics/pokemon/burmy/follower.4bpp"); - const u32 gObjectEventPic_BurmySandyCloak[] = INCBIN_COMP("graphics/pokemon/burmy/sandy_cloak/follower.4bpp"); - const u32 gObjectEventPic_BurmyTrashCloak[] = INCBIN_COMP("graphics/pokemon/burmy/trash_cloak/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_BurmyPlantCloak[] = INCBIN_U32("graphics/pokemon/burmy/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#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"); +#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 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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz"); const u32 gMonPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/normal.gbapal.lz"); @@ -9875,19 +9875,19 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_WormadamPlantCloak[] = INCBIN_COMP("graphics/pokemon/wormadam/follower.4bpp"); - const u32 gObjectEventPic_WormadamSandyCloak[] = INCBIN_COMP("graphics/pokemon/wormadam/sandy_cloak/follower.4bpp"); - const u32 gObjectEventPic_WormadamTrashCloak[] = INCBIN_COMP("graphics/pokemon/wormadam/trash_cloak/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_WormadamPlantCloak[] = INCBIN_U32("graphics/pokemon/wormadam/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_WormadamTrashCloak[] = INCBIN_U32("graphics/pokemon/wormadam/trash_cloak/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#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"); +#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 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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/anim_front.4bpp.lz"); const u32 gMonPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/normal.gbapal.lz"); @@ -9897,13 +9897,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mothim[] = INCBIN_U8("graphics/pokemon/mothim/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mothim[] = INCBIN_COMP("graphics/pokemon/mothim/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mothim[] = INCBIN_COMP("graphics/pokemon/mothim/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BURMY #if P_FAMILY_COMBEE @@ -9915,19 +9915,19 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Combee[] = INCBIN_U8("graphics/pokemon/combee/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Combee[] = INCBIN_COMP("graphics/pokemon/combee/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Combee[] = INCBIN_COMP("graphics/pokemon/combee/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/normalf.gbapal.lz"); const u32 gMonShinyPalette_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/shinyf.gbapal.lz"); -#if OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_CombeeF[] = INCBIN_COMP("graphics/pokemon/combee/followerf.4bpp"); -#endif //OW_FOLLOWERS_ENABLED +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz"); const u32 gMonPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/normal.gbapal.lz"); @@ -9937,13 +9937,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vespiquen[] = INCBIN_U8("graphics/pokemon/vespiquen/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vespiquen[] = INCBIN_COMP("graphics/pokemon/vespiquen/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vespiquen[] = INCBIN_COMP("graphics/pokemon/vespiquen/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_COMBEE #if P_FAMILY_PACHIRISU @@ -9955,13 +9955,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pachirisu[] = INCBIN_U8("graphics/pokemon/pachirisu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pachirisu[] = INCBIN_COMP("graphics/pokemon/pachirisu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pachirisu[] = INCBIN_COMP("graphics/pokemon/pachirisu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_PachirisuF[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_frontf.4bpp.lz"); #endif //P_FAMILY_PACHIRISU @@ -9975,13 +9975,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Buizel[] = INCBIN_U8("graphics/pokemon/buizel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Buizel[] = INCBIN_COMP("graphics/pokemon/buizel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Buizel[] = INCBIN_COMP("graphics/pokemon/buizel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonBackPic_BuizelF[] = INCBIN_U32("graphics/pokemon/buizel/backf.4bpp.lz"); @@ -9993,13 +9993,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Floatzel[] = INCBIN_U8("graphics/pokemon/floatzel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Floatzel[] = INCBIN_COMP("graphics/pokemon/floatzel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Floatzel[] = INCBIN_COMP("graphics/pokemon/floatzel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonBackPic_FloatzelF[] = INCBIN_U32("graphics/pokemon/floatzel/backf.4bpp.lz"); #endif //P_FAMILY_BUIZEL @@ -10013,13 +10013,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cherubi[] = INCBIN_U8("graphics/pokemon/cherubi/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cherubi[] = INCBIN_COMP("graphics/pokemon/cherubi/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cherubi[] = INCBIN_COMP("graphics/pokemon/cherubi/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/anim_front.4bpp.lz"); const u32 gMonPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/normal.gbapal.lz"); @@ -10036,16 +10036,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/shiny.gbapal.lz"); const u8 gMonIcon_CherrimSunshine[] = INCBIN_U8("graphics/pokemon/cherrim/sunshine/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_CherrimOvercast[] = INCBIN_COMP("graphics/pokemon/cherrim/follower.4bpp"); - // const u32 gObjectEventPic_CherrimSunshine[] = INCBIN_COMP("graphics/pokemon/cherrim/sunshine/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/follow_normal.gbapal.lz"); - // const u32 gFollowerPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/follow_shiny.gbapal.lz"); - // const u32 gShinyFollowerPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_CherrimOvercast[] = INCBIN_COMP("graphics/pokemon/cherrim/overworld.4bpp"); + // const u32 gObjectEventPic_CherrimSunshine[] = INCBIN_COMP("graphics/pokemon/cherrim/sunshine/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/overworld_normal.gbapal.lz"); + // const u32 gOverworldPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_CherrimOvercast[] = INCBIN_U32("graphics/pokemon/cherrim/overworld_shiny.gbapal.lz"); + // const u32 gShinyOverworldPalette_CherrimSunshine[] = INCBIN_U32("graphics/pokemon/cherrim/sunshine/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CHERUBI #if P_FAMILY_SHELLOS @@ -10064,16 +10064,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ShellosWestSea[] = INCBIN_COMP("graphics/pokemon/shellos/follower.4bpp"); - const u32 gObjectEventPic_ShellosEastSea[] = INCBIN_COMP("graphics/pokemon/shellos/east_sea/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ShellosWestSea[] = INCBIN_U32("graphics/pokemon/shellos/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ShellosEastSea[] = INCBIN_U32("graphics/pokemon/shellos/east_sea/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#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"); +#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 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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/anim_front.4bpp.lz"); const u32 gMonPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/normal.gbapal.lz"); @@ -10089,16 +10089,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_GastrodonWestSea[] = INCBIN_COMP("graphics/pokemon/gastrodon/follower.4bpp"); - const u32 gObjectEventPic_GastrodonEastSea[] = INCBIN_COMP("graphics/pokemon/gastrodon/east_sea/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_GastrodonWestSea[] = INCBIN_U32("graphics/pokemon/gastrodon/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_GastrodonEastSea[] = INCBIN_U32("graphics/pokemon/gastrodon/east_sea/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#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"); +#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 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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SHELLOS #if P_FAMILY_DRIFLOON @@ -10110,13 +10110,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Drifloon[] = INCBIN_U8("graphics/pokemon/drifloon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Drifloon[] = INCBIN_COMP("graphics/pokemon/drifloon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Drifloon[] = INCBIN_COMP("graphics/pokemon/drifloon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Drifloon[] = INCBIN_U32("graphics/pokemon/drifloon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/anim_front.4bpp.lz"); const u32 gMonPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/normal.gbapal.lz"); @@ -10126,13 +10126,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Drifblim[] = INCBIN_U8("graphics/pokemon/drifblim/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Drifblim[] = INCBIN_COMP("graphics/pokemon/drifblim/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Drifblim[] = INCBIN_COMP("graphics/pokemon/drifblim/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Drifblim[] = INCBIN_U32("graphics/pokemon/drifblim/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DRIFLOON #if P_FAMILY_BUNEARY @@ -10144,13 +10144,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Buneary[] = INCBIN_U8("graphics/pokemon/buneary/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Buneary[] = INCBIN_COMP("graphics/pokemon/buneary/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Buneary[] = INCBIN_COMP("graphics/pokemon/buneary/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Buneary[] = INCBIN_U32("graphics/pokemon/buneary/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/anim_front.4bpp.lz"); const u32 gMonPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/normal.gbapal.lz"); @@ -10160,13 +10160,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lopunny[] = INCBIN_U8("graphics/pokemon/lopunny/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lopunny[] = INCBIN_COMP("graphics/pokemon/lopunny/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lopunny[] = INCBIN_COMP("graphics/pokemon/lopunny/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lopunny[] = INCBIN_U32("graphics/pokemon/lopunny/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/front.4bpp.lz"); @@ -10174,13 +10174,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/back.4bpp.lz"); const u32 gMonShinyPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/shiny.gbapal.lz"); const u8 gMonIcon_LopunnyMega[] = INCBIN_U8("graphics/pokemon/lopunny/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_LopunnyMega[] = INCBIN_COMP("graphics/pokemon/lopunny/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_LopunnyMega[] = INCBIN_COMP("graphics/pokemon/lopunny/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_LopunnyMega[] = INCBIN_U32("graphics/pokemon/lopunny/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BUNEARY @@ -10193,13 +10193,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Glameow[] = INCBIN_U8("graphics/pokemon/glameow/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Glameow[] = INCBIN_COMP("graphics/pokemon/glameow/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Glameow[] = INCBIN_COMP("graphics/pokemon/glameow/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Glameow[] = INCBIN_U32("graphics/pokemon/glameow/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/anim_front.4bpp.lz"); const u32 gMonPalette_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/normal.gbapal.lz"); @@ -10209,13 +10209,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Purugly[] = INCBIN_U8("graphics/pokemon/purugly/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Purugly[] = INCBIN_COMP("graphics/pokemon/purugly/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Purugly[] = INCBIN_COMP("graphics/pokemon/purugly/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Purugly[] = INCBIN_U32("graphics/pokemon/purugly/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GLAMEOW #if P_FAMILY_STUNKY @@ -10227,13 +10227,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Stunky[] = INCBIN_U8("graphics/pokemon/stunky/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Stunky[] = INCBIN_COMP("graphics/pokemon/stunky/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Stunky[] = INCBIN_COMP("graphics/pokemon/stunky/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Stunky[] = INCBIN_U32("graphics/pokemon/stunky/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/anim_front.4bpp.lz"); const u32 gMonPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/normal.gbapal.lz"); @@ -10243,13 +10243,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Skuntank[] = INCBIN_COMP("graphics/pokemon/skuntank/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Skuntank[] = INCBIN_COMP("graphics/pokemon/skuntank/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_STUNKY #if P_FAMILY_BRONZOR @@ -10261,13 +10261,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bronzor[] = INCBIN_COMP("graphics/pokemon/bronzor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bronzor[] = INCBIN_COMP("graphics/pokemon/bronzor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/anim_front.4bpp.lz"); const u32 gMonPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/normal.gbapal.lz"); @@ -10277,13 +10277,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bronzong[] = INCBIN_COMP("graphics/pokemon/bronzong/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bronzong[] = INCBIN_COMP("graphics/pokemon/bronzong/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BRONZOR #if P_FAMILY_CHATOT @@ -10295,13 +10295,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chatot[] = INCBIN_COMP("graphics/pokemon/chatot/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chatot[] = INCBIN_COMP("graphics/pokemon/chatot/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CHATOT #if P_FAMILY_SPIRITOMB @@ -10313,13 +10313,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Spiritomb[] = INCBIN_COMP("graphics/pokemon/spiritomb/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Spiritomb[] = INCBIN_COMP("graphics/pokemon/spiritomb/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SPIRITOMB #if P_FAMILY_GIBLE @@ -10331,13 +10331,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gible[] = INCBIN_U8("graphics/pokemon/gible/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gible[] = INCBIN_COMP("graphics/pokemon/gible/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gible[] = INCBIN_U32("graphics/pokemon/gible/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gible[] = INCBIN_U32("graphics/pokemon/gible/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gible[] = INCBIN_COMP("graphics/pokemon/gible/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gible[] = INCBIN_U32("graphics/pokemon/gible/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gible[] = INCBIN_U32("graphics/pokemon/gible/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GibleF[] = INCBIN_U32("graphics/pokemon/gible/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GibleF[] = INCBIN_U32("graphics/pokemon/gible/backf.4bpp.lz"); @@ -10350,13 +10350,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gabite[] = INCBIN_U8("graphics/pokemon/gabite/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gabite[] = INCBIN_COMP("graphics/pokemon/gabite/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gabite[] = INCBIN_COMP("graphics/pokemon/gabite/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gabite[] = INCBIN_U32("graphics/pokemon/gabite/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gabite/anim_frontf.4bpp.lz"); const u32 gMonBackPic_GabiteF[] = INCBIN_U32("graphics/pokemon/gabite/backf.4bpp.lz"); @@ -10369,13 +10369,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Garchomp[] = INCBIN_U8("graphics/pokemon/garchomp/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Garchomp[] = INCBIN_COMP("graphics/pokemon/garchomp/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Garchomp[] = INCBIN_COMP("graphics/pokemon/garchomp/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GarchompF[] = INCBIN_U32("graphics/pokemon/garchomp/anim_frontf.4bpp.lz"); @@ -10385,13 +10385,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/back.4bpp.lz"); const u32 gMonShinyPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/shiny.gbapal.lz"); const u8 gMonIcon_GarchompMega[] = INCBIN_U8("graphics/pokemon/garchomp/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GarchompMega[] = INCBIN_COMP("graphics/pokemon/garchomp/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GarchompMega[] = INCBIN_COMP("graphics/pokemon/garchomp/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GarchompMega[] = INCBIN_U32("graphics/pokemon/garchomp/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_GIBLE @@ -10404,13 +10404,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Riolu[] = INCBIN_U8("graphics/pokemon/riolu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Riolu[] = INCBIN_COMP("graphics/pokemon/riolu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Riolu[] = INCBIN_COMP("graphics/pokemon/riolu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/anim_front.4bpp.lz"); const u32 gMonPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/normal.gbapal.lz"); @@ -10420,13 +10420,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lucario[] = INCBIN_U8("graphics/pokemon/lucario/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lucario[] = INCBIN_COMP("graphics/pokemon/lucario/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lucario[] = INCBIN_COMP("graphics/pokemon/lucario/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/front.4bpp.lz"); @@ -10434,13 +10434,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/back.4bpp.lz"); const u32 gMonShinyPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/shiny.gbapal.lz"); const u8 gMonIcon_LucarioMega[] = INCBIN_U8("graphics/pokemon/lucario/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_LucarioMega[] = INCBIN_COMP("graphics/pokemon/lucario/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_LucarioMega[] = INCBIN_COMP("graphics/pokemon/lucario/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_LucarioMega[] = INCBIN_U32("graphics/pokemon/lucario/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RIOLU @@ -10453,26 +10453,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hippopotas[] = INCBIN_U8("graphics/pokemon/hippopotas/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hippopotas[] = INCBIN_COMP("graphics/pokemon/hippopotas/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hippopotas[] = INCBIN_COMP("graphics/pokemon/hippopotas/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/normalf.gbapal.lz"); const u32 gMonShinyPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/shinyf.gbapal.lz"); #if P_CUSTOM_GENDER_DIFF_ICONS const u8 gMonIcon_HippopotasF[] = INCBIN_U8("graphics/pokemon/hippopotas/iconf.4bpp"); #endif -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_HippopotasF[] = INCBIN_COMP("graphics/pokemon/hippopotas/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_HippopotasF[] = INCBIN_COMP("graphics/pokemon/hippopotas/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/anim_front.4bpp.lz"); const u32 gMonPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/normal.gbapal.lz"); @@ -10482,26 +10482,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hippowdon[] = INCBIN_U8("graphics/pokemon/hippowdon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hippowdon[] = INCBIN_COMP("graphics/pokemon/hippowdon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hippowdon[] = INCBIN_COMP("graphics/pokemon/hippowdon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/normalf.gbapal.lz"); const u32 gMonShinyPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/shinyf.gbapal.lz"); #if P_CUSTOM_GENDER_DIFF_ICONS const u8 gMonIcon_HippowdonF[] = INCBIN_U8("graphics/pokemon/hippowdon/iconf.4bpp"); #endif -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_HippowdonF[] = INCBIN_COMP("graphics/pokemon/hippowdon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_HippowdonF[] = INCBIN_COMP("graphics/pokemon/hippowdon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_HIPPOPOTAS #if P_FAMILY_SKORUPI @@ -10513,13 +10513,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Skorupi[] = INCBIN_U8("graphics/pokemon/skorupi/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Skorupi[] = INCBIN_COMP("graphics/pokemon/skorupi/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Skorupi[] = INCBIN_COMP("graphics/pokemon/skorupi/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/anim_front.4bpp.lz"); const u32 gMonPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/normal.gbapal.lz"); @@ -10529,13 +10529,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Drapion[] = INCBIN_U8("graphics/pokemon/drapion/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Drapion[] = INCBIN_COMP("graphics/pokemon/drapion/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Drapion[] = INCBIN_COMP("graphics/pokemon/drapion/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SKORUPI #if P_FAMILY_CROAGUNK @@ -10547,13 +10547,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Croagunk[] = INCBIN_U8("graphics/pokemon/croagunk/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Croagunk[] = INCBIN_COMP("graphics/pokemon/croagunk/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Croagunk[] = INCBIN_COMP("graphics/pokemon/croagunk/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/croagunk/anim_frontf.4bpp.lz"); const u32 gMonBackPic_CroagunkF[] = INCBIN_U32("graphics/pokemon/croagunk/backf.4bpp.lz"); @@ -10566,13 +10566,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Toxicroak[] = INCBIN_U8("graphics/pokemon/toxicroak/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Toxicroak[] = INCBIN_COMP("graphics/pokemon/toxicroak/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Toxicroak[] = INCBIN_COMP("graphics/pokemon/toxicroak/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Toxicroak[] = INCBIN_U32("graphics/pokemon/toxicroak/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/toxicroak/anim_frontf.4bpp.lz"); const u32 gMonBackPic_ToxicroakF[] = INCBIN_U32("graphics/pokemon/toxicroak/backf.4bpp.lz"); @@ -10587,13 +10587,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Carnivine[] = INCBIN_U8("graphics/pokemon/carnivine/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Carnivine[] = INCBIN_COMP("graphics/pokemon/carnivine/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Carnivine[] = INCBIN_COMP("graphics/pokemon/carnivine/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Carnivine[] = INCBIN_U32("graphics/pokemon/carnivine/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CARNIVINE #if P_FAMILY_FINNEON @@ -10605,13 +10605,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Finneon[] = INCBIN_U8("graphics/pokemon/finneon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Finneon[] = INCBIN_COMP("graphics/pokemon/finneon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Finneon[] = INCBIN_COMP("graphics/pokemon/finneon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Finneon[] = INCBIN_U32("graphics/pokemon/finneon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_FinneonF[] = INCBIN_U32("graphics/pokemon/finneon/anim_frontf.4bpp.lz"); const u32 gMonBackPic_FinneonF[] = INCBIN_U32("graphics/pokemon/finneon/backf.4bpp.lz"); @@ -10624,13 +10624,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lumineon[] = INCBIN_U8("graphics/pokemon/lumineon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lumineon[] = INCBIN_COMP("graphics/pokemon/lumineon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lumineon[] = INCBIN_COMP("graphics/pokemon/lumineon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lumineon[] = INCBIN_U32("graphics/pokemon/lumineon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_LumineonF[] = INCBIN_U32("graphics/pokemon/lumineon/anim_frontf.4bpp.lz"); const u32 gMonBackPic_LumineonF[] = INCBIN_U32("graphics/pokemon/lumineon/backf.4bpp.lz"); @@ -10645,13 +10645,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Snover[] = INCBIN_U8("graphics/pokemon/snover/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Snover[] = INCBIN_COMP("graphics/pokemon/snover/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Snover[] = INCBIN_U32("graphics/pokemon/snover/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Snover[] = INCBIN_U32("graphics/pokemon/snover/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Snover[] = INCBIN_COMP("graphics/pokemon/snover/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Snover[] = INCBIN_U32("graphics/pokemon/snover/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Snover[] = INCBIN_U32("graphics/pokemon/snover/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_SnoverF[] = INCBIN_U32("graphics/pokemon/snover/anim_frontf.4bpp.lz"); const u32 gMonBackPic_SnoverF[] = INCBIN_U32("graphics/pokemon/snover/backf.4bpp.lz"); @@ -10664,13 +10664,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Abomasnow[] = INCBIN_U8("graphics/pokemon/abomasnow/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Abomasnow[] = INCBIN_COMP("graphics/pokemon/abomasnow/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Abomasnow[] = INCBIN_COMP("graphics/pokemon/abomasnow/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Abomasnow[] = INCBIN_U32("graphics/pokemon/abomasnow/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_AbomasnowF[] = INCBIN_U32("graphics/pokemon/abomasnow/anim_frontf.4bpp.lz"); @@ -10680,13 +10680,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/shiny.gbapal.lz"); const u8 gMonIcon_AbomasnowMega[] = INCBIN_U8("graphics/pokemon/abomasnow/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AbomasnowMega[] = INCBIN_COMP("graphics/pokemon/abomasnow/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AbomasnowMega[] = INCBIN_COMP("graphics/pokemon/abomasnow/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AbomasnowMega[] = INCBIN_U32("graphics/pokemon/abomasnow/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SNOVER @@ -10730,28 +10730,28 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/shiny.gbapal.lz"); const u8 gMonIcon_RotomMow[] = INCBIN_U8("graphics/pokemon/rotom/mow/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rotom[] = INCBIN_COMP("graphics/pokemon/rotom/follower.4bpp"); - const u32 gObjectEventPic_RotomHeat[] = INCBIN_COMP("graphics/pokemon/rotom/heat/follower.4bpp"); - const u32 gObjectEventPic_RotomWash[] = INCBIN_COMP("graphics/pokemon/rotom/wash/follower.4bpp"); - const u32 gObjectEventPic_RotomFrost[] = INCBIN_COMP("graphics/pokemon/rotom/frost/follower.4bpp"); - const u32 gObjectEventPic_RotomFan[] = INCBIN_COMP("graphics/pokemon/rotom/fan/follower.4bpp"); - const u32 gObjectEventPic_RotomMow[] = INCBIN_COMP("graphics/pokemon/rotom/mow/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rotom[] = INCBIN_COMP("graphics/pokemon/rotom/overworld.4bpp"); + const u32 gObjectEventPic_RotomHeat[] = INCBIN_COMP("graphics/pokemon/rotom/heat/overworld.4bpp"); + const u32 gObjectEventPic_RotomWash[] = INCBIN_COMP("graphics/pokemon/rotom/wash/overworld.4bpp"); + const u32 gObjectEventPic_RotomFrost[] = INCBIN_COMP("graphics/pokemon/rotom/frost/overworld.4bpp"); + const u32 gObjectEventPic_RotomFan[] = INCBIN_COMP("graphics/pokemon/rotom/fan/overworld.4bpp"); + const u32 gObjectEventPic_RotomMow[] = INCBIN_COMP("graphics/pokemon/rotom/mow/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rotom[] = INCBIN_U32("graphics/pokemon/rotom/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_RotomHeat[] = INCBIN_U32("graphics/pokemon/rotom/heat/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ROTOM #if P_FAMILY_UXIE @@ -10763,13 +10763,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Uxie[] = INCBIN_U8("graphics/pokemon/uxie/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Uxie[] = INCBIN_COMP("graphics/pokemon/uxie/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Uxie[] = INCBIN_COMP("graphics/pokemon/uxie/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Uxie[] = INCBIN_U32("graphics/pokemon/uxie/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_UXIE #if P_FAMILY_MESPRIT @@ -10781,13 +10781,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mesprit[] = INCBIN_U8("graphics/pokemon/mesprit/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mesprit[] = INCBIN_COMP("graphics/pokemon/mesprit/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mesprit[] = INCBIN_COMP("graphics/pokemon/mesprit/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mesprit[] = INCBIN_U32("graphics/pokemon/mesprit/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MESPRIT #if P_FAMILY_AZELF @@ -10799,13 +10799,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Azelf[] = INCBIN_U8("graphics/pokemon/azelf/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Azelf[] = INCBIN_COMP("graphics/pokemon/azelf/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Azelf[] = INCBIN_COMP("graphics/pokemon/azelf/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Azelf[] = INCBIN_U32("graphics/pokemon/azelf/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_AZELF #if P_FAMILY_DIALGA @@ -10817,26 +10817,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dialga[] = INCBIN_U8("graphics/pokemon/dialga/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dialga[] = INCBIN_COMP("graphics/pokemon/dialga/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dialga[] = INCBIN_COMP("graphics/pokemon/dialga/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dialga[] = INCBIN_U32("graphics/pokemon/dialga/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/front.4bpp.lz"); const u32 gMonPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/normal.gbapal.lz"); const u32 gMonBackPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/back.4bpp.lz"); const u32 gMonShinyPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/shiny.gbapal.lz"); const u8 gMonIcon_DialgaOrigin[] = INCBIN_U8("graphics/pokemon/dialga/origin/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_DialgaOrigin[] = INCBIN_COMP("graphics/pokemon/dialga/origin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_DialgaOrigin[] = INCBIN_COMP("graphics/pokemon/dialga/origin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DIALGA #if P_FAMILY_PALKIA @@ -10848,26 +10848,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Palkia[] = INCBIN_U8("graphics/pokemon/palkia/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Palkia[] = INCBIN_COMP("graphics/pokemon/palkia/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Palkia[] = INCBIN_COMP("graphics/pokemon/palkia/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Palkia[] = INCBIN_U32("graphics/pokemon/palkia/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/front.4bpp.lz"); const u32 gMonPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/normal.gbapal.lz"); const u32 gMonBackPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/back.4bpp.lz"); const u32 gMonShinyPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/shiny.gbapal.lz"); const u8 gMonIcon_PalkiaOrigin[] = INCBIN_U8("graphics/pokemon/palkia/origin/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_PalkiaOrigin[] = INCBIN_COMP("graphics/pokemon/palkia/origin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_PalkiaOrigin[] = INCBIN_COMP("graphics/pokemon/palkia/origin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PALKIA #if P_FAMILY_HEATRAN @@ -10879,13 +10879,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Heatran[] = INCBIN_U8("graphics/pokemon/heatran/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Heatran[] = INCBIN_COMP("graphics/pokemon/heatran/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Heatran[] = INCBIN_COMP("graphics/pokemon/heatran/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Heatran[] = INCBIN_U32("graphics/pokemon/heatran/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_HEATRAN #if P_FAMILY_REGIGIGAS @@ -10897,13 +10897,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Regigigas[] = INCBIN_U8("graphics/pokemon/regigigas/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Regigigas[] = INCBIN_COMP("graphics/pokemon/regigigas/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Regigigas[] = INCBIN_COMP("graphics/pokemon/regigigas/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Regigigas[] = INCBIN_U32("graphics/pokemon/regigigas/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_REGIGIGAS #if P_FAMILY_GIRATINA @@ -10915,13 +10915,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_GiratinaAltered[] = INCBIN_U8("graphics/pokemon/giratina/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_GiratinaAltered[] = INCBIN_COMP("graphics/pokemon/giratina/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_GiratinaAltered[] = INCBIN_COMP("graphics/pokemon/giratina/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GiratinaAltered[] = INCBIN_U32("graphics/pokemon/giratina/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/anim_front.4bpp.lz"); const u32 gMonPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/normal.gbapal.lz"); @@ -10931,13 +10931,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/origin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_GiratinaOrigin[] = INCBIN_COMP("graphics/pokemon/giratina/origin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_GiratinaOrigin[] = INCBIN_COMP("graphics/pokemon/giratina/origin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GIRATINA #if P_FAMILY_CRESSELIA @@ -10949,13 +10949,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cresselia[] = INCBIN_U8("graphics/pokemon/cresselia/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cresselia[] = INCBIN_COMP("graphics/pokemon/cresselia/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cresselia[] = INCBIN_COMP("graphics/pokemon/cresselia/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cresselia[] = INCBIN_U32("graphics/pokemon/cresselia/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CRESSELIA #if P_FAMILY_MANAPHY @@ -10967,13 +10967,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Phione[] = INCBIN_U8("graphics/pokemon/phione/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Phione[] = INCBIN_COMP("graphics/pokemon/phione/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Phione[] = INCBIN_COMP("graphics/pokemon/phione/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Phione[] = INCBIN_U32("graphics/pokemon/phione/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/anim_front.4bpp.lz"); const u32 gMonPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/normal.gbapal.lz"); @@ -10983,13 +10983,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Manaphy[] = INCBIN_U8("graphics/pokemon/manaphy/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Manaphy[] = INCBIN_COMP("graphics/pokemon/manaphy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Manaphy[] = INCBIN_COMP("graphics/pokemon/manaphy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Manaphy[] = INCBIN_U32("graphics/pokemon/manaphy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MANAPHY #if P_FAMILY_DARKRAI @@ -11001,13 +11001,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Darkrai[] = INCBIN_U8("graphics/pokemon/darkrai/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Darkrai[] = INCBIN_COMP("graphics/pokemon/darkrai/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Darkrai[] = INCBIN_COMP("graphics/pokemon/darkrai/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Darkrai[] = INCBIN_U32("graphics/pokemon/darkrai/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DARKRAI #if P_FAMILY_SHAYMIN @@ -11019,26 +11019,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shaymin[] = INCBIN_U8("graphics/pokemon/shaymin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ShayminLand[] = INCBIN_COMP("graphics/pokemon/shaymin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ShayminLand[] = INCBIN_COMP("graphics/pokemon/shaymin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ShayminLand[] = INCBIN_U32("graphics/pokemon/shaymin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/anim_front.4bpp.lz"); const u32 gMonPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/normal.gbapal.lz"); const u32 gMonBackPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/back.4bpp.lz"); const u32 gMonShinyPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/shiny.gbapal.lz"); const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/shaymin/sky/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_ShayminSky[] = INCBIN_COMP("graphics/pokemon/shaymin/sky/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_ShayminSky[] = INCBIN_COMP("graphics/pokemon/shaymin/sky/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SHAYMIN #if P_FAMILY_ARCEUS @@ -11122,64 +11122,64 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u8 gMonIcon_ArceusDark[] = INCBIN_U8("graphics/pokemon/arceus/dark/icon.4bpp"); const u8 gMonIcon_ArceusFairy[] = INCBIN_U8("graphics/pokemon/arceus/fairy/icon.4bpp"); #endif //P_ARCEUS_UNIQUE_FORM_ICONS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ArceusNormal[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusFighting[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusFlying[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusPoison[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusGround[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusRock[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusBug[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusGhost[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusSteel[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusFire[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusWater[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusGrass[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusElectric[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusPsychic[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusIce[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusDragon[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusDark[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); - const u32 gObjectEventPic_ArceusFairy[] = INCBIN_COMP("graphics/pokemon/arceus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/arceus/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/arceus/flying/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/arceus/poison/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/arceus/ground/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/arceus/rock/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/arceus/bug/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/arceus/ghost/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/arceus/steel/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/arceus/fire/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/arceus/water/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/arceus/grass/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/arceus/electric/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/arceus/psychic/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/arceus/ice/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/dragon/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/arceus/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/arceus/flying/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/arceus/poison/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/arceus/ground/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/arceus/rock/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/arceus/bug/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/arceus/ghost/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/arceus/steel/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/arceus/fire/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/arceus/water/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/arceus/grass/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/arceus/electric/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/arceus/psychic/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/arceus/ice/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/dragon/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ArceusNormal[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusFighting[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusFlying[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusPoison[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusGround[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusRock[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusBug[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusGhost[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusSteel[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusFire[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusWater[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusGrass[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusElectric[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusPsychic[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusIce[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusDragon[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusDark[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); + const u32 gObjectEventPic_ArceusFairy[] = INCBIN_COMP("graphics/pokemon/arceus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/arceus/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/arceus/flying/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/arceus/poison/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/arceus/ground/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/arceus/rock/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/arceus/bug/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/arceus/ghost/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/arceus/steel/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/arceus/fire/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/arceus/water/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/arceus/grass/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/arceus/electric/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/arceus/psychic/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/arceus/ice/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/dragon/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusNormal[] = INCBIN_U32("graphics/pokemon/arceus/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusFlying[] = INCBIN_U32("graphics/pokemon/arceus/flying/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusPoison[] = INCBIN_U32("graphics/pokemon/arceus/poison/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusGround[] = INCBIN_U32("graphics/pokemon/arceus/ground/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusRock[] = INCBIN_U32("graphics/pokemon/arceus/rock/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusBug[] = INCBIN_U32("graphics/pokemon/arceus/bug/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusGhost[] = INCBIN_U32("graphics/pokemon/arceus/ghost/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusSteel[] = INCBIN_U32("graphics/pokemon/arceus/steel/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusFire[] = INCBIN_U32("graphics/pokemon/arceus/fire/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusWater[] = INCBIN_U32("graphics/pokemon/arceus/water/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusGrass[] = INCBIN_U32("graphics/pokemon/arceus/grass/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusElectric[] = INCBIN_U32("graphics/pokemon/arceus/electric/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusPsychic[] = INCBIN_U32("graphics/pokemon/arceus/psychic/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusIce[] = INCBIN_U32("graphics/pokemon/arceus/ice/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/dragon/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ARCEUS #if P_FAMILY_VICTINI @@ -11191,13 +11191,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Victini[] = INCBIN_U8("graphics/pokemon/victini/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Victini[] = INCBIN_COMP("graphics/pokemon/victini/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Victini[] = INCBIN_COMP("graphics/pokemon/victini/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Victini[] = INCBIN_U32("graphics/pokemon/victini/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_VICTINI #if P_FAMILY_SNIVY @@ -11209,13 +11209,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Snivy[] = INCBIN_U8("graphics/pokemon/snivy/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Snivy[] = INCBIN_COMP("graphics/pokemon/snivy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Snivy[] = INCBIN_COMP("graphics/pokemon/snivy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Snivy[] = INCBIN_U32("graphics/pokemon/snivy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Servine[] = INCBIN_U32("graphics/pokemon/servine/anim_front.4bpp.lz"); const u32 gMonPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/normal.gbapal.lz"); @@ -11225,13 +11225,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Servine[] = INCBIN_U8("graphics/pokemon/servine/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Servine[] = INCBIN_COMP("graphics/pokemon/servine/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Servine[] = INCBIN_COMP("graphics/pokemon/servine/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Servine[] = INCBIN_U32("graphics/pokemon/servine/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/anim_front.4bpp.lz"); const u32 gMonPalette_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/normal.gbapal.lz"); @@ -11241,13 +11241,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Serperior[] = INCBIN_U8("graphics/pokemon/serperior/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Serperior[] = INCBIN_COMP("graphics/pokemon/serperior/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Serperior[] = INCBIN_COMP("graphics/pokemon/serperior/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Serperior[] = INCBIN_U32("graphics/pokemon/serperior/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SNIVY #if P_FAMILY_TEPIG @@ -11259,13 +11259,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tepig[] = INCBIN_U8("graphics/pokemon/tepig/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tepig[] = INCBIN_COMP("graphics/pokemon/tepig/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tepig[] = INCBIN_COMP("graphics/pokemon/tepig/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tepig[] = INCBIN_U32("graphics/pokemon/tepig/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/anim_front.4bpp.lz"); const u32 gMonPalette_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/normal.gbapal.lz"); @@ -11275,13 +11275,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pignite[] = INCBIN_U8("graphics/pokemon/pignite/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pignite[] = INCBIN_COMP("graphics/pokemon/pignite/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pignite[] = INCBIN_COMP("graphics/pokemon/pignite/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pignite[] = INCBIN_U32("graphics/pokemon/pignite/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/anim_front.4bpp.lz"); const u32 gMonPalette_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/normal.gbapal.lz"); @@ -11291,13 +11291,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Emboar[] = INCBIN_U8("graphics/pokemon/emboar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Emboar[] = INCBIN_COMP("graphics/pokemon/emboar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Emboar[] = INCBIN_COMP("graphics/pokemon/emboar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Emboar[] = INCBIN_U32("graphics/pokemon/emboar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TEPIG #if P_FAMILY_OSHAWOTT @@ -11309,13 +11309,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Oshawott[] = INCBIN_U8("graphics/pokemon/oshawott/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Oshawott[] = INCBIN_COMP("graphics/pokemon/oshawott/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Oshawott[] = INCBIN_COMP("graphics/pokemon/oshawott/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Oshawott[] = INCBIN_U32("graphics/pokemon/oshawott/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/anim_front.4bpp.lz"); const u32 gMonPalette_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/normal.gbapal.lz"); @@ -11325,13 +11325,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dewott[] = INCBIN_U8("graphics/pokemon/dewott/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dewott[] = INCBIN_COMP("graphics/pokemon/dewott/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dewott[] = INCBIN_COMP("graphics/pokemon/dewott/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dewott[] = INCBIN_U32("graphics/pokemon/dewott/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/anim_front.4bpp.lz"); const u32 gMonPalette_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/normal.gbapal.lz"); @@ -11341,13 +11341,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Samurott[] = INCBIN_U8("graphics/pokemon/samurott/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Samurott[] = INCBIN_COMP("graphics/pokemon/samurott/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Samurott[] = INCBIN_COMP("graphics/pokemon/samurott/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Samurott[] = INCBIN_U32("graphics/pokemon/samurott/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz"); @@ -11355,13 +11355,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_SamurottHisuian[] = INCBIN_COMP("graphics/pokemon/samurott/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_SamurottHisuian[] = INCBIN_U32("graphics/pokemon/samurott/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_SamurottHisuian[] = INCBIN_COMP("graphics/pokemon/samurott/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_OSHAWOTT @@ -11374,13 +11374,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Patrat[] = INCBIN_U8("graphics/pokemon/patrat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Patrat[] = INCBIN_COMP("graphics/pokemon/patrat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Patrat[] = INCBIN_COMP("graphics/pokemon/patrat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Patrat[] = INCBIN_U32("graphics/pokemon/patrat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/anim_front.4bpp.lz"); const u32 gMonPalette_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/normal.gbapal.lz"); @@ -11390,13 +11390,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Watchog[] = INCBIN_U8("graphics/pokemon/watchog/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Watchog[] = INCBIN_COMP("graphics/pokemon/watchog/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Watchog[] = INCBIN_COMP("graphics/pokemon/watchog/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Watchog[] = INCBIN_U32("graphics/pokemon/watchog/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PATRAT #if P_FAMILY_LILLIPUP @@ -11408,13 +11408,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lillipup[] = INCBIN_U8("graphics/pokemon/lillipup/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lillipup[] = INCBIN_COMP("graphics/pokemon/lillipup/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lillipup[] = INCBIN_COMP("graphics/pokemon/lillipup/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lillipup[] = INCBIN_U32("graphics/pokemon/lillipup/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/anim_front.4bpp.lz"); const u32 gMonPalette_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/normal.gbapal.lz"); @@ -11424,13 +11424,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Herdier[] = INCBIN_U8("graphics/pokemon/herdier/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Herdier[] = INCBIN_COMP("graphics/pokemon/herdier/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Herdier[] = INCBIN_COMP("graphics/pokemon/herdier/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Herdier[] = INCBIN_U32("graphics/pokemon/herdier/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/anim_front.4bpp.lz"); const u32 gMonPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/normal.gbapal.lz"); @@ -11440,13 +11440,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Stoutland[] = INCBIN_U8("graphics/pokemon/stoutland/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Stoutland[] = INCBIN_COMP("graphics/pokemon/stoutland/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Stoutland[] = INCBIN_COMP("graphics/pokemon/stoutland/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Stoutland[] = INCBIN_U32("graphics/pokemon/stoutland/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LILLIPUP #if P_FAMILY_PURRLOIN @@ -11458,13 +11458,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Purrloin[] = INCBIN_U8("graphics/pokemon/purrloin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Purrloin[] = INCBIN_COMP("graphics/pokemon/purrloin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Purrloin[] = INCBIN_COMP("graphics/pokemon/purrloin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Purrloin[] = INCBIN_U32("graphics/pokemon/purrloin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/anim_front.4bpp.lz"); const u32 gMonPalette_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/normal.gbapal.lz"); @@ -11474,13 +11474,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Liepard[] = INCBIN_U8("graphics/pokemon/liepard/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Liepard[] = INCBIN_COMP("graphics/pokemon/liepard/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Liepard[] = INCBIN_COMP("graphics/pokemon/liepard/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Liepard[] = INCBIN_U32("graphics/pokemon/liepard/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PURRLOIN #if P_FAMILY_PANSAGE @@ -11492,13 +11492,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pansage[] = INCBIN_U8("graphics/pokemon/pansage/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pansage[] = INCBIN_COMP("graphics/pokemon/pansage/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pansage[] = INCBIN_COMP("graphics/pokemon/pansage/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pansage[] = INCBIN_U32("graphics/pokemon/pansage/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/anim_front.4bpp.lz"); const u32 gMonPalette_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/normal.gbapal.lz"); @@ -11508,13 +11508,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Simisage[] = INCBIN_U8("graphics/pokemon/simisage/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Simisage[] = INCBIN_COMP("graphics/pokemon/simisage/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Simisage[] = INCBIN_COMP("graphics/pokemon/simisage/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Simisage[] = INCBIN_U32("graphics/pokemon/simisage/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PANSAGE #if P_FAMILY_PANSEAR @@ -11526,13 +11526,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pansear[] = INCBIN_U8("graphics/pokemon/pansear/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pansear[] = INCBIN_COMP("graphics/pokemon/pansear/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pansear[] = INCBIN_COMP("graphics/pokemon/pansear/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pansear[] = INCBIN_U32("graphics/pokemon/pansear/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/anim_front.4bpp.lz"); const u32 gMonPalette_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/normal.gbapal.lz"); @@ -11542,13 +11542,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Simisear[] = INCBIN_U8("graphics/pokemon/simisear/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Simisear[] = INCBIN_COMP("graphics/pokemon/simisear/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Simisear[] = INCBIN_COMP("graphics/pokemon/simisear/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Simisear[] = INCBIN_U32("graphics/pokemon/simisear/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PANSEAR #if P_FAMILY_PANPOUR @@ -11560,13 +11560,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Panpour[] = INCBIN_U8("graphics/pokemon/panpour/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Panpour[] = INCBIN_COMP("graphics/pokemon/panpour/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Panpour[] = INCBIN_COMP("graphics/pokemon/panpour/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Panpour[] = INCBIN_U32("graphics/pokemon/panpour/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/anim_front.4bpp.lz"); const u32 gMonPalette_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/normal.gbapal.lz"); @@ -11576,13 +11576,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Simipour[] = INCBIN_U8("graphics/pokemon/simipour/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Simipour[] = INCBIN_COMP("graphics/pokemon/simipour/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Simipour[] = INCBIN_COMP("graphics/pokemon/simipour/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Simipour[] = INCBIN_U32("graphics/pokemon/simipour/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PANPOUR #if P_FAMILY_MUNNA @@ -11594,13 +11594,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Munna[] = INCBIN_U8("graphics/pokemon/munna/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Munna[] = INCBIN_COMP("graphics/pokemon/munna/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Munna[] = INCBIN_U32("graphics/pokemon/munna/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Munna[] = INCBIN_U32("graphics/pokemon/munna/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Munna[] = INCBIN_COMP("graphics/pokemon/munna/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Munna[] = INCBIN_U32("graphics/pokemon/munna/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Munna[] = INCBIN_U32("graphics/pokemon/munna/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/anim_front.4bpp.lz"); const u32 gMonPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/normal.gbapal.lz"); @@ -11610,13 +11610,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Musharna[] = INCBIN_U8("graphics/pokemon/musharna/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Musharna[] = INCBIN_COMP("graphics/pokemon/musharna/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Musharna[] = INCBIN_COMP("graphics/pokemon/musharna/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Musharna[] = INCBIN_U32("graphics/pokemon/musharna/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MUNNA #if P_FAMILY_PIDOVE @@ -11628,13 +11628,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pidove[] = INCBIN_U8("graphics/pokemon/pidove/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pidove[] = INCBIN_COMP("graphics/pokemon/pidove/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pidove[] = INCBIN_COMP("graphics/pokemon/pidove/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pidove[] = INCBIN_U32("graphics/pokemon/pidove/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/anim_front.4bpp.lz"); const u32 gMonPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/normal.gbapal.lz"); @@ -11644,13 +11644,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tranquill[] = INCBIN_U8("graphics/pokemon/tranquill/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tranquill[] = INCBIN_COMP("graphics/pokemon/tranquill/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tranquill[] = INCBIN_COMP("graphics/pokemon/tranquill/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tranquill[] = INCBIN_U32("graphics/pokemon/tranquill/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/anim_front.4bpp.lz"); const u32 gMonPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/normal.gbapal.lz"); @@ -11660,26 +11660,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Unfezant[] = INCBIN_U8("graphics/pokemon/unfezant/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Unfezant[] = INCBIN_COMP("graphics/pokemon/unfezant/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Unfezant[] = INCBIN_COMP("graphics/pokemon/unfezant/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Unfezant[] = INCBIN_U32("graphics/pokemon/unfezant/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/anim_frontf.4bpp.lz"); const u32 gMonPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/normalf.gbapal.lz"); const u32 gMonBackPic_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/backf.4bpp.lz"); const u32 gMonShinyPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant/shinyf.gbapal.lz"); const u8 gMonIcon_UnfezantF[] = INCBIN_U8("graphics/pokemon/unfezant/iconf.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_UnfezantF[] = INCBIN_COMP("graphics/pokemon/unfezant_f/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant_f/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant_f/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_UnfezantF[] = INCBIN_COMP("graphics/pokemon/unfezant_f/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant_f/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_UnfezantF[] = INCBIN_U32("graphics/pokemon/unfezant_f/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PIDOVE #if P_FAMILY_BLITZLE @@ -11691,13 +11691,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Blitzle[] = INCBIN_U8("graphics/pokemon/blitzle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Blitzle[] = INCBIN_COMP("graphics/pokemon/blitzle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Blitzle[] = INCBIN_COMP("graphics/pokemon/blitzle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Blitzle[] = INCBIN_U32("graphics/pokemon/blitzle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/anim_front.4bpp.lz"); const u32 gMonPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/normal.gbapal.lz"); @@ -11707,13 +11707,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zebstrika[] = INCBIN_U8("graphics/pokemon/zebstrika/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zebstrika[] = INCBIN_COMP("graphics/pokemon/zebstrika/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zebstrika[] = INCBIN_COMP("graphics/pokemon/zebstrika/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zebstrika[] = INCBIN_U32("graphics/pokemon/zebstrika/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BLITZLE #if P_FAMILY_ROGGENROLA @@ -11725,13 +11725,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Roggenrola[] = INCBIN_U8("graphics/pokemon/roggenrola/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Roggenrola[] = INCBIN_COMP("graphics/pokemon/roggenrola/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Roggenrola[] = INCBIN_COMP("graphics/pokemon/roggenrola/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Roggenrola[] = INCBIN_U32("graphics/pokemon/roggenrola/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/anim_front.4bpp.lz"); const u32 gMonPalette_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/normal.gbapal.lz"); @@ -11741,13 +11741,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Boldore[] = INCBIN_U8("graphics/pokemon/boldore/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Boldore[] = INCBIN_COMP("graphics/pokemon/boldore/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Boldore[] = INCBIN_COMP("graphics/pokemon/boldore/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Boldore[] = INCBIN_U32("graphics/pokemon/boldore/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/anim_front.4bpp.lz"); const u32 gMonPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/normal.gbapal.lz"); @@ -11757,13 +11757,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gigalith[] = INCBIN_U8("graphics/pokemon/gigalith/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gigalith[] = INCBIN_COMP("graphics/pokemon/gigalith/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gigalith[] = INCBIN_COMP("graphics/pokemon/gigalith/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gigalith[] = INCBIN_U32("graphics/pokemon/gigalith/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ROGGENROLA #if P_FAMILY_WOOBAT @@ -11775,13 +11775,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Woobat[] = INCBIN_U8("graphics/pokemon/woobat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Woobat[] = INCBIN_COMP("graphics/pokemon/woobat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Woobat[] = INCBIN_COMP("graphics/pokemon/woobat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Woobat[] = INCBIN_U32("graphics/pokemon/woobat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/anim_front.4bpp.lz"); const u32 gMonPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/normal.gbapal.lz"); @@ -11791,13 +11791,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Swoobat[] = INCBIN_U8("graphics/pokemon/swoobat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Swoobat[] = INCBIN_COMP("graphics/pokemon/swoobat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Swoobat[] = INCBIN_COMP("graphics/pokemon/swoobat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Swoobat[] = INCBIN_U32("graphics/pokemon/swoobat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WOOBAT #if P_FAMILY_DRILBUR @@ -11809,13 +11809,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Drilbur[] = INCBIN_U8("graphics/pokemon/drilbur/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Drilbur[] = INCBIN_COMP("graphics/pokemon/drilbur/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Drilbur[] = INCBIN_COMP("graphics/pokemon/drilbur/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Drilbur[] = INCBIN_U32("graphics/pokemon/drilbur/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/anim_front.4bpp.lz"); const u32 gMonPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/normal.gbapal.lz"); @@ -11825,13 +11825,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Excadrill[] = INCBIN_U8("graphics/pokemon/excadrill/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Excadrill[] = INCBIN_COMP("graphics/pokemon/excadrill/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Excadrill[] = INCBIN_COMP("graphics/pokemon/excadrill/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Excadrill[] = INCBIN_U32("graphics/pokemon/excadrill/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DRILBUR #if P_FAMILY_AUDINO @@ -11843,13 +11843,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Audino[] = INCBIN_U8("graphics/pokemon/audino/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Audino[] = INCBIN_COMP("graphics/pokemon/audino/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Audino[] = INCBIN_U32("graphics/pokemon/audino/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Audino[] = INCBIN_U32("graphics/pokemon/audino/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Audino[] = INCBIN_COMP("graphics/pokemon/audino/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Audino[] = INCBIN_U32("graphics/pokemon/audino/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Audino[] = INCBIN_U32("graphics/pokemon/audino/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/front.4bpp.lz"); @@ -11857,13 +11857,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/back.4bpp.lz"); const u32 gMonShinyPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/shiny.gbapal.lz"); const u8 gMonIcon_AudinoMega[] = INCBIN_U8("graphics/pokemon/audino/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AudinoMega[] = INCBIN_COMP("graphics/pokemon/audino/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AudinoMega[] = INCBIN_COMP("graphics/pokemon/audino/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AudinoMega[] = INCBIN_U32("graphics/pokemon/audino/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AUDINO @@ -11876,13 +11876,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Timburr[] = INCBIN_U8("graphics/pokemon/timburr/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Timburr[] = INCBIN_COMP("graphics/pokemon/timburr/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Timburr[] = INCBIN_COMP("graphics/pokemon/timburr/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Timburr[] = INCBIN_U32("graphics/pokemon/timburr/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/anim_front.4bpp.lz"); const u32 gMonPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/normal.gbapal.lz"); @@ -11892,13 +11892,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gurdurr[] = INCBIN_U8("graphics/pokemon/gurdurr/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gurdurr[] = INCBIN_COMP("graphics/pokemon/gurdurr/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gurdurr[] = INCBIN_COMP("graphics/pokemon/gurdurr/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gurdurr[] = INCBIN_U32("graphics/pokemon/gurdurr/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/anim_front.4bpp.lz"); const u32 gMonPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/normal.gbapal.lz"); @@ -11908,13 +11908,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Conkeldurr[] = INCBIN_U8("graphics/pokemon/conkeldurr/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Conkeldurr[] = INCBIN_COMP("graphics/pokemon/conkeldurr/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Conkeldurr[] = INCBIN_COMP("graphics/pokemon/conkeldurr/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Conkeldurr[] = INCBIN_U32("graphics/pokemon/conkeldurr/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TIMBURR #if P_FAMILY_TYMPOLE @@ -11926,13 +11926,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tympole[] = INCBIN_U8("graphics/pokemon/tympole/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tympole[] = INCBIN_COMP("graphics/pokemon/tympole/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tympole[] = INCBIN_COMP("graphics/pokemon/tympole/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tympole[] = INCBIN_U32("graphics/pokemon/tympole/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/anim_front.4bpp.lz"); const u32 gMonPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/normal.gbapal.lz"); @@ -11942,13 +11942,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Palpitoad[] = INCBIN_U8("graphics/pokemon/palpitoad/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Palpitoad[] = INCBIN_COMP("graphics/pokemon/palpitoad/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Palpitoad[] = INCBIN_COMP("graphics/pokemon/palpitoad/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Palpitoad[] = INCBIN_U32("graphics/pokemon/palpitoad/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/anim_front.4bpp.lz"); const u32 gMonPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/normal.gbapal.lz"); @@ -11958,13 +11958,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Seismitoad[] = INCBIN_U8("graphics/pokemon/seismitoad/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Seismitoad[] = INCBIN_COMP("graphics/pokemon/seismitoad/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Seismitoad[] = INCBIN_COMP("graphics/pokemon/seismitoad/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Seismitoad[] = INCBIN_U32("graphics/pokemon/seismitoad/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TYMPOLE #if P_FAMILY_THROH @@ -11976,13 +11976,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Throh[] = INCBIN_U8("graphics/pokemon/throh/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Throh[] = INCBIN_COMP("graphics/pokemon/throh/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Throh[] = INCBIN_U32("graphics/pokemon/throh/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Throh[] = INCBIN_U32("graphics/pokemon/throh/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Throh[] = INCBIN_COMP("graphics/pokemon/throh/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Throh[] = INCBIN_U32("graphics/pokemon/throh/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Throh[] = INCBIN_U32("graphics/pokemon/throh/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_THROH #if P_FAMILY_SAWK @@ -11994,13 +11994,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sawk[] = INCBIN_U8("graphics/pokemon/sawk/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sawk[] = INCBIN_COMP("graphics/pokemon/sawk/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sawk[] = INCBIN_COMP("graphics/pokemon/sawk/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sawk[] = INCBIN_U32("graphics/pokemon/sawk/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SAWK #if P_FAMILY_SEWADDLE @@ -12012,13 +12012,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sewaddle[] = INCBIN_U8("graphics/pokemon/sewaddle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sewaddle[] = INCBIN_COMP("graphics/pokemon/sewaddle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sewaddle[] = INCBIN_COMP("graphics/pokemon/sewaddle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sewaddle[] = INCBIN_U32("graphics/pokemon/sewaddle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/anim_front.4bpp.lz"); const u32 gMonPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/normal.gbapal.lz"); @@ -12028,13 +12028,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Swadloon[] = INCBIN_U8("graphics/pokemon/swadloon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Swadloon[] = INCBIN_COMP("graphics/pokemon/swadloon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Swadloon[] = INCBIN_COMP("graphics/pokemon/swadloon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Swadloon[] = INCBIN_U32("graphics/pokemon/swadloon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/anim_front.4bpp.lz"); const u32 gMonPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/normal.gbapal.lz"); @@ -12044,13 +12044,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Leavanny[] = INCBIN_U8("graphics/pokemon/leavanny/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Leavanny[] = INCBIN_COMP("graphics/pokemon/leavanny/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Leavanny[] = INCBIN_COMP("graphics/pokemon/leavanny/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Leavanny[] = INCBIN_U32("graphics/pokemon/leavanny/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SEWADDLE #if P_FAMILY_VENIPEDE @@ -12062,13 +12062,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Venipede[] = INCBIN_U8("graphics/pokemon/venipede/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Venipede[] = INCBIN_COMP("graphics/pokemon/venipede/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Venipede[] = INCBIN_COMP("graphics/pokemon/venipede/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Venipede[] = INCBIN_U32("graphics/pokemon/venipede/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/anim_front.4bpp.lz"); const u32 gMonPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/normal.gbapal.lz"); @@ -12078,13 +12078,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Whirlipede[] = INCBIN_U8("graphics/pokemon/whirlipede/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Whirlipede[] = INCBIN_COMP("graphics/pokemon/whirlipede/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Whirlipede[] = INCBIN_COMP("graphics/pokemon/whirlipede/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Whirlipede[] = INCBIN_U32("graphics/pokemon/whirlipede/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/anim_front.4bpp.lz"); const u32 gMonPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/normal.gbapal.lz"); @@ -12094,13 +12094,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Scolipede[] = INCBIN_U8("graphics/pokemon/scolipede/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Scolipede[] = INCBIN_COMP("graphics/pokemon/scolipede/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Scolipede[] = INCBIN_COMP("graphics/pokemon/scolipede/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Scolipede[] = INCBIN_U32("graphics/pokemon/scolipede/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_VENIPEDE #if P_FAMILY_COTTONEE @@ -12112,13 +12112,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cottonee[] = INCBIN_U8("graphics/pokemon/cottonee/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cottonee[] = INCBIN_COMP("graphics/pokemon/cottonee/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cottonee[] = INCBIN_COMP("graphics/pokemon/cottonee/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cottonee[] = INCBIN_U32("graphics/pokemon/cottonee/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/anim_front.4bpp.lz"); const u32 gMonPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/normal.gbapal.lz"); @@ -12128,13 +12128,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Whimsicott[] = INCBIN_U8("graphics/pokemon/whimsicott/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Whimsicott[] = INCBIN_COMP("graphics/pokemon/whimsicott/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Whimsicott[] = INCBIN_COMP("graphics/pokemon/whimsicott/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Whimsicott[] = INCBIN_U32("graphics/pokemon/whimsicott/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_COTTONEE #if P_FAMILY_PETILIL @@ -12146,13 +12146,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Petilil[] = INCBIN_U8("graphics/pokemon/petilil/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Petilil[] = INCBIN_COMP("graphics/pokemon/petilil/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Petilil[] = INCBIN_COMP("graphics/pokemon/petilil/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Petilil[] = INCBIN_U32("graphics/pokemon/petilil/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/anim_front.4bpp.lz"); const u32 gMonPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/normal.gbapal.lz"); @@ -12162,13 +12162,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lilligant[] = INCBIN_U8("graphics/pokemon/lilligant/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lilligant[] = INCBIN_COMP("graphics/pokemon/lilligant/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lilligant[] = INCBIN_COMP("graphics/pokemon/lilligant/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lilligant[] = INCBIN_U32("graphics/pokemon/lilligant/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz"); @@ -12176,13 +12176,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_LilligantHisuian[] = INCBIN_COMP("graphics/pokemon/lilligant/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_LilligantHisuian[] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_LilligantHisuian[] = INCBIN_COMP("graphics/pokemon/lilligant/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_PETILIL @@ -12209,19 +12209,19 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/shiny.gbapal.lz"); const u8 gMonIcon_BasculinWhiteStriped[] = INCBIN_U8("graphics/pokemon/basculin/white_striped/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_BasculinRedStriped[] = INCBIN_COMP("graphics/pokemon/basculin/follower.4bpp"); - const u32 gObjectEventPic_BasculinBlueStriped[] = INCBIN_COMP("graphics/pokemon/basculin/blue_striped/follower.4bpp"); - const u32 gObjectEventPic_BasculinWhiteStriped[] = INCBIN_COMP("graphics/pokemon/basculin/white_striped/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_BasculinRedStriped[] = INCBIN_COMP("graphics/pokemon/basculin/overworld.4bpp"); + const u32 gObjectEventPic_BasculinBlueStriped[] = INCBIN_COMP("graphics/pokemon/basculin/blue_striped/overworld.4bpp"); + const u32 gObjectEventPic_BasculinWhiteStriped[] = INCBIN_COMP("graphics/pokemon/basculin/white_striped/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_BasculinRedStriped[] = INCBIN_U32("graphics/pokemon/basculin/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/overworld_shiny.gbapal.lz"); +#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"); @@ -12238,16 +12238,16 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_BasculegionMale[] = INCBIN_COMP("graphics/pokemon/basculegion/follower.4bpp"); - const u32 gObjectEventPic_BasculegionFemale[] = INCBIN_COMP("graphics/pokemon/basculegion/female/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_BasculegionMale[] = INCBIN_U32("graphics/pokemon/basculegion/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_BasculegionFemale[] = INCBIN_U32("graphics/pokemon/basculegion/female/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#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"); +#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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BASCULIN @@ -12260,13 +12260,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sandile[] = INCBIN_U8("graphics/pokemon/sandile/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sandile[] = INCBIN_COMP("graphics/pokemon/sandile/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sandile[] = INCBIN_COMP("graphics/pokemon/sandile/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sandile[] = INCBIN_U32("graphics/pokemon/sandile/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/anim_front.4bpp.lz"); const u32 gMonPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/normal.gbapal.lz"); @@ -12276,13 +12276,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Krokorok[] = INCBIN_U8("graphics/pokemon/krokorok/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Krokorok[] = INCBIN_COMP("graphics/pokemon/krokorok/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Krokorok[] = INCBIN_COMP("graphics/pokemon/krokorok/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Krokorok[] = INCBIN_U32("graphics/pokemon/krokorok/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/anim_front.4bpp.lz"); const u32 gMonPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/normal.gbapal.lz"); @@ -12292,13 +12292,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Krookodile[] = INCBIN_U8("graphics/pokemon/krookodile/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Krookodile[] = INCBIN_COMP("graphics/pokemon/krookodile/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Krookodile[] = INCBIN_COMP("graphics/pokemon/krookodile/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Krookodile[] = INCBIN_U32("graphics/pokemon/krookodile/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SANDILE #if P_FAMILY_DARUMAKA @@ -12310,13 +12310,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Darumaka[] = INCBIN_U8("graphics/pokemon/darumaka/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Darumaka[] = INCBIN_COMP("graphics/pokemon/darumaka/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Darumaka[] = INCBIN_COMP("graphics/pokemon/darumaka/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Darumaka[] = INCBIN_U32("graphics/pokemon/darumaka/overworld_shiny.gbapal.lz"); +#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"); @@ -12326,26 +12326,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Darmanitan[] = INCBIN_U8("graphics/pokemon/darmanitan/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_DarmanitanStandardMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_DarmanitanStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_DarmanitanStandardMode[] = 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"); +#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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_DarmanitanZenMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/zen_mode/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_DarmanitanZenMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/zen_mode/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"); +#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"); @@ -12353,39 +12353,39 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_DarumakaGalarian[] = INCBIN_COMP("graphics/pokemon/darumaka/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_DarumakaGalarian[] = INCBIN_COMP("graphics/pokemon/darumaka/galarian/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_DarmanitanGalarianStandardMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_DarmanitanGalarianStandardMode[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_DarmanitanGalarianStandardMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/galarian/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_DarmanitanGalarianZenMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/zen_mode/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_DarmanitanGalarianZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_DarmanitanGalarianZenMode[] = INCBIN_COMP("graphics/pokemon/darmanitan/zen_mode/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_DARUMAKA @@ -12398,13 +12398,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Maractus[] = INCBIN_U8("graphics/pokemon/maractus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Maractus[] = INCBIN_COMP("graphics/pokemon/maractus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Maractus[] = INCBIN_COMP("graphics/pokemon/maractus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Maractus[] = INCBIN_U32("graphics/pokemon/maractus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MARACTUS #if P_FAMILY_DWEBBLE @@ -12416,13 +12416,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dwebble[] = INCBIN_U8("graphics/pokemon/dwebble/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dwebble[] = INCBIN_COMP("graphics/pokemon/dwebble/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dwebble[] = INCBIN_COMP("graphics/pokemon/dwebble/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dwebble[] = INCBIN_U32("graphics/pokemon/dwebble/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/anim_front.4bpp.lz"); const u32 gMonPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/normal.gbapal.lz"); @@ -12432,13 +12432,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Crustle[] = INCBIN_U8("graphics/pokemon/crustle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Crustle[] = INCBIN_COMP("graphics/pokemon/crustle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Crustle[] = INCBIN_COMP("graphics/pokemon/crustle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Crustle[] = INCBIN_U32("graphics/pokemon/crustle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DWEBBLE #if P_FAMILY_SCRAGGY @@ -12450,13 +12450,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Scraggy[] = INCBIN_U8("graphics/pokemon/scraggy/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Scraggy[] = INCBIN_COMP("graphics/pokemon/scraggy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Scraggy[] = INCBIN_COMP("graphics/pokemon/scraggy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Scraggy[] = INCBIN_U32("graphics/pokemon/scraggy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/anim_front.4bpp.lz"); const u32 gMonPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/normal.gbapal.lz"); @@ -12466,13 +12466,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Scrafty[] = INCBIN_U8("graphics/pokemon/scrafty/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Scrafty[] = INCBIN_COMP("graphics/pokemon/scrafty/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Scrafty[] = INCBIN_COMP("graphics/pokemon/scrafty/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Scrafty[] = INCBIN_U32("graphics/pokemon/scrafty/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SCRAGGY #if P_FAMILY_SIGILYPH @@ -12484,13 +12484,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sigilyph[] = INCBIN_U8("graphics/pokemon/sigilyph/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sigilyph[] = INCBIN_COMP("graphics/pokemon/sigilyph/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sigilyph[] = INCBIN_COMP("graphics/pokemon/sigilyph/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sigilyph[] = INCBIN_U32("graphics/pokemon/sigilyph/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SIGILYPH #if P_FAMILY_YAMASK @@ -12502,13 +12502,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Yamask[] = INCBIN_U8("graphics/pokemon/yamask/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Yamask[] = INCBIN_COMP("graphics/pokemon/yamask/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Yamask[] = INCBIN_COMP("graphics/pokemon/yamask/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Yamask[] = INCBIN_U32("graphics/pokemon/yamask/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/anim_front.4bpp.lz"); const u32 gMonPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/normal.gbapal.lz"); @@ -12518,13 +12518,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cofagrigus[] = INCBIN_U8("graphics/pokemon/cofagrigus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cofagrigus[] = INCBIN_COMP("graphics/pokemon/cofagrigus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cofagrigus[] = INCBIN_COMP("graphics/pokemon/cofagrigus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cofagrigus[] = INCBIN_U32("graphics/pokemon/cofagrigus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/front.4bpp.lz"); @@ -12532,13 +12532,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_YamaskGalarian[] = INCBIN_COMP("graphics/pokemon/yamask/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_YamaskGalarian[] = INCBIN_COMP("graphics/pokemon/yamask/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/front.4bpp.lz"); const u32 gMonPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/normal.gbapal.lz"); @@ -12548,13 +12548,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Runerigus[] = INCBIN_U8("graphics/pokemon/runerigus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Runerigus[] = INCBIN_COMP("graphics/pokemon/runerigus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Runerigus[] = INCBIN_COMP("graphics/pokemon/runerigus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_YAMASK @@ -12567,13 +12567,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tirtouga[] = INCBIN_U8("graphics/pokemon/tirtouga/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tirtouga[] = INCBIN_COMP("graphics/pokemon/tirtouga/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tirtouga[] = INCBIN_COMP("graphics/pokemon/tirtouga/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tirtouga[] = INCBIN_U32("graphics/pokemon/tirtouga/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/anim_front.4bpp.lz"); const u32 gMonPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/normal.gbapal.lz"); @@ -12583,13 +12583,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Carracosta[] = INCBIN_U8("graphics/pokemon/carracosta/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Carracosta[] = INCBIN_COMP("graphics/pokemon/carracosta/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Carracosta[] = INCBIN_COMP("graphics/pokemon/carracosta/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Carracosta[] = INCBIN_U32("graphics/pokemon/carracosta/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TIRTOUGA #if P_FAMILY_ARCHEN @@ -12601,13 +12601,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Archen[] = INCBIN_U8("graphics/pokemon/archen/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Archen[] = INCBIN_COMP("graphics/pokemon/archen/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Archen[] = INCBIN_U32("graphics/pokemon/archen/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Archen[] = INCBIN_U32("graphics/pokemon/archen/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Archen[] = INCBIN_COMP("graphics/pokemon/archen/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Archen[] = INCBIN_U32("graphics/pokemon/archen/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Archen[] = INCBIN_U32("graphics/pokemon/archen/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/anim_front.4bpp.lz"); const u32 gMonPalette_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/normal.gbapal.lz"); @@ -12617,13 +12617,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Archeops[] = INCBIN_U8("graphics/pokemon/archeops/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Archeops[] = INCBIN_COMP("graphics/pokemon/archeops/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Archeops[] = INCBIN_COMP("graphics/pokemon/archeops/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Archeops[] = INCBIN_U32("graphics/pokemon/archeops/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ARCHEN #if P_FAMILY_TRUBBISH @@ -12635,13 +12635,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Trubbish[] = INCBIN_U8("graphics/pokemon/trubbish/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Trubbish[] = INCBIN_COMP("graphics/pokemon/trubbish/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Trubbish[] = INCBIN_COMP("graphics/pokemon/trubbish/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Trubbish[] = INCBIN_U32("graphics/pokemon/trubbish/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/anim_front.4bpp.lz"); const u32 gMonPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/normal.gbapal.lz"); @@ -12651,13 +12651,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Garbodor[] = INCBIN_U8("graphics/pokemon/garbodor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Garbodor[] = INCBIN_COMP("graphics/pokemon/garbodor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Garbodor[] = INCBIN_COMP("graphics/pokemon/garbodor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Garbodor[] = INCBIN_U32("graphics/pokemon/garbodor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/front.4bpp.lz"); @@ -12665,13 +12665,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GarbodorGigantamax[] = INCBIN_COMP("graphics/pokemon/garbodor/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GarbodorGigantamax[] = INCBIN_U32("graphics/pokemon/garbodor/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GarbodorGigantamax[] = INCBIN_COMP("graphics/pokemon/garbodor/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TRUBBISH @@ -12684,13 +12684,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zorua[] = INCBIN_U8("graphics/pokemon/zorua/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zorua[] = INCBIN_COMP("graphics/pokemon/zorua/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zorua[] = INCBIN_COMP("graphics/pokemon/zorua/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zorua[] = INCBIN_U32("graphics/pokemon/zorua/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/anim_front.4bpp.lz"); const u32 gMonPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/normal.gbapal.lz"); @@ -12700,13 +12700,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zoroark[] = INCBIN_U8("graphics/pokemon/zoroark/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zoroark[] = INCBIN_COMP("graphics/pokemon/zoroark/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zoroark[] = INCBIN_COMP("graphics/pokemon/zoroark/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zoroark[] = INCBIN_U32("graphics/pokemon/zoroark/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/front.4bpp.lz"); @@ -12714,26 +12714,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ZoruaHisuian[] = INCBIN_COMP("graphics/pokemon/zorua/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ZoruaHisuian[] = INCBIN_U32("graphics/pokemon/zorua/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ZoruaHisuian[] = INCBIN_COMP("graphics/pokemon/zorua/hisuian/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ZoroarkHisuian[] = INCBIN_COMP("graphics/pokemon/zoroark/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ZoroarkHisuian[] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ZoroarkHisuian[] = INCBIN_COMP("graphics/pokemon/zoroark/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ZORUA @@ -12746,13 +12746,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Minccino[] = INCBIN_U8("graphics/pokemon/minccino/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Minccino[] = INCBIN_COMP("graphics/pokemon/minccino/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Minccino[] = INCBIN_COMP("graphics/pokemon/minccino/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Minccino[] = INCBIN_U32("graphics/pokemon/minccino/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/anim_front.4bpp.lz"); const u32 gMonPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/normal.gbapal.lz"); @@ -12762,13 +12762,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cinccino[] = INCBIN_U8("graphics/pokemon/cinccino/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cinccino[] = INCBIN_COMP("graphics/pokemon/cinccino/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cinccino[] = INCBIN_COMP("graphics/pokemon/cinccino/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cinccino[] = INCBIN_U32("graphics/pokemon/cinccino/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MINCCINO #if P_FAMILY_GOTHITA @@ -12780,13 +12780,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gothita[] = INCBIN_U8("graphics/pokemon/gothita/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gothita[] = INCBIN_COMP("graphics/pokemon/gothita/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gothita[] = INCBIN_COMP("graphics/pokemon/gothita/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gothita[] = INCBIN_U32("graphics/pokemon/gothita/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/anim_front.4bpp.lz"); const u32 gMonPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/normal.gbapal.lz"); @@ -12796,13 +12796,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gothorita[] = INCBIN_U8("graphics/pokemon/gothorita/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gothorita[] = INCBIN_COMP("graphics/pokemon/gothorita/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gothorita[] = INCBIN_COMP("graphics/pokemon/gothorita/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gothorita[] = INCBIN_U32("graphics/pokemon/gothorita/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/anim_front.4bpp.lz"); const u32 gMonPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/normal.gbapal.lz"); @@ -12812,13 +12812,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gothitelle[] = INCBIN_U8("graphics/pokemon/gothitelle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gothitelle[] = INCBIN_COMP("graphics/pokemon/gothitelle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gothitelle[] = INCBIN_COMP("graphics/pokemon/gothitelle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gothitelle[] = INCBIN_U32("graphics/pokemon/gothitelle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GOTHITA #if P_FAMILY_SOLOSIS @@ -12830,13 +12830,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Solosis[] = INCBIN_U8("graphics/pokemon/solosis/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Solosis[] = INCBIN_COMP("graphics/pokemon/solosis/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Solosis[] = INCBIN_COMP("graphics/pokemon/solosis/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Solosis[] = INCBIN_U32("graphics/pokemon/solosis/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/anim_front.4bpp.lz"); const u32 gMonPalette_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/normal.gbapal.lz"); @@ -12846,13 +12846,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Duosion[] = INCBIN_U8("graphics/pokemon/duosion/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Duosion[] = INCBIN_COMP("graphics/pokemon/duosion/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Duosion[] = INCBIN_COMP("graphics/pokemon/duosion/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Duosion[] = INCBIN_U32("graphics/pokemon/duosion/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/anim_front.4bpp.lz"); const u32 gMonPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/normal.gbapal.lz"); @@ -12862,13 +12862,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Reuniclus[] = INCBIN_U8("graphics/pokemon/reuniclus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Reuniclus[] = INCBIN_COMP("graphics/pokemon/reuniclus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Reuniclus[] = INCBIN_COMP("graphics/pokemon/reuniclus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Reuniclus[] = INCBIN_U32("graphics/pokemon/reuniclus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SOLOSIS #if P_FAMILY_DUCKLETT @@ -12880,13 +12880,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ducklett[] = INCBIN_U8("graphics/pokemon/ducklett/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ducklett[] = INCBIN_COMP("graphics/pokemon/ducklett/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ducklett[] = INCBIN_COMP("graphics/pokemon/ducklett/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ducklett[] = INCBIN_U32("graphics/pokemon/ducklett/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/anim_front.4bpp.lz"); const u32 gMonPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/normal.gbapal.lz"); @@ -12896,13 +12896,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Swanna[] = INCBIN_U8("graphics/pokemon/swanna/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Swanna[] = INCBIN_COMP("graphics/pokemon/swanna/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Swanna[] = INCBIN_COMP("graphics/pokemon/swanna/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Swanna[] = INCBIN_U32("graphics/pokemon/swanna/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DUCKLETT #if P_FAMILY_VANILLITE @@ -12914,13 +12914,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vanillite[] = INCBIN_U8("graphics/pokemon/vanillite/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vanillite[] = INCBIN_COMP("graphics/pokemon/vanillite/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vanillite[] = INCBIN_COMP("graphics/pokemon/vanillite/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vanillite[] = INCBIN_U32("graphics/pokemon/vanillite/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/anim_front.4bpp.lz"); const u32 gMonPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/normal.gbapal.lz"); @@ -12930,13 +12930,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vanillish[] = INCBIN_U8("graphics/pokemon/vanillish/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vanillish[] = INCBIN_COMP("graphics/pokemon/vanillish/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vanillish[] = INCBIN_COMP("graphics/pokemon/vanillish/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vanillish[] = INCBIN_U32("graphics/pokemon/vanillish/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/anim_front.4bpp.lz"); const u32 gMonPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/normal.gbapal.lz"); @@ -12946,13 +12946,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vanilluxe[] = INCBIN_U8("graphics/pokemon/vanilluxe/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vanilluxe[] = INCBIN_COMP("graphics/pokemon/vanilluxe/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vanilluxe[] = INCBIN_COMP("graphics/pokemon/vanilluxe/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vanilluxe[] = INCBIN_U32("graphics/pokemon/vanilluxe/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_VANILLITE #if P_FAMILY_DEERLING @@ -12978,22 +12978,22 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/deerling/winter/shiny.gbapal.lz"); const u8 gMonIcon_DeerlingWinter[] = INCBIN_U8("graphics/pokemon/deerling/winter/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_DeerlingSpring[] = INCBIN_COMP("graphics/pokemon/deerling/follower.4bpp"); - const u32 gObjectEventPic_DeerlingSummer[] = INCBIN_COMP("graphics/pokemon/deerling/summer/follower.4bpp"); - const u32 gObjectEventPic_DeerlingAutumn[] = INCBIN_COMP("graphics/pokemon/deerling/autumn/follower.4bpp"); - const u32 gObjectEventPic_DeerlingWinter[] = INCBIN_COMP("graphics/pokemon/deerling/winter/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/deerling/autumn/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/deerling/winter/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/deerling/autumn/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/deerling/winter/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_DeerlingSpring[] = INCBIN_COMP("graphics/pokemon/deerling/overworld.4bpp"); + const u32 gObjectEventPic_DeerlingSummer[] = INCBIN_COMP("graphics/pokemon/deerling/summer/overworld.4bpp"); + const u32 gObjectEventPic_DeerlingAutumn[] = INCBIN_COMP("graphics/pokemon/deerling/autumn/overworld.4bpp"); + const u32 gObjectEventPic_DeerlingWinter[] = INCBIN_COMP("graphics/pokemon/deerling/winter/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/deerling/autumn/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/deerling/winter/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_DeerlingSpring[] = INCBIN_U32("graphics/pokemon/deerling/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_DeerlingAutumn[] = INCBIN_U32("graphics/pokemon/deerling/autumn/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_DeerlingWinter[] = INCBIN_U32("graphics/pokemon/deerling/winter/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/anim_front.4bpp.lz"); const u32 gMonPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/normal.gbapal.lz"); @@ -13022,22 +13022,22 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/shiny.gbapal.lz"); const u8 gMonIcon_SawsbuckWinter[] = INCBIN_U8("graphics/pokemon/sawsbuck/winter/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_SawsbuckSpring[] = INCBIN_COMP("graphics/pokemon/sawsbuck/follower.4bpp"); - const u32 gObjectEventPic_SawsbuckSummer[] = INCBIN_COMP("graphics/pokemon/sawsbuck/summer/follower.4bpp"); - const u32 gObjectEventPic_SawsbuckAutumn[] = INCBIN_COMP("graphics/pokemon/sawsbuck/autumn/follower.4bpp"); - const u32 gObjectEventPic_SawsbuckWinter[] = INCBIN_COMP("graphics/pokemon/sawsbuck/winter/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_SawsbuckSpring[] = INCBIN_COMP("graphics/pokemon/sawsbuck/overworld.4bpp"); + const u32 gObjectEventPic_SawsbuckSummer[] = INCBIN_COMP("graphics/pokemon/sawsbuck/summer/overworld.4bpp"); + const u32 gObjectEventPic_SawsbuckAutumn[] = INCBIN_COMP("graphics/pokemon/sawsbuck/autumn/overworld.4bpp"); + const u32 gObjectEventPic_SawsbuckWinter[] = INCBIN_COMP("graphics/pokemon/sawsbuck/winter/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_SawsbuckSpring[] = INCBIN_U32("graphics/pokemon/sawsbuck/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_SawsbuckAutumn[] = INCBIN_U32("graphics/pokemon/sawsbuck/autumn/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/winter/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DEERLING #if P_FAMILY_EMOLGA @@ -13049,13 +13049,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Emolga[] = INCBIN_U8("graphics/pokemon/emolga/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Emolga[] = INCBIN_COMP("graphics/pokemon/emolga/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Emolga[] = INCBIN_COMP("graphics/pokemon/emolga/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Emolga[] = INCBIN_U32("graphics/pokemon/emolga/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_EMOLGA #if P_FAMILY_KARRABLAST @@ -13067,13 +13067,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Karrablast[] = INCBIN_U8("graphics/pokemon/karrablast/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Karrablast[] = INCBIN_COMP("graphics/pokemon/karrablast/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Karrablast[] = INCBIN_COMP("graphics/pokemon/karrablast/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Karrablast[] = INCBIN_U32("graphics/pokemon/karrablast/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/anim_front.4bpp.lz"); const u32 gMonPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/normal.gbapal.lz"); @@ -13083,13 +13083,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Escavalier[] = INCBIN_U8("graphics/pokemon/escavalier/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Escavalier[] = INCBIN_COMP("graphics/pokemon/escavalier/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Escavalier[] = INCBIN_COMP("graphics/pokemon/escavalier/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Escavalier[] = INCBIN_U32("graphics/pokemon/escavalier/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_KARRABLAST #if P_FAMILY_FOONGUS @@ -13101,13 +13101,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Foongus[] = INCBIN_U8("graphics/pokemon/foongus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Foongus[] = INCBIN_COMP("graphics/pokemon/foongus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Foongus[] = INCBIN_COMP("graphics/pokemon/foongus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Foongus[] = INCBIN_U32("graphics/pokemon/foongus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/anim_front.4bpp.lz"); const u32 gMonPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/normal.gbapal.lz"); @@ -13117,13 +13117,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Amoonguss[] = INCBIN_U8("graphics/pokemon/amoonguss/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Amoonguss[] = INCBIN_COMP("graphics/pokemon/amoonguss/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Amoonguss[] = INCBIN_COMP("graphics/pokemon/amoonguss/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Amoonguss[] = INCBIN_U32("graphics/pokemon/amoonguss/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FOONGUS #if P_FAMILY_FRILLISH @@ -13135,26 +13135,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Frillish[] = INCBIN_U8("graphics/pokemon/frillish/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Frillish[] = INCBIN_COMP("graphics/pokemon/frillish/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Frillish[] = INCBIN_COMP("graphics/pokemon/frillish/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Frillish[] = INCBIN_U32("graphics/pokemon/frillish/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/anim_frontf.4bpp.lz"); const u32 gMonPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/normalf.gbapal.lz"); const u32 gMonBackPic_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/backf.4bpp.lz"); const u32 gMonShinyPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/shinyf.gbapal.lz"); const u8 gMonIcon_FrillishF[] = INCBIN_U8("graphics/pokemon/frillish/iconf.4bpp"); -#if OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_FrillishF[] = INCBIN_COMP("graphics/pokemon/frillish/followerf.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/follow_normalf.gbapal.lz"); - // const u32 gShinyFollowerPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/follow_shinyf.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/overworld_normalf.gbapal.lz"); + // const u32 gShinyOverworldPalette_FrillishF[] = INCBIN_U32("graphics/pokemon/frillish/overworld_shinyf.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/anim_front.4bpp.lz"); const u32 gMonPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/normal.gbapal.lz"); @@ -13164,26 +13164,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Jellicent[] = INCBIN_U8("graphics/pokemon/jellicent/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Jellicent[] = INCBIN_COMP("graphics/pokemon/jellicent/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Jellicent[] = INCBIN_COMP("graphics/pokemon/jellicent/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Jellicent[] = INCBIN_U32("graphics/pokemon/jellicent/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/anim_frontf.4bpp.lz"); const u32 gMonPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/normalf.gbapal.lz"); const u32 gMonBackPic_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/backf.4bpp.lz"); const u32 gMonShinyPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/shinyf.gbapal.lz"); const u8 gMonIcon_JellicentF[] = INCBIN_U8("graphics/pokemon/jellicent/iconf.4bpp"); -#if OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_JellicentF[] = INCBIN_COMP("graphics/pokemon/jellicent/followerf.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_JellicentF[] = INCBIN_U32("graphics/pokemon/jellicent/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FRILLISH #if P_FAMILY_ALOMOMOLA @@ -13195,13 +13195,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Alomomola[] = INCBIN_U8("graphics/pokemon/alomomola/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Alomomola[] = INCBIN_COMP("graphics/pokemon/alomomola/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Alomomola[] = INCBIN_COMP("graphics/pokemon/alomomola/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Alomomola[] = INCBIN_U32("graphics/pokemon/alomomola/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ALOMOMOLA #if P_FAMILY_JOLTIK @@ -13213,13 +13213,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Joltik[] = INCBIN_U8("graphics/pokemon/joltik/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Joltik[] = INCBIN_COMP("graphics/pokemon/joltik/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Joltik[] = INCBIN_COMP("graphics/pokemon/joltik/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Joltik[] = INCBIN_U32("graphics/pokemon/joltik/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/anim_front.4bpp.lz"); const u32 gMonPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/normal.gbapal.lz"); @@ -13229,13 +13229,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Galvantula[] = INCBIN_U8("graphics/pokemon/galvantula/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Galvantula[] = INCBIN_COMP("graphics/pokemon/galvantula/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Galvantula[] = INCBIN_COMP("graphics/pokemon/galvantula/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Galvantula[] = INCBIN_U32("graphics/pokemon/galvantula/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_JOLTIK #if P_FAMILY_FERROSEED @@ -13247,13 +13247,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ferroseed[] = INCBIN_U8("graphics/pokemon/ferroseed/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ferroseed[] = INCBIN_COMP("graphics/pokemon/ferroseed/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ferroseed[] = INCBIN_COMP("graphics/pokemon/ferroseed/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ferroseed[] = INCBIN_U32("graphics/pokemon/ferroseed/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/anim_front.4bpp.lz"); const u32 gMonPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/normal.gbapal.lz"); @@ -13263,13 +13263,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ferrothorn[] = INCBIN_U8("graphics/pokemon/ferrothorn/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ferrothorn[] = INCBIN_COMP("graphics/pokemon/ferrothorn/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ferrothorn[] = INCBIN_COMP("graphics/pokemon/ferrothorn/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ferrothorn[] = INCBIN_U32("graphics/pokemon/ferrothorn/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FERROSEED #if P_FAMILY_KLINK @@ -13281,13 +13281,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Klink[] = INCBIN_U8("graphics/pokemon/klink/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Klink[] = INCBIN_COMP("graphics/pokemon/klink/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Klink[] = INCBIN_U32("graphics/pokemon/klink/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Klink[] = INCBIN_U32("graphics/pokemon/klink/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Klink[] = INCBIN_COMP("graphics/pokemon/klink/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Klink[] = INCBIN_U32("graphics/pokemon/klink/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Klink[] = INCBIN_U32("graphics/pokemon/klink/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Klang[] = INCBIN_U32("graphics/pokemon/klang/anim_front.4bpp.lz"); const u32 gMonPalette_Klang[] = INCBIN_U32("graphics/pokemon/klang/normal.gbapal.lz"); @@ -13297,13 +13297,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Klang[] = INCBIN_U8("graphics/pokemon/klang/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Klang[] = INCBIN_COMP("graphics/pokemon/klang/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Klang[] = INCBIN_U32("graphics/pokemon/klang/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Klang[] = INCBIN_U32("graphics/pokemon/klang/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Klang[] = INCBIN_COMP("graphics/pokemon/klang/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Klang[] = INCBIN_U32("graphics/pokemon/klang/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Klang[] = INCBIN_U32("graphics/pokemon/klang/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/anim_front.4bpp.lz"); const u32 gMonPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/normal.gbapal.lz"); @@ -13313,13 +13313,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Klinklang[] = INCBIN_U8("graphics/pokemon/klinklang/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Klinklang[] = INCBIN_COMP("graphics/pokemon/klinklang/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Klinklang[] = INCBIN_COMP("graphics/pokemon/klinklang/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Klinklang[] = INCBIN_U32("graphics/pokemon/klinklang/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_KLINK #if P_FAMILY_TYNAMO @@ -13331,13 +13331,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tynamo[] = INCBIN_U8("graphics/pokemon/tynamo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tynamo[] = INCBIN_COMP("graphics/pokemon/tynamo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tynamo[] = INCBIN_COMP("graphics/pokemon/tynamo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tynamo[] = INCBIN_U32("graphics/pokemon/tynamo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/anim_front.4bpp.lz"); const u32 gMonPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/normal.gbapal.lz"); @@ -13347,13 +13347,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Eelektrik[] = INCBIN_U8("graphics/pokemon/eelektrik/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Eelektrik[] = INCBIN_COMP("graphics/pokemon/eelektrik/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Eelektrik[] = INCBIN_COMP("graphics/pokemon/eelektrik/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Eelektrik[] = INCBIN_U32("graphics/pokemon/eelektrik/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/anim_front.4bpp.lz"); const u32 gMonPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/normal.gbapal.lz"); @@ -13363,13 +13363,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Eelektross[] = INCBIN_U8("graphics/pokemon/eelektross/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Eelektross[] = INCBIN_COMP("graphics/pokemon/eelektross/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Eelektross[] = INCBIN_COMP("graphics/pokemon/eelektross/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Eelektross[] = INCBIN_U32("graphics/pokemon/eelektross/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TYNAMO #if P_FAMILY_ELGYEM @@ -13381,13 +13381,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Elgyem[] = INCBIN_U8("graphics/pokemon/elgyem/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Elgyem[] = INCBIN_COMP("graphics/pokemon/elgyem/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Elgyem[] = INCBIN_COMP("graphics/pokemon/elgyem/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Elgyem[] = INCBIN_U32("graphics/pokemon/elgyem/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/anim_front.4bpp.lz"); const u32 gMonPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/normal.gbapal.lz"); @@ -13397,13 +13397,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Beheeyem[] = INCBIN_U8("graphics/pokemon/beheeyem/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Beheeyem[] = INCBIN_COMP("graphics/pokemon/beheeyem/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Beheeyem[] = INCBIN_COMP("graphics/pokemon/beheeyem/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Beheeyem[] = INCBIN_U32("graphics/pokemon/beheeyem/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ELGYEM #if P_FAMILY_LITWICK @@ -13415,13 +13415,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Litwick[] = INCBIN_U8("graphics/pokemon/litwick/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Litwick[] = INCBIN_COMP("graphics/pokemon/litwick/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Litwick[] = INCBIN_COMP("graphics/pokemon/litwick/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Litwick[] = INCBIN_U32("graphics/pokemon/litwick/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/anim_front.4bpp.lz"); const u32 gMonPalette_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/normal.gbapal.lz"); @@ -13431,13 +13431,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lampent[] = INCBIN_U8("graphics/pokemon/lampent/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lampent[] = INCBIN_COMP("graphics/pokemon/lampent/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lampent[] = INCBIN_COMP("graphics/pokemon/lampent/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lampent[] = INCBIN_U32("graphics/pokemon/lampent/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/anim_front.4bpp.lz"); const u32 gMonPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/normal.gbapal.lz"); @@ -13447,13 +13447,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chandelure[] = INCBIN_U8("graphics/pokemon/chandelure/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chandelure[] = INCBIN_COMP("graphics/pokemon/chandelure/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chandelure[] = INCBIN_COMP("graphics/pokemon/chandelure/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chandelure[] = INCBIN_U32("graphics/pokemon/chandelure/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LITWICK #if P_FAMILY_AXEW @@ -13465,13 +13465,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Axew[] = INCBIN_U8("graphics/pokemon/axew/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Axew[] = INCBIN_COMP("graphics/pokemon/axew/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Axew[] = INCBIN_U32("graphics/pokemon/axew/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Axew[] = INCBIN_U32("graphics/pokemon/axew/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Axew[] = INCBIN_COMP("graphics/pokemon/axew/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Axew[] = INCBIN_U32("graphics/pokemon/axew/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Axew[] = INCBIN_U32("graphics/pokemon/axew/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/anim_front.4bpp.lz"); const u32 gMonPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/normal.gbapal.lz"); @@ -13481,13 +13481,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Fraxure[] = INCBIN_U8("graphics/pokemon/fraxure/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Fraxure[] = INCBIN_COMP("graphics/pokemon/fraxure/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Fraxure[] = INCBIN_COMP("graphics/pokemon/fraxure/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Fraxure[] = INCBIN_U32("graphics/pokemon/fraxure/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/anim_front.4bpp.lz"); const u32 gMonPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/normal.gbapal.lz"); @@ -13497,13 +13497,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Haxorus[] = INCBIN_U8("graphics/pokemon/haxorus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Haxorus[] = INCBIN_COMP("graphics/pokemon/haxorus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Haxorus[] = INCBIN_COMP("graphics/pokemon/haxorus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Haxorus[] = INCBIN_U32("graphics/pokemon/haxorus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_AXEW #if P_FAMILY_CUBCHOO @@ -13515,13 +13515,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cubchoo[] = INCBIN_U8("graphics/pokemon/cubchoo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cubchoo[] = INCBIN_COMP("graphics/pokemon/cubchoo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cubchoo[] = INCBIN_COMP("graphics/pokemon/cubchoo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cubchoo[] = INCBIN_U32("graphics/pokemon/cubchoo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/anim_front.4bpp.lz"); const u32 gMonPalette_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/normal.gbapal.lz"); @@ -13531,13 +13531,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Beartic[] = INCBIN_U8("graphics/pokemon/beartic/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Beartic[] = INCBIN_COMP("graphics/pokemon/beartic/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Beartic[] = INCBIN_COMP("graphics/pokemon/beartic/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Beartic[] = INCBIN_U32("graphics/pokemon/beartic/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CUBCHOO #if P_FAMILY_CRYOGONAL @@ -13549,13 +13549,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cryogonal[] = INCBIN_U8("graphics/pokemon/cryogonal/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cryogonal[] = INCBIN_COMP("graphics/pokemon/cryogonal/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cryogonal[] = INCBIN_COMP("graphics/pokemon/cryogonal/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cryogonal[] = INCBIN_U32("graphics/pokemon/cryogonal/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CRYOGONAL #if P_FAMILY_SHELMET @@ -13567,13 +13567,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shelmet[] = INCBIN_U8("graphics/pokemon/shelmet/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shelmet[] = INCBIN_COMP("graphics/pokemon/shelmet/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shelmet[] = INCBIN_COMP("graphics/pokemon/shelmet/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shelmet[] = INCBIN_U32("graphics/pokemon/shelmet/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/anim_front.4bpp.lz"); const u32 gMonPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/normal.gbapal.lz"); @@ -13583,13 +13583,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Accelgor[] = INCBIN_U8("graphics/pokemon/accelgor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Accelgor[] = INCBIN_COMP("graphics/pokemon/accelgor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Accelgor[] = INCBIN_COMP("graphics/pokemon/accelgor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Accelgor[] = INCBIN_U32("graphics/pokemon/accelgor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SHELMET #if P_FAMILY_STUNFISK @@ -13601,13 +13601,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Stunfisk[] = INCBIN_U8("graphics/pokemon/stunfisk/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Stunfisk[] = INCBIN_COMP("graphics/pokemon/stunfisk/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Stunfisk[] = INCBIN_COMP("graphics/pokemon/stunfisk/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Stunfisk[] = INCBIN_U32("graphics/pokemon/stunfisk/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GALARIAN_FORMS const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/front.4bpp.lz"); @@ -13615,13 +13615,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_StunfiskGalarian[] = INCBIN_COMP("graphics/pokemon/stunfisk/galarian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_StunfiskGalarian[] = INCBIN_COMP("graphics/pokemon/stunfisk/galarian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GALARIAN_FORMS #endif //P_FAMILY_STUNFISK @@ -13634,13 +13634,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mienfoo[] = INCBIN_U8("graphics/pokemon/mienfoo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mienfoo[] = INCBIN_COMP("graphics/pokemon/mienfoo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mienfoo[] = INCBIN_COMP("graphics/pokemon/mienfoo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mienfoo[] = INCBIN_U32("graphics/pokemon/mienfoo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/anim_front.4bpp.lz"); const u32 gMonPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/normal.gbapal.lz"); @@ -13650,13 +13650,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mienshao[] = INCBIN_U8("graphics/pokemon/mienshao/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mienshao[] = INCBIN_COMP("graphics/pokemon/mienshao/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mienshao[] = INCBIN_COMP("graphics/pokemon/mienshao/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mienshao[] = INCBIN_U32("graphics/pokemon/mienshao/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MIENFOO #if P_FAMILY_DRUDDIGON @@ -13668,13 +13668,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Druddigon[] = INCBIN_U8("graphics/pokemon/druddigon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Druddigon[] = INCBIN_COMP("graphics/pokemon/druddigon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Druddigon[] = INCBIN_COMP("graphics/pokemon/druddigon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Druddigon[] = INCBIN_U32("graphics/pokemon/druddigon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DRUDDIGON #if P_FAMILY_GOLETT @@ -13686,13 +13686,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Golett[] = INCBIN_U8("graphics/pokemon/golett/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Golett[] = INCBIN_COMP("graphics/pokemon/golett/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Golett[] = INCBIN_U32("graphics/pokemon/golett/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Golett[] = INCBIN_U32("graphics/pokemon/golett/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Golett[] = INCBIN_COMP("graphics/pokemon/golett/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Golett[] = INCBIN_U32("graphics/pokemon/golett/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Golett[] = INCBIN_U32("graphics/pokemon/golett/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/anim_front.4bpp.lz"); const u32 gMonPalette_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/normal.gbapal.lz"); @@ -13702,13 +13702,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Golurk[] = INCBIN_U8("graphics/pokemon/golurk/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Golurk[] = INCBIN_COMP("graphics/pokemon/golurk/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Golurk[] = INCBIN_COMP("graphics/pokemon/golurk/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Golurk[] = INCBIN_U32("graphics/pokemon/golurk/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GOLETT #if P_FAMILY_PAWNIARD @@ -13720,13 +13720,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pawniard[] = INCBIN_U8("graphics/pokemon/pawniard/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pawniard[] = INCBIN_COMP("graphics/pokemon/pawniard/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pawniard[] = INCBIN_COMP("graphics/pokemon/pawniard/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pawniard[] = INCBIN_U32("graphics/pokemon/pawniard/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/anim_front.4bpp.lz"); const u32 gMonPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/normal.gbapal.lz"); @@ -13736,13 +13736,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bisharp[] = INCBIN_U8("graphics/pokemon/bisharp/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bisharp[] = INCBIN_COMP("graphics/pokemon/bisharp/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bisharp[] = INCBIN_COMP("graphics/pokemon/bisharp/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bisharp[] = INCBIN_U32("graphics/pokemon/bisharp/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GEN_9_CROSS_EVOS const u32 gMonFrontPic_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/front.4bpp.lz"); @@ -13753,13 +13753,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kingambit[] = INCBIN_U8("graphics/pokemon/kingambit/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Kingambit[] = INCBIN_COMP("graphics/pokemon/kingambit/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Kingambit[] = INCBIN_COMP("graphics/pokemon/kingambit/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Kingambit[] = INCBIN_U32("graphics/pokemon/kingambit/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_PAWNIARD @@ -13772,13 +13772,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bouffalant[] = INCBIN_U8("graphics/pokemon/bouffalant/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bouffalant[] = INCBIN_COMP("graphics/pokemon/bouffalant/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bouffalant[] = INCBIN_COMP("graphics/pokemon/bouffalant/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bouffalant[] = INCBIN_U32("graphics/pokemon/bouffalant/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BOUFFALANT #if P_FAMILY_RUFFLET @@ -13790,13 +13790,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rufflet[] = INCBIN_U8("graphics/pokemon/rufflet/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rufflet[] = INCBIN_COMP("graphics/pokemon/rufflet/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rufflet[] = INCBIN_COMP("graphics/pokemon/rufflet/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rufflet[] = INCBIN_U32("graphics/pokemon/rufflet/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/anim_front.4bpp.lz"); const u32 gMonPalette_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/normal.gbapal.lz"); @@ -13806,13 +13806,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Braviary[] = INCBIN_U8("graphics/pokemon/braviary/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Braviary[] = INCBIN_COMP("graphics/pokemon/braviary/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Braviary[] = INCBIN_COMP("graphics/pokemon/braviary/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Braviary[] = INCBIN_U32("graphics/pokemon/braviary/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/front.4bpp.lz"); @@ -13820,13 +13820,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_BraviaryHisuian[] = INCBIN_COMP("graphics/pokemon/braviary/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_BraviaryHisuian[] = INCBIN_U32("graphics/pokemon/braviary/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_BraviaryHisuian[] = INCBIN_COMP("graphics/pokemon/braviary/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_RUFFLET @@ -13839,13 +13839,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vullaby[] = INCBIN_U8("graphics/pokemon/vullaby/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vullaby[] = INCBIN_COMP("graphics/pokemon/vullaby/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vullaby[] = INCBIN_COMP("graphics/pokemon/vullaby/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vullaby[] = INCBIN_U32("graphics/pokemon/vullaby/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/anim_front.4bpp.lz"); const u32 gMonPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/normal.gbapal.lz"); @@ -13855,13 +13855,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mandibuzz[] = INCBIN_U8("graphics/pokemon/mandibuzz/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mandibuzz[] = INCBIN_COMP("graphics/pokemon/mandibuzz/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mandibuzz[] = INCBIN_COMP("graphics/pokemon/mandibuzz/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mandibuzz[] = INCBIN_U32("graphics/pokemon/mandibuzz/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_VULLABY #if P_FAMILY_HEATMOR @@ -13873,13 +13873,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Heatmor[] = INCBIN_U8("graphics/pokemon/heatmor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Heatmor[] = INCBIN_COMP("graphics/pokemon/heatmor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Heatmor[] = INCBIN_COMP("graphics/pokemon/heatmor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Heatmor[] = INCBIN_U32("graphics/pokemon/heatmor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_HEATMOR #if P_FAMILY_DURANT @@ -13891,13 +13891,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Durant[] = INCBIN_U8("graphics/pokemon/durant/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Durant[] = INCBIN_COMP("graphics/pokemon/durant/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Durant[] = INCBIN_U32("graphics/pokemon/durant/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Durant[] = INCBIN_U32("graphics/pokemon/durant/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Durant[] = INCBIN_COMP("graphics/pokemon/durant/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Durant[] = INCBIN_U32("graphics/pokemon/durant/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Durant[] = INCBIN_U32("graphics/pokemon/durant/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DURANT #if P_FAMILY_DEINO @@ -13909,13 +13909,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Deino[] = INCBIN_U8("graphics/pokemon/deino/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Deino[] = INCBIN_COMP("graphics/pokemon/deino/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Deino[] = INCBIN_U32("graphics/pokemon/deino/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Deino[] = INCBIN_U32("graphics/pokemon/deino/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Deino[] = INCBIN_COMP("graphics/pokemon/deino/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Deino[] = INCBIN_U32("graphics/pokemon/deino/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Deino[] = INCBIN_U32("graphics/pokemon/deino/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/anim_front.4bpp.lz"); const u32 gMonPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/normal.gbapal.lz"); @@ -13925,13 +13925,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zweilous[] = INCBIN_U8("graphics/pokemon/zweilous/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zweilous[] = INCBIN_COMP("graphics/pokemon/zweilous/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zweilous[] = INCBIN_COMP("graphics/pokemon/zweilous/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zweilous[] = INCBIN_U32("graphics/pokemon/zweilous/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/anim_front.4bpp.lz"); const u32 gMonPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/normal.gbapal.lz"); @@ -13941,13 +13941,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hydreigon[] = INCBIN_U8("graphics/pokemon/hydreigon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hydreigon[] = INCBIN_COMP("graphics/pokemon/hydreigon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hydreigon[] = INCBIN_COMP("graphics/pokemon/hydreigon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hydreigon[] = INCBIN_U32("graphics/pokemon/hydreigon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DEINO #if P_FAMILY_LARVESTA @@ -13959,13 +13959,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Larvesta[] = INCBIN_U8("graphics/pokemon/larvesta/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Larvesta[] = INCBIN_COMP("graphics/pokemon/larvesta/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Larvesta[] = INCBIN_COMP("graphics/pokemon/larvesta/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Larvesta[] = INCBIN_U32("graphics/pokemon/larvesta/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/anim_front.4bpp.lz"); const u32 gMonPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/normal.gbapal.lz"); @@ -13975,13 +13975,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Volcarona[] = INCBIN_U8("graphics/pokemon/volcarona/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Volcarona[] = INCBIN_COMP("graphics/pokemon/volcarona/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Volcarona[] = INCBIN_COMP("graphics/pokemon/volcarona/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Volcarona[] = INCBIN_U32("graphics/pokemon/volcarona/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LARVESTA #if P_FAMILY_COBALION @@ -13993,13 +13993,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cobalion[] = INCBIN_U8("graphics/pokemon/cobalion/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cobalion[] = INCBIN_COMP("graphics/pokemon/cobalion/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cobalion[] = INCBIN_COMP("graphics/pokemon/cobalion/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cobalion[] = INCBIN_U32("graphics/pokemon/cobalion/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_COBALION #if P_FAMILY_TERRAKION @@ -14011,13 +14011,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Terrakion[] = INCBIN_U8("graphics/pokemon/terrakion/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Terrakion[] = INCBIN_COMP("graphics/pokemon/terrakion/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Terrakion[] = INCBIN_COMP("graphics/pokemon/terrakion/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Terrakion[] = INCBIN_U32("graphics/pokemon/terrakion/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TERRAKION #if P_FAMILY_VIRIZION @@ -14029,13 +14029,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Virizion[] = INCBIN_U8("graphics/pokemon/virizion/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Virizion[] = INCBIN_COMP("graphics/pokemon/virizion/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Virizion[] = INCBIN_COMP("graphics/pokemon/virizion/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Virizion[] = INCBIN_U32("graphics/pokemon/virizion/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_VIRIZION #if P_FAMILY_TORNADUS @@ -14047,26 +14047,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tornadus[] = INCBIN_U8("graphics/pokemon/tornadus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_TornadusIncarnate[] = INCBIN_COMP("graphics/pokemon/tornadus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_TornadusIncarnate[] = INCBIN_COMP("graphics/pokemon/tornadus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_TornadusIncarnate[] = INCBIN_U32("graphics/pokemon/tornadus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/anim_front.4bpp.lz"); const u32 gMonPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/normal.gbapal.lz"); const u32 gMonBackPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/back.4bpp.lz"); const u32 gMonShinyPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/shiny.gbapal.lz"); const u8 gMonIcon_TornadusTherian[] = INCBIN_U8("graphics/pokemon/tornadus/therian/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - //const u32 gObjectEventPic_TornadusTherian[] = INCBIN_COMP("graphics/pokemon/tornadus/therian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - //const u32 gFollowerPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/follow_normal.gbapal.lz"); - //const u32 gShinyFollowerPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + //const u32 gObjectEventPic_TornadusTherian[] = INCBIN_COMP("graphics/pokemon/tornadus/therian/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + //const u32 gOverworldPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/overworld_normal.gbapal.lz"); + //const u32 gShinyOverworldPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TORNADUS #if P_FAMILY_THUNDURUS @@ -14078,26 +14078,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Thundurus[] = INCBIN_U8("graphics/pokemon/thundurus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ThundurusIncarnate[] = INCBIN_COMP("graphics/pokemon/thundurus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ThundurusIncarnate[] = INCBIN_COMP("graphics/pokemon/thundurus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ThundurusIncarnate[] = INCBIN_U32("graphics/pokemon/thundurus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/anim_front.4bpp.lz"); const u32 gMonPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/normal.gbapal.lz"); const u32 gMonBackPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/back.4bpp.lz"); const u32 gMonShinyPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/shiny.gbapal.lz"); const u8 gMonIcon_ThundurusTherian[] = INCBIN_U8("graphics/pokemon/thundurus/therian/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - //const u32 gObjectEventPic_ThundurusTherian[] = INCBIN_COMP("graphics/pokemon/thundurus/therian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - //const u32 gFollowerPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/follow_normal.gbapal.lz"); - //const u32 gShinyFollowerPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + //const u32 gObjectEventPic_ThundurusTherian[] = INCBIN_COMP("graphics/pokemon/thundurus/therian/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + //const u32 gOverworldPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/overworld_normal.gbapal.lz"); + //const u32 gShinyOverworldPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_THUNDURUS #if P_FAMILY_RESHIRAM @@ -14109,13 +14109,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Reshiram[] = INCBIN_U8("graphics/pokemon/reshiram/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Reshiram[] = INCBIN_COMP("graphics/pokemon/reshiram/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Reshiram[] = INCBIN_COMP("graphics/pokemon/reshiram/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Reshiram[] = INCBIN_U32("graphics/pokemon/reshiram/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_RESHIRAM #if P_FAMILY_ZEKROM @@ -14127,13 +14127,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zekrom[] = INCBIN_U8("graphics/pokemon/zekrom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zekrom[] = INCBIN_COMP("graphics/pokemon/zekrom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zekrom[] = INCBIN_COMP("graphics/pokemon/zekrom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zekrom[] = INCBIN_U32("graphics/pokemon/zekrom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ZEKROM #if P_FAMILY_LANDORUS @@ -14145,26 +14145,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Landorus[] = INCBIN_U8("graphics/pokemon/landorus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_LandorusIncarnate[] = INCBIN_COMP("graphics/pokemon/landorus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_LandorusIncarnate[] = INCBIN_COMP("graphics/pokemon/landorus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_LandorusIncarnate[] = INCBIN_U32("graphics/pokemon/landorus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/anim_front.4bpp.lz"); const u32 gMonPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/normal.gbapal.lz"); const u32 gMonBackPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/back.4bpp.lz"); const u32 gMonShinyPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/shiny.gbapal.lz"); const u8 gMonIcon_LandorusTherian[] = INCBIN_U8("graphics/pokemon/landorus/therian/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - //const u32 gObjectEventPic_LandorusTherian[] = INCBIN_COMP("graphics/pokemon/landorus/therian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - //const u32 gFollowerPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/follow_normal.gbapal.lz"); - //const u32 gShinyFollowerPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + //const u32 gObjectEventPic_LandorusTherian[] = INCBIN_COMP("graphics/pokemon/landorus/therian/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + //const u32 gOverworldPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/overworld_normal.gbapal.lz"); + //const u32 gShinyOverworldPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LANDORUS #if P_FAMILY_ENAMORUS @@ -14176,26 +14176,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_EnamorusIncarnate[] = INCBIN_COMP("graphics/pokemon/enamorus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_EnamorusIncarnate[] = INCBIN_COMP("graphics/pokemon/enamorus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz"); const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz"); const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz"); const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz"); const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_EnamorusTherian[] = INCBIN_COMP("graphics/pokemon/enamorus/therian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_EnamorusTherian[] = INCBIN_COMP("graphics/pokemon/enamorus/therian/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ENAMORUS #if P_FAMILY_KYUREM @@ -14207,13 +14207,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kyurem[] = INCBIN_U8("graphics/pokemon/kyurem/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kyurem[] = INCBIN_COMP("graphics/pokemon/kyurem/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kyurem[] = INCBIN_COMP("graphics/pokemon/kyurem/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kyurem[] = INCBIN_U32("graphics/pokemon/kyurem/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_FUSION_FORMS const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/anim_front.4bpp.lz"); @@ -14221,26 +14221,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/back.4bpp.lz"); const u32 gMonShinyPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/shiny.gbapal.lz"); const u8 gMonIcon_KyuremWhite[] = INCBIN_U8("graphics/pokemon/kyurem/white/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_KyuremWhite[] = INCBIN_COMP("graphics/pokemon/kyurem/white/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_KyuremWhite[] = INCBIN_COMP("graphics/pokemon/kyurem/white/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/anim_front.4bpp.lz"); const u32 gMonPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/normal.gbapal.lz"); const u32 gMonBackPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/back.4bpp.lz"); const u32 gMonShinyPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/shiny.gbapal.lz"); const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/kyurem/black/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_KyuremBlack[] = INCBIN_COMP("graphics/pokemon/kyurem/black/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_KyuremBlack[] = INCBIN_COMP("graphics/pokemon/kyurem/black/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FUSION_FORMS #endif //P_FAMILY_KYUREM @@ -14253,26 +14253,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Keldeo[] = INCBIN_U8("graphics/pokemon/keldeo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_KeldeoOrdinary[] = INCBIN_COMP("graphics/pokemon/keldeo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_KeldeoOrdinary[] = INCBIN_COMP("graphics/pokemon/keldeo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_KeldeoOrdinary[] = INCBIN_U32("graphics/pokemon/keldeo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/anim_front.4bpp.lz"); const u32 gMonPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/normal.gbapal.lz"); const u32 gMonBackPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/back.4bpp.lz"); const u32 gMonShinyPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/shiny.gbapal.lz"); const u8 gMonIcon_KeldeoResolute[] = INCBIN_U8("graphics/pokemon/keldeo/resolute/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_KeldeoResolute[] = INCBIN_COMP("graphics/pokemon/keldeo/resolute/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_KeldeoResolute[] = INCBIN_COMP("graphics/pokemon/keldeo/resolute/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_KELDEO #if P_FAMILY_MELOETTA @@ -14284,26 +14284,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Meloetta[] = INCBIN_U8("graphics/pokemon/meloetta/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MeloettaAria[] = INCBIN_COMP("graphics/pokemon/meloetta/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MeloettaAria[] = INCBIN_COMP("graphics/pokemon/meloetta/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MeloettaAria[] = INCBIN_U32("graphics/pokemon/meloetta/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/anim_front.4bpp.lz"); const u32 gMonPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/normal.gbapal.lz"); const u32 gMonBackPic_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/back.4bpp.lz"); const u32 gMonShinyPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/shiny.gbapal.lz"); const u8 gMonIcon_MeloettaPirouette[] = INCBIN_U8("graphics/pokemon/meloetta/pirouette/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MeloettaPirouette[] = INCBIN_COMP("graphics/pokemon/meloetta/pirouette/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MeloettaPirouette[] = INCBIN_COMP("graphics/pokemon/meloetta/pirouette/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MeloettaPirouette[] = INCBIN_U32("graphics/pokemon/meloetta/pirouette/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MELOETTA #if P_FAMILY_GENESECT @@ -14315,13 +14315,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Genesect[] = INCBIN_U8("graphics/pokemon/genesect/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Genesect[] = INCBIN_COMP("graphics/pokemon/genesect/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Genesect[] = INCBIN_COMP("graphics/pokemon/genesect/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Genesect[] = INCBIN_U32("graphics/pokemon/genesect/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/genesect/douse_drive/normal.gbapal.lz"); const u32 gMonShinyPalette_GenesectDouseDrive[] = INCBIN_U32("graphics/pokemon/genesect/douse_drive/shiny.gbapal.lz"); @@ -14345,13 +14345,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chespin[] = INCBIN_U8("graphics/pokemon/chespin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chespin[] = INCBIN_COMP("graphics/pokemon/chespin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chespin[] = INCBIN_COMP("graphics/pokemon/chespin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chespin[] = INCBIN_U32("graphics/pokemon/chespin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/anim_front.4bpp.lz"); const u32 gMonPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/normal.gbapal.lz"); @@ -14361,13 +14361,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Quilladin[] = INCBIN_U8("graphics/pokemon/quilladin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Quilladin[] = INCBIN_COMP("graphics/pokemon/quilladin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Quilladin[] = INCBIN_COMP("graphics/pokemon/quilladin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Quilladin[] = INCBIN_U32("graphics/pokemon/quilladin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/anim_front.4bpp.lz"); const u32 gMonPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/normal.gbapal.lz"); @@ -14377,13 +14377,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chesnaught[] = INCBIN_U8("graphics/pokemon/chesnaught/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chesnaught[] = INCBIN_COMP("graphics/pokemon/chesnaught/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chesnaught[] = INCBIN_COMP("graphics/pokemon/chesnaught/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chesnaught[] = INCBIN_U32("graphics/pokemon/chesnaught/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CHESPIN #if P_FAMILY_FENNEKIN @@ -14395,13 +14395,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Fennekin[] = INCBIN_U8("graphics/pokemon/fennekin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Fennekin[] = INCBIN_COMP("graphics/pokemon/fennekin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Fennekin[] = INCBIN_COMP("graphics/pokemon/fennekin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Fennekin[] = INCBIN_U32("graphics/pokemon/fennekin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/anim_front.4bpp.lz"); const u32 gMonPalette_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/normal.gbapal.lz"); @@ -14411,13 +14411,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Braixen[] = INCBIN_U8("graphics/pokemon/braixen/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Braixen[] = INCBIN_COMP("graphics/pokemon/braixen/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Braixen[] = INCBIN_COMP("graphics/pokemon/braixen/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Braixen[] = INCBIN_U32("graphics/pokemon/braixen/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/anim_front.4bpp.lz"); const u32 gMonPalette_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/normal.gbapal.lz"); @@ -14427,13 +14427,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Delphox[] = INCBIN_U8("graphics/pokemon/delphox/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Delphox[] = INCBIN_COMP("graphics/pokemon/delphox/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Delphox[] = INCBIN_COMP("graphics/pokemon/delphox/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Delphox[] = INCBIN_U32("graphics/pokemon/delphox/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FENNEKIN #if P_FAMILY_FROAKIE @@ -14445,13 +14445,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Froakie[] = INCBIN_U8("graphics/pokemon/froakie/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Froakie[] = INCBIN_COMP("graphics/pokemon/froakie/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Froakie[] = INCBIN_COMP("graphics/pokemon/froakie/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Froakie[] = INCBIN_U32("graphics/pokemon/froakie/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/anim_front.4bpp.lz"); const u32 gMonPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/normal.gbapal.lz"); @@ -14461,13 +14461,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Frogadier[] = INCBIN_U8("graphics/pokemon/frogadier/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Frogadier[] = INCBIN_COMP("graphics/pokemon/frogadier/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Frogadier[] = INCBIN_COMP("graphics/pokemon/frogadier/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Frogadier[] = INCBIN_U32("graphics/pokemon/frogadier/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/anim_front.4bpp.lz"); const u32 gMonPalette_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/normal.gbapal.lz"); @@ -14477,26 +14477,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Greninja[] = INCBIN_U8("graphics/pokemon/greninja/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Greninja[] = INCBIN_COMP("graphics/pokemon/greninja/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Greninja[] = INCBIN_COMP("graphics/pokemon/greninja/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Greninja[] = INCBIN_U32("graphics/pokemon/greninja/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/anim_front.4bpp.lz"); const u32 gMonPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/normal.gbapal.lz"); const u32 gMonBackPic_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/back.4bpp.lz"); const u32 gMonShinyPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/shiny.gbapal.lz"); const u8 gMonIcon_GreninjaAsh[] = INCBIN_U8("graphics/pokemon/greninja/ash/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GreninjaAsh[] = INCBIN_COMP("graphics/pokemon/greninja/ash/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GreninjaAsh[] = INCBIN_COMP("graphics/pokemon/greninja/ash/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GreninjaAsh[] = INCBIN_U32("graphics/pokemon/greninja/ash/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FROAKIE #if P_FAMILY_BUNNELBY @@ -14508,13 +14508,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bunnelby[] = INCBIN_U8("graphics/pokemon/bunnelby/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bunnelby[] = INCBIN_COMP("graphics/pokemon/bunnelby/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bunnelby[] = INCBIN_COMP("graphics/pokemon/bunnelby/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bunnelby[] = INCBIN_U32("graphics/pokemon/bunnelby/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/anim_front.4bpp.lz"); const u32 gMonPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/normal.gbapal.lz"); @@ -14524,13 +14524,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Diggersby[] = INCBIN_U8("graphics/pokemon/diggersby/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Diggersby[] = INCBIN_COMP("graphics/pokemon/diggersby/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Diggersby[] = INCBIN_COMP("graphics/pokemon/diggersby/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Diggersby[] = INCBIN_U32("graphics/pokemon/diggersby/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BUNNELBY #if P_FAMILY_FLETCHLING @@ -14542,13 +14542,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Fletchling[] = INCBIN_U8("graphics/pokemon/fletchling/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Fletchling[] = INCBIN_COMP("graphics/pokemon/fletchling/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Fletchling[] = INCBIN_COMP("graphics/pokemon/fletchling/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Fletchling[] = INCBIN_U32("graphics/pokemon/fletchling/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/anim_front.4bpp.lz"); const u32 gMonPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/normal.gbapal.lz"); @@ -14558,13 +14558,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Fletchinder[] = INCBIN_U8("graphics/pokemon/fletchinder/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Fletchinder[] = INCBIN_COMP("graphics/pokemon/fletchinder/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Fletchinder[] = INCBIN_COMP("graphics/pokemon/fletchinder/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Fletchinder[] = INCBIN_U32("graphics/pokemon/fletchinder/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/anim_front.4bpp.lz"); const u32 gMonPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/normal.gbapal.lz"); @@ -14574,13 +14574,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Talonflame[] = INCBIN_U8("graphics/pokemon/talonflame/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Talonflame[] = INCBIN_COMP("graphics/pokemon/talonflame/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Talonflame[] = INCBIN_COMP("graphics/pokemon/talonflame/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Talonflame[] = INCBIN_U32("graphics/pokemon/talonflame/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FLETCHLING #if P_FAMILY_SCATTERBUG @@ -14592,13 +14592,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Scatterbug[] = INCBIN_U8("graphics/pokemon/scatterbug/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Scatterbug[] = INCBIN_COMP("graphics/pokemon/scatterbug/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Scatterbug[] = INCBIN_COMP("graphics/pokemon/scatterbug/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Scatterbug[] = INCBIN_U32("graphics/pokemon/scatterbug/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/anim_front.4bpp.lz"); const u32 gMonPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/normal.gbapal.lz"); @@ -14608,13 +14608,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Spewpa[] = INCBIN_U8("graphics/pokemon/spewpa/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Spewpa[] = INCBIN_COMP("graphics/pokemon/spewpa/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Spewpa[] = INCBIN_COMP("graphics/pokemon/spewpa/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Spewpa[] = INCBIN_U32("graphics/pokemon/spewpa/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/anim_front.4bpp.lz"); const u32 gMonPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/normal.gbapal.lz"); @@ -14715,70 +14715,70 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/shiny.gbapal.lz"); const u8 gMonIcon_VivillonSun[] = INCBIN_U8("graphics/pokemon/vivillon/sun/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_VivillonIcySnow[] = INCBIN_COMP("graphics/pokemon/vivillon/follower.4bpp"); - const u32 gObjectEventPic_VivillonPolar[] = INCBIN_COMP("graphics/pokemon/vivillon/polar/follower.4bpp"); - const u32 gObjectEventPic_VivillonTundra[] = INCBIN_COMP("graphics/pokemon/vivillon/tundra/follower.4bpp"); - const u32 gObjectEventPic_VivillonContinental[] = INCBIN_COMP("graphics/pokemon/vivillon/continental/follower.4bpp"); - const u32 gObjectEventPic_VivillonGarden[] = INCBIN_COMP("graphics/pokemon/vivillon/garden/follower.4bpp"); - const u32 gObjectEventPic_VivillonElegant[] = INCBIN_COMP("graphics/pokemon/vivillon/elegant/follower.4bpp"); - const u32 gObjectEventPic_VivillonMeadow[] = INCBIN_COMP("graphics/pokemon/vivillon/meadow/follower.4bpp"); - const u32 gObjectEventPic_VivillonModern[] = INCBIN_COMP("graphics/pokemon/vivillon/modern/follower.4bpp"); - const u32 gObjectEventPic_VivillonMarine[] = INCBIN_COMP("graphics/pokemon/vivillon/marine/follower.4bpp"); - const u32 gObjectEventPic_VivillonArchipelago[] = INCBIN_COMP("graphics/pokemon/vivillon/archipelago/follower.4bpp"); - const u32 gObjectEventPic_VivillonHighPlains[] = INCBIN_COMP("graphics/pokemon/vivillon/high_plains/follower.4bpp"); - const u32 gObjectEventPic_VivillonSandstorm[] = INCBIN_COMP("graphics/pokemon/vivillon/sandstorm/follower.4bpp"); - const u32 gObjectEventPic_VivillonRiver[] = INCBIN_COMP("graphics/pokemon/vivillon/river/follower.4bpp"); - const u32 gObjectEventPic_VivillonMonsoon[] = INCBIN_COMP("graphics/pokemon/vivillon/monsoon/follower.4bpp"); - const u32 gObjectEventPic_VivillonSavanna[] = INCBIN_COMP("graphics/pokemon/vivillon/savanna/follower.4bpp"); - const u32 gObjectEventPic_VivillonSun[] = INCBIN_COMP("graphics/pokemon/vivillon/sun/follower.4bpp"); - const u32 gObjectEventPic_VivillonOcean[] = INCBIN_COMP("graphics/pokemon/vivillon/ocean/follower.4bpp"); - const u32 gObjectEventPic_VivillonJungle[] = INCBIN_COMP("graphics/pokemon/vivillon/jungle/follower.4bpp"); - const u32 gObjectEventPic_VivillonFancy[] = INCBIN_COMP("graphics/pokemon/vivillon/fancy/follower.4bpp"); - const u32 gObjectEventPic_VivillonPokeBall[] = INCBIN_COMP("graphics/pokemon/vivillon/poke_ball/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_VivillonIcySnow[] = INCBIN_COMP("graphics/pokemon/vivillon/overworld.4bpp"); + const u32 gObjectEventPic_VivillonPolar[] = INCBIN_COMP("graphics/pokemon/vivillon/polar/overworld.4bpp"); + const u32 gObjectEventPic_VivillonTundra[] = INCBIN_COMP("graphics/pokemon/vivillon/tundra/overworld.4bpp"); + const u32 gObjectEventPic_VivillonContinental[] = INCBIN_COMP("graphics/pokemon/vivillon/continental/overworld.4bpp"); + const u32 gObjectEventPic_VivillonGarden[] = INCBIN_COMP("graphics/pokemon/vivillon/garden/overworld.4bpp"); + const u32 gObjectEventPic_VivillonElegant[] = INCBIN_COMP("graphics/pokemon/vivillon/elegant/overworld.4bpp"); + const u32 gObjectEventPic_VivillonMeadow[] = INCBIN_COMP("graphics/pokemon/vivillon/meadow/overworld.4bpp"); + const u32 gObjectEventPic_VivillonModern[] = INCBIN_COMP("graphics/pokemon/vivillon/modern/overworld.4bpp"); + const u32 gObjectEventPic_VivillonMarine[] = INCBIN_COMP("graphics/pokemon/vivillon/marine/overworld.4bpp"); + const u32 gObjectEventPic_VivillonArchipelago[] = INCBIN_COMP("graphics/pokemon/vivillon/archipelago/overworld.4bpp"); + const u32 gObjectEventPic_VivillonHighPlains[] = INCBIN_COMP("graphics/pokemon/vivillon/high_plains/overworld.4bpp"); + const u32 gObjectEventPic_VivillonSandstorm[] = INCBIN_COMP("graphics/pokemon/vivillon/sandstorm/overworld.4bpp"); + const u32 gObjectEventPic_VivillonRiver[] = INCBIN_COMP("graphics/pokemon/vivillon/river/overworld.4bpp"); + const u32 gObjectEventPic_VivillonMonsoon[] = INCBIN_COMP("graphics/pokemon/vivillon/monsoon/overworld.4bpp"); + const u32 gObjectEventPic_VivillonSavanna[] = INCBIN_COMP("graphics/pokemon/vivillon/savanna/overworld.4bpp"); + const u32 gObjectEventPic_VivillonSun[] = INCBIN_COMP("graphics/pokemon/vivillon/sun/overworld.4bpp"); + const u32 gObjectEventPic_VivillonOcean[] = INCBIN_COMP("graphics/pokemon/vivillon/ocean/overworld.4bpp"); + const u32 gObjectEventPic_VivillonJungle[] = INCBIN_COMP("graphics/pokemon/vivillon/jungle/overworld.4bpp"); + const u32 gObjectEventPic_VivillonFancy[] = INCBIN_COMP("graphics/pokemon/vivillon/fancy/overworld.4bpp"); + const u32 gObjectEventPic_VivillonPokeBall[] = INCBIN_COMP("graphics/pokemon/vivillon/poke_ball/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonPolar[] = INCBIN_U32("graphics/pokemon/vivillon/polar/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonTundra[] = INCBIN_U32("graphics/pokemon/vivillon/tundra/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonContinental[] = INCBIN_U32("graphics/pokemon/vivillon/continental/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonGarden[] = INCBIN_U32("graphics/pokemon/vivillon/garden/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonElegant[] = INCBIN_U32("graphics/pokemon/vivillon/elegant/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonMeadow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonModern[] = INCBIN_U32("graphics/pokemon/vivillon/modern/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonMarine[] = INCBIN_U32("graphics/pokemon/vivillon/marine/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonArchipelago[] = INCBIN_U32("graphics/pokemon/vivillon/archipelago/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonHighPlains[] = INCBIN_U32("graphics/pokemon/vivillon/high_plains/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonSandstorm[] = INCBIN_U32("graphics/pokemon/vivillon/sandstorm/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonRiver[] = INCBIN_U32("graphics/pokemon/vivillon/river/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonMonsoon[] = INCBIN_U32("graphics/pokemon/vivillon/monsoon/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonSavanna[] = INCBIN_U32("graphics/pokemon/vivillon/savanna/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonSun[] = INCBIN_U32("graphics/pokemon/vivillon/sun/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonJungle[] = INCBIN_U32("graphics/pokemon/vivillon/jungle/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonFancy[] = INCBIN_U32("graphics/pokemon/vivillon/fancy/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_VivillonPokeBall[] = INCBIN_U32("graphics/pokemon/vivillon/poke_ball/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/anim_front.4bpp.lz"); const u32 gMonPalette_VivillonOcean[] = INCBIN_U32("graphics/pokemon/vivillon/ocean/normal.gbapal.lz"); @@ -14814,13 +14814,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Litleo[] = INCBIN_U8("graphics/pokemon/litleo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Litleo[] = INCBIN_COMP("graphics/pokemon/litleo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Litleo[] = INCBIN_COMP("graphics/pokemon/litleo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Litleo[] = INCBIN_U32("graphics/pokemon/litleo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/anim_front.4bpp.lz"); const u32 gMonPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/normal.gbapal.lz"); @@ -14830,24 +14830,24 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pyroar[] = INCBIN_U8("graphics/pokemon/pyroar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pyroar[] = INCBIN_COMP("graphics/pokemon/pyroar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pyroar[] = INCBIN_COMP("graphics/pokemon/pyroar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pyroar[] = INCBIN_U32("graphics/pokemon/pyroar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/anim_frontf.4bpp.lz"); const u32 gMonBackPic_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/backf.4bpp.lz"); const u8 gMonIcon_PyroarF[] = INCBIN_U8("graphics/pokemon/pyroar/iconf.4bpp"); -#if OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS const u32 gObjectEventPic_PyroarF[] = INCBIN_COMP("graphics/pokemon/pyroar/followerf.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/follow_normalf.gbapal.lz"); - // const u32 gShinyFollowerPalette_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/follow_shinyf.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/overworld_normalf.gbapal.lz"); + // const u32 gShinyOverworldPalette_PyroarF[] = INCBIN_U32("graphics/pokemon/pyroar/overworld_shinyf.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LITLEO #if P_FAMILY_FLABEBE @@ -14877,25 +14877,25 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_FlabebeRedFlower[] = INCBIN_COMP("graphics/pokemon/flabebe/follower.4bpp"); - const u32 gObjectEventPic_FlabebeYellowFlower[] = INCBIN_COMP("graphics/pokemon/flabebe/yellow_flower/follower.4bpp"); - const u32 gObjectEventPic_FlabebeOrangeFlower[] = INCBIN_COMP("graphics/pokemon/flabebe/orange_flower/follower.4bpp"); - const u32 gObjectEventPic_FlabebeBlueFlower[] = INCBIN_COMP("graphics/pokemon/flabebe/blue_flower/follower.4bpp"); - const u32 gObjectEventPic_FlabebeWhiteFlower[] = INCBIN_COMP("graphics/pokemon/flabebe/white_flower/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/flabebe/yellow_flower/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/flabebe/orange_flower/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/flabebe/blue_flower/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/flabebe/white_flower/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_FlabebeRedFlower[] = INCBIN_U32("graphics/pokemon/flabebe/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FlabebeYellowFlower[] = INCBIN_U32("graphics/pokemon/flabebe/yellow_flower/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FlabebeOrangeFlower[] = INCBIN_U32("graphics/pokemon/flabebe/orange_flower/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FlabebeBlueFlower[] = INCBIN_U32("graphics/pokemon/flabebe/blue_flower/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FlabebeWhiteFlower[] = INCBIN_U32("graphics/pokemon/flabebe/white_flower/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#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"); +#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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/anim_front.4bpp.lz"); const u32 gMonBackPic_Floette[] = INCBIN_U32("graphics/pokemon/floette/back.4bpp.lz"); @@ -14929,28 +14929,28 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_FloetteRedFlower[] = INCBIN_COMP("graphics/pokemon/floette/follower.4bpp"); - const u32 gObjectEventPic_FloetteYellowFlower[] = INCBIN_COMP("graphics/pokemon/floette/yellow_flower/follower.4bpp"); - const u32 gObjectEventPic_FloetteOrangeFlower[] = INCBIN_COMP("graphics/pokemon/floette/orange_flower/follower.4bpp"); - const u32 gObjectEventPic_FloetteBlueFlower[] = INCBIN_COMP("graphics/pokemon/floette/blue_flower/follower.4bpp"); - const u32 gObjectEventPic_FloetteWhiteFlower[] = INCBIN_COMP("graphics/pokemon/floette/white_flower/follower.4bpp"); - const u32 gObjectEventPic_FloetteEternalFlower[] = INCBIN_COMP("graphics/pokemon/floette/eternal_flower/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/floette/yellow_flower/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/floette/orange_flower/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/floette/blue_flower/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/floette/white_flower/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_FloetteRedFlower[] = INCBIN_U32("graphics/pokemon/floette/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FloetteYellowFlower[] = INCBIN_U32("graphics/pokemon/floette/yellow_flower/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FloetteOrangeFlower[] = INCBIN_U32("graphics/pokemon/floette/orange_flower/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FloetteBlueFlower[] = INCBIN_U32("graphics/pokemon/floette/blue_flower/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FloetteWhiteFlower[] = INCBIN_U32("graphics/pokemon/floette/white_flower/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FloetteEternalFlower[] = INCBIN_U32("graphics/pokemon/floette/eternal_flower/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#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"); +#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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/anim_front.4bpp.lz"); const u32 gMonBackPic_Florges[] = INCBIN_U32("graphics/pokemon/florges/back.4bpp.lz"); @@ -14978,25 +14978,25 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_FlorgesRedFlower[] = INCBIN_COMP("graphics/pokemon/florges/follower.4bpp"); - const u32 gObjectEventPic_FlorgesYellowFlower[] = INCBIN_COMP("graphics/pokemon/florges/yellow_flower/follower.4bpp"); - const u32 gObjectEventPic_FlorgesOrangeFlower[] = INCBIN_COMP("graphics/pokemon/florges/orange_flower/follower.4bpp"); - const u32 gObjectEventPic_FlorgesBlueFlower[] = INCBIN_COMP("graphics/pokemon/florges/blue_flower/follower.4bpp"); - const u32 gObjectEventPic_FlorgesWhiteFlower[] = INCBIN_COMP("graphics/pokemon/florges/white_flower/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/florges/yellow_flower/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/florges/orange_flower/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/florges/blue_flower/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/florges/white_flower/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_FlorgesRedFlower[] = INCBIN_U32("graphics/pokemon/florges/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FlorgesYellowFlower[] = INCBIN_U32("graphics/pokemon/florges/yellow_flower/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FlorgesOrangeFlower[] = INCBIN_U32("graphics/pokemon/florges/orange_flower/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FlorgesBlueFlower[] = INCBIN_U32("graphics/pokemon/florges/blue_flower/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FlorgesWhiteFlower[] = INCBIN_U32("graphics/pokemon/florges/white_flower/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#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"); +#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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FLABEBE #if P_FAMILY_SKIDDO @@ -15008,13 +15008,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Skiddo[] = INCBIN_U8("graphics/pokemon/skiddo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Skiddo[] = INCBIN_COMP("graphics/pokemon/skiddo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Skiddo[] = INCBIN_COMP("graphics/pokemon/skiddo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Skiddo[] = INCBIN_U32("graphics/pokemon/skiddo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/anim_front.4bpp.lz"); const u32 gMonPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/normal.gbapal.lz"); @@ -15024,13 +15024,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gogoat[] = INCBIN_U8("graphics/pokemon/gogoat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gogoat[] = INCBIN_COMP("graphics/pokemon/gogoat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gogoat[] = INCBIN_COMP("graphics/pokemon/gogoat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gogoat[] = INCBIN_U32("graphics/pokemon/gogoat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SKIDDO #if P_FAMILY_PANCHAM @@ -15042,13 +15042,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pancham[] = INCBIN_U8("graphics/pokemon/pancham/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pancham[] = INCBIN_COMP("graphics/pokemon/pancham/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pancham[] = INCBIN_COMP("graphics/pokemon/pancham/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pancham[] = INCBIN_U32("graphics/pokemon/pancham/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/anim_front.4bpp.lz"); const u32 gMonPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/normal.gbapal.lz"); @@ -15058,13 +15058,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pangoro[] = INCBIN_U8("graphics/pokemon/pangoro/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pangoro[] = INCBIN_COMP("graphics/pokemon/pangoro/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pangoro[] = INCBIN_COMP("graphics/pokemon/pangoro/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pangoro[] = INCBIN_U32("graphics/pokemon/pangoro/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PANCHAM #if P_FAMILY_FURFROU @@ -15131,40 +15131,40 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonShinyPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/shiny.gbapal.lz"); const u8 gMonIcon_FurfrouPharaohTrim[] = INCBIN_U8("graphics/pokemon/furfrou/pharaoh_trim/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_FurfrouNatural[] = INCBIN_COMP("graphics/pokemon/furfrou/follower.4bpp"); - const u32 gObjectEventPic_FurfrouHeartTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/heart_trim/follower.4bpp"); - const u32 gObjectEventPic_FurfrouStarTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/star_trim/follower.4bpp"); - const u32 gObjectEventPic_FurfrouDiamondTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/diamond_trim/follower.4bpp"); - const u32 gObjectEventPic_FurfrouDebutanteTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/debutante_trim/follower.4bpp"); - const u32 gObjectEventPic_FurfrouMatronTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/matron_trim/follower.4bpp"); - const u32 gObjectEventPic_FurfrouDandyTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/dandy_trim/follower.4bpp"); - const u32 gObjectEventPic_FurfrouLaReineTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/la_reine_trim/follower.4bpp"); - const u32 gObjectEventPic_FurfrouKabukiTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/kabuki_trim/follower.4bpp"); - const u32 gObjectEventPic_FurfrouPharaohTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/pharaoh_trim/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/follow_normal.gbapal.lz"); - const u32 gFollowerPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/follow_shiny.gbapal.lz"); - const u32 gShinyFollowerPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_FurfrouNatural[] = INCBIN_COMP("graphics/pokemon/furfrou/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouHeartTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/heart_trim/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouStarTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/star_trim/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouDiamondTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/diamond_trim/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouDebutanteTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/debutante_trim/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouMatronTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/matron_trim/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouDandyTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/dandy_trim/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouLaReineTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/la_reine_trim/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouKabukiTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/kabuki_trim/overworld.4bpp"); + const u32 gObjectEventPic_FurfrouPharaohTrim[] = INCBIN_COMP("graphics/pokemon/furfrou/pharaoh_trim/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/overworld_normal.gbapal.lz"); + const u32 gOverworldPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouNatural[] = INCBIN_U32("graphics/pokemon/furfrou/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouHeartTrim[] = INCBIN_U32("graphics/pokemon/furfrou/heart_trim/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouStarTrim[] = INCBIN_U32("graphics/pokemon/furfrou/star_trim/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouDiamondTrim[] = INCBIN_U32("graphics/pokemon/furfrou/diamond_trim/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouDebutanteTrim[] = INCBIN_U32("graphics/pokemon/furfrou/debutante_trim/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouMatronTrim[] = INCBIN_U32("graphics/pokemon/furfrou/matron_trim/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouDandyTrim[] = INCBIN_U32("graphics/pokemon/furfrou/dandy_trim/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouLaReineTrim[] = INCBIN_U32("graphics/pokemon/furfrou/la_reine_trim/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouKabukiTrim[] = INCBIN_U32("graphics/pokemon/furfrou/kabuki_trim/overworld_shiny.gbapal.lz"); + const u32 gShinyOverworldPalette_FurfrouPharaohTrim[] = INCBIN_U32("graphics/pokemon/furfrou/pharaoh_trim/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FURFROU #if P_FAMILY_ESPURR @@ -15176,13 +15176,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Espurr[] = INCBIN_U8("graphics/pokemon/espurr/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Espurr[] = INCBIN_COMP("graphics/pokemon/espurr/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Espurr[] = INCBIN_COMP("graphics/pokemon/espurr/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Espurr[] = INCBIN_U32("graphics/pokemon/espurr/overworld_shiny.gbapal.lz"); +#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"); @@ -15192,26 +15192,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Meowstic[] = INCBIN_U8("graphics/pokemon/meowstic/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MeowsticMale[] = INCBIN_COMP("graphics/pokemon/meowstic/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MeowsticMale[] = INCBIN_U32("graphics/pokemon/meowstic/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MeowsticMale[] = 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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MeowsticFemale[] = INCBIN_COMP("graphics/pokemon/meowstic/female/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MeowsticFemale[] = INCBIN_U32("graphics/pokemon/meowstic/female/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MeowsticFemale[] = INCBIN_COMP("graphics/pokemon/meowstic/female/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ESPURR #if P_FAMILY_HONEDGE @@ -15223,13 +15223,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Honedge[] = INCBIN_U8("graphics/pokemon/honedge/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Honedge[] = INCBIN_COMP("graphics/pokemon/honedge/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Honedge[] = INCBIN_COMP("graphics/pokemon/honedge/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Honedge[] = INCBIN_U32("graphics/pokemon/honedge/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/anim_front.4bpp.lz"); const u32 gMonPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/normal.gbapal.lz"); @@ -15239,13 +15239,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Doublade[] = INCBIN_U8("graphics/pokemon/doublade/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Doublade[] = INCBIN_COMP("graphics/pokemon/doublade/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Doublade[] = INCBIN_COMP("graphics/pokemon/doublade/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Doublade[] = INCBIN_U32("graphics/pokemon/doublade/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/anim_front.4bpp.lz"); const u32 gMonPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/normal.gbapal.lz"); @@ -15255,26 +15255,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Aegislash[] = INCBIN_U8("graphics/pokemon/aegislash/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_AegislashShield[] = INCBIN_COMP("graphics/pokemon/aegislash/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_AegislashShield[] = INCBIN_COMP("graphics/pokemon/aegislash/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AegislashShield[] = INCBIN_U32("graphics/pokemon/aegislash/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/anim_front.4bpp.lz"); const u32 gMonPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/normal.gbapal.lz"); const u32 gMonBackPic_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/back.4bpp.lz"); const u32 gMonShinyPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/shiny.gbapal.lz"); const u8 gMonIcon_AegislashBlade[] = INCBIN_U8("graphics/pokemon/aegislash/blade/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AegislashBlade[] = INCBIN_COMP("graphics/pokemon/aegislash/blade/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AegislashBlade[] = INCBIN_COMP("graphics/pokemon/aegislash/blade/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_AegislashBlade[] = INCBIN_U32("graphics/pokemon/aegislash/blade/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_HONEDGE #if P_FAMILY_SPRITZEE @@ -15286,13 +15286,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Spritzee[] = INCBIN_U8("graphics/pokemon/spritzee/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Spritzee[] = INCBIN_COMP("graphics/pokemon/spritzee/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Spritzee[] = INCBIN_COMP("graphics/pokemon/spritzee/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Spritzee[] = INCBIN_U32("graphics/pokemon/spritzee/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/anim_front.4bpp.lz"); const u32 gMonPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/normal.gbapal.lz"); @@ -15302,13 +15302,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Aromatisse[] = INCBIN_U8("graphics/pokemon/aromatisse/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Aromatisse[] = INCBIN_COMP("graphics/pokemon/aromatisse/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Aromatisse[] = INCBIN_COMP("graphics/pokemon/aromatisse/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Aromatisse[] = INCBIN_U32("graphics/pokemon/aromatisse/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SPRITZEE #if P_FAMILY_SWIRLIX @@ -15320,13 +15320,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Swirlix[] = INCBIN_U8("graphics/pokemon/swirlix/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Swirlix[] = INCBIN_COMP("graphics/pokemon/swirlix/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Swirlix[] = INCBIN_COMP("graphics/pokemon/swirlix/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Swirlix[] = INCBIN_U32("graphics/pokemon/swirlix/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/anim_front.4bpp.lz"); const u32 gMonPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/normal.gbapal.lz"); @@ -15336,13 +15336,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Slurpuff[] = INCBIN_U8("graphics/pokemon/slurpuff/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Slurpuff[] = INCBIN_COMP("graphics/pokemon/slurpuff/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Slurpuff[] = INCBIN_COMP("graphics/pokemon/slurpuff/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Slurpuff[] = INCBIN_U32("graphics/pokemon/slurpuff/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SWIRLIX #if P_FAMILY_INKAY @@ -15354,13 +15354,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Inkay[] = INCBIN_U8("graphics/pokemon/inkay/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Inkay[] = INCBIN_COMP("graphics/pokemon/inkay/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Inkay[] = INCBIN_COMP("graphics/pokemon/inkay/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Inkay[] = INCBIN_U32("graphics/pokemon/inkay/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/anim_front.4bpp.lz"); const u32 gMonPalette_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/normal.gbapal.lz"); @@ -15370,13 +15370,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Malamar[] = INCBIN_U8("graphics/pokemon/malamar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Malamar[] = INCBIN_COMP("graphics/pokemon/malamar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Malamar[] = INCBIN_COMP("graphics/pokemon/malamar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Malamar[] = INCBIN_U32("graphics/pokemon/malamar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_INKAY #if P_FAMILY_BINACLE @@ -15388,13 +15388,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Binacle[] = INCBIN_U8("graphics/pokemon/binacle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Binacle[] = INCBIN_COMP("graphics/pokemon/binacle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Binacle[] = INCBIN_COMP("graphics/pokemon/binacle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Binacle[] = INCBIN_U32("graphics/pokemon/binacle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/anim_front.4bpp.lz"); const u32 gMonPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/normal.gbapal.lz"); @@ -15404,13 +15404,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Barbaracle[] = INCBIN_U8("graphics/pokemon/barbaracle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Barbaracle[] = INCBIN_COMP("graphics/pokemon/barbaracle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Barbaracle[] = INCBIN_COMP("graphics/pokemon/barbaracle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Barbaracle[] = INCBIN_U32("graphics/pokemon/barbaracle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BINACLE #if P_FAMILY_SKRELP @@ -15422,13 +15422,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Skrelp[] = INCBIN_U8("graphics/pokemon/skrelp/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Skrelp[] = INCBIN_COMP("graphics/pokemon/skrelp/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Skrelp[] = INCBIN_COMP("graphics/pokemon/skrelp/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Skrelp[] = INCBIN_U32("graphics/pokemon/skrelp/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/anim_front.4bpp.lz"); const u32 gMonPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/normal.gbapal.lz"); @@ -15438,13 +15438,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dragalge[] = INCBIN_U8("graphics/pokemon/dragalge/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dragalge[] = INCBIN_COMP("graphics/pokemon/dragalge/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dragalge[] = INCBIN_COMP("graphics/pokemon/dragalge/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dragalge[] = INCBIN_U32("graphics/pokemon/dragalge/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SKRELP #if P_FAMILY_CLAUNCHER @@ -15456,13 +15456,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Clauncher[] = INCBIN_U8("graphics/pokemon/clauncher/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Clauncher[] = INCBIN_COMP("graphics/pokemon/clauncher/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Clauncher[] = INCBIN_COMP("graphics/pokemon/clauncher/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Clauncher[] = INCBIN_U32("graphics/pokemon/clauncher/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/anim_front.4bpp.lz"); const u32 gMonPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/normal.gbapal.lz"); @@ -15472,13 +15472,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Clawitzer[] = INCBIN_U8("graphics/pokemon/clawitzer/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Clawitzer[] = INCBIN_COMP("graphics/pokemon/clawitzer/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Clawitzer[] = INCBIN_COMP("graphics/pokemon/clawitzer/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Clawitzer[] = INCBIN_U32("graphics/pokemon/clawitzer/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CLAUNCHER #if P_FAMILY_HELIOPTILE @@ -15490,13 +15490,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Helioptile[] = INCBIN_U8("graphics/pokemon/helioptile/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Helioptile[] = INCBIN_COMP("graphics/pokemon/helioptile/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Helioptile[] = INCBIN_COMP("graphics/pokemon/helioptile/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Helioptile[] = INCBIN_U32("graphics/pokemon/helioptile/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/anim_front.4bpp.lz"); const u32 gMonPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/normal.gbapal.lz"); @@ -15506,13 +15506,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Heliolisk[] = INCBIN_U8("graphics/pokemon/heliolisk/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Heliolisk[] = INCBIN_COMP("graphics/pokemon/heliolisk/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Heliolisk[] = INCBIN_COMP("graphics/pokemon/heliolisk/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Heliolisk[] = INCBIN_U32("graphics/pokemon/heliolisk/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_HELIOPTILE #if P_FAMILY_TYRUNT @@ -15524,13 +15524,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tyrunt[] = INCBIN_U8("graphics/pokemon/tyrunt/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tyrunt[] = INCBIN_COMP("graphics/pokemon/tyrunt/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tyrunt[] = INCBIN_COMP("graphics/pokemon/tyrunt/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tyrunt[] = INCBIN_U32("graphics/pokemon/tyrunt/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/anim_front.4bpp.lz"); const u32 gMonPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/normal.gbapal.lz"); @@ -15540,13 +15540,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tyrantrum[] = INCBIN_U8("graphics/pokemon/tyrantrum/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tyrantrum[] = INCBIN_COMP("graphics/pokemon/tyrantrum/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tyrantrum[] = INCBIN_COMP("graphics/pokemon/tyrantrum/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tyrantrum[] = INCBIN_U32("graphics/pokemon/tyrantrum/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TYRUNT #if P_FAMILY_AMAURA @@ -15558,13 +15558,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Amaura[] = INCBIN_U8("graphics/pokemon/amaura/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Amaura[] = INCBIN_COMP("graphics/pokemon/amaura/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Amaura[] = INCBIN_COMP("graphics/pokemon/amaura/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Amaura[] = INCBIN_U32("graphics/pokemon/amaura/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/anim_front.4bpp.lz"); const u32 gMonPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/normal.gbapal.lz"); @@ -15574,13 +15574,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Aurorus[] = INCBIN_U8("graphics/pokemon/aurorus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Aurorus[] = INCBIN_COMP("graphics/pokemon/aurorus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Aurorus[] = INCBIN_COMP("graphics/pokemon/aurorus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Aurorus[] = INCBIN_U32("graphics/pokemon/aurorus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_AMAURA #if P_FAMILY_HAWLUCHA @@ -15592,13 +15592,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hawlucha[] = INCBIN_U8("graphics/pokemon/hawlucha/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hawlucha[] = INCBIN_COMP("graphics/pokemon/hawlucha/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hawlucha[] = INCBIN_COMP("graphics/pokemon/hawlucha/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hawlucha[] = INCBIN_U32("graphics/pokemon/hawlucha/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_HAWLUCHA #if P_FAMILY_DEDENNE @@ -15610,13 +15610,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dedenne[] = INCBIN_U8("graphics/pokemon/dedenne/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dedenne[] = INCBIN_COMP("graphics/pokemon/dedenne/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dedenne[] = INCBIN_COMP("graphics/pokemon/dedenne/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dedenne[] = INCBIN_U32("graphics/pokemon/dedenne/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DEDENNE #if P_FAMILY_CARBINK @@ -15628,13 +15628,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Carbink[] = INCBIN_U8("graphics/pokemon/carbink/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Carbink[] = INCBIN_COMP("graphics/pokemon/carbink/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Carbink[] = INCBIN_COMP("graphics/pokemon/carbink/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Carbink[] = INCBIN_U32("graphics/pokemon/carbink/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CARBINK #if P_FAMILY_GOOMY @@ -15646,13 +15646,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Goomy[] = INCBIN_U8("graphics/pokemon/goomy/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Goomy[] = INCBIN_COMP("graphics/pokemon/goomy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Goomy[] = INCBIN_COMP("graphics/pokemon/goomy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Goomy[] = INCBIN_U32("graphics/pokemon/goomy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/anim_front.4bpp.lz"); const u32 gMonPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/normal.gbapal.lz"); @@ -15662,13 +15662,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sliggoo[] = INCBIN_U8("graphics/pokemon/sliggoo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sliggoo[] = INCBIN_COMP("graphics/pokemon/sliggoo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sliggoo[] = INCBIN_COMP("graphics/pokemon/sliggoo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sliggoo[] = INCBIN_U32("graphics/pokemon/sliggoo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/front.4bpp.lz"); @@ -15676,13 +15676,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_SliggooHisuian[] = INCBIN_COMP("graphics/pokemon/sliggoo/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_SliggooHisuian[] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_SliggooHisuian[] = INCBIN_COMP("graphics/pokemon/sliggoo/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS const u32 gMonFrontPic_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/anim_front.4bpp.lz"); @@ -15693,13 +15693,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Goodra[] = INCBIN_U8("graphics/pokemon/goodra/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Goodra[] = INCBIN_COMP("graphics/pokemon/goodra/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Goodra[] = INCBIN_COMP("graphics/pokemon/goodra/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Goodra[] = INCBIN_U32("graphics/pokemon/goodra/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/front.4bpp.lz"); @@ -15707,13 +15707,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_GoodraHisuian[] = INCBIN_COMP("graphics/pokemon/goodra/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_GoodraHisuian[] = INCBIN_U32("graphics/pokemon/goodra/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_GoodraHisuian[] = INCBIN_COMP("graphics/pokemon/goodra/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_GOOMY @@ -15726,13 +15726,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Klefki[] = INCBIN_U8("graphics/pokemon/klefki/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Klefki[] = INCBIN_COMP("graphics/pokemon/klefki/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Klefki[] = INCBIN_COMP("graphics/pokemon/klefki/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Klefki[] = INCBIN_U32("graphics/pokemon/klefki/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_KLEFKI #if P_FAMILY_PHANTUMP @@ -15744,13 +15744,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Phantump[] = INCBIN_U8("graphics/pokemon/phantump/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Phantump[] = INCBIN_COMP("graphics/pokemon/phantump/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Phantump[] = INCBIN_COMP("graphics/pokemon/phantump/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Phantump[] = INCBIN_U32("graphics/pokemon/phantump/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/anim_front.4bpp.lz"); const u32 gMonPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/normal.gbapal.lz"); @@ -15760,13 +15760,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Trevenant[] = INCBIN_U8("graphics/pokemon/trevenant/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Trevenant[] = INCBIN_COMP("graphics/pokemon/trevenant/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Trevenant[] = INCBIN_COMP("graphics/pokemon/trevenant/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Trevenant[] = INCBIN_U32("graphics/pokemon/trevenant/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PHANTUMP #if P_FAMILY_PUMPKABOO @@ -15789,17 +15789,17 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonFrontPic_PumpkabooSuper[] = INCBIN_U32("graphics/pokemon/pumpkaboo/super/anim_front.4bpp.lz"); const u32 gMonBackPic_PumpkabooSuper[] = INCBIN_U32("graphics/pokemon/pumpkaboo/super/back.4bpp.lz"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pumpkaboo[] = INCBIN_U32("graphics/pokemon/pumpkaboo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_PumpkabooAverage[] = INCBIN_COMP("graphics/pokemon/pumpkaboo/follower.4bpp"); - // const u32 gObjectEventPic_PumpkabooSmall[] = INCBIN_COMP("graphics/pokemon/pumpkaboo/small/follower.4bpp"); - // const u32 gObjectEventPic_PumpkabooLarge[] = INCBIN_COMP("graphics/pokemon/pumpkaboo/large/follower.4bpp"); - // const u32 gObjectEventPic_PumpkabooSuper[] = INCBIN_COMP("graphics/pokemon/pumpkaboo/super/follower.4bpp"); -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_PumpkabooAverage[] = INCBIN_COMP("graphics/pokemon/pumpkaboo/overworld.4bpp"); + // const u32 gObjectEventPic_PumpkabooSmall[] = INCBIN_COMP("graphics/pokemon/pumpkaboo/small/overworld.4bpp"); + // const u32 gObjectEventPic_PumpkabooLarge[] = INCBIN_COMP("graphics/pokemon/pumpkaboo/large/overworld.4bpp"); + // const u32 gObjectEventPic_PumpkabooSuper[] = INCBIN_COMP("graphics/pokemon/pumpkaboo/super/overworld.4bpp"); +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/normal.gbapal.lz"); const u32 gMonShinyPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/shiny.gbapal.lz"); @@ -15820,17 +15820,17 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonFrontPic_GourgeistSuper[] = INCBIN_U32("graphics/pokemon/gourgeist/super/anim_front.4bpp.lz"); const u32 gMonBackPic_GourgeistSuper[] = INCBIN_U32("graphics/pokemon/gourgeist/super/back.4bpp.lz"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gourgeist[] = INCBIN_U32("graphics/pokemon/gourgeist/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_GourgeistAverage[] = INCBIN_COMP("graphics/pokemon/gourgeist/follower.4bpp"); - // const u32 gObjectEventPic_GourgeistSmall[] = INCBIN_COMP("graphics/pokemon/gourgeist/small/follower.4bpp"); - // const u32 gObjectEventPic_GourgeistLarge[] = INCBIN_COMP("graphics/pokemon/gourgeist/large/follower.4bpp"); - // const u32 gObjectEventPic_GourgeistSuper[] = INCBIN_COMP("graphics/pokemon/gourgeist/super/follower.4bpp"); -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_GourgeistAverage[] = INCBIN_COMP("graphics/pokemon/gourgeist/overworld.4bpp"); + // const u32 gObjectEventPic_GourgeistSmall[] = INCBIN_COMP("graphics/pokemon/gourgeist/small/overworld.4bpp"); + // const u32 gObjectEventPic_GourgeistLarge[] = INCBIN_COMP("graphics/pokemon/gourgeist/large/overworld.4bpp"); + // const u32 gObjectEventPic_GourgeistSuper[] = INCBIN_COMP("graphics/pokemon/gourgeist/super/overworld.4bpp"); +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PUMPKABOO #if P_FAMILY_BERGMITE @@ -15842,13 +15842,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bergmite[] = INCBIN_U8("graphics/pokemon/bergmite/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bergmite[] = INCBIN_COMP("graphics/pokemon/bergmite/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bergmite[] = INCBIN_COMP("graphics/pokemon/bergmite/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bergmite[] = INCBIN_U32("graphics/pokemon/bergmite/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/anim_front.4bpp.lz"); const u32 gMonPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/normal.gbapal.lz"); @@ -15858,13 +15858,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Avalugg[] = INCBIN_U8("graphics/pokemon/avalugg/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Avalugg[] = INCBIN_COMP("graphics/pokemon/avalugg/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Avalugg[] = INCBIN_COMP("graphics/pokemon/avalugg/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Avalugg[] = INCBIN_U32("graphics/pokemon/avalugg/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/front.4bpp.lz"); @@ -15872,13 +15872,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_AvaluggHisuian[] = INCBIN_COMP("graphics/pokemon/avalugg/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_AvaluggHisuian[] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_AvaluggHisuian[] = INCBIN_COMP("graphics/pokemon/avalugg/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_BERGMITE @@ -15891,13 +15891,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Noibat[] = INCBIN_U8("graphics/pokemon/noibat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Noibat[] = INCBIN_COMP("graphics/pokemon/noibat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Noibat[] = INCBIN_COMP("graphics/pokemon/noibat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Noibat[] = INCBIN_U32("graphics/pokemon/noibat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/anim_front.4bpp.lz"); const u32 gMonPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/normal.gbapal.lz"); @@ -15907,13 +15907,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Noivern[] = INCBIN_U8("graphics/pokemon/noivern/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Noivern[] = INCBIN_COMP("graphics/pokemon/noivern/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Noivern[] = INCBIN_COMP("graphics/pokemon/noivern/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Noivern[] = INCBIN_U32("graphics/pokemon/noivern/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_NOIBAT #if P_FAMILY_XERNEAS @@ -15925,26 +15925,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Xerneas[] = INCBIN_U8("graphics/pokemon/xerneas/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_XerneasNeutral[] = INCBIN_COMP("graphics/pokemon/xerneas/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_XerneasNeutral[] = INCBIN_COMP("graphics/pokemon/xerneas/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_XerneasNeutral[] = INCBIN_U32("graphics/pokemon/xerneas/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/anim_front.4bpp.lz"); const u32 gMonPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/normal.gbapal.lz"); const u32 gMonBackPic_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/back.4bpp.lz"); const u32 gMonShinyPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/shiny.gbapal.lz"); const u8 gMonIcon_XerneasActive[] = INCBIN_U8("graphics/pokemon/xerneas/active/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_XerneasActive[] = INCBIN_COMP("graphics/pokemon/xerneas/active/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_XerneasActive[] = INCBIN_COMP("graphics/pokemon/xerneas/active/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_XerneasActive[] = INCBIN_U32("graphics/pokemon/xerneas/active/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_XERNEAS #if P_FAMILY_YVELTAL @@ -15956,13 +15956,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Yveltal[] = INCBIN_U8("graphics/pokemon/yveltal/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Yveltal[] = INCBIN_COMP("graphics/pokemon/yveltal/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Yveltal[] = INCBIN_COMP("graphics/pokemon/yveltal/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Yveltal[] = INCBIN_U32("graphics/pokemon/yveltal/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_YVELTAL #if P_FAMILY_ZYGARDE @@ -15975,39 +15975,39 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u8 gMonFootprint_Zygarde[] = INCBIN_U8("graphics/pokemon/zygarde/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zygarde50[] = INCBIN_COMP("graphics/pokemon/zygarde/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zygarde50[] = INCBIN_COMP("graphics/pokemon/zygarde/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zygarde50[] = INCBIN_U32("graphics/pokemon/zygarde/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/anim_front.4bpp.lz"); const u32 gMonPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/normal.gbapal.lz"); const u32 gMonBackPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/back.4bpp.lz"); const u32 gMonShinyPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/shiny.gbapal.lz"); const u8 gMonIcon_Zygarde10[] = INCBIN_U8("graphics/pokemon/zygarde/10_percent/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - //const u32 gObjectEventPic_Zygarde10[] = INCBIN_COMP("graphics/pokemon/zygarde/10_percent/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - //const u32 gFollowerPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/follow_normal.gbapal.lz"); - //const u32 gShinyFollowerPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + //const u32 gObjectEventPic_Zygarde10[] = INCBIN_COMP("graphics/pokemon/zygarde/10_percent/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + //const u32 gOverworldPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/overworld_normal.gbapal.lz"); + //const u32 gShinyOverworldPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_percent/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/anim_front.4bpp.lz"); const u32 gMonPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/normal.gbapal.lz"); const u32 gMonBackPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/back.4bpp.lz"); const u32 gMonShinyPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/shiny.gbapal.lz"); const u8 gMonIcon_ZygardeComplete[] = INCBIN_U8("graphics/pokemon/zygarde/complete/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - //const u32 gObjectEventPic_ZygardeComplete[] = INCBIN_COMP("graphics/pokemon/zygarde/complete/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - //const u32 gFollowerPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/follow_normal.gbapal.lz"); - //const u32 gShinyFollowerPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + //const u32 gObjectEventPic_ZygardeComplete[] = INCBIN_COMP("graphics/pokemon/zygarde/complete/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + //const u32 gOverworldPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/overworld_normal.gbapal.lz"); + //const u32 gShinyOverworldPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ZYGARDE #if P_FAMILY_DIANCIE @@ -16019,13 +16019,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Diancie[] = INCBIN_U8("graphics/pokemon/diancie/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Diancie[] = INCBIN_COMP("graphics/pokemon/diancie/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Diancie[] = INCBIN_COMP("graphics/pokemon/diancie/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Diancie[] = INCBIN_U32("graphics/pokemon/diancie/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_MEGA_EVOLUTIONS const u32 gMonFrontPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/front.4bpp.lz"); @@ -16033,13 +16033,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/back.4bpp.lz"); const u32 gMonShinyPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/shiny.gbapal.lz"); const u8 gMonIcon_DiancieMega[] = INCBIN_U8("graphics/pokemon/diancie/mega/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_DiancieMega[] = INCBIN_COMP("graphics/pokemon/diancie/mega/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_DiancieMega[] = INCBIN_COMP("graphics/pokemon/diancie/mega/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_DiancieMega[] = INCBIN_U32("graphics/pokemon/diancie/mega/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_DIANCIE @@ -16052,26 +16052,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hoopa[] = INCBIN_U8("graphics/pokemon/hoopa/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_HoopaConfined[] = INCBIN_COMP("graphics/pokemon/hoopa/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_HoopaConfined[] = INCBIN_COMP("graphics/pokemon/hoopa/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_HoopaConfined[] = INCBIN_U32("graphics/pokemon/hoopa/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/anim_front.4bpp.lz"); const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/normal.gbapal.lz"); const u32 gMonBackPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/back.4bpp.lz"); const u32 gMonShinyPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/shiny.gbapal.lz"); const u8 gMonIcon_HoopaUnbound[] = INCBIN_U8("graphics/pokemon/hoopa/unbound/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_HoopaUnbound[] = INCBIN_COMP("graphics/pokemon/hoopa/unbound/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_HoopaUnbound[] = INCBIN_COMP("graphics/pokemon/hoopa/unbound/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_HOOPA #if P_FAMILY_VOLCANION @@ -16083,13 +16083,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Volcanion[] = INCBIN_U8("graphics/pokemon/volcanion/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Volcanion[] = INCBIN_COMP("graphics/pokemon/volcanion/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Volcanion[] = INCBIN_COMP("graphics/pokemon/volcanion/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Volcanion[] = INCBIN_U32("graphics/pokemon/volcanion/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_VOLCANION #if P_FAMILY_ROWLET @@ -16101,13 +16101,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rowlet[] = INCBIN_U8("graphics/pokemon/rowlet/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rowlet[] = INCBIN_COMP("graphics/pokemon/rowlet/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rowlet[] = INCBIN_COMP("graphics/pokemon/rowlet/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rowlet[] = INCBIN_U32("graphics/pokemon/rowlet/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/anim_front.4bpp.lz"); const u32 gMonPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/normal.gbapal.lz"); @@ -16117,13 +16117,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dartrix[] = INCBIN_U8("graphics/pokemon/dartrix/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dartrix[] = INCBIN_COMP("graphics/pokemon/dartrix/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dartrix[] = INCBIN_COMP("graphics/pokemon/dartrix/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dartrix[] = INCBIN_U32("graphics/pokemon/dartrix/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/anim_front.4bpp.lz"); const u32 gMonPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/normal.gbapal.lz"); @@ -16133,13 +16133,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Decidueye[] = INCBIN_U8("graphics/pokemon/decidueye/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Decidueye[] = INCBIN_COMP("graphics/pokemon/decidueye/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Decidueye[] = INCBIN_COMP("graphics/pokemon/decidueye/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Decidueye[] = INCBIN_U32("graphics/pokemon/decidueye/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_HISUIAN_FORMS const u32 gMonFrontPic_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz"); @@ -16147,13 +16147,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_DecidueyeHisuian[] = INCBIN_COMP("graphics/pokemon/decidueye/hisuian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_DecidueyeHisuian[] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_DecidueyeHisuian[] = INCBIN_COMP("graphics/pokemon/decidueye/hisuian/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_HISUIAN_FORMS #endif //P_FAMILY_ROWLET @@ -16166,13 +16166,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Litten[] = INCBIN_U8("graphics/pokemon/litten/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Litten[] = INCBIN_COMP("graphics/pokemon/litten/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Litten[] = INCBIN_U32("graphics/pokemon/litten/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Litten[] = INCBIN_U32("graphics/pokemon/litten/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Litten[] = INCBIN_COMP("graphics/pokemon/litten/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Litten[] = INCBIN_U32("graphics/pokemon/litten/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Litten[] = INCBIN_U32("graphics/pokemon/litten/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/front.4bpp.lz"); const u32 gMonPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/normal.gbapal.lz"); @@ -16182,13 +16182,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Torracat[] = INCBIN_U8("graphics/pokemon/torracat/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Torracat[] = INCBIN_COMP("graphics/pokemon/torracat/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Torracat[] = INCBIN_COMP("graphics/pokemon/torracat/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Torracat[] = INCBIN_U32("graphics/pokemon/torracat/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/front.4bpp.lz"); const u32 gMonPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/normal.gbapal.lz"); @@ -16198,13 +16198,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Incineroar[] = INCBIN_U8("graphics/pokemon/incineroar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Incineroar[] = INCBIN_COMP("graphics/pokemon/incineroar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Incineroar[] = INCBIN_COMP("graphics/pokemon/incineroar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Incineroar[] = INCBIN_U32("graphics/pokemon/incineroar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LITTEN #if P_FAMILY_POPPLIO @@ -16216,13 +16216,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Popplio[] = INCBIN_U8("graphics/pokemon/popplio/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Popplio[] = INCBIN_COMP("graphics/pokemon/popplio/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Popplio[] = INCBIN_COMP("graphics/pokemon/popplio/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Popplio[] = INCBIN_U32("graphics/pokemon/popplio/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/front.4bpp.lz"); const u32 gMonPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/normal.gbapal.lz"); @@ -16232,13 +16232,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Brionne[] = INCBIN_U8("graphics/pokemon/brionne/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Brionne[] = INCBIN_COMP("graphics/pokemon/brionne/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Brionne[] = INCBIN_COMP("graphics/pokemon/brionne/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Brionne[] = INCBIN_U32("graphics/pokemon/brionne/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/front.4bpp.lz"); const u32 gMonPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/normal.gbapal.lz"); @@ -16248,13 +16248,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Primarina[] = INCBIN_U8("graphics/pokemon/primarina/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Primarina[] = INCBIN_COMP("graphics/pokemon/primarina/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Primarina[] = INCBIN_COMP("graphics/pokemon/primarina/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Primarina[] = INCBIN_U32("graphics/pokemon/primarina/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_POPPLIO #if P_FAMILY_PIKIPEK @@ -16266,13 +16266,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pikipek[] = INCBIN_U8("graphics/pokemon/pikipek/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pikipek[] = INCBIN_COMP("graphics/pokemon/pikipek/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pikipek[] = INCBIN_COMP("graphics/pokemon/pikipek/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pikipek[] = INCBIN_U32("graphics/pokemon/pikipek/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/anim_front.4bpp.lz"); const u32 gMonPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/normal.gbapal.lz"); @@ -16282,13 +16282,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Trumbeak[] = INCBIN_U8("graphics/pokemon/trumbeak/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Trumbeak[] = INCBIN_COMP("graphics/pokemon/trumbeak/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Trumbeak[] = INCBIN_COMP("graphics/pokemon/trumbeak/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Trumbeak[] = INCBIN_U32("graphics/pokemon/trumbeak/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/anim_front.4bpp.lz"); const u32 gMonPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/normal.gbapal.lz"); @@ -16298,13 +16298,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Toucannon[] = INCBIN_U8("graphics/pokemon/toucannon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Toucannon[] = INCBIN_COMP("graphics/pokemon/toucannon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Toucannon[] = INCBIN_COMP("graphics/pokemon/toucannon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Toucannon[] = INCBIN_U32("graphics/pokemon/toucannon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PIKIPEK #if P_FAMILY_YUNGOOS @@ -16316,13 +16316,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Yungoos[] = INCBIN_U8("graphics/pokemon/yungoos/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Yungoos[] = INCBIN_COMP("graphics/pokemon/yungoos/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Yungoos[] = INCBIN_COMP("graphics/pokemon/yungoos/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Yungoos[] = INCBIN_U32("graphics/pokemon/yungoos/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/front.4bpp.lz"); const u32 gMonPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/normal.gbapal.lz"); @@ -16332,13 +16332,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gumshoos[] = INCBIN_U8("graphics/pokemon/gumshoos/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gumshoos[] = INCBIN_COMP("graphics/pokemon/gumshoos/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gumshoos[] = INCBIN_COMP("graphics/pokemon/gumshoos/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gumshoos[] = INCBIN_U32("graphics/pokemon/gumshoos/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_YUNGOOS #if P_FAMILY_GRUBBIN @@ -16350,13 +16350,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Grubbin[] = INCBIN_U8("graphics/pokemon/grubbin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Grubbin[] = INCBIN_COMP("graphics/pokemon/grubbin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Grubbin[] = INCBIN_COMP("graphics/pokemon/grubbin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Grubbin[] = INCBIN_U32("graphics/pokemon/grubbin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/anim_front.4bpp.lz"); const u32 gMonPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/normal.gbapal.lz"); @@ -16366,13 +16366,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Charjabug[] = INCBIN_U8("graphics/pokemon/charjabug/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Charjabug[] = INCBIN_COMP("graphics/pokemon/charjabug/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Charjabug[] = INCBIN_COMP("graphics/pokemon/charjabug/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Charjabug[] = INCBIN_U32("graphics/pokemon/charjabug/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/anim_front.4bpp.lz"); const u32 gMonPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/normal.gbapal.lz"); @@ -16382,13 +16382,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Vikavolt[] = INCBIN_U8("graphics/pokemon/vikavolt/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Vikavolt[] = INCBIN_COMP("graphics/pokemon/vikavolt/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Vikavolt[] = INCBIN_COMP("graphics/pokemon/vikavolt/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Vikavolt[] = INCBIN_U32("graphics/pokemon/vikavolt/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GRUBBIN #if P_FAMILY_CRABRAWLER @@ -16400,13 +16400,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Crabrawler[] = INCBIN_U8("graphics/pokemon/crabrawler/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Crabrawler[] = INCBIN_COMP("graphics/pokemon/crabrawler/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Crabrawler[] = INCBIN_COMP("graphics/pokemon/crabrawler/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Crabrawler[] = INCBIN_U32("graphics/pokemon/crabrawler/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/front.4bpp.lz"); const u32 gMonPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/normal.gbapal.lz"); @@ -16416,13 +16416,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Crabominable[] = INCBIN_U8("graphics/pokemon/crabominable/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Crabominable[] = INCBIN_COMP("graphics/pokemon/crabominable/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Crabominable[] = INCBIN_COMP("graphics/pokemon/crabominable/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Crabominable[] = INCBIN_U32("graphics/pokemon/crabominable/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CRABRAWLER #if P_FAMILY_ORICORIO @@ -16434,52 +16434,52 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Oricorio[] = INCBIN_U8("graphics/pokemon/oricorio/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_OricorioBaile[] = INCBIN_COMP("graphics/pokemon/oricorio/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_OricorioBaile[] = INCBIN_COMP("graphics/pokemon/oricorio/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_OricorioBaile[] = INCBIN_U32("graphics/pokemon/oricorio/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/front.4bpp.lz"); const u32 gMonPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/normal.gbapal.lz"); const u32 gMonBackPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/back.4bpp.lz"); const u32 gMonShinyPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/shiny.gbapal.lz"); const u8 gMonIcon_OricorioPomPom[] = INCBIN_U8("graphics/pokemon/oricorio/pom_pom/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_OricorioPomPom[] = INCBIN_COMP("graphics/pokemon/oricorio/pom_pom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_OricorioPomPom[] = INCBIN_COMP("graphics/pokemon/oricorio/pom_pom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/front.4bpp.lz"); const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/normal.gbapal.lz"); const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/back.4bpp.lz"); const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/shiny.gbapal.lz"); const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/oricorio/pau/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_OricorioPau[] = INCBIN_COMP("graphics/pokemon/oricorio/pau/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_OricorioPau[] = INCBIN_COMP("graphics/pokemon/oricorio/pau/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/front.4bpp.lz"); const u32 gMonPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/normal.gbapal.lz"); const u32 gMonBackPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/back.4bpp.lz"); const u32 gMonShinyPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/shiny.gbapal.lz"); const u8 gMonIcon_OricorioSensu[] = INCBIN_U8("graphics/pokemon/oricorio/sensu/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_OricorioSensu[] = INCBIN_COMP("graphics/pokemon/oricorio/sensu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_OricorioSensu[] = INCBIN_COMP("graphics/pokemon/oricorio/sensu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ORICORIO #if P_FAMILY_CUTIEFLY @@ -16491,13 +16491,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cutiefly[] = INCBIN_U8("graphics/pokemon/cutiefly/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cutiefly[] = INCBIN_COMP("graphics/pokemon/cutiefly/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cutiefly[] = INCBIN_COMP("graphics/pokemon/cutiefly/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cutiefly[] = INCBIN_U32("graphics/pokemon/cutiefly/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/anim_front.4bpp.lz"); const u32 gMonPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/normal.gbapal.lz"); @@ -16507,13 +16507,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ribombee[] = INCBIN_U8("graphics/pokemon/ribombee/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Ribombee[] = INCBIN_COMP("graphics/pokemon/ribombee/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Ribombee[] = INCBIN_COMP("graphics/pokemon/ribombee/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Ribombee[] = INCBIN_U32("graphics/pokemon/ribombee/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CUTIEFLY #if P_FAMILY_ROCKRUFF @@ -16525,13 +16525,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rockruff[] = INCBIN_U8("graphics/pokemon/rockruff/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rockruff[] = INCBIN_COMP("graphics/pokemon/rockruff/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rockruff[] = INCBIN_COMP("graphics/pokemon/rockruff/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rockruff[] = INCBIN_U32("graphics/pokemon/rockruff/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/anim_front.4bpp.lz"); const u32 gMonPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/normal.gbapal.lz"); @@ -16541,39 +16541,39 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lycanroc[] = INCBIN_U8("graphics/pokemon/lycanroc/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_LycanrocMidday[] = INCBIN_COMP("graphics/pokemon/lycanroc/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_LycanrocMidday[] = INCBIN_COMP("graphics/pokemon/lycanroc/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_LycanrocMidday[] = INCBIN_U32("graphics/pokemon/lycanroc/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/anim_front.4bpp.lz"); const u32 gMonPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/normal.gbapal.lz"); const u32 gMonBackPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/back.4bpp.lz"); const u32 gMonShinyPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/shiny.gbapal.lz"); const u8 gMonIcon_LycanrocMidnight[] = INCBIN_U8("graphics/pokemon/lycanroc/midnight/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_LycanrocMidnight[] = INCBIN_COMP("graphics/pokemon/lycanroc/midnight/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_LycanrocMidnight[] = INCBIN_COMP("graphics/pokemon/lycanroc/midnight/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/anim_front.4bpp.lz"); const u32 gMonPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/normal.gbapal.lz"); const u32 gMonBackPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/back.4bpp.lz"); const u32 gMonShinyPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/shiny.gbapal.lz"); const u8 gMonIcon_LycanrocDusk[] = INCBIN_U8("graphics/pokemon/lycanroc/dusk/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_LycanrocDusk[] = INCBIN_COMP("graphics/pokemon/lycanroc/dusk/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_LycanrocDusk[] = INCBIN_COMP("graphics/pokemon/lycanroc/dusk/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ROCKRUFF #if P_FAMILY_WISHIWASHI @@ -16585,26 +16585,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wishiwashi[] = INCBIN_U8("graphics/pokemon/wishiwashi/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_WishiwashiSolo[] = INCBIN_COMP("graphics/pokemon/wishiwashi/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_WishiwashiSolo[] = INCBIN_COMP("graphics/pokemon/wishiwashi/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_WishiwashiSolo[] = INCBIN_U32("graphics/pokemon/wishiwashi/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/front.4bpp.lz"); const u32 gMonPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/normal.gbapal.lz"); const u32 gMonBackPic_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/back.4bpp.lz"); const u32 gMonShinyPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/shiny.gbapal.lz"); const u8 gMonIcon_WishiwashiSchool[] = INCBIN_U8("graphics/pokemon/wishiwashi/school/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_WishiwashiSchool[] = INCBIN_COMP("graphics/pokemon/wishiwashi/school/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_WishiwashiSchool[] = INCBIN_COMP("graphics/pokemon/wishiwashi/school/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_WishiwashiSchool[] = INCBIN_U32("graphics/pokemon/wishiwashi/school/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WISHIWASHI #if P_FAMILY_MAREANIE @@ -16616,13 +16616,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mareanie[] = INCBIN_U8("graphics/pokemon/mareanie/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mareanie[] = INCBIN_COMP("graphics/pokemon/mareanie/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mareanie[] = INCBIN_COMP("graphics/pokemon/mareanie/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mareanie[] = INCBIN_U32("graphics/pokemon/mareanie/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/front.4bpp.lz"); const u32 gMonPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/normal.gbapal.lz"); @@ -16632,13 +16632,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Toxapex[] = INCBIN_U8("graphics/pokemon/toxapex/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Toxapex[] = INCBIN_COMP("graphics/pokemon/toxapex/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Toxapex[] = INCBIN_COMP("graphics/pokemon/toxapex/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Toxapex[] = INCBIN_U32("graphics/pokemon/toxapex/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MAREANIE #if P_FAMILY_MUDBRAY @@ -16650,13 +16650,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mudbray[] = INCBIN_U8("graphics/pokemon/mudbray/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mudbray[] = INCBIN_COMP("graphics/pokemon/mudbray/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mudbray[] = INCBIN_COMP("graphics/pokemon/mudbray/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mudbray[] = INCBIN_U32("graphics/pokemon/mudbray/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/front.4bpp.lz"); const u32 gMonPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/normal.gbapal.lz"); @@ -16666,13 +16666,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mudsdale[] = INCBIN_U8("graphics/pokemon/mudsdale/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Mudsdale[] = INCBIN_COMP("graphics/pokemon/mudsdale/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Mudsdale[] = INCBIN_COMP("graphics/pokemon/mudsdale/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Mudsdale[] = INCBIN_U32("graphics/pokemon/mudsdale/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MUDBRAY #if P_FAMILY_DEWPIDER @@ -16684,13 +16684,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dewpider[] = INCBIN_U8("graphics/pokemon/dewpider/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dewpider[] = INCBIN_COMP("graphics/pokemon/dewpider/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dewpider[] = INCBIN_COMP("graphics/pokemon/dewpider/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dewpider[] = INCBIN_U32("graphics/pokemon/dewpider/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/anim_front.4bpp.lz"); const u32 gMonPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/normal.gbapal.lz"); @@ -16700,13 +16700,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Araquanid[] = INCBIN_U8("graphics/pokemon/araquanid/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Araquanid[] = INCBIN_COMP("graphics/pokemon/araquanid/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Araquanid[] = INCBIN_COMP("graphics/pokemon/araquanid/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Araquanid[] = INCBIN_U32("graphics/pokemon/araquanid/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DEWPIDER #if P_FAMILY_FOMANTIS @@ -16718,13 +16718,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Fomantis[] = INCBIN_U8("graphics/pokemon/fomantis/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Fomantis[] = INCBIN_COMP("graphics/pokemon/fomantis/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Fomantis[] = INCBIN_COMP("graphics/pokemon/fomantis/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Fomantis[] = INCBIN_U32("graphics/pokemon/fomantis/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/front.4bpp.lz"); const u32 gMonPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/normal.gbapal.lz"); @@ -16734,13 +16734,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lurantis[] = INCBIN_U8("graphics/pokemon/lurantis/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lurantis[] = INCBIN_COMP("graphics/pokemon/lurantis/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lurantis[] = INCBIN_COMP("graphics/pokemon/lurantis/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lurantis[] = INCBIN_U32("graphics/pokemon/lurantis/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FOMANTIS #if P_FAMILY_MORELULL @@ -16752,13 +16752,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Morelull[] = INCBIN_U8("graphics/pokemon/morelull/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Morelull[] = INCBIN_COMP("graphics/pokemon/morelull/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Morelull[] = INCBIN_COMP("graphics/pokemon/morelull/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Morelull[] = INCBIN_U32("graphics/pokemon/morelull/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/front.4bpp.lz"); const u32 gMonPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/normal.gbapal.lz"); @@ -16768,13 +16768,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shiinotic[] = INCBIN_U8("graphics/pokemon/shiinotic/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Shiinotic[] = INCBIN_COMP("graphics/pokemon/shiinotic/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Shiinotic[] = INCBIN_COMP("graphics/pokemon/shiinotic/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Shiinotic[] = INCBIN_U32("graphics/pokemon/shiinotic/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MORELULL #if P_FAMILY_SALANDIT @@ -16786,13 +16786,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Salandit[] = INCBIN_U8("graphics/pokemon/salandit/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Salandit[] = INCBIN_COMP("graphics/pokemon/salandit/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Salandit[] = INCBIN_COMP("graphics/pokemon/salandit/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Salandit[] = INCBIN_U32("graphics/pokemon/salandit/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/anim_front.4bpp.lz"); const u32 gMonPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/normal.gbapal.lz"); @@ -16802,13 +16802,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Salazzle[] = INCBIN_U8("graphics/pokemon/salazzle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Salazzle[] = INCBIN_COMP("graphics/pokemon/salazzle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Salazzle[] = INCBIN_COMP("graphics/pokemon/salazzle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Salazzle[] = INCBIN_U32("graphics/pokemon/salazzle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SALANDIT #if P_FAMILY_STUFFUL @@ -16820,13 +16820,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Stufful[] = INCBIN_U8("graphics/pokemon/stufful/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Stufful[] = INCBIN_COMP("graphics/pokemon/stufful/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Stufful[] = INCBIN_COMP("graphics/pokemon/stufful/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Stufful[] = INCBIN_U32("graphics/pokemon/stufful/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/anim_front.4bpp.lz"); const u32 gMonPalette_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/normal.gbapal.lz"); @@ -16836,13 +16836,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bewear[] = INCBIN_U8("graphics/pokemon/bewear/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bewear[] = INCBIN_COMP("graphics/pokemon/bewear/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bewear[] = INCBIN_COMP("graphics/pokemon/bewear/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bewear[] = INCBIN_U32("graphics/pokemon/bewear/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_STUFFUL #if P_FAMILY_BOUNSWEET @@ -16854,13 +16854,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bounsweet[] = INCBIN_U8("graphics/pokemon/bounsweet/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bounsweet[] = INCBIN_COMP("graphics/pokemon/bounsweet/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bounsweet[] = INCBIN_COMP("graphics/pokemon/bounsweet/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bounsweet[] = INCBIN_U32("graphics/pokemon/bounsweet/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/front.4bpp.lz"); const u32 gMonPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/normal.gbapal.lz"); @@ -16870,13 +16870,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Steenee[] = INCBIN_U8("graphics/pokemon/steenee/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Steenee[] = INCBIN_COMP("graphics/pokemon/steenee/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Steenee[] = INCBIN_COMP("graphics/pokemon/steenee/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Steenee[] = INCBIN_U32("graphics/pokemon/steenee/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/front.4bpp.lz"); const u32 gMonPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/normal.gbapal.lz"); @@ -16886,13 +16886,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tsareena[] = INCBIN_U8("graphics/pokemon/tsareena/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Tsareena[] = INCBIN_COMP("graphics/pokemon/tsareena/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Tsareena[] = INCBIN_COMP("graphics/pokemon/tsareena/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Tsareena[] = INCBIN_U32("graphics/pokemon/tsareena/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BOUNSWEET #if P_FAMILY_COMFEY @@ -16904,13 +16904,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Comfey[] = INCBIN_U8("graphics/pokemon/comfey/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Comfey[] = INCBIN_COMP("graphics/pokemon/comfey/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Comfey[] = INCBIN_COMP("graphics/pokemon/comfey/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Comfey[] = INCBIN_U32("graphics/pokemon/comfey/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_COMFEY #if P_FAMILY_ORANGURU @@ -16922,13 +16922,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Oranguru[] = INCBIN_U8("graphics/pokemon/oranguru/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Oranguru[] = INCBIN_COMP("graphics/pokemon/oranguru/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Oranguru[] = INCBIN_COMP("graphics/pokemon/oranguru/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Oranguru[] = INCBIN_U32("graphics/pokemon/oranguru/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ORANGURU #if P_FAMILY_PASSIMIAN @@ -16940,13 +16940,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Passimian[] = INCBIN_U8("graphics/pokemon/passimian/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Passimian[] = INCBIN_COMP("graphics/pokemon/passimian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Passimian[] = INCBIN_COMP("graphics/pokemon/passimian/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Passimian[] = INCBIN_U32("graphics/pokemon/passimian/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PASSIMIAN #if P_FAMILY_WIMPOD @@ -16958,13 +16958,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wimpod[] = INCBIN_U8("graphics/pokemon/wimpod/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wimpod[] = INCBIN_COMP("graphics/pokemon/wimpod/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wimpod[] = INCBIN_COMP("graphics/pokemon/wimpod/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wimpod[] = INCBIN_U32("graphics/pokemon/wimpod/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/anim_front.4bpp.lz"); const u32 gMonPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/normal.gbapal.lz"); @@ -16974,13 +16974,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Golisopod[] = INCBIN_U8("graphics/pokemon/golisopod/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Golisopod[] = INCBIN_COMP("graphics/pokemon/golisopod/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Golisopod[] = INCBIN_COMP("graphics/pokemon/golisopod/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WIMPOD #if P_FAMILY_SANDYGAST @@ -16992,13 +16992,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sandygast[] = INCBIN_U8("graphics/pokemon/sandygast/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sandygast[] = INCBIN_COMP("graphics/pokemon/sandygast/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sandygast[] = INCBIN_COMP("graphics/pokemon/sandygast/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/front.4bpp.lz"); const u32 gMonPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/normal.gbapal.lz"); @@ -17008,13 +17008,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Palossand[] = INCBIN_COMP("graphics/pokemon/palossand/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Palossand[] = INCBIN_COMP("graphics/pokemon/palossand/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SANDYGAST #if P_FAMILY_PYUKUMUKU @@ -17026,13 +17026,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pyukumuku[] = INCBIN_COMP("graphics/pokemon/pyukumuku/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pyukumuku[] = INCBIN_COMP("graphics/pokemon/pyukumuku/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PYUKUMUKU #if P_FAMILY_TYPE_NULL @@ -17044,13 +17044,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Type_Null[] = INCBIN_U8("graphics/pokemon/type_null/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_TypeNull[] = INCBIN_COMP("graphics/pokemon/type_null/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_TypeNull[] = INCBIN_COMP("graphics/pokemon/type_null/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front.4bpp.lz"); const u32 gMonBackPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/back.4bpp.lz"); @@ -17058,13 +17058,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Silvally[] = INCBIN_COMP("graphics/pokemon/silvally/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Silvally[] = INCBIN_COMP("graphics/pokemon/silvally/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/silvally/normal.gbapal.lz"); const u32 gMonShinyPalette_SilvallyNormal[] = INCBIN_U32("graphics/pokemon/silvally/shiny.gbapal.lz"); @@ -17156,13 +17156,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonPalette_MiniorCoreViolet[] = INCBIN_U32("graphics/pokemon/minior/core/violet/normal.gbapal.lz"); const u8 gMonIcon_MiniorCoreViolet[] = INCBIN_U8("graphics/pokemon/minior/core/violet/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MiniorMeteor[] = INCBIN_COMP("graphics/pokemon/minior/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MiniorMeteor[] = INCBIN_COMP("graphics/pokemon/minior/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MiniorMeteor[] = INCBIN_U32("graphics/pokemon/minior/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MINIOR #if P_FAMILY_KOMALA @@ -17174,13 +17174,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Komala[] = INCBIN_U8("graphics/pokemon/komala/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Komala[] = INCBIN_COMP("graphics/pokemon/komala/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Komala[] = INCBIN_COMP("graphics/pokemon/komala/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_KOMALA #if P_FAMILY_TURTONATOR @@ -17192,13 +17192,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Turtonator[] = INCBIN_U8("graphics/pokemon/turtonator/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Turtonator[] = INCBIN_COMP("graphics/pokemon/turtonator/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Turtonator[] = INCBIN_COMP("graphics/pokemon/turtonator/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Turtonator[] = INCBIN_U32("graphics/pokemon/turtonator/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TURTONATOR #if P_FAMILY_TOGEDEMARU @@ -17210,13 +17210,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Togedemaru[] = INCBIN_U8("graphics/pokemon/togedemaru/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Togedemaru[] = INCBIN_COMP("graphics/pokemon/togedemaru/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Togedemaru[] = INCBIN_COMP("graphics/pokemon/togedemaru/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Togedemaru[] = INCBIN_U32("graphics/pokemon/togedemaru/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TOGEDEMARU #if P_FAMILY_MIMIKYU @@ -17228,26 +17228,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MimikyuDisguised[] = INCBIN_COMP("graphics/pokemon/mimikyu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MimikyuDisguised[] = INCBIN_COMP("graphics/pokemon/mimikyu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MimikyuDisguised[] = INCBIN_U32("graphics/pokemon/mimikyu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/front.4bpp.lz"); const u32 gMonPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/normal.gbapal.lz"); const u32 gMonBackPic_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/back.4bpp.lz"); const u32 gMonShinyPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/shiny.gbapal.lz"); const u8 gMonIcon_MimikyuBusted[] = INCBIN_U8("graphics/pokemon/mimikyu/busted/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MimikyuBusted[] = INCBIN_COMP("graphics/pokemon/mimikyu/busted/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MimikyuBusted[] = INCBIN_COMP("graphics/pokemon/mimikyu/busted/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_MimikyuBusted[] = INCBIN_U32("graphics/pokemon/mimikyu/busted/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MIMIKYU #if P_FAMILY_BRUXISH @@ -17259,13 +17259,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Bruxish[] = INCBIN_COMP("graphics/pokemon/bruxish/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Bruxish[] = INCBIN_COMP("graphics/pokemon/bruxish/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BRUXISH #if P_FAMILY_DRAMPA @@ -17277,13 +17277,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Drampa[] = INCBIN_COMP("graphics/pokemon/drampa/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Drampa[] = INCBIN_COMP("graphics/pokemon/drampa/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DRAMPA #if P_FAMILY_DHELMISE @@ -17295,13 +17295,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dhelmise[] = INCBIN_COMP("graphics/pokemon/dhelmise/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dhelmise[] = INCBIN_COMP("graphics/pokemon/dhelmise/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DHELMISE #if P_FAMILY_JANGMO_O @@ -17313,13 +17313,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_JangmoO[] = INCBIN_COMP("graphics/pokemon/jangmo_o/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_JangmoO[] = INCBIN_COMP("graphics/pokemon/jangmo_o/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/anim_front.4bpp.lz"); const u32 gMonPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); @@ -17329,13 +17329,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_HakamoO[] = INCBIN_COMP("graphics/pokemon/hakamo_o/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_HakamoO[] = INCBIN_COMP("graphics/pokemon/hakamo_o/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/anim_front.4bpp.lz"); const u32 gMonPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); @@ -17345,13 +17345,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_KommoO[] = INCBIN_COMP("graphics/pokemon/kommo_o/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_KommoO[] = INCBIN_COMP("graphics/pokemon/kommo_o/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_JANGMO_O #if P_FAMILY_TAPU_KOKO @@ -17363,13 +17363,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_TapuKoko[] = INCBIN_U8("graphics/pokemon/tapu_koko/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_TapuKoko[] = INCBIN_COMP("graphics/pokemon/tapu_koko/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_TapuKoko[] = INCBIN_COMP("graphics/pokemon/tapu_koko/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TAPU_KOKO #if P_FAMILY_TAPU_LELE @@ -17381,13 +17381,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_TapuLele[] = INCBIN_U8("graphics/pokemon/tapu_lele/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_TapuLele[] = INCBIN_COMP("graphics/pokemon/tapu_lele/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_TapuLele[] = INCBIN_COMP("graphics/pokemon/tapu_lele/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TAPU_LELE #if P_FAMILY_TAPU_BULU @@ -17399,13 +17399,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_TapuBulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_TapuBulu[] = INCBIN_COMP("graphics/pokemon/tapu_bulu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_TapuBulu[] = INCBIN_COMP("graphics/pokemon/tapu_bulu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TAPU_BULU #if P_FAMILY_TAPU_FINI @@ -17417,13 +17417,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_TapuFini[] = INCBIN_U8("graphics/pokemon/tapu_fini/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_TapuFini[] = INCBIN_COMP("graphics/pokemon/tapu_fini/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_TapuFini[] = INCBIN_COMP("graphics/pokemon/tapu_fini/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TAPU_FINI #if P_FAMILY_COSMOG @@ -17435,13 +17435,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cosmog[] = INCBIN_COMP("graphics/pokemon/cosmog/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cosmog[] = INCBIN_COMP("graphics/pokemon/cosmog/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/front.4bpp.lz"); const u32 gMonPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/normal.gbapal.lz"); @@ -17451,13 +17451,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cosmoem[] = INCBIN_COMP("graphics/pokemon/cosmoem/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cosmoem[] = INCBIN_COMP("graphics/pokemon/cosmoem/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/front.4bpp.lz"); const u32 gMonPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/normal.gbapal.lz"); @@ -17467,13 +17467,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Solgaleo[] = INCBIN_COMP("graphics/pokemon/solgaleo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Solgaleo[] = INCBIN_COMP("graphics/pokemon/solgaleo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/front.4bpp.lz"); const u32 gMonPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/normal.gbapal.lz"); @@ -17483,13 +17483,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lunala[] = INCBIN_U8("graphics/pokemon/lunala/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Lunala[] = INCBIN_COMP("graphics/pokemon/lunala/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Lunala[] = INCBIN_COMP("graphics/pokemon/lunala/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Lunala[] = INCBIN_U32("graphics/pokemon/lunala/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_COSMOG #if P_FAMILY_NIHILEGO @@ -17501,13 +17501,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nihilego[] = INCBIN_U8("graphics/pokemon/nihilego/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Nihilego[] = INCBIN_COMP("graphics/pokemon/nihilego/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Nihilego[] = INCBIN_COMP("graphics/pokemon/nihilego/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Nihilego[] = INCBIN_U32("graphics/pokemon/nihilego/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_NIHILEGO #if P_FAMILY_BUZZWOLE @@ -17519,13 +17519,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Buzzwole[] = INCBIN_U8("graphics/pokemon/buzzwole/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Buzzwole[] = INCBIN_COMP("graphics/pokemon/buzzwole/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Buzzwole[] = INCBIN_COMP("graphics/pokemon/buzzwole/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Buzzwole[] = INCBIN_U32("graphics/pokemon/buzzwole/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BUZZWOLE #if P_FAMILY_PHEROMOSA @@ -17537,13 +17537,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pheromosa[] = INCBIN_U8("graphics/pokemon/pheromosa/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pheromosa[] = INCBIN_COMP("graphics/pokemon/pheromosa/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pheromosa[] = INCBIN_COMP("graphics/pokemon/pheromosa/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pheromosa[] = INCBIN_U32("graphics/pokemon/pheromosa/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PHEROMOSA #if P_FAMILY_XURKITREE @@ -17555,13 +17555,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Xurkitree[] = INCBIN_U8("graphics/pokemon/xurkitree/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Xurkitree[] = INCBIN_COMP("graphics/pokemon/xurkitree/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Xurkitree[] = INCBIN_COMP("graphics/pokemon/xurkitree/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Xurkitree[] = INCBIN_U32("graphics/pokemon/xurkitree/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_XURKITREE #if P_FAMILY_CELESTEELA @@ -17573,13 +17573,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Celesteela[] = INCBIN_U8("graphics/pokemon/celesteela/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Celesteela[] = INCBIN_COMP("graphics/pokemon/celesteela/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Celesteela[] = INCBIN_COMP("graphics/pokemon/celesteela/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Celesteela[] = INCBIN_U32("graphics/pokemon/celesteela/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CELESTEELA #if P_FAMILY_KARTANA @@ -17591,13 +17591,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kartana[] = INCBIN_U8("graphics/pokemon/kartana/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kartana[] = INCBIN_COMP("graphics/pokemon/kartana/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kartana[] = INCBIN_COMP("graphics/pokemon/kartana/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kartana[] = INCBIN_U32("graphics/pokemon/kartana/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_KARTANA #if P_FAMILY_GUZZLORD @@ -17609,13 +17609,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Guzzlord[] = INCBIN_U8("graphics/pokemon/guzzlord/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Guzzlord[] = INCBIN_COMP("graphics/pokemon/guzzlord/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Guzzlord[] = INCBIN_COMP("graphics/pokemon/guzzlord/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Guzzlord[] = INCBIN_U32("graphics/pokemon/guzzlord/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GUZZLORD #if P_FAMILY_NECROZMA @@ -17627,13 +17627,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Necrozma[] = INCBIN_U8("graphics/pokemon/necrozma/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Necrozma[] = INCBIN_COMP("graphics/pokemon/necrozma/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Necrozma[] = INCBIN_COMP("graphics/pokemon/necrozma/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Necrozma[] = INCBIN_U32("graphics/pokemon/necrozma/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_FUSION_FORMS const u32 gMonFrontPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/front.4bpp.lz"); @@ -17641,26 +17641,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/back.4bpp.lz"); const u32 gMonShinyPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/shiny.gbapal.lz"); const u8 gMonIcon_NecrozmaDuskMane[] = INCBIN_U8("graphics/pokemon/necrozma/dusk_mane/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_NecrozmaDuskMane[] = INCBIN_COMP("graphics/pokemon/necrozma/dusk_mane/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_NecrozmaDuskMane[] = INCBIN_COMP("graphics/pokemon/necrozma/dusk_mane/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_NecrozmaDuskMane[] = INCBIN_U32("graphics/pokemon/necrozma/dusk_mane/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/front.4bpp.lz"); const u32 gMonPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/normal.gbapal.lz"); const u32 gMonBackPic_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/back.4bpp.lz"); const u32 gMonShinyPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/shiny.gbapal.lz"); const u8 gMonIcon_NecrozmaDawnWings[] = INCBIN_U8("graphics/pokemon/necrozma/dawn_wings/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_NecrozmaDawnWings[] = INCBIN_COMP("graphics/pokemon/necrozma/dawn_wings/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_NecrozmaDawnWings[] = INCBIN_COMP("graphics/pokemon/necrozma/dawn_wings/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_NecrozmaDawnWings[] = INCBIN_U32("graphics/pokemon/necrozma/dawn_wings/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_ULTRA_BURST_FORMS const u32 gMonFrontPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/front.4bpp.lz"); @@ -17668,13 +17668,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/back.4bpp.lz"); const u32 gMonShinyPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/shiny.gbapal.lz"); const u8 gMonIcon_NecrozmaUltra[] = INCBIN_U8("graphics/pokemon/necrozma/ultra/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_NecrozmaUltra[] = INCBIN_COMP("graphics/pokemon/necrozma/ultra/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_NecrozmaUltra[] = INCBIN_COMP("graphics/pokemon/necrozma/ultra/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_NecrozmaUltra[] = INCBIN_U32("graphics/pokemon/necrozma/ultra/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_ULTRA_BURST_FORMS #endif //P_FUSION_FORMS #endif //P_FAMILY_NECROZMA @@ -17688,26 +17688,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Magearna[] = INCBIN_U8("graphics/pokemon/magearna/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Magearna[] = INCBIN_COMP("graphics/pokemon/magearna/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Magearna[] = INCBIN_COMP("graphics/pokemon/magearna/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Magearna[] = INCBIN_U32("graphics/pokemon/magearna/overworld_shiny.gbapal.lz"); +#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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MagearnaOriginalColor[] = INCBIN_COMP("graphics/pokemon/magearna/original_color/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MagearnaOriginalColor[] = INCBIN_U32("graphics/pokemon/magearna/original_color/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MagearnaOriginalColor[] = 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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MAGEARNA #if P_FAMILY_MARSHADOW @@ -17719,13 +17719,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Marshadow[] = INCBIN_U8("graphics/pokemon/marshadow/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Marshadow[] = INCBIN_COMP("graphics/pokemon/marshadow/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Marshadow[] = INCBIN_COMP("graphics/pokemon/marshadow/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Marshadow[] = INCBIN_U32("graphics/pokemon/marshadow/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MARSHADOW #if P_FAMILY_POIPOLE @@ -17737,13 +17737,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Poipole[] = INCBIN_U8("graphics/pokemon/poipole/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Poipole[] = INCBIN_COMP("graphics/pokemon/poipole/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Poipole[] = INCBIN_COMP("graphics/pokemon/poipole/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Poipole[] = INCBIN_U32("graphics/pokemon/poipole/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/front.4bpp.lz"); const u32 gMonPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/normal.gbapal.lz"); @@ -17753,13 +17753,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Naganadel[] = INCBIN_U8("graphics/pokemon/naganadel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Naganadel[] = INCBIN_COMP("graphics/pokemon/naganadel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Naganadel[] = INCBIN_COMP("graphics/pokemon/naganadel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Naganadel[] = INCBIN_U32("graphics/pokemon/naganadel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_POIPOLE #if P_FAMILY_STAKATAKA @@ -17771,13 +17771,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Stakataka[] = INCBIN_U8("graphics/pokemon/stakataka/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Stakataka[] = INCBIN_COMP("graphics/pokemon/stakataka/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Stakataka[] = INCBIN_COMP("graphics/pokemon/stakataka/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_STAKATAKA #if P_FAMILY_BLACEPHALON @@ -17789,13 +17789,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Blacephalon[] = INCBIN_U8("graphics/pokemon/blacephalon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Blacephalon[] = INCBIN_COMP("graphics/pokemon/blacephalon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Blacephalon[] = INCBIN_COMP("graphics/pokemon/blacephalon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BLACEPHALON #if P_FAMILY_ZERAORA @@ -17807,13 +17807,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zeraora[] = INCBIN_U8("graphics/pokemon/zeraora/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zeraora[] = INCBIN_COMP("graphics/pokemon/zeraora/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zeraora[] = INCBIN_COMP("graphics/pokemon/zeraora/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ZERAORA #if P_FAMILY_MELTAN @@ -17825,13 +17825,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Meltan[] = INCBIN_U8("graphics/pokemon/meltan/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Meltan[] = INCBIN_COMP("graphics/pokemon/meltan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Meltan[] = INCBIN_COMP("graphics/pokemon/meltan/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/front.4bpp.lz"); const u32 gMonPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/normal.gbapal.lz"); @@ -17841,13 +17841,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Melmetal[] = INCBIN_U8("graphics/pokemon/melmetal/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Melmetal[] = INCBIN_COMP("graphics/pokemon/melmetal/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Melmetal[] = INCBIN_COMP("graphics/pokemon/melmetal/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/front.4bpp.lz"); @@ -17855,13 +17855,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MelmetalGigantamax[] = INCBIN_COMP("graphics/pokemon/melmetal/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MelmetalGigantamax[] = INCBIN_U32("graphics/pokemon/melmetal/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MelmetalGigantamax[] = INCBIN_COMP("graphics/pokemon/melmetal/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MELTAN @@ -17874,13 +17874,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Grookey[] = INCBIN_U8("graphics/pokemon/grookey/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Grookey[] = INCBIN_COMP("graphics/pokemon/grookey/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Grookey[] = INCBIN_COMP("graphics/pokemon/grookey/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Grookey[] = INCBIN_U32("graphics/pokemon/grookey/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/front.4bpp.lz"); const u32 gMonPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/normal.gbapal.lz"); @@ -17890,13 +17890,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Thwackey[] = INCBIN_U8("graphics/pokemon/thwackey/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Thwackey[] = INCBIN_COMP("graphics/pokemon/thwackey/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Thwackey[] = INCBIN_COMP("graphics/pokemon/thwackey/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Thwackey[] = INCBIN_U32("graphics/pokemon/thwackey/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/front.4bpp.lz"); const u32 gMonPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/normal.gbapal.lz"); @@ -17906,13 +17906,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rillaboom[] = INCBIN_U8("graphics/pokemon/rillaboom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rillaboom[] = INCBIN_COMP("graphics/pokemon/rillaboom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rillaboom[] = INCBIN_COMP("graphics/pokemon/rillaboom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rillaboom[] = INCBIN_U32("graphics/pokemon/rillaboom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/front.4bpp.lz"); @@ -17920,13 +17920,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_RillaboomGigantamax[] = INCBIN_COMP("graphics/pokemon/rillaboom/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_RillaboomGigantamax[] = INCBIN_U32("graphics/pokemon/rillaboom/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_RillaboomGigantamax[] = INCBIN_COMP("graphics/pokemon/rillaboom/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GROOKEY @@ -17939,13 +17939,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Scorbunny[] = INCBIN_U8("graphics/pokemon/scorbunny/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Scorbunny[] = INCBIN_COMP("graphics/pokemon/scorbunny/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Scorbunny[] = INCBIN_COMP("graphics/pokemon/scorbunny/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Scorbunny[] = INCBIN_U32("graphics/pokemon/scorbunny/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/front.4bpp.lz"); const u32 gMonPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/normal.gbapal.lz"); @@ -17955,13 +17955,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Raboot[] = INCBIN_U8("graphics/pokemon/raboot/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Raboot[] = INCBIN_COMP("graphics/pokemon/raboot/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Raboot[] = INCBIN_COMP("graphics/pokemon/raboot/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Raboot[] = INCBIN_U32("graphics/pokemon/raboot/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/front.4bpp.lz"); const u32 gMonPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/normal.gbapal.lz"); @@ -17971,13 +17971,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cinderace[] = INCBIN_U8("graphics/pokemon/cinderace/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cinderace[] = INCBIN_COMP("graphics/pokemon/cinderace/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cinderace[] = INCBIN_COMP("graphics/pokemon/cinderace/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cinderace[] = INCBIN_U32("graphics/pokemon/cinderace/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/front.4bpp.lz"); @@ -17985,13 +17985,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CinderaceGigantamax[] = INCBIN_COMP("graphics/pokemon/cinderace/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CinderaceGigantamax[] = INCBIN_U32("graphics/pokemon/cinderace/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CinderaceGigantamax[] = INCBIN_COMP("graphics/pokemon/cinderace/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SCORBUNNY @@ -18004,13 +18004,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sobble[] = INCBIN_U8("graphics/pokemon/sobble/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sobble[] = INCBIN_COMP("graphics/pokemon/sobble/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sobble[] = INCBIN_COMP("graphics/pokemon/sobble/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sobble[] = INCBIN_U32("graphics/pokemon/sobble/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/front.4bpp.lz"); const u32 gMonPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/normal.gbapal.lz"); @@ -18020,13 +18020,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Drizzile[] = INCBIN_U8("graphics/pokemon/drizzile/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Drizzile[] = INCBIN_COMP("graphics/pokemon/drizzile/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Drizzile[] = INCBIN_COMP("graphics/pokemon/drizzile/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Drizzile[] = INCBIN_U32("graphics/pokemon/drizzile/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/front.4bpp.lz"); const u32 gMonPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/normal.gbapal.lz"); @@ -18036,13 +18036,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Inteleon[] = INCBIN_U8("graphics/pokemon/inteleon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Inteleon[] = INCBIN_COMP("graphics/pokemon/inteleon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Inteleon[] = INCBIN_COMP("graphics/pokemon/inteleon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Inteleon[] = INCBIN_U32("graphics/pokemon/inteleon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/front.4bpp.lz"); @@ -18050,13 +18050,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_InteleonGigantamax[] = INCBIN_COMP("graphics/pokemon/inteleon/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_InteleonGigantamax[] = INCBIN_U32("graphics/pokemon/inteleon/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_InteleonGigantamax[] = INCBIN_COMP("graphics/pokemon/inteleon/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SOBBLE @@ -18069,13 +18069,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Skwovet[] = INCBIN_U8("graphics/pokemon/skwovet/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Skwovet[] = INCBIN_COMP("graphics/pokemon/skwovet/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Skwovet[] = INCBIN_COMP("graphics/pokemon/skwovet/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Skwovet[] = INCBIN_U32("graphics/pokemon/skwovet/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/front.4bpp.lz"); const u32 gMonPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/normal.gbapal.lz"); @@ -18085,13 +18085,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Greedent[] = INCBIN_U8("graphics/pokemon/greedent/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Greedent[] = INCBIN_COMP("graphics/pokemon/greedent/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Greedent[] = INCBIN_COMP("graphics/pokemon/greedent/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Greedent[] = INCBIN_U32("graphics/pokemon/greedent/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SKWOVET #if P_FAMILY_ROOKIDEE @@ -18103,13 +18103,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rookidee[] = INCBIN_U8("graphics/pokemon/rookidee/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rookidee[] = INCBIN_COMP("graphics/pokemon/rookidee/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rookidee[] = INCBIN_COMP("graphics/pokemon/rookidee/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rookidee[] = INCBIN_U32("graphics/pokemon/rookidee/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/anim_front.4bpp.lz"); const u32 gMonPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/normal.gbapal.lz"); @@ -18119,13 +18119,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Corvisquire[] = INCBIN_U8("graphics/pokemon/corvisquire/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Corvisquire[] = INCBIN_COMP("graphics/pokemon/corvisquire/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Corvisquire[] = INCBIN_COMP("graphics/pokemon/corvisquire/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Corvisquire[] = INCBIN_U32("graphics/pokemon/corvisquire/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/anim_front.4bpp.lz"); const u32 gMonPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/normal.gbapal.lz"); @@ -18135,13 +18135,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Corviknight[] = INCBIN_U8("graphics/pokemon/corviknight/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Corviknight[] = INCBIN_COMP("graphics/pokemon/corviknight/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Corviknight[] = INCBIN_COMP("graphics/pokemon/corviknight/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Corviknight[] = INCBIN_U32("graphics/pokemon/corviknight/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/front.4bpp.lz"); @@ -18149,13 +18149,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CorviknightGigantamax[] = INCBIN_COMP("graphics/pokemon/corviknight/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CorviknightGigantamax[] = INCBIN_U32("graphics/pokemon/corviknight/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CorviknightGigantamax[] = INCBIN_COMP("graphics/pokemon/corviknight/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROOKIDEE @@ -18168,13 +18168,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Blipbug[] = INCBIN_U8("graphics/pokemon/blipbug/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Blipbug[] = INCBIN_COMP("graphics/pokemon/blipbug/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Blipbug[] = INCBIN_COMP("graphics/pokemon/blipbug/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Blipbug[] = INCBIN_U32("graphics/pokemon/blipbug/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/front.4bpp.lz"); const u32 gMonPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/normal.gbapal.lz"); @@ -18184,13 +18184,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dottler[] = INCBIN_U8("graphics/pokemon/dottler/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dottler[] = INCBIN_COMP("graphics/pokemon/dottler/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dottler[] = INCBIN_COMP("graphics/pokemon/dottler/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dottler[] = INCBIN_U32("graphics/pokemon/dottler/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/front.4bpp.lz"); const u32 gMonPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/normal.gbapal.lz"); @@ -18200,13 +18200,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Orbeetle[] = INCBIN_U8("graphics/pokemon/orbeetle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Orbeetle[] = INCBIN_COMP("graphics/pokemon/orbeetle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Orbeetle[] = INCBIN_COMP("graphics/pokemon/orbeetle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Orbeetle[] = INCBIN_U32("graphics/pokemon/orbeetle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/front.4bpp.lz"); @@ -18214,13 +18214,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_OrbeetleGigantamax[] = INCBIN_COMP("graphics/pokemon/orbeetle/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_OrbeetleGigantamax[] = INCBIN_U32("graphics/pokemon/orbeetle/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_OrbeetleGigantamax[] = INCBIN_COMP("graphics/pokemon/orbeetle/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BLIPBUG @@ -18233,13 +18233,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nickit[] = INCBIN_U8("graphics/pokemon/nickit/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Nickit[] = INCBIN_COMP("graphics/pokemon/nickit/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Nickit[] = INCBIN_COMP("graphics/pokemon/nickit/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Nickit[] = INCBIN_U32("graphics/pokemon/nickit/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/front.4bpp.lz"); const u32 gMonPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/normal.gbapal.lz"); @@ -18249,13 +18249,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Thievul[] = INCBIN_U8("graphics/pokemon/thievul/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Thievul[] = INCBIN_COMP("graphics/pokemon/thievul/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Thievul[] = INCBIN_COMP("graphics/pokemon/thievul/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Thievul[] = INCBIN_U32("graphics/pokemon/thievul/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_NICKIT #if P_FAMILY_GOSSIFLEUR @@ -18267,13 +18267,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gossifleur[] = INCBIN_U8("graphics/pokemon/gossifleur/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Gossifleur[] = INCBIN_COMP("graphics/pokemon/gossifleur/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Gossifleur[] = INCBIN_COMP("graphics/pokemon/gossifleur/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Gossifleur[] = INCBIN_U32("graphics/pokemon/gossifleur/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/front.4bpp.lz"); const u32 gMonPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/normal.gbapal.lz"); @@ -18283,13 +18283,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Eldegoss[] = INCBIN_U8("graphics/pokemon/eldegoss/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Eldegoss[] = INCBIN_COMP("graphics/pokemon/eldegoss/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Eldegoss[] = INCBIN_COMP("graphics/pokemon/eldegoss/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Eldegoss[] = INCBIN_U32("graphics/pokemon/eldegoss/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GOSSIFLEUR #if P_FAMILY_WOOLOO @@ -18301,13 +18301,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wooloo[] = INCBIN_U8("graphics/pokemon/wooloo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Wooloo[] = INCBIN_COMP("graphics/pokemon/wooloo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Wooloo[] = INCBIN_COMP("graphics/pokemon/wooloo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Wooloo[] = INCBIN_U32("graphics/pokemon/wooloo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/front.4bpp.lz"); const u32 gMonPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/normal.gbapal.lz"); @@ -18317,13 +18317,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dubwool[] = INCBIN_U8("graphics/pokemon/dubwool/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dubwool[] = INCBIN_COMP("graphics/pokemon/dubwool/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dubwool[] = INCBIN_COMP("graphics/pokemon/dubwool/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dubwool[] = INCBIN_U32("graphics/pokemon/dubwool/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WOOLOO #if P_FAMILY_CHEWTLE @@ -18335,13 +18335,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Chewtle[] = INCBIN_U8("graphics/pokemon/chewtle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Chewtle[] = INCBIN_COMP("graphics/pokemon/chewtle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Chewtle[] = INCBIN_COMP("graphics/pokemon/chewtle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Chewtle[] = INCBIN_U32("graphics/pokemon/chewtle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/anim_front.4bpp.lz"); const u32 gMonPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/normal.gbapal.lz"); @@ -18351,13 +18351,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Drednaw[] = INCBIN_U8("graphics/pokemon/drednaw/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Drednaw[] = INCBIN_COMP("graphics/pokemon/drednaw/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Drednaw[] = INCBIN_COMP("graphics/pokemon/drednaw/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Drednaw[] = INCBIN_U32("graphics/pokemon/drednaw/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/front.4bpp.lz"); @@ -18365,13 +18365,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_DrednawGigantamax[] = INCBIN_COMP("graphics/pokemon/drednaw/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_DrednawGigantamax[] = INCBIN_U32("graphics/pokemon/drednaw/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_DrednawGigantamax[] = INCBIN_COMP("graphics/pokemon/drednaw/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHEWTLE @@ -18384,13 +18384,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Yamper[] = INCBIN_U8("graphics/pokemon/yamper/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Yamper[] = INCBIN_COMP("graphics/pokemon/yamper/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Yamper[] = INCBIN_COMP("graphics/pokemon/yamper/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Yamper[] = INCBIN_U32("graphics/pokemon/yamper/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/front.4bpp.lz"); const u32 gMonPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/normal.gbapal.lz"); @@ -18400,13 +18400,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Boltund[] = INCBIN_U8("graphics/pokemon/boltund/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Boltund[] = INCBIN_COMP("graphics/pokemon/boltund/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Boltund[] = INCBIN_COMP("graphics/pokemon/boltund/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Boltund[] = INCBIN_U32("graphics/pokemon/boltund/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_YAMPER #if P_FAMILY_ROLYCOLY @@ -18418,13 +18418,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rolycoly[] = INCBIN_U8("graphics/pokemon/rolycoly/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Rolycoly[] = INCBIN_COMP("graphics/pokemon/rolycoly/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Rolycoly[] = INCBIN_COMP("graphics/pokemon/rolycoly/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Rolycoly[] = INCBIN_U32("graphics/pokemon/rolycoly/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/anim_front.4bpp.lz"); const u32 gMonPalette_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/normal.gbapal.lz"); @@ -18434,13 +18434,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Carkol[] = INCBIN_U8("graphics/pokemon/carkol/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Carkol[] = INCBIN_COMP("graphics/pokemon/carkol/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Carkol[] = INCBIN_COMP("graphics/pokemon/carkol/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Carkol[] = INCBIN_U32("graphics/pokemon/carkol/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/anim_front.4bpp.lz"); const u32 gMonPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/normal.gbapal.lz"); @@ -18450,13 +18450,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Coalossal[] = INCBIN_U8("graphics/pokemon/coalossal/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Coalossal[] = INCBIN_COMP("graphics/pokemon/coalossal/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Coalossal[] = INCBIN_COMP("graphics/pokemon/coalossal/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Coalossal[] = INCBIN_U32("graphics/pokemon/coalossal/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/front.4bpp.lz"); @@ -18464,13 +18464,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CoalossalGigantamax[] = INCBIN_COMP("graphics/pokemon/coalossal/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CoalossalGigantamax[] = INCBIN_U32("graphics/pokemon/coalossal/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CoalossalGigantamax[] = INCBIN_COMP("graphics/pokemon/coalossal/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROLYCOLY @@ -18483,13 +18483,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Applin[] = INCBIN_U8("graphics/pokemon/applin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Applin[] = INCBIN_COMP("graphics/pokemon/applin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Applin[] = INCBIN_U32("graphics/pokemon/applin/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Applin[] = INCBIN_U32("graphics/pokemon/applin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Applin[] = INCBIN_COMP("graphics/pokemon/applin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Applin[] = INCBIN_U32("graphics/pokemon/applin/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Applin[] = INCBIN_U32("graphics/pokemon/applin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/anim_front.4bpp.lz"); const u32 gMonPalette_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/normal.gbapal.lz"); @@ -18499,13 +18499,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Flapple[] = INCBIN_U8("graphics/pokemon/flapple/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Flapple[] = INCBIN_COMP("graphics/pokemon/flapple/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Flapple[] = INCBIN_COMP("graphics/pokemon/flapple/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Flapple[] = INCBIN_U32("graphics/pokemon/flapple/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/front.4bpp.lz"); @@ -18513,13 +18513,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_FlappleGigantamax[] = INCBIN_COMP("graphics/pokemon/flapple/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_FlappleGigantamax[] = INCBIN_U32("graphics/pokemon/flapple/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_FlappleGigantamax[] = INCBIN_COMP("graphics/pokemon/flapple/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS const u32 gMonFrontPic_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/anim_front.4bpp.lz"); @@ -18530,13 +18530,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Appletun[] = INCBIN_U8("graphics/pokemon/appletun/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Appletun[] = INCBIN_COMP("graphics/pokemon/appletun/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Appletun[] = INCBIN_COMP("graphics/pokemon/appletun/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Appletun[] = INCBIN_U32("graphics/pokemon/appletun/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/front.4bpp.lz"); @@ -18544,13 +18544,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AppletunGigantamax[] = INCBIN_COMP("graphics/pokemon/appletun/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AppletunGigantamax[] = INCBIN_U32("graphics/pokemon/appletun/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AppletunGigantamax[] = INCBIN_COMP("graphics/pokemon/appletun/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #if P_GEN_9_CROSS_EVOS @@ -18562,13 +18562,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dipplin[] = INCBIN_U8("graphics/pokemon/dipplin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Dipplin[] = INCBIN_COMP("graphics/pokemon/dipplin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Dipplin[] = INCBIN_COMP("graphics/pokemon/dipplin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Dipplin[] = INCBIN_U32("graphics/pokemon/dipplin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/front.4bpp.lz"); const u32 gMonPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/normal.gbapal.lz"); @@ -18578,13 +18578,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hydrapple[] = INCBIN_U8("graphics/pokemon/hydrapple/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Hydrapple[] = INCBIN_COMP("graphics/pokemon/hydrapple/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Hydrapple[] = INCBIN_COMP("graphics/pokemon/hydrapple/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Hydrapple[] = INCBIN_U32("graphics/pokemon/hydrapple/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN @@ -18597,13 +18597,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Silicobra[] = INCBIN_U8("graphics/pokemon/silicobra/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Silicobra[] = INCBIN_COMP("graphics/pokemon/silicobra/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Silicobra[] = INCBIN_COMP("graphics/pokemon/silicobra/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Silicobra[] = INCBIN_U32("graphics/pokemon/silicobra/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/front.4bpp.lz"); const u32 gMonPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/normal.gbapal.lz"); @@ -18613,13 +18613,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sandaconda[] = INCBIN_U8("graphics/pokemon/sandaconda/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sandaconda[] = INCBIN_COMP("graphics/pokemon/sandaconda/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sandaconda[] = INCBIN_COMP("graphics/pokemon/sandaconda/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sandaconda[] = INCBIN_U32("graphics/pokemon/sandaconda/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/front.4bpp.lz"); @@ -18627,13 +18627,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SandacondaGigantamax[] = INCBIN_COMP("graphics/pokemon/sandaconda/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SandacondaGigantamax[] = INCBIN_U32("graphics/pokemon/sandaconda/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SandacondaGigantamax[] = INCBIN_COMP("graphics/pokemon/sandaconda/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SILICOBRA @@ -18646,39 +18646,39 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cramorant[] = INCBIN_U8("graphics/pokemon/cramorant/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cramorant[] = INCBIN_COMP("graphics/pokemon/cramorant/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cramorant[] = INCBIN_COMP("graphics/pokemon/cramorant/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cramorant[] = INCBIN_U32("graphics/pokemon/cramorant/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/front.4bpp.lz"); const u32 gMonPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/normal.gbapal.lz"); const u32 gMonBackPic_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/back.4bpp.lz"); const u32 gMonShinyPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/shiny.gbapal.lz"); const u8 gMonIcon_CramorantGulping[] = INCBIN_U8("graphics/pokemon/cramorant/gulping/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CramorantGulping[] = INCBIN_COMP("graphics/pokemon/cramorant/gulping/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CramorantGulping[] = INCBIN_COMP("graphics/pokemon/cramorant/gulping/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CramorantGulping[] = INCBIN_U32("graphics/pokemon/cramorant/gulping/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/front.4bpp.lz"); const u32 gMonPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/normal.gbapal.lz"); const u32 gMonBackPic_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/back.4bpp.lz"); const u32 gMonShinyPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/shiny.gbapal.lz"); const u8 gMonIcon_CramorantGorging[] = INCBIN_U8("graphics/pokemon/cramorant/gorging/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CramorantGorging[] = INCBIN_COMP("graphics/pokemon/cramorant/gorging/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CramorantGorging[] = INCBIN_COMP("graphics/pokemon/cramorant/gorging/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_CramorantGorging[] = INCBIN_U32("graphics/pokemon/cramorant/gorging/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CRAMORANT #if P_FAMILY_ARROKUDA @@ -18690,13 +18690,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Arrokuda[] = INCBIN_U8("graphics/pokemon/arrokuda/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Arrokuda[] = INCBIN_COMP("graphics/pokemon/arrokuda/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Arrokuda[] = INCBIN_COMP("graphics/pokemon/arrokuda/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Arrokuda[] = INCBIN_U32("graphics/pokemon/arrokuda/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/front.4bpp.lz"); const u32 gMonPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/normal.gbapal.lz"); @@ -18706,13 +18706,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Barraskewda[] = INCBIN_U8("graphics/pokemon/barraskewda/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Barraskewda[] = INCBIN_COMP("graphics/pokemon/barraskewda/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Barraskewda[] = INCBIN_COMP("graphics/pokemon/barraskewda/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Barraskewda[] = INCBIN_U32("graphics/pokemon/barraskewda/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ARROKUDA #if P_FAMILY_TOXEL @@ -18724,13 +18724,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Toxel[] = INCBIN_U8("graphics/pokemon/toxel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Toxel[] = INCBIN_COMP("graphics/pokemon/toxel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Toxel[] = INCBIN_COMP("graphics/pokemon/toxel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Toxel[] = INCBIN_U32("graphics/pokemon/toxel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/front.4bpp.lz"); const u32 gMonPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/normal.gbapal.lz"); @@ -18740,26 +18740,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Toxtricity[] = INCBIN_U8("graphics/pokemon/toxtricity/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ToxtricityAmped[] = INCBIN_COMP("graphics/pokemon/toxtricity/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ToxtricityAmped[] = INCBIN_COMP("graphics/pokemon/toxtricity/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ToxtricityAmped[] = INCBIN_U32("graphics/pokemon/toxtricity/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/front.4bpp.lz"); const u32 gMonPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/normal.gbapal.lz"); const u32 gMonBackPic_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/back.4bpp.lz"); const u32 gMonShinyPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/shiny.gbapal.lz"); const u8 gMonIcon_ToxtricityLowKey[] = INCBIN_U8("graphics/pokemon/toxtricity/low_key/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ToxtricityLowKey[] = INCBIN_COMP("graphics/pokemon/toxtricity/low_key/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ToxtricityLowKey[] = INCBIN_COMP("graphics/pokemon/toxtricity/low_key/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_ToxtricityLowKey[] = INCBIN_U32("graphics/pokemon/toxtricity/low_key/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/front.4bpp.lz"); @@ -18767,13 +18767,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_ToxtricityGigantamax[] = INCBIN_COMP("graphics/pokemon/toxtricity/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_ToxtricityGigantamax[] = INCBIN_U32("graphics/pokemon/toxtricity/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_ToxtricityGigantamax[] = INCBIN_COMP("graphics/pokemon/toxtricity/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TOXEL @@ -18786,13 +18786,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sizzlipede[] = INCBIN_U8("graphics/pokemon/sizzlipede/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sizzlipede[] = INCBIN_COMP("graphics/pokemon/sizzlipede/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sizzlipede[] = INCBIN_COMP("graphics/pokemon/sizzlipede/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sizzlipede[] = INCBIN_U32("graphics/pokemon/sizzlipede/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/anim_front.4bpp.lz"); const u32 gMonPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/normal.gbapal.lz"); @@ -18802,13 +18802,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Centiskorch[] = INCBIN_U8("graphics/pokemon/centiskorch/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Centiskorch[] = INCBIN_COMP("graphics/pokemon/centiskorch/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Centiskorch[] = INCBIN_COMP("graphics/pokemon/centiskorch/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Centiskorch[] = INCBIN_U32("graphics/pokemon/centiskorch/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/front.4bpp.lz"); @@ -18816,13 +18816,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CentiskorchGigantamax[] = INCBIN_COMP("graphics/pokemon/centiskorch/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CentiskorchGigantamax[] = INCBIN_U32("graphics/pokemon/centiskorch/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CentiskorchGigantamax[] = INCBIN_COMP("graphics/pokemon/centiskorch/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SIZZLIPEDE @@ -18835,13 +18835,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Clobbopus[] = INCBIN_U8("graphics/pokemon/clobbopus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Clobbopus[] = INCBIN_COMP("graphics/pokemon/clobbopus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Clobbopus[] = INCBIN_COMP("graphics/pokemon/clobbopus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Clobbopus[] = INCBIN_U32("graphics/pokemon/clobbopus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/front.4bpp.lz"); const u32 gMonPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/normal.gbapal.lz"); @@ -18851,13 +18851,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Grapploct[] = INCBIN_U8("graphics/pokemon/grapploct/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Grapploct[] = INCBIN_COMP("graphics/pokemon/grapploct/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Grapploct[] = INCBIN_COMP("graphics/pokemon/grapploct/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Grapploct[] = INCBIN_U32("graphics/pokemon/grapploct/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CLOBBOPUS #if P_FAMILY_SINISTEA @@ -18869,13 +18869,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sinistea[] = INCBIN_U8("graphics/pokemon/sinistea/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Sinistea[] = INCBIN_COMP("graphics/pokemon/sinistea/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Sinistea[] = INCBIN_COMP("graphics/pokemon/sinistea/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Sinistea[] = INCBIN_U32("graphics/pokemon/sinistea/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/front.4bpp.lz"); const u32 gMonPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/normal.gbapal.lz"); @@ -18885,13 +18885,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Polteageist[] = INCBIN_U8("graphics/pokemon/polteageist/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Polteageist[] = INCBIN_COMP("graphics/pokemon/polteageist/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Polteageist[] = INCBIN_COMP("graphics/pokemon/polteageist/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Polteageist[] = INCBIN_U32("graphics/pokemon/polteageist/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SINISTEA #if P_FAMILY_HATENNA @@ -18903,13 +18903,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hatenna[] = INCBIN_U8("graphics/pokemon/hatenna/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hatenna[] = INCBIN_COMP("graphics/pokemon/hatenna/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hatenna[] = INCBIN_COMP("graphics/pokemon/hatenna/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hatenna[] = INCBIN_U32("graphics/pokemon/hatenna/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/front.4bpp.lz"); const u32 gMonPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/normal.gbapal.lz"); @@ -18919,13 +18919,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hattrem[] = INCBIN_U8("graphics/pokemon/hattrem/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hattrem[] = INCBIN_COMP("graphics/pokemon/hattrem/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hattrem[] = INCBIN_COMP("graphics/pokemon/hattrem/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hattrem[] = INCBIN_U32("graphics/pokemon/hattrem/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/front.4bpp.lz"); const u32 gMonPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/normal.gbapal.lz"); @@ -18935,13 +18935,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Hatterene[] = INCBIN_U8("graphics/pokemon/hatterene/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Hatterene[] = INCBIN_COMP("graphics/pokemon/hatterene/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Hatterene[] = INCBIN_COMP("graphics/pokemon/hatterene/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Hatterene[] = INCBIN_U32("graphics/pokemon/hatterene/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/front.4bpp.lz"); @@ -18949,13 +18949,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_HattereneGigantamax[] = INCBIN_COMP("graphics/pokemon/hatterene/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_HattereneGigantamax[] = INCBIN_U32("graphics/pokemon/hatterene/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_HattereneGigantamax[] = INCBIN_COMP("graphics/pokemon/hatterene/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_HATENNA @@ -18968,13 +18968,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Impidimp[] = INCBIN_U8("graphics/pokemon/impidimp/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Impidimp[] = INCBIN_COMP("graphics/pokemon/impidimp/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Impidimp[] = INCBIN_COMP("graphics/pokemon/impidimp/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Impidimp[] = INCBIN_U32("graphics/pokemon/impidimp/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/front.4bpp.lz"); const u32 gMonPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/normal.gbapal.lz"); @@ -18984,13 +18984,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Morgrem[] = INCBIN_U8("graphics/pokemon/morgrem/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Morgrem[] = INCBIN_COMP("graphics/pokemon/morgrem/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Morgrem[] = INCBIN_COMP("graphics/pokemon/morgrem/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Morgrem[] = INCBIN_U32("graphics/pokemon/morgrem/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/front.4bpp.lz"); const u32 gMonPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/normal.gbapal.lz"); @@ -19000,13 +19000,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Grimmsnarl[] = INCBIN_U8("graphics/pokemon/grimmsnarl/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Grimmsnarl[] = INCBIN_COMP("graphics/pokemon/grimmsnarl/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Grimmsnarl[] = INCBIN_COMP("graphics/pokemon/grimmsnarl/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Grimmsnarl[] = INCBIN_U32("graphics/pokemon/grimmsnarl/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/front.4bpp.lz"); @@ -19014,13 +19014,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GrimmsnarlGigantamax[] = INCBIN_COMP("graphics/pokemon/grimmsnarl/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GrimmsnarlGigantamax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GrimmsnarlGigantamax[] = INCBIN_COMP("graphics/pokemon/grimmsnarl/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_IMPIDIMP @@ -19033,13 +19033,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Milcery[] = INCBIN_U8("graphics/pokemon/milcery/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Milcery[] = INCBIN_COMP("graphics/pokemon/milcery/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Milcery[] = INCBIN_COMP("graphics/pokemon/milcery/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/front.4bpp.lz"); const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/back.4bpp.lz"); const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/normal.gbapal.lz"); @@ -19149,13 +19149,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u32 gMonBackPic_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/back.4bpp.lz"); const u32 gMonShinyPalette_AlcremieRibbon[] = INCBIN_U32("graphics/pokemon/alcremie/ribbon/ribbon_shiny.gbapal.lz"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_AlcremieStrawberry[] = INCBIN_COMP("graphics/pokemon/alcremie/strawberry/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_AlcremieStrawberry[] = INCBIN_COMP("graphics/pokemon/alcremie/strawberry/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_AlcremieStrawberryVanillaCream[] = INCBIN_U32("graphics/pokemon/alcremie/strawberry/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/front.4bpp.lz"); @@ -19163,13 +19163,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_AlcremieGigantamax[] = INCBIN_COMP("graphics/pokemon/alcremie/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_AlcremieGigantamax[] = INCBIN_U32("graphics/pokemon/alcremie/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_AlcremieGigantamax[] = INCBIN_COMP("graphics/pokemon/alcremie/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MILCERY @@ -19182,13 +19182,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Falinks[] = INCBIN_U8("graphics/pokemon/falinks/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Falinks[] = INCBIN_COMP("graphics/pokemon/falinks/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Falinks[] = INCBIN_COMP("graphics/pokemon/falinks/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Falinks[] = INCBIN_U32("graphics/pokemon/falinks/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FALINKS #if P_FAMILY_PINCURCHIN @@ -19200,13 +19200,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pincurchin[] = INCBIN_U8("graphics/pokemon/pincurchin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Pincurchin[] = INCBIN_COMP("graphics/pokemon/pincurchin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Pincurchin[] = INCBIN_COMP("graphics/pokemon/pincurchin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Pincurchin[] = INCBIN_U32("graphics/pokemon/pincurchin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PINCURCHIN #if P_FAMILY_SNOM @@ -19218,13 +19218,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Snom[] = INCBIN_U8("graphics/pokemon/snom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Snom[] = INCBIN_COMP("graphics/pokemon/snom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Snom[] = INCBIN_COMP("graphics/pokemon/snom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Snom[] = INCBIN_U32("graphics/pokemon/snom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/front.4bpp.lz"); const u32 gMonPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/normal.gbapal.lz"); @@ -19234,13 +19234,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Frosmoth[] = INCBIN_U8("graphics/pokemon/frosmoth/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Frosmoth[] = INCBIN_COMP("graphics/pokemon/frosmoth/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Frosmoth[] = INCBIN_COMP("graphics/pokemon/frosmoth/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Frosmoth[] = INCBIN_U32("graphics/pokemon/frosmoth/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SNOM #if P_FAMILY_STONJOURNER @@ -19252,13 +19252,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Stonjourner[] = INCBIN_U8("graphics/pokemon/stonjourner/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Stonjourner[] = INCBIN_COMP("graphics/pokemon/stonjourner/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Stonjourner[] = INCBIN_COMP("graphics/pokemon/stonjourner/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Stonjourner[] = INCBIN_U32("graphics/pokemon/stonjourner/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_STONJOURNER #if P_FAMILY_EISCUE @@ -19270,26 +19270,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Eiscue[] = INCBIN_U8("graphics/pokemon/eiscue/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_EiscueIceFace[] = INCBIN_COMP("graphics/pokemon/eiscue/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_EiscueIceFace[] = INCBIN_U32("graphics/pokemon/eiscue/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_EiscueIceFace[] = 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"); +#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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_EiscueNoiceFace[] = INCBIN_COMP("graphics/pokemon/eiscue/noice_face/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_EiscueNoiceFace[] = INCBIN_U32("graphics/pokemon/eiscue/noice_face/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_EiscueNoiceFace[] = 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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_EISCUE #if P_FAMILY_INDEEDEE @@ -19301,26 +19301,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Indeedee[] = INCBIN_U8("graphics/pokemon/indeedee/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_IndeedeeMale[] = INCBIN_COMP("graphics/pokemon/indeedee/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_IndeedeeMale[] = INCBIN_U32("graphics/pokemon/indeedee/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_IndeedeeMale[] = 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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_IndeedeeFemale[] = INCBIN_COMP("graphics/pokemon/indeedee/female/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_IndeedeeFemale[] = INCBIN_U32("graphics/pokemon/indeedee/female/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_IndeedeeFemale[] = INCBIN_COMP("graphics/pokemon/indeedee/female/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_INDEEDEE #if P_FAMILY_MORPEKO @@ -19332,26 +19332,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Morpeko[] = INCBIN_U8("graphics/pokemon/morpeko/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_MorpekoFullBelly[] = INCBIN_COMP("graphics/pokemon/morpeko/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_MorpekoFullBelly[] = INCBIN_COMP("graphics/pokemon/morpeko/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_MorpekoFullBelly[] = INCBIN_U32("graphics/pokemon/morpeko/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/front.4bpp.lz"); const u32 gMonPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/normal.gbapal.lz"); const u32 gMonBackPic_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/back.4bpp.lz"); const u32 gMonShinyPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/shiny.gbapal.lz"); const u8 gMonIcon_MorpekoHangry[] = INCBIN_U8("graphics/pokemon/morpeko/hangry/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MorpekoHangry[] = INCBIN_COMP("graphics/pokemon/morpeko/hangry/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MorpekoHangry[] = INCBIN_COMP("graphics/pokemon/morpeko/hangry/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_MorpekoHangry[] = INCBIN_U32("graphics/pokemon/morpeko/hangry/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MORPEKO #if P_FAMILY_CUFANT @@ -19363,13 +19363,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cufant[] = INCBIN_U8("graphics/pokemon/cufant/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Cufant[] = INCBIN_COMP("graphics/pokemon/cufant/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Cufant[] = INCBIN_COMP("graphics/pokemon/cufant/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Cufant[] = INCBIN_U32("graphics/pokemon/cufant/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/front.4bpp.lz"); const u32 gMonPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/normal.gbapal.lz"); @@ -19379,13 +19379,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Copperajah[] = INCBIN_U8("graphics/pokemon/copperajah/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Copperajah[] = INCBIN_COMP("graphics/pokemon/copperajah/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Copperajah[] = INCBIN_COMP("graphics/pokemon/copperajah/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Copperajah[] = INCBIN_U32("graphics/pokemon/copperajah/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/front.4bpp.lz"); @@ -19393,13 +19393,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_CopperajahGigantamax[] = INCBIN_COMP("graphics/pokemon/copperajah/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_CopperajahGigantamax[] = INCBIN_U32("graphics/pokemon/copperajah/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_CopperajahGigantamax[] = INCBIN_COMP("graphics/pokemon/copperajah/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CUFANT @@ -19412,13 +19412,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dracozolt[] = INCBIN_U8("graphics/pokemon/dracozolt/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dracozolt[] = INCBIN_COMP("graphics/pokemon/dracozolt/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dracozolt[] = INCBIN_COMP("graphics/pokemon/dracozolt/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dracozolt[] = INCBIN_U32("graphics/pokemon/dracozolt/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DRACOZOLT #if P_FAMILY_ARCTOZOLT @@ -19430,13 +19430,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Arctozolt[] = INCBIN_U8("graphics/pokemon/arctozolt/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Arctozolt[] = INCBIN_COMP("graphics/pokemon/arctozolt/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Arctozolt[] = INCBIN_COMP("graphics/pokemon/arctozolt/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Arctozolt[] = INCBIN_U32("graphics/pokemon/arctozolt/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ARCTOZOLT #if P_FAMILY_DRACOVISH @@ -19448,13 +19448,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dracovish[] = INCBIN_U8("graphics/pokemon/dracovish/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dracovish[] = INCBIN_COMP("graphics/pokemon/dracovish/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dracovish[] = INCBIN_COMP("graphics/pokemon/dracovish/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dracovish[] = INCBIN_U32("graphics/pokemon/dracovish/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DRACOVISH #if P_FAMILY_ARCTOVISH @@ -19466,13 +19466,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Arctovish[] = INCBIN_U8("graphics/pokemon/arctovish/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Arctovish[] = INCBIN_COMP("graphics/pokemon/arctovish/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Arctovish[] = INCBIN_COMP("graphics/pokemon/arctovish/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Arctovish[] = INCBIN_U32("graphics/pokemon/arctovish/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ARCTOVISH #if P_FAMILY_DURALUDON @@ -19484,13 +19484,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Duraludon[] = INCBIN_U8("graphics/pokemon/duraludon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Duraludon[] = INCBIN_COMP("graphics/pokemon/duraludon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Duraludon[] = INCBIN_COMP("graphics/pokemon/duraludon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_GIGANTAMAX_FORMS const u32 gMonFrontPic_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/front.4bpp.lz"); @@ -19498,13 +19498,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_DuraludonGigantamax[] = INCBIN_COMP("graphics/pokemon/duraludon/gigantamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_DuraludonGigantamax[] = INCBIN_U32("graphics/pokemon/duraludon/gigantamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_DuraludonGigantamax[] = INCBIN_COMP("graphics/pokemon/duraludon/gigantamax/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #if P_GEN_9_CROSS_EVOS @@ -19516,13 +19516,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Archaludon[] = INCBIN_U8("graphics/pokemon/archaludon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Archaludon[] = INCBIN_COMP("graphics/pokemon/archaludon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Archaludon[] = INCBIN_COMP("graphics/pokemon/archaludon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Archaludon[] = INCBIN_U32("graphics/pokemon/archaludon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON @@ -19535,13 +19535,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dreepy[] = INCBIN_U8("graphics/pokemon/dreepy/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dreepy[] = INCBIN_COMP("graphics/pokemon/dreepy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dreepy[] = INCBIN_COMP("graphics/pokemon/dreepy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dreepy[] = INCBIN_U32("graphics/pokemon/dreepy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/front.4bpp.lz"); const u32 gMonPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/normal.gbapal.lz"); @@ -19551,13 +19551,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Drakloak[] = INCBIN_U8("graphics/pokemon/drakloak/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Drakloak[] = INCBIN_COMP("graphics/pokemon/drakloak/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Drakloak[] = INCBIN_COMP("graphics/pokemon/drakloak/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Drakloak[] = INCBIN_U32("graphics/pokemon/drakloak/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/front.4bpp.lz"); const u32 gMonPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/normal.gbapal.lz"); @@ -19567,13 +19567,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dragapult[] = INCBIN_U8("graphics/pokemon/dragapult/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Dragapult[] = INCBIN_COMP("graphics/pokemon/dragapult/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Dragapult[] = INCBIN_COMP("graphics/pokemon/dragapult/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Dragapult[] = INCBIN_U32("graphics/pokemon/dragapult/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DREEPY #if P_FAMILY_ZACIAN @@ -19585,26 +19585,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zacian[] = INCBIN_U8("graphics/pokemon/zacian/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ZacianHeroOfManyBattles[] = INCBIN_COMP("graphics/pokemon/zacian/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ZacianHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zacian/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ZacianHeroOfManyBattles[] = 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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ZacianCrownedSword[] = INCBIN_COMP("graphics/pokemon/zacian/crowned_sword/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ZacianCrownedSword[] = INCBIN_U32("graphics/pokemon/zacian/crowned_sword/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ZacianCrownedSword[] = 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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ZACIAN #if P_FAMILY_ZAMAZENTA @@ -19616,26 +19616,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zamazenta[] = INCBIN_U8("graphics/pokemon/zamazenta/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ZamazentaHeroOfManyBattles[] = INCBIN_COMP("graphics/pokemon/zamazenta/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ZamazentaHeroOfManyBattles[] = INCBIN_U32("graphics/pokemon/zamazenta/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ZamazentaHeroOfManyBattles[] = 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"); +#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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_ZamazentaCrownedShield[] = INCBIN_COMP("graphics/pokemon/zamazenta/crowned_shield/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_ZamazentaCrownedShield[] = INCBIN_U32("graphics/pokemon/zamazenta/crowned_shield/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_ZamazentaCrownedShield[] = 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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ZAMAZENTA #if P_FAMILY_ETERNATUS @@ -19647,26 +19647,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Eternatus[] = INCBIN_U8("graphics/pokemon/eternatus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Eternatus[] = INCBIN_COMP("graphics/pokemon/eternatus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Eternatus[] = INCBIN_COMP("graphics/pokemon/eternatus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Eternatus[] = INCBIN_U32("graphics/pokemon/eternatus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/front.4bpp.lz"); const u32 gMonPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/normal.gbapal.lz"); const u32 gMonBackPic_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/back.4bpp.lz"); const u32 gMonShinyPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/shiny.gbapal.lz"); const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/eternatus/eternamax/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_EternatusEternamax[] = INCBIN_COMP("graphics/pokemon/eternatus/eternamax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_EternatusEternamax[] = INCBIN_COMP("graphics/pokemon/eternatus/eternamax/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_EternatusEternamax[] = INCBIN_U32("graphics/pokemon/eternatus/eternamax/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ETERNATUS #if P_FAMILY_KUBFU @@ -19678,13 +19678,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kubfu[] = INCBIN_U8("graphics/pokemon/kubfu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Kubfu[] = INCBIN_COMP("graphics/pokemon/kubfu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Kubfu[] = INCBIN_COMP("graphics/pokemon/kubfu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Kubfu[] = INCBIN_U32("graphics/pokemon/kubfu/overworld_shiny.gbapal.lz"); +#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"); @@ -19694,13 +19694,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Urshifu[] = INCBIN_U8("graphics/pokemon/urshifu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Urshifu[] = INCBIN_COMP("graphics/pokemon/urshifu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Urshifu[] = INCBIN_COMP("graphics/pokemon/urshifu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Urshifu[] = INCBIN_U32("graphics/pokemon/urshifu/overworld_shiny.gbapal.lz"); +#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"); @@ -19720,10 +19720,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_UrshifuSingleStrikeStyleGigantamax[] = INCBIN_COMP("graphics/pokemon/urshifu/single_strike_style_gigantamax/follower.4bpp"); - // const u32 gObjectEventPic_UrshifuRapidStrikeStyleGigantamax[] = INCBIN_COMP("graphics/pokemon/urshifu/rapid_strike_style_gigantamax/follower.4bpp"); -#endif //OW_FOLLOWERS_ENABLED +#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"); +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KUBFU @@ -19736,26 +19736,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Zarude[] = INCBIN_U8("graphics/pokemon/zarude/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Zarude[] = INCBIN_COMP("graphics/pokemon/zarude/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Zarude[] = INCBIN_COMP("graphics/pokemon/zarude/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Zarude[] = INCBIN_U32("graphics/pokemon/zarude/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/front.4bpp.lz"); const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/normal.gbapal.lz"); const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/back.4bpp.lz"); const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/shiny.gbapal.lz"); const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - //const u32 gObjectEventPic_ZarudeDada[] = INCBIN_COMP("graphics/pokemon/zarude/dada/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + //const u32 gObjectEventPic_ZarudeDada[] = INCBIN_COMP("graphics/pokemon/zarude/dada/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ZARUDE #if P_FAMILY_REGIELEKI @@ -19767,13 +19767,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Regieleki[] = INCBIN_COMP("graphics/pokemon/regieleki/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Regieleki[] = INCBIN_COMP("graphics/pokemon/regieleki/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Regieleki[] = INCBIN_U32("graphics/pokemon/regieleki/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_REGIELEKI #if P_FAMILY_REGIDRAGO @@ -19785,13 +19785,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Regidrago[] = INCBIN_COMP("graphics/pokemon/regidrago/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Regidrago[] = INCBIN_COMP("graphics/pokemon/regidrago/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_REGIDRAGO #if P_FAMILY_GLASTRIER @@ -19803,13 +19803,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Glastrier[] = INCBIN_COMP("graphics/pokemon/glastrier/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Glastrier[] = INCBIN_COMP("graphics/pokemon/glastrier/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GLASTRIER #if P_FAMILY_SPECTRIER @@ -19821,13 +19821,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Spectrier[] = INCBIN_COMP("graphics/pokemon/spectrier/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Spectrier[] = INCBIN_COMP("graphics/pokemon/spectrier/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SPECTRIER #if P_FAMILY_CALYREX @@ -19839,13 +19839,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_Calyrex[] = INCBIN_COMP("graphics/pokemon/calyrex/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_Calyrex[] = INCBIN_COMP("graphics/pokemon/calyrex/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + const u32 gOverworldPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/overworld_normal.gbapal.lz"); + const u32 gShinyOverworldPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #if P_FUSION_FORMS const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz"); @@ -19853,13 +19853,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_CalyrexIceRider[] = INCBIN_COMP("graphics/pokemon/calyrex/ice_rider/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_CalyrexIceRider[] = INCBIN_COMP("graphics/pokemon/calyrex/ice_rider/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FUSION_FORMS #if P_FUSION_FORMS @@ -19868,13 +19868,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - const u32 gObjectEventPic_CalyrexShadowRider[] = INCBIN_COMP("graphics/pokemon/calyrex/shadow_rider/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - const u32 gFollowerPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/follow_normal.gbapal.lz"); - const u32 gShinyFollowerPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + const u32 gObjectEventPic_CalyrexShadowRider[] = INCBIN_COMP("graphics/pokemon/calyrex/shadow_rider/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FUSION_FORMS #endif //P_FAMILY_CALYREX @@ -19887,13 +19887,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sprigatito[] = INCBIN_U8("graphics/pokemon/sprigatito/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Sprigatito[] = INCBIN_COMP("graphics/pokemon/sprigatito/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Sprigatito[] = INCBIN_COMP("graphics/pokemon/sprigatito/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Sprigatito[] = INCBIN_U32("graphics/pokemon/sprigatito/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/front.4bpp.lz"); const u32 gMonPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/normal.gbapal.lz"); @@ -19903,13 +19903,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Floragato[] = INCBIN_U8("graphics/pokemon/floragato/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Floragato[] = INCBIN_COMP("graphics/pokemon/floragato/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Floragato[] = INCBIN_COMP("graphics/pokemon/floragato/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Floragato[] = INCBIN_U32("graphics/pokemon/floragato/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/front.4bpp.lz"); const u32 gMonPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/normal.gbapal.lz"); @@ -19919,13 +19919,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Meowscarada[] = INCBIN_U8("graphics/pokemon/meowscarada/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Meowscarada[] = INCBIN_COMP("graphics/pokemon/meowscarada/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Meowscarada[] = INCBIN_COMP("graphics/pokemon/meowscarada/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Meowscarada[] = INCBIN_U32("graphics/pokemon/meowscarada/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SPRIGATITO #if P_FAMILY_FUECOCO @@ -19937,13 +19937,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Fuecoco[] = INCBIN_U8("graphics/pokemon/fuecoco/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Fuecoco[] = INCBIN_COMP("graphics/pokemon/fuecoco/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Fuecoco[] = INCBIN_COMP("graphics/pokemon/fuecoco/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Fuecoco[] = INCBIN_U32("graphics/pokemon/fuecoco/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/front.4bpp.lz"); const u32 gMonPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/normal.gbapal.lz"); @@ -19953,13 +19953,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Crocalor[] = INCBIN_U8("graphics/pokemon/crocalor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Crocalor[] = INCBIN_COMP("graphics/pokemon/crocalor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Crocalor[] = INCBIN_COMP("graphics/pokemon/crocalor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Crocalor[] = INCBIN_U32("graphics/pokemon/crocalor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/front.4bpp.lz"); const u32 gMonPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/normal.gbapal.lz"); @@ -19969,13 +19969,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Skeledirge[] = INCBIN_U8("graphics/pokemon/skeledirge/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Skeledirge[] = INCBIN_COMP("graphics/pokemon/skeledirge/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Skeledirge[] = INCBIN_COMP("graphics/pokemon/skeledirge/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Skeledirge[] = INCBIN_U32("graphics/pokemon/skeledirge/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FUECOCO #if P_FAMILY_QUAXLY @@ -19987,13 +19987,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Quaxly[] = INCBIN_U8("graphics/pokemon/quaxly/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Quaxly[] = INCBIN_COMP("graphics/pokemon/quaxly/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Quaxly[] = INCBIN_COMP("graphics/pokemon/quaxly/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Quaxly[] = INCBIN_U32("graphics/pokemon/quaxly/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/front.4bpp.lz"); const u32 gMonPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/normal.gbapal.lz"); @@ -20003,13 +20003,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Quaxwell[] = INCBIN_U8("graphics/pokemon/quaxwell/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Quaxwell[] = INCBIN_COMP("graphics/pokemon/quaxwell/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Quaxwell[] = INCBIN_COMP("graphics/pokemon/quaxwell/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Quaxwell[] = INCBIN_U32("graphics/pokemon/quaxwell/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/front.4bpp.lz"); const u32 gMonPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/normal.gbapal.lz"); @@ -20019,13 +20019,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Quaquaval[] = INCBIN_U8("graphics/pokemon/quaquaval/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Quaquaval[] = INCBIN_COMP("graphics/pokemon/quaquaval/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Quaquaval[] = INCBIN_COMP("graphics/pokemon/quaquaval/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Quaquaval[] = INCBIN_U32("graphics/pokemon/quaquaval/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_QUAXLY #if P_FAMILY_LECHONK @@ -20037,13 +20037,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Lechonk[] = INCBIN_COMP("graphics/pokemon/lechonk/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Lechonk[] = INCBIN_COMP("graphics/pokemon/lechonk/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/overworld_shiny.gbapal.lz"); +#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"); @@ -20053,26 +20053,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_OinkologneMale[] = INCBIN_COMP("graphics/pokemon/oinkologne/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_OinkologneMale[] = 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"); +#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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_OinkologneFemale[] = INCBIN_COMP("graphics/pokemon/oinkologne/female/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_OinkologneFemale[] = INCBIN_COMP("graphics/pokemon/oinkologne/female/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_LECHONK #if P_FAMILY_TAROUNTULA @@ -20084,13 +20084,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tarountula[] = INCBIN_U8("graphics/pokemon/tarountula/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Tarountula[] = INCBIN_COMP("graphics/pokemon/tarountula/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Tarountula[] = INCBIN_COMP("graphics/pokemon/tarountula/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Tarountula[] = INCBIN_U32("graphics/pokemon/tarountula/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/front.4bpp.lz"); const u32 gMonPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/normal.gbapal.lz"); @@ -20100,13 +20100,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Spidops[] = INCBIN_U8("graphics/pokemon/spidops/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Spidops[] = INCBIN_COMP("graphics/pokemon/spidops/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Spidops[] = INCBIN_COMP("graphics/pokemon/spidops/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Spidops[] = INCBIN_U32("graphics/pokemon/spidops/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TAROUNTULA #if P_FAMILY_NYMBLE @@ -20118,13 +20118,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nymble[] = INCBIN_U8("graphics/pokemon/nymble/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Nymble[] = INCBIN_COMP("graphics/pokemon/nymble/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Nymble[] = INCBIN_COMP("graphics/pokemon/nymble/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Nymble[] = INCBIN_U32("graphics/pokemon/nymble/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/front.4bpp.lz"); const u32 gMonPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/normal.gbapal.lz"); @@ -20134,13 +20134,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Lokix[] = INCBIN_U8("graphics/pokemon/lokix/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Lokix[] = INCBIN_COMP("graphics/pokemon/lokix/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Lokix[] = INCBIN_COMP("graphics/pokemon/lokix/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Lokix[] = INCBIN_U32("graphics/pokemon/lokix/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_NYMBLE #if P_FAMILY_PAWMI @@ -20152,13 +20152,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pawmi[] = INCBIN_U8("graphics/pokemon/pawmi/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Pawmi[] = INCBIN_COMP("graphics/pokemon/pawmi/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Pawmi[] = INCBIN_COMP("graphics/pokemon/pawmi/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Pawmi[] = INCBIN_U32("graphics/pokemon/pawmi/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/front.4bpp.lz"); const u32 gMonPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/normal.gbapal.lz"); @@ -20168,13 +20168,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pawmo[] = INCBIN_U8("graphics/pokemon/pawmo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Pawmo[] = INCBIN_COMP("graphics/pokemon/pawmo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Pawmo[] = INCBIN_COMP("graphics/pokemon/pawmo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Pawmo[] = INCBIN_U32("graphics/pokemon/pawmo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/front.4bpp.lz"); const u32 gMonPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/normal.gbapal.lz"); @@ -20184,13 +20184,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pawmot[] = INCBIN_U8("graphics/pokemon/pawmot/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Pawmot[] = INCBIN_COMP("graphics/pokemon/pawmot/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Pawmot[] = INCBIN_COMP("graphics/pokemon/pawmot/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Pawmot[] = INCBIN_U32("graphics/pokemon/pawmot/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PAWMI #if P_FAMILY_TANDEMAUS @@ -20202,13 +20202,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tandemaus[] = INCBIN_U8("graphics/pokemon/tandemaus/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Tandemaus[] = INCBIN_COMP("graphics/pokemon/tandemaus/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Tandemaus[] = INCBIN_COMP("graphics/pokemon/tandemaus/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Tandemaus[] = INCBIN_U32("graphics/pokemon/tandemaus/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/normal.gbapal.lz"); const u32 gMonShinyPalette_Maushold[] = INCBIN_U32("graphics/pokemon/maushold/shiny.gbapal.lz"); @@ -20219,13 +20219,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_MausholdFamilyOfThree[] = INCBIN_U8("graphics/pokemon/maushold/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MausholdFamilyOfThree[] = INCBIN_COMP("graphics/pokemon/maushold/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MausholdFamilyOfThree[] = INCBIN_U32("graphics/pokemon/maushold/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MausholdFamilyOfThree[] = 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"); +#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"); @@ -20233,13 +20233,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_MausholdFamilyOfFour[] = INCBIN_U8("graphics/pokemon/maushold/four/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_MausholdFamilyOfFour[] = INCBIN_COMP("graphics/pokemon/maushold/four/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_MausholdFamilyOfFour[] = INCBIN_U32("graphics/pokemon/maushold/four/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_MausholdFamilyOfFour[] = 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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TANDEMAUS #if P_FAMILY_FIDOUGH @@ -20251,13 +20251,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Fidough[] = INCBIN_U8("graphics/pokemon/fidough/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Fidough[] = INCBIN_COMP("graphics/pokemon/fidough/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Fidough[] = INCBIN_COMP("graphics/pokemon/fidough/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Fidough[] = INCBIN_U32("graphics/pokemon/fidough/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/front.4bpp.lz"); const u32 gMonPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/normal.gbapal.lz"); @@ -20267,13 +20267,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dachsbun[] = INCBIN_U8("graphics/pokemon/dachsbun/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Dachsbun[] = INCBIN_COMP("graphics/pokemon/dachsbun/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Dachsbun[] = INCBIN_COMP("graphics/pokemon/dachsbun/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Dachsbun[] = INCBIN_U32("graphics/pokemon/dachsbun/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FIDOUGH #if P_FAMILY_SMOLIV @@ -20285,13 +20285,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Smoliv[] = INCBIN_U8("graphics/pokemon/smoliv/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Smoliv[] = INCBIN_COMP("graphics/pokemon/smoliv/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Smoliv[] = INCBIN_COMP("graphics/pokemon/smoliv/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Smoliv[] = INCBIN_U32("graphics/pokemon/smoliv/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/front.4bpp.lz"); const u32 gMonPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/normal.gbapal.lz"); @@ -20301,13 +20301,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dolliv[] = INCBIN_U8("graphics/pokemon/dolliv/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Dolliv[] = INCBIN_COMP("graphics/pokemon/dolliv/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Dolliv[] = INCBIN_COMP("graphics/pokemon/dolliv/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Dolliv[] = INCBIN_U32("graphics/pokemon/dolliv/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/front.4bpp.lz"); const u32 gMonPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/normal.gbapal.lz"); @@ -20317,13 +20317,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Arboliva[] = INCBIN_U8("graphics/pokemon/arboliva/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Arboliva[] = INCBIN_COMP("graphics/pokemon/arboliva/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Arboliva[] = INCBIN_COMP("graphics/pokemon/arboliva/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Arboliva[] = INCBIN_U32("graphics/pokemon/arboliva/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SMOLIV #if P_FAMILY_SQUAWKABILLY @@ -20336,46 +20336,46 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SquawkabillyGreenPlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/green_plumage/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SquawkabillyGreenPlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/green_plumage/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SquawkabillyGreenPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/green_plumage/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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SquawkabillyBluePlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/blue_plumage/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SquawkabillyBluePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/blue_plumage/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SquawkabillyBluePlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/blue_plumage/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SquawkabillyYellowPlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/yellow_plumage/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SquawkabillyYellowPlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/yellow_plumage/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SquawkabillyYellowPlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/yellow_plumage/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"); +#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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SquawkabillyWhitePlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/white_plumage/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SquawkabillyWhitePlumage[] = INCBIN_U32("graphics/pokemon/squawkabilly/white_plumage/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SquawkabillyWhitePlumage[] = INCBIN_COMP("graphics/pokemon/squawkabilly/white_plumage/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"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SQUAWKABILLY #if P_FAMILY_NACLI @@ -20387,13 +20387,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Nacli[] = INCBIN_U8("graphics/pokemon/nacli/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Nacli[] = INCBIN_COMP("graphics/pokemon/nacli/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Nacli[] = INCBIN_COMP("graphics/pokemon/nacli/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Nacli[] = INCBIN_U32("graphics/pokemon/nacli/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/front.4bpp.lz"); const u32 gMonPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/normal.gbapal.lz"); @@ -20403,13 +20403,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Naclstack[] = INCBIN_U8("graphics/pokemon/naclstack/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Naclstack[] = INCBIN_COMP("graphics/pokemon/naclstack/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Naclstack[] = INCBIN_COMP("graphics/pokemon/naclstack/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Naclstack[] = INCBIN_U32("graphics/pokemon/naclstack/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/front.4bpp.lz"); const u32 gMonPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/normal.gbapal.lz"); @@ -20419,13 +20419,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Garganacl[] = INCBIN_U8("graphics/pokemon/garganacl/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Garganacl[] = INCBIN_COMP("graphics/pokemon/garganacl/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Garganacl[] = INCBIN_COMP("graphics/pokemon/garganacl/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Garganacl[] = INCBIN_U32("graphics/pokemon/garganacl/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_NACLI #if P_FAMILY_CHARCADET @@ -20437,13 +20437,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Charcadet[] = INCBIN_U8("graphics/pokemon/charcadet/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Charcadet[] = INCBIN_COMP("graphics/pokemon/charcadet/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Charcadet[] = INCBIN_COMP("graphics/pokemon/charcadet/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Charcadet[] = INCBIN_U32("graphics/pokemon/charcadet/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/front.4bpp.lz"); const u32 gMonPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/normal.gbapal.lz"); @@ -20453,13 +20453,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Armarouge[] = INCBIN_U8("graphics/pokemon/armarouge/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Armarouge[] = INCBIN_COMP("graphics/pokemon/armarouge/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Armarouge[] = INCBIN_COMP("graphics/pokemon/armarouge/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Armarouge[] = INCBIN_U32("graphics/pokemon/armarouge/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/front.4bpp.lz"); const u32 gMonPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/normal.gbapal.lz"); @@ -20469,13 +20469,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Ceruledge[] = INCBIN_U8("graphics/pokemon/ceruledge/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Ceruledge[] = INCBIN_COMP("graphics/pokemon/ceruledge/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Ceruledge[] = INCBIN_COMP("graphics/pokemon/ceruledge/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Ceruledge[] = INCBIN_U32("graphics/pokemon/ceruledge/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CHARCADET #if P_FAMILY_TADBULB @@ -20487,13 +20487,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tadbulb[] = INCBIN_U8("graphics/pokemon/tadbulb/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Tadbulb[] = INCBIN_COMP("graphics/pokemon/tadbulb/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Tadbulb[] = INCBIN_COMP("graphics/pokemon/tadbulb/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Tadbulb[] = INCBIN_U32("graphics/pokemon/tadbulb/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/front.4bpp.lz"); const u32 gMonPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/normal.gbapal.lz"); @@ -20503,13 +20503,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bellibolt[] = INCBIN_U8("graphics/pokemon/bellibolt/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Bellibolt[] = INCBIN_COMP("graphics/pokemon/bellibolt/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Bellibolt[] = INCBIN_COMP("graphics/pokemon/bellibolt/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Bellibolt[] = INCBIN_U32("graphics/pokemon/bellibolt/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TADBULB #if P_FAMILY_WATTREL @@ -20521,13 +20521,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wattrel[] = INCBIN_U8("graphics/pokemon/wattrel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Wattrel[] = INCBIN_COMP("graphics/pokemon/wattrel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Wattrel[] = INCBIN_COMP("graphics/pokemon/wattrel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Wattrel[] = INCBIN_U32("graphics/pokemon/wattrel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/front.4bpp.lz"); const u32 gMonPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/normal.gbapal.lz"); @@ -20537,13 +20537,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Kilowattrel[] = INCBIN_U8("graphics/pokemon/kilowattrel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Kilowattrel[] = INCBIN_COMP("graphics/pokemon/kilowattrel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Kilowattrel[] = INCBIN_COMP("graphics/pokemon/kilowattrel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Kilowattrel[] = INCBIN_U32("graphics/pokemon/kilowattrel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WATTREL #if P_FAMILY_MASCHIFF @@ -20555,13 +20555,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Maschiff[] = INCBIN_U8("graphics/pokemon/maschiff/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Maschiff[] = INCBIN_COMP("graphics/pokemon/maschiff/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Maschiff[] = INCBIN_COMP("graphics/pokemon/maschiff/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Maschiff[] = INCBIN_U32("graphics/pokemon/maschiff/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/front.4bpp.lz"); const u32 gMonPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/normal.gbapal.lz"); @@ -20571,13 +20571,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Mabosstiff[] = INCBIN_U8("graphics/pokemon/mabosstiff/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Mabosstiff[] = INCBIN_COMP("graphics/pokemon/mabosstiff/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Mabosstiff[] = INCBIN_COMP("graphics/pokemon/mabosstiff/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Mabosstiff[] = INCBIN_U32("graphics/pokemon/mabosstiff/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MASCHIFF #if P_FAMILY_SHROODLE @@ -20589,13 +20589,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Shroodle[] = INCBIN_U8("graphics/pokemon/shroodle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Shroodle[] = INCBIN_COMP("graphics/pokemon/shroodle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Shroodle[] = INCBIN_COMP("graphics/pokemon/shroodle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Shroodle[] = INCBIN_U32("graphics/pokemon/shroodle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/front.4bpp.lz"); const u32 gMonPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/normal.gbapal.lz"); @@ -20605,13 +20605,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Grafaiai[] = INCBIN_U8("graphics/pokemon/grafaiai/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Grafaiai[] = INCBIN_COMP("graphics/pokemon/grafaiai/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Grafaiai[] = INCBIN_COMP("graphics/pokemon/grafaiai/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Grafaiai[] = INCBIN_U32("graphics/pokemon/grafaiai/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SHROODLE #if P_FAMILY_BRAMBLIN @@ -20623,13 +20623,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bramblin[] = INCBIN_U8("graphics/pokemon/bramblin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Bramblin[] = INCBIN_COMP("graphics/pokemon/bramblin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Bramblin[] = INCBIN_COMP("graphics/pokemon/bramblin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Bramblin[] = INCBIN_U32("graphics/pokemon/bramblin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/front.4bpp.lz"); const u32 gMonPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/normal.gbapal.lz"); @@ -20639,13 +20639,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Brambleghast[] = INCBIN_U8("graphics/pokemon/brambleghast/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Brambleghast[] = INCBIN_COMP("graphics/pokemon/brambleghast/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Brambleghast[] = INCBIN_COMP("graphics/pokemon/brambleghast/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Brambleghast[] = INCBIN_U32("graphics/pokemon/brambleghast/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BRAMBLIN #if P_FAMILY_TOEDSCOOL @@ -20657,13 +20657,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Toedscool[] = INCBIN_U8("graphics/pokemon/toedscool/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Toedscool[] = INCBIN_COMP("graphics/pokemon/toedscool/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Toedscool[] = INCBIN_COMP("graphics/pokemon/toedscool/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Toedscool[] = INCBIN_U32("graphics/pokemon/toedscool/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/front.4bpp.lz"); const u32 gMonPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/normal.gbapal.lz"); @@ -20673,13 +20673,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Toedscruel[] = INCBIN_U8("graphics/pokemon/toedscruel/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Toedscruel[] = INCBIN_COMP("graphics/pokemon/toedscruel/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Toedscruel[] = INCBIN_COMP("graphics/pokemon/toedscruel/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Toedscruel[] = INCBIN_U32("graphics/pokemon/toedscruel/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TOEDSCOOL #if P_FAMILY_KLAWF @@ -20691,13 +20691,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Klawf[] = INCBIN_U8("graphics/pokemon/klawf/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Klawf[] = INCBIN_COMP("graphics/pokemon/klawf/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Klawf[] = INCBIN_COMP("graphics/pokemon/klawf/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Klawf[] = INCBIN_U32("graphics/pokemon/klawf/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_KLAWF #if P_FAMILY_CAPSAKID @@ -20709,13 +20709,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Capsakid[] = INCBIN_U8("graphics/pokemon/capsakid/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Capsakid[] = INCBIN_COMP("graphics/pokemon/capsakid/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Capsakid[] = INCBIN_COMP("graphics/pokemon/capsakid/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Capsakid[] = INCBIN_U32("graphics/pokemon/capsakid/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/front.4bpp.lz"); const u32 gMonPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/normal.gbapal.lz"); @@ -20725,13 +20725,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Scovillain[] = INCBIN_U8("graphics/pokemon/scovillain/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Scovillain[] = INCBIN_COMP("graphics/pokemon/scovillain/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Scovillain[] = INCBIN_COMP("graphics/pokemon/scovillain/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Scovillain[] = INCBIN_U32("graphics/pokemon/scovillain/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CAPSAKID #if P_FAMILY_RELLOR @@ -20743,13 +20743,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rellor[] = INCBIN_U8("graphics/pokemon/rellor/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Rellor[] = INCBIN_COMP("graphics/pokemon/rellor/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Rellor[] = INCBIN_COMP("graphics/pokemon/rellor/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Rellor[] = INCBIN_U32("graphics/pokemon/rellor/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/front.4bpp.lz"); const u32 gMonPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/normal.gbapal.lz"); @@ -20759,13 +20759,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Rabsca[] = INCBIN_U8("graphics/pokemon/rabsca/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Rabsca[] = INCBIN_COMP("graphics/pokemon/rabsca/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Rabsca[] = INCBIN_COMP("graphics/pokemon/rabsca/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Rabsca[] = INCBIN_U32("graphics/pokemon/rabsca/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_RELLOR #if P_FAMILY_FLITTLE @@ -20777,13 +20777,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Flittle[] = INCBIN_U8("graphics/pokemon/flittle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Flittle[] = INCBIN_COMP("graphics/pokemon/flittle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Flittle[] = INCBIN_COMP("graphics/pokemon/flittle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Flittle[] = INCBIN_U32("graphics/pokemon/flittle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/front.4bpp.lz"); const u32 gMonPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/normal.gbapal.lz"); @@ -20793,13 +20793,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Espathra[] = INCBIN_U8("graphics/pokemon/espathra/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Espathra[] = INCBIN_COMP("graphics/pokemon/espathra/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Espathra[] = INCBIN_COMP("graphics/pokemon/espathra/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Espathra[] = INCBIN_U32("graphics/pokemon/espathra/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FLITTLE #if P_FAMILY_TINKATINK @@ -20811,13 +20811,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tinkatink[] = INCBIN_U8("graphics/pokemon/tinkatink/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Tinkatink[] = INCBIN_COMP("graphics/pokemon/tinkatink/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Tinkatink[] = INCBIN_COMP("graphics/pokemon/tinkatink/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Tinkatink[] = INCBIN_U32("graphics/pokemon/tinkatink/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/front.4bpp.lz"); const u32 gMonPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/normal.gbapal.lz"); @@ -20827,13 +20827,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tinkatuff[] = INCBIN_U8("graphics/pokemon/tinkatuff/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Tinkatuff[] = INCBIN_COMP("graphics/pokemon/tinkatuff/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Tinkatuff[] = INCBIN_COMP("graphics/pokemon/tinkatuff/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Tinkatuff[] = INCBIN_U32("graphics/pokemon/tinkatuff/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/front.4bpp.lz"); const u32 gMonPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/normal.gbapal.lz"); @@ -20843,13 +20843,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tinkaton[] = INCBIN_U8("graphics/pokemon/tinkaton/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Tinkaton[] = INCBIN_COMP("graphics/pokemon/tinkaton/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Tinkaton[] = INCBIN_COMP("graphics/pokemon/tinkaton/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Tinkaton[] = INCBIN_U32("graphics/pokemon/tinkaton/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TINKATINK #if P_FAMILY_WIGLETT @@ -20861,13 +20861,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wiglett[] = INCBIN_U8("graphics/pokemon/wiglett/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Wiglett[] = INCBIN_COMP("graphics/pokemon/wiglett/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Wiglett[] = INCBIN_COMP("graphics/pokemon/wiglett/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Wiglett[] = INCBIN_U32("graphics/pokemon/wiglett/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/front.4bpp.lz"); const u32 gMonPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/normal.gbapal.lz"); @@ -20877,13 +20877,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Wugtrio[] = INCBIN_U8("graphics/pokemon/wugtrio/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Wugtrio[] = INCBIN_COMP("graphics/pokemon/wugtrio/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Wugtrio[] = INCBIN_COMP("graphics/pokemon/wugtrio/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Wugtrio[] = INCBIN_U32("graphics/pokemon/wugtrio/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WIGLETT #if P_FAMILY_BOMBIRDIER @@ -20895,13 +20895,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Bombirdier[] = INCBIN_U8("graphics/pokemon/bombirdier/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Bombirdier[] = INCBIN_COMP("graphics/pokemon/bombirdier/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Bombirdier[] = INCBIN_COMP("graphics/pokemon/bombirdier/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Bombirdier[] = INCBIN_U32("graphics/pokemon/bombirdier/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BOMBIRDIER #if P_FAMILY_FINIZEN @@ -20913,13 +20913,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Finizen[] = INCBIN_U8("graphics/pokemon/finizen/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Finizen[] = INCBIN_COMP("graphics/pokemon/finizen/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Finizen[] = INCBIN_COMP("graphics/pokemon/finizen/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Finizen[] = INCBIN_U32("graphics/pokemon/finizen/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/front.4bpp.lz"); const u32 gMonPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/normal.gbapal.lz"); @@ -20929,26 +20929,26 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Palafin[] = INCBIN_U8("graphics/pokemon/palafin/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_PalafinZero[] = INCBIN_COMP("graphics/pokemon/palafin/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_PalafinZero[] = INCBIN_COMP("graphics/pokemon/palafin/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_PalafinZero[] = INCBIN_U32("graphics/pokemon/palafin/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/front.4bpp.lz"); const u32 gMonPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/normal.gbapal.lz"); const u32 gMonBackPic_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/back.4bpp.lz"); const u32 gMonShinyPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/shiny.gbapal.lz"); const u8 gMonIcon_PalafinHero[] = INCBIN_U8("graphics/pokemon/palafin/hero/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_PalafinHero[] = INCBIN_COMP("graphics/pokemon/palafin/hero/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_PalafinHero[] = INCBIN_COMP("graphics/pokemon/palafin/hero/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_PalafinHero[] = INCBIN_U32("graphics/pokemon/palafin/hero/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FINIZEN #if P_FAMILY_VAROOM @@ -20960,13 +20960,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Varoom[] = INCBIN_U8("graphics/pokemon/varoom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Varoom[] = INCBIN_COMP("graphics/pokemon/varoom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Varoom[] = INCBIN_COMP("graphics/pokemon/varoom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Varoom[] = INCBIN_U32("graphics/pokemon/varoom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/front.4bpp.lz"); const u32 gMonPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/normal.gbapal.lz"); @@ -20976,13 +20976,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Revavroom[] = INCBIN_U8("graphics/pokemon/revavroom/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Revavroom[] = INCBIN_COMP("graphics/pokemon/revavroom/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Revavroom[] = INCBIN_COMP("graphics/pokemon/revavroom/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Revavroom[] = INCBIN_U32("graphics/pokemon/revavroom/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_VAROOM #if P_FAMILY_CYCLIZAR @@ -20994,13 +20994,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cyclizar[] = INCBIN_U8("graphics/pokemon/cyclizar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Cyclizar[] = INCBIN_COMP("graphics/pokemon/cyclizar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Cyclizar[] = INCBIN_COMP("graphics/pokemon/cyclizar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Cyclizar[] = INCBIN_U32("graphics/pokemon/cyclizar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CYCLIZAR #if P_FAMILY_ORTHWORM @@ -21012,13 +21012,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Orthworm[] = INCBIN_U8("graphics/pokemon/orthworm/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Orthworm[] = INCBIN_COMP("graphics/pokemon/orthworm/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Orthworm[] = INCBIN_COMP("graphics/pokemon/orthworm/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Orthworm[] = INCBIN_U32("graphics/pokemon/orthworm/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ORTHWORM #if P_FAMILY_GLIMMET @@ -21030,13 +21030,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Glimmet[] = INCBIN_U8("graphics/pokemon/glimmet/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Glimmet[] = INCBIN_COMP("graphics/pokemon/glimmet/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Glimmet[] = INCBIN_COMP("graphics/pokemon/glimmet/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Glimmet[] = INCBIN_U32("graphics/pokemon/glimmet/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/front.4bpp.lz"); const u32 gMonPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/normal.gbapal.lz"); @@ -21046,13 +21046,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Glimmora[] = INCBIN_U8("graphics/pokemon/glimmora/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Glimmora[] = INCBIN_COMP("graphics/pokemon/glimmora/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Glimmora[] = INCBIN_COMP("graphics/pokemon/glimmora/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Glimmora[] = INCBIN_U32("graphics/pokemon/glimmora/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GLIMMET #if P_FAMILY_GREAVARD @@ -21064,13 +21064,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Greavard[] = INCBIN_U8("graphics/pokemon/greavard/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Greavard[] = INCBIN_COMP("graphics/pokemon/greavard/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Greavard[] = INCBIN_COMP("graphics/pokemon/greavard/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Greavard[] = INCBIN_U32("graphics/pokemon/greavard/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/front.4bpp.lz"); const u32 gMonPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/normal.gbapal.lz"); @@ -21080,13 +21080,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Houndstone[] = INCBIN_U8("graphics/pokemon/houndstone/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Houndstone[] = INCBIN_COMP("graphics/pokemon/houndstone/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Houndstone[] = INCBIN_COMP("graphics/pokemon/houndstone/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Houndstone[] = INCBIN_U32("graphics/pokemon/houndstone/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GREAVARD #if P_FAMILY_FLAMIGO @@ -21098,13 +21098,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Flamigo[] = INCBIN_U8("graphics/pokemon/flamigo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Flamigo[] = INCBIN_COMP("graphics/pokemon/flamigo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Flamigo[] = INCBIN_COMP("graphics/pokemon/flamigo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Flamigo[] = INCBIN_U32("graphics/pokemon/flamigo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FLAMIGO #if P_FAMILY_CETODDLE @@ -21116,13 +21116,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cetoddle[] = INCBIN_U8("graphics/pokemon/cetoddle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Cetoddle[] = INCBIN_COMP("graphics/pokemon/cetoddle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Cetoddle[] = INCBIN_COMP("graphics/pokemon/cetoddle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Cetoddle[] = INCBIN_U32("graphics/pokemon/cetoddle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/front.4bpp.lz"); const u32 gMonPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/normal.gbapal.lz"); @@ -21132,13 +21132,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Cetitan[] = INCBIN_U8("graphics/pokemon/cetitan/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Cetitan[] = INCBIN_COMP("graphics/pokemon/cetitan/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Cetitan[] = INCBIN_COMP("graphics/pokemon/cetitan/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Cetitan[] = INCBIN_U32("graphics/pokemon/cetitan/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CETODDLE #if P_FAMILY_VELUZA @@ -21150,13 +21150,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Veluza[] = INCBIN_U8("graphics/pokemon/veluza/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Veluza[] = INCBIN_COMP("graphics/pokemon/veluza/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Veluza[] = INCBIN_COMP("graphics/pokemon/veluza/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Veluza[] = INCBIN_U32("graphics/pokemon/veluza/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_VELUZA #if P_FAMILY_DONDOZO @@ -21168,13 +21168,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Dondozo[] = INCBIN_U8("graphics/pokemon/dondozo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Dondozo[] = INCBIN_COMP("graphics/pokemon/dondozo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Dondozo[] = INCBIN_COMP("graphics/pokemon/dondozo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Dondozo[] = INCBIN_U32("graphics/pokemon/dondozo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DONDOZO #if P_FAMILY_TATSUGIRI @@ -21186,39 +21186,39 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Tatsugiri[] = INCBIN_U8("graphics/pokemon/tatsugiri/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_TatsugiriCurly[] = INCBIN_COMP("graphics/pokemon/tatsugiri/curly/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_TatsugiriCurly[] = INCBIN_COMP("graphics/pokemon/tatsugiri/curly/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_TatsugiriCurly[] = INCBIN_U32("graphics/pokemon/tatsugiri/curly/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/front.4bpp.lz"); const u32 gMonPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/normal.gbapal.lz"); const u32 gMonBackPic_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/back.4bpp.lz"); const u32 gMonShinyPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/shiny.gbapal.lz"); const u8 gMonIcon_TatsugiriDroopy[] = INCBIN_U8("graphics/pokemon/tatsugiri/droopy/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_TatsugiriDroopy[] = INCBIN_COMP("graphics/pokemon/tatsugiri/droopy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_TatsugiriDroopy[] = INCBIN_COMP("graphics/pokemon/tatsugiri/droopy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_TatsugiriDroopy[] = INCBIN_U32("graphics/pokemon/tatsugiri/droopy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/front.4bpp.lz"); const u32 gMonPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/normal.gbapal.lz"); const u32 gMonBackPic_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/back.4bpp.lz"); const u32 gMonShinyPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/shiny.gbapal.lz"); const u8 gMonIcon_TatsugiriStretchy[] = INCBIN_U8("graphics/pokemon/tatsugiri/stretchy/icon.4bpp"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_TatsugiriStretchy[] = INCBIN_COMP("graphics/pokemon/tatsugiri/stretchy/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_TatsugiriStretchy[] = INCBIN_COMP("graphics/pokemon/tatsugiri/stretchy/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_TatsugiriStretchy[] = INCBIN_U32("graphics/pokemon/tatsugiri/stretchy/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_DONDOZO #if P_FAMILY_GREAT_TUSK @@ -21230,13 +21230,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_GreatTusk[] = INCBIN_U8("graphics/pokemon/great_tusk/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GreatTusk[] = INCBIN_COMP("graphics/pokemon/great_tusk/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GreatTusk[] = INCBIN_COMP("graphics/pokemon/great_tusk/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GreatTusk[] = INCBIN_U32("graphics/pokemon/great_tusk/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GREAT_TUSK #if P_FAMILY_SCREAM_TAIL @@ -21248,13 +21248,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_ScreamTail[] = INCBIN_U8("graphics/pokemon/scream_tail/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_ScreamTail[] = INCBIN_COMP("graphics/pokemon/scream_tail/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_ScreamTail[] = INCBIN_COMP("graphics/pokemon/scream_tail/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_ScreamTail[] = INCBIN_U32("graphics/pokemon/scream_tail/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SCREAM_TAIL #if P_FAMILY_BRUTE_BONNET @@ -21266,13 +21266,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_BruteBonnet[] = INCBIN_U8("graphics/pokemon/brute_bonnet/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_BruteBonnet[] = INCBIN_COMP("graphics/pokemon/brute_bonnet/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_BruteBonnet[] = INCBIN_COMP("graphics/pokemon/brute_bonnet/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_BruteBonnet[] = INCBIN_U32("graphics/pokemon/brute_bonnet/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_BRUTE_BONNET #if P_FAMILY_FLUTTER_MANE @@ -21284,13 +21284,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_FlutterMane[] = INCBIN_U8("graphics/pokemon/flutter_mane/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_FlutterMane[] = INCBIN_COMP("graphics/pokemon/flutter_mane/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_FlutterMane[] = INCBIN_COMP("graphics/pokemon/flutter_mane/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_FlutterMane[] = INCBIN_U32("graphics/pokemon/flutter_mane/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FLUTTER_MANE #if P_FAMILY_SLITHER_WING @@ -21302,13 +21302,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_SlitherWing[] = INCBIN_U8("graphics/pokemon/slither_wing/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SlitherWing[] = INCBIN_COMP("graphics/pokemon/slither_wing/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SlitherWing[] = INCBIN_COMP("graphics/pokemon/slither_wing/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SlitherWing[] = INCBIN_U32("graphics/pokemon/slither_wing/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SLITHER_WING #if P_FAMILY_SANDY_SHOCKS @@ -21320,13 +21320,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_SandyShocks[] = INCBIN_U8("graphics/pokemon/sandy_shocks/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_SandyShocks[] = INCBIN_COMP("graphics/pokemon/sandy_shocks/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_SandyShocks[] = INCBIN_COMP("graphics/pokemon/sandy_shocks/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_SandyShocks[] = INCBIN_U32("graphics/pokemon/sandy_shocks/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_SANDY_SHOCKS #if P_FAMILY_IRON_TREADS @@ -21338,13 +21338,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_IronTreads[] = INCBIN_U8("graphics/pokemon/iron_treads/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_IronTreads[] = INCBIN_COMP("graphics/pokemon/iron_treads/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_IronTreads[] = INCBIN_COMP("graphics/pokemon/iron_treads/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_IronTreads[] = INCBIN_U32("graphics/pokemon/iron_treads/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_IRON_TREADS #if P_FAMILY_IRON_BUNDLE @@ -21356,13 +21356,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_IronBundle[] = INCBIN_U8("graphics/pokemon/iron_bundle/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_IronBundle[] = INCBIN_COMP("graphics/pokemon/iron_bundle/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_IronBundle[] = INCBIN_COMP("graphics/pokemon/iron_bundle/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_IronBundle[] = INCBIN_U32("graphics/pokemon/iron_bundle/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_IRON_BUNDLE #if P_FAMILY_IRON_HANDS @@ -21374,13 +21374,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_IronHands[] = INCBIN_U8("graphics/pokemon/iron_hands/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_IronHands[] = INCBIN_COMP("graphics/pokemon/iron_hands/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_IronHands[] = INCBIN_COMP("graphics/pokemon/iron_hands/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_IronHands[] = INCBIN_U32("graphics/pokemon/iron_hands/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_IRON_HANDS #if P_FAMILY_IRON_JUGULIS @@ -21392,13 +21392,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_IronJugulis[] = INCBIN_U8("graphics/pokemon/iron_jugulis/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_IronJugulis[] = INCBIN_COMP("graphics/pokemon/iron_jugulis/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_IronJugulis[] = INCBIN_COMP("graphics/pokemon/iron_jugulis/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_IronJugulis[] = INCBIN_U32("graphics/pokemon/iron_jugulis/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_IRON_JUGULIS #if P_FAMILY_IRON_MOTH @@ -21410,13 +21410,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_IronMoth[] = INCBIN_U8("graphics/pokemon/iron_moth/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_IronMoth[] = INCBIN_COMP("graphics/pokemon/iron_moth/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_IronMoth[] = INCBIN_COMP("graphics/pokemon/iron_moth/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_IronMoth[] = INCBIN_U32("graphics/pokemon/iron_moth/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_IRON_MOTH #if P_FAMILY_IRON_THORNS @@ -21428,13 +21428,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_IronThorns[] = INCBIN_U8("graphics/pokemon/iron_thorns/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_IronThorns[] = INCBIN_COMP("graphics/pokemon/iron_thorns/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_IronThorns[] = INCBIN_COMP("graphics/pokemon/iron_thorns/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_IronThorns[] = INCBIN_U32("graphics/pokemon/iron_thorns/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_IRON_THORNS #if P_FAMILY_FRIGIBAX @@ -21446,13 +21446,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Frigibax[] = INCBIN_U8("graphics/pokemon/frigibax/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Frigibax[] = INCBIN_COMP("graphics/pokemon/frigibax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Frigibax[] = INCBIN_COMP("graphics/pokemon/frigibax/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Frigibax[] = INCBIN_U32("graphics/pokemon/frigibax/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/front.4bpp.lz"); const u32 gMonPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/normal.gbapal.lz"); @@ -21462,13 +21462,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Arctibax[] = INCBIN_U8("graphics/pokemon/arctibax/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Arctibax[] = INCBIN_COMP("graphics/pokemon/arctibax/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Arctibax[] = INCBIN_COMP("graphics/pokemon/arctibax/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Arctibax[] = INCBIN_U32("graphics/pokemon/arctibax/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/front.4bpp.lz"); const u32 gMonPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/normal.gbapal.lz"); @@ -21478,13 +21478,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Baxcalibur[] = INCBIN_U8("graphics/pokemon/baxcalibur/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Baxcalibur[] = INCBIN_COMP("graphics/pokemon/baxcalibur/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Baxcalibur[] = INCBIN_COMP("graphics/pokemon/baxcalibur/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Baxcalibur[] = INCBIN_U32("graphics/pokemon/baxcalibur/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FRIGIBAX #if P_FAMILY_GIMMIGHOUL @@ -21496,13 +21496,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_GimmighoulChest[] = INCBIN_U8("graphics/pokemon/gimmighoul/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GimmighoulChest[] = INCBIN_COMP("graphics/pokemon/gimmighoul/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GimmighoulChest[] = INCBIN_COMP("graphics/pokemon/gimmighoul/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GimmighoulChest[] = INCBIN_U32("graphics/pokemon/gimmighoul/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/front.4bpp.lz"); const u32 gMonPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/normal.gbapal.lz"); @@ -21512,13 +21512,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_GimmighoulRoaming[] = INCBIN_U8("graphics/pokemon/gimmighoul/roaming/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GimmighoulRoaming[] = INCBIN_COMP("graphics/pokemon/gimmighoul/roaming/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GimmighoulRoaming[] = INCBIN_COMP("graphics/pokemon/gimmighoul/roaming/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GimmighoulRoaming[] = INCBIN_U32("graphics/pokemon/gimmighoul/roaming/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/front.4bpp.lz"); const u32 gMonPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/normal.gbapal.lz"); @@ -21528,13 +21528,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Gholdengo[] = INCBIN_U8("graphics/pokemon/gholdengo/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Gholdengo[] = INCBIN_COMP("graphics/pokemon/gholdengo/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Gholdengo[] = INCBIN_COMP("graphics/pokemon/gholdengo/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Gholdengo[] = INCBIN_U32("graphics/pokemon/gholdengo/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GIMMIGHOUL #if P_FAMILY_WO_CHIEN @@ -21546,13 +21546,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_WoChien[] = INCBIN_U8("graphics/pokemon/wo_chien/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_WoChien[] = INCBIN_COMP("graphics/pokemon/wo_chien/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_WoChien[] = INCBIN_COMP("graphics/pokemon/wo_chien/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_WoChien[] = INCBIN_U32("graphics/pokemon/wo_chien/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WO_CHIEN #if P_FAMILY_CHIEN_PAO @@ -21564,13 +21564,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_ChienPao[] = INCBIN_U8("graphics/pokemon/chien_pao/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_ChienPao[] = INCBIN_COMP("graphics/pokemon/chien_pao/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_ChienPao[] = INCBIN_COMP("graphics/pokemon/chien_pao/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_ChienPao[] = INCBIN_U32("graphics/pokemon/chien_pao/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CHIEN_PAO #if P_FAMILY_TING_LU @@ -21582,13 +21582,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_TingLu[] = INCBIN_U8("graphics/pokemon/ting_lu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_TingLu[] = INCBIN_COMP("graphics/pokemon/ting_lu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_TingLu[] = INCBIN_COMP("graphics/pokemon/ting_lu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_TingLu[] = INCBIN_U32("graphics/pokemon/ting_lu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TING_LU #if P_FAMILY_CHI_YU @@ -21600,13 +21600,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_ChiYu[] = INCBIN_U8("graphics/pokemon/chi_yu/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_ChiYu[] = INCBIN_COMP("graphics/pokemon/chi_yu/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_ChiYu[] = INCBIN_COMP("graphics/pokemon/chi_yu/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_ChiYu[] = INCBIN_U32("graphics/pokemon/chi_yu/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_CHI_YU #if P_FAMILY_ROARING_MOON @@ -21618,13 +21618,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_RoaringMoon[] = INCBIN_U8("graphics/pokemon/roaring_moon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_RoaringMoon[] = INCBIN_COMP("graphics/pokemon/roaring_moon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_RoaringMoon[] = INCBIN_COMP("graphics/pokemon/roaring_moon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_RoaringMoon[] = INCBIN_U32("graphics/pokemon/roaring_moon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_ROARING_MOON #if P_FAMILY_IRON_VALIANT @@ -21636,13 +21636,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_IronValiant[] = INCBIN_U8("graphics/pokemon/iron_valiant/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_IronValiant[] = INCBIN_COMP("graphics/pokemon/iron_valiant/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_IronValiant[] = INCBIN_COMP("graphics/pokemon/iron_valiant/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_IronValiant[] = INCBIN_U32("graphics/pokemon/iron_valiant/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_IRON_VALIANT #if P_FAMILY_KORAIDON @@ -21654,13 +21654,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Koraidon[] = INCBIN_U8("graphics/pokemon/koraidon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Koraidon[] = INCBIN_COMP("graphics/pokemon/koraidon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Koraidon[] = INCBIN_COMP("graphics/pokemon/koraidon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Koraidon[] = INCBIN_U32("graphics/pokemon/koraidon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_KORAIDON #if P_FAMILY_MIRAIDON @@ -21672,13 +21672,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Miraidon[] = INCBIN_U8("graphics/pokemon/miraidon/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Miraidon[] = INCBIN_COMP("graphics/pokemon/miraidon/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Miraidon[] = INCBIN_COMP("graphics/pokemon/miraidon/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Miraidon[] = INCBIN_U32("graphics/pokemon/miraidon/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MIRAIDON #if P_FAMILY_WALKING_WAKE @@ -21690,13 +21690,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_WalkingWake[] = INCBIN_U8("graphics/pokemon/walking_wake/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_WalkingWake[] = INCBIN_COMP("graphics/pokemon/walking_wake/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_WalkingWake[] = INCBIN_COMP("graphics/pokemon/walking_wake/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_WalkingWake[] = INCBIN_U32("graphics/pokemon/walking_wake/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_WALKING_WAKE #if P_FAMILY_IRON_LEAVES @@ -21708,13 +21708,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_IronLeaves[] = INCBIN_U8("graphics/pokemon/iron_leaves/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_IronLeaves[] = INCBIN_COMP("graphics/pokemon/iron_leaves/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_IronLeaves[] = INCBIN_COMP("graphics/pokemon/iron_leaves/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_IronLeaves[] = INCBIN_U32("graphics/pokemon/iron_leaves/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_IRON_LEAVES #if P_FAMILY_POLTCHAGEIST @@ -21726,13 +21726,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Poltchageist[] = INCBIN_U8("graphics/pokemon/poltchageist/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Poltchageist[] = INCBIN_COMP("graphics/pokemon/poltchageist/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Poltchageist[] = INCBIN_COMP("graphics/pokemon/poltchageist/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Poltchageist[] = INCBIN_U32("graphics/pokemon/poltchageist/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/front.4bpp.lz"); const u32 gMonPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/normal.gbapal.lz"); @@ -21742,13 +21742,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Sinistcha[] = INCBIN_U8("graphics/pokemon/sinistcha/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Sinistcha[] = INCBIN_COMP("graphics/pokemon/sinistcha/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Sinistcha[] = INCBIN_COMP("graphics/pokemon/sinistcha/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Sinistcha[] = INCBIN_U32("graphics/pokemon/sinistcha/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_POLTCHAGEIST #if P_FAMILY_OKIDOGI @@ -21760,13 +21760,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Okidogi[] = INCBIN_U8("graphics/pokemon/okidogi/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Okidogi[] = INCBIN_COMP("graphics/pokemon/okidogi/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Okidogi[] = INCBIN_COMP("graphics/pokemon/okidogi/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Okidogi[] = INCBIN_U32("graphics/pokemon/okidogi/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_OKIDOGI #if P_FAMILY_MUNKIDORI @@ -21778,13 +21778,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Munkidori[] = INCBIN_U8("graphics/pokemon/munkidori/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Munkidori[] = INCBIN_COMP("graphics/pokemon/munkidori/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Munkidori[] = INCBIN_COMP("graphics/pokemon/munkidori/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Munkidori[] = INCBIN_U32("graphics/pokemon/munkidori/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_MUNKIDORI #if P_FAMILY_FEZANDIPITI @@ -21796,13 +21796,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Fezandipiti[] = INCBIN_U8("graphics/pokemon/fezandipiti/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Fezandipiti[] = INCBIN_COMP("graphics/pokemon/fezandipiti/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Fezandipiti[] = INCBIN_COMP("graphics/pokemon/fezandipiti/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Fezandipiti[] = INCBIN_U32("graphics/pokemon/fezandipiti/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_FEZANDIPITI #if P_FAMILY_OGERPON @@ -21853,12 +21853,12 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ // 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"); -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_OgerponTealMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/follower.4bpp"); - // const u32 gObjectEventPic_OgerponWellspringMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/wellspring/follower.4bpp"); - // const u32 gObjectEventPic_OgerponHearthflameMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/hearthflame/follower.4bpp"); - // const u32 gObjectEventPic_OgerponCornerstoneMask[] = INCBIN_COMP("graphics/pokemon/ogerpon/cornerstone/follower.4bpp"); -#endif //OW_FOLLOWERS_ENABLED +#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"); +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_OGERPON #if P_FAMILY_GOUGING_FIRE @@ -21870,13 +21870,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_GougingFire[] = INCBIN_U8("graphics/pokemon/gouging_fire/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_GougingFire[] = INCBIN_COMP("graphics/pokemon/gouging_fire/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_GougingFire[] = INCBIN_COMP("graphics/pokemon/gouging_fire/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_GougingFire[] = INCBIN_U32("graphics/pokemon/gouging_fire/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_GOUGING_FIRE #if P_FAMILY_RAGING_BOLT @@ -21888,13 +21888,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_RagingBolt[] = INCBIN_U8("graphics/pokemon/raging_bolt/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_RagingBolt[] = INCBIN_COMP("graphics/pokemon/raging_bolt/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_RagingBolt[] = INCBIN_COMP("graphics/pokemon/raging_bolt/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_RagingBolt[] = INCBIN_U32("graphics/pokemon/raging_bolt/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_RAGING_BOLT #if P_FAMILY_IRON_BOULDER @@ -21906,13 +21906,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_IronBoulder[] = INCBIN_U8("graphics/pokemon/iron_boulder/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_IronBoulder[] = INCBIN_COMP("graphics/pokemon/iron_boulder/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_IronBoulder[] = INCBIN_COMP("graphics/pokemon/iron_boulder/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_IronBoulder[] = INCBIN_U32("graphics/pokemon/iron_boulder/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_IRON_BOULDER #if P_FAMILY_IRON_CROWN @@ -21924,13 +21924,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_IronCrown[] = INCBIN_U8("graphics/pokemon/iron_crown/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_IronCrown[] = INCBIN_COMP("graphics/pokemon/iron_crown/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_IronCrown[] = INCBIN_COMP("graphics/pokemon/iron_crown/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_IronCrown[] = INCBIN_U32("graphics/pokemon/iron_crown/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_IRON_CROWN #if P_FAMILY_TERAPAGOS @@ -21942,13 +21942,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_TerapagosNormal[] = INCBIN_U8("graphics/pokemon/terapagos/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_TerapagosNormal[] = INCBIN_COMP("graphics/pokemon/terapagos/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_TerapagosNormal[] = INCBIN_COMP("graphics/pokemon/terapagos/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_TerapagosNormal[] = INCBIN_U32("graphics/pokemon/terapagos/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS const u32 gMonFrontPic_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/anim_front.4bpp.lz"); const u32 gMonPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/normal.gbapal.lz"); @@ -21958,13 +21958,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_TerapagosTerastal[] = INCBIN_U8("graphics/pokemon/terapagos/terastal/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_TerapagosTerastal[] = INCBIN_COMP("graphics/pokemon/terapagos/terastal/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_TerapagosTerastal[] = INCBIN_COMP("graphics/pokemon/terapagos/terastal/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_TerapagosTerastal[] = INCBIN_U32("graphics/pokemon/terapagos/terastal/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS // const u32 gMonFrontPic_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/front.4bpp.lz"); // const u32 gMonPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/normal.gbapal.lz"); @@ -21974,13 +21974,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_TerapagosStellar[] = INCBIN_U8("graphics/pokemon/terapagos/stellar/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_TerapagosStellar[] = INCBIN_COMP("graphics/pokemon/terapagos/stellar/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_TerapagosStellar[] = INCBIN_COMP("graphics/pokemon/terapagos/stellar/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_TerapagosStellar[] = INCBIN_U32("graphics/pokemon/terapagos/stellar/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_TERAPAGOS #if P_FAMILY_PECHARUNT @@ -21992,13 +21992,13 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #if P_FOOTPRINTS const u8 gMonFootprint_Pecharunt[] = INCBIN_U8("graphics/pokemon/pecharunt/footprint.1bpp"); #endif //P_FOOTPRINTS -#if OW_FOLLOWERS_ENABLED - // const u32 gObjectEventPic_Pecharunt[] = INCBIN_COMP("graphics/pokemon/pecharunt/follower.4bpp"); -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE - // const u32 gFollowerPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/follow_normal.gbapal.lz"); - // const u32 gShinyFollowerPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/follow_shiny.gbapal.lz"); -#endif //OW_FOLLOWERS_SHARE_PALETTE -#endif //OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS + // const u32 gObjectEventPic_Pecharunt[] = INCBIN_COMP("graphics/pokemon/pecharunt/overworld.4bpp"); +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + // const u32 gOverworldPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/overworld_normal.gbapal.lz"); + // const u32 gShinyOverworldPalette_Pecharunt[] = INCBIN_U32("graphics/pokemon/pecharunt/overworld_shiny.gbapal.lz"); +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES +#endif //OW_POKEMON_OBJECT_EVENTS #endif //P_FAMILY_PECHARUNT const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz"); diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index ff0d3f0568..1f08b77599 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -380,11 +380,11 @@ const u32 gObjectEventPic_RayquazaCutscene[] = INCBIN_U32("graphics/object_event const u16 gObjectEventPal_HoOh[] = INCBIN_U16("graphics/object_events/palettes/ho_oh.gbapal"); const u16 gObjectEventPal_Lugia[] = INCBIN_U16("graphics/object_events/palettes/lugia.gbapal"); -const u16 gObjectEventPal_Substitute[] = INCBIN_U16("graphics/pokemon/question_mark/follower.gbapal"); +const u16 gObjectEventPal_Substitute[] = INCBIN_U16("graphics/pokemon/question_mark/overworld.gbapal"); const u16 gObjectEventPaletteEmotes[] = INCBIN_U16("graphics/misc/emotes.gbapal"); -#if OW_MON_POKEBALLS +#if OW_FOLLOWERS_POKEBALLS const u32 gObjectEventPic_MasterBall[] = INCBIN_U32("graphics/object_events/pics/misc/ball_master.4bpp"); const u32 gObjectEventPic_UltraBall[] = INCBIN_U32("graphics/object_events/pics/misc/ball_ultra.4bpp"); const u32 gObjectEventPic_GreatBall[] = INCBIN_U32("graphics/object_events/pics/misc/ball_great.4bpp"); @@ -413,10 +413,10 @@ const u32 gObjectEventPic_DreamBall[] = INCBIN_U32("graphics/object_events/pics/ const u32 gObjectEventPic_BeastBall[] = INCBIN_U32("graphics/object_events/pics/misc/ball_beast.4bpp"); #ifdef ITEM_STRANGE_BALL const u32 gObjectEventPic_StrangeBall[] = INCBIN_U32("graphics/object_events/pics/misc/ball_strange.4bpp"); -#endif -#endif +#endif //ITEM_STRANGE_BALL +#endif //OW_FOLLOWERS_POKEBALLS -#if OW_MON_POKEBALLS +#if OW_FOLLOWERS_POKEBALLS // Palettes are small, so always include all of the palettes (no #ifdef) // Vanilla const u16 gObjectEventPal_MasterBall[] = INCBIN_U16("graphics/object_events/pics/misc/ball_master.gbapal"); @@ -450,5 +450,7 @@ const u16 gObjectEventPal_DreamBall[] = INCBIN_U16("graphics/object_events/pics/ // Gen VII const u16 gObjectEventPal_BeastBall[] = INCBIN_U16("graphics/object_events/pics/misc/ball_beast.gbapal"); // Gen VIII +#ifdef ITEM_STRANGE_BALL const u16 gObjectEventPal_StrangeBall[] = INCBIN_U16("graphics/object_events/pics/misc/ball_strange.gbapal"); -#endif +#endif //ITEM_STRANGE_BALL +#endif //OW_FOLLOWERS_POKEBALLS diff --git a/src/data/object_events/object_event_graphics_info_followers.h b/src/data/object_events/object_event_graphics_info_followers.h index 7441c00bb7..e35b1ebd67 100644 --- a/src/data/object_events/object_event_graphics_info_followers.h +++ b/src/data/object_events/object_event_graphics_info_followers.h @@ -1,4 +1,4 @@ -#if OW_MON_POKEBALLS +#if OW_FOLLOWERS_POKEBALLS #define POKEBALL_GFX_INFO(NAME) \ [BALL_##NAME] = { \ @@ -54,4 +54,4 @@ const struct ObjectEventGraphicsInfo gPokeballGraphics[POKEBALL_COUNT] = { POKEBALL_GFX_INFO(STRANGE), #endif }; -#endif +#endif //OW_FOLLOWERS_POKEBALLS diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h index 181d675e75..1fdfc6d492 100755 --- a/src/data/object_events/object_event_pic_tables.h +++ b/src/data/object_events/object_event_pic_tables.h @@ -1117,7 +1117,7 @@ static const struct SpriteFrameImage sPicTable_PokeBall[] = { overworld_frame(gObjectEventPic_PokeBall, 2, 4, 0), }; -#if OW_MON_POKEBALLS +#if OW_FOLLOWERS_POKEBALLS #define POKEBALL_PIC_FRAMES(name) \ overworld_frame(gObjectEventPic_##name##Ball, 2, 4, 0), \ @@ -1209,8 +1209,8 @@ static const struct SpriteFrameImage sPicTable_Ball_BEAST[] = { static const struct SpriteFrameImage sPicTable_Ball_STRANGE[] = { POKEBALL_PIC_FRAMES(Strange), }; -#endif -#endif +#endif //ITEM_STRANGE_BALL +#endif //OW_FOLLOWERS_POKEBALLS static const struct SpriteFrameImage sPicTable_DeoxysOld[] = { overworld_frame(gObjectEventPic_DeoxysOld, 4, 4, 0), 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 4385436725..46c134d911 100644 --- a/src/data/object_events/object_event_pic_tables_followers.h +++ b/src/data/object_events/object_event_pic_tables_followers.h @@ -2,7 +2,7 @@ static const struct SpriteFrameImage sPicTable_Substitute[] = { overworld_ascending_frames(gObjectEventPic_Substitute, 4, 4), }; -#if OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS #if P_FAMILY_BULBASAUR static const struct SpriteFrameImage sPicTable_Bulbasaur[] = { overworld_ascending_frames(gObjectEventPic_Bulbasaur, 4, 4), @@ -4481,8 +4481,13 @@ static const struct SpriteFrameImage sPicTable_Yveltal[] = { static const struct SpriteFrameImage sPicTable_Zygarde50[] = { overworld_ascending_frames(gObjectEventPic_Zygarde50, 4, 4), }; - //const u32 gObjectEventPic_Zygarde10[] = INCBIN_COMP("graphics/pokemon/zygarde/10_percent/follower.4bpp"); - //const u32 gObjectEventPic_ZygardeComplete[] = INCBIN_COMP("graphics/pokemon/zygarde/complete/follower.4bpp"); +/*static const struct SpriteFrameImage sPicTable_Zygarde10[] = { + overworld_ascending_frames(gObjectEventPic_Zygarde10, 4, 4), +}; +static const struct SpriteFrameImage sPicTable_ZygardeComplete[] = { + overworld_ascending_frames(gObjectEventPic_ZygardeComplete, 4, 4), +}; +*/ #endif //P_FAMILY_ZYGARDE #if P_FAMILY_DIANCIE @@ -6147,4 +6152,4 @@ static const struct SpriteFrameImage sPicTable_TerapagosStellar[] = { };*/ #endif //P_FAMILY_PECHARUNT -#endif //OW_FOLLOWERS_ENABLED +#endif //OW_POKEMON_OBJECT_EVENTS diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index bd74805c15..eae4929a9d 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -17,17 +17,17 @@ // Set .compressed = OW_GFX_COMPRESS #define COMP OW_GFX_COMPRESS -#if OW_FOLLOWERS_ENABLED -#if OW_FOLLOWERS_SHARE_PALETTE == FALSE -#define FOLLOWER_PAL(...) \ - .followerPalette = DEFAULT(NULL, __VA_ARGS__), \ - .followerShinyPalette = DEFAULT_2(NULL, __VA_ARGS__), +#if OW_POKEMON_OBJECT_EVENTS +#if OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE +#define OVERWORLD_PAL(...) \ + .overworldPalette = DEFAULT(NULL, __VA_ARGS__), \ + .overworldShinyPalette = DEFAULT_2(NULL, __VA_ARGS__), #else -#define FOLLOWER_PAL(...) -#endif //OW_FOLLOWERS_SHARE_PALETTE == FALSE +#define OVERWORLD_PAL(...) +#endif //OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE -#define FOLLOWER(picTable, _size, shadow, _tracks, ...) \ -.followerData = { \ +#define OVERWORLD(picTable, _size, shadow, _tracks, ...) \ +.overworldData = { \ .tileTag = TAG_NONE, \ .paletteTag = OBJ_EVENT_PAL_TAG_DYNAMIC, \ .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, \ @@ -45,10 +45,10 @@ .images = picTable, \ .affineAnims = gDummySpriteAffineAnimTable, \ }, \ - FOLLOWER_PAL(__VA_ARGS__) + OVERWORLD_PAL(__VA_ARGS__) #else -#define FOLLOWER(picTable, _size, shadow, _tracks, ...) -#endif //OW_FOLLOWERS_ENABLED +#define OVERWORLD(picTable, _size, shadow, _tracks, ...) +#endif //OW_POKEMON_OBJECT_EVENTS // Maximum value for a female Pokémon is 254 (MON_FEMALE) which is 100% female. // 255 (MON_GENDERLESS) is reserved for genderless Pokémon. @@ -99,8 +99,8 @@ const struct SpeciesInfo gSpeciesInfo[] = .iconSprite = gMonIcon_QuestionMark, .iconPalIndex = 0, FOOTPRINT(QuestionMark) - #if OW_FOLLOWERS_ENABLED - .followerData = {TAG_NONE, OBJ_EVENT_PAL_TAG_SUBSTITUTE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, COMP, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Substitute, gDummySpriteAffineAnimTable}, + #if OW_POKEMON_OBJECT_EVENTS + .overworldData = {TAG_NONE, OBJ_EVENT_PAL_TAG_SUBSTITUTE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, COMP, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Following, sPicTable_Substitute, gDummySpriteAffineAnimTable}, #endif .levelUpLearnset = sNoneLevelUpLearnset, .teachableLearnset = sNoneTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index e281ef6d1d..e3689d102d 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -52,13 +52,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Bulbasaur, .iconPalIndex = 4, FOOTPRINT(Bulbasaur) - FOLLOWER( + OVERWORLD( sPicTable_Bulbasaur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bulbasaur, - gShinyFollowerPalette_Bulbasaur + gOverworldPalette_Bulbasaur, + gShinyOverworldPalette_Bulbasaur ) .levelUpLearnset = sBulbasaurLevelUpLearnset, .teachableLearnset = sBulbasaurTeachableLearnset, @@ -115,13 +115,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Ivysaur, .iconPalIndex = 4, FOOTPRINT(Ivysaur) - FOLLOWER( + OVERWORLD( sPicTable_Ivysaur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ivysaur, - gShinyFollowerPalette_Ivysaur + gOverworldPalette_Ivysaur, + gShinyOverworldPalette_Ivysaur ) .levelUpLearnset = sIvysaurLevelUpLearnset, .teachableLearnset = sIvysaurTeachableLearnset, @@ -187,13 +187,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Venusaur, .iconPalIndex = 4, FOOTPRINT(Venusaur) - FOLLOWER( + OVERWORLD( sPicTable_Venusaur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Venusaur, - gShinyFollowerPalette_Venusaur + gOverworldPalette_Venusaur, + gShinyOverworldPalette_Venusaur ) .levelUpLearnset = sVenusaurLevelUpLearnset, .teachableLearnset = sVenusaurTeachableLearnset, @@ -366,13 +366,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Charmander, .iconPalIndex = 0, FOOTPRINT(Charmander) - FOLLOWER( + OVERWORLD( sPicTable_Charmander, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Charmander, - gShinyFollowerPalette_Charmander + gOverworldPalette_Charmander, + gShinyOverworldPalette_Charmander ) .levelUpLearnset = sCharmanderLevelUpLearnset, .teachableLearnset = sCharmanderTeachableLearnset, @@ -429,13 +429,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Charmeleon, .iconPalIndex = 0, FOOTPRINT(Charmeleon) - FOLLOWER( + OVERWORLD( sPicTable_Charmeleon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Charmeleon, - gShinyFollowerPalette_Charmeleon + gOverworldPalette_Charmeleon, + gShinyOverworldPalette_Charmeleon ) .levelUpLearnset = sCharmeleonLevelUpLearnset, .teachableLearnset = sCharmeleonTeachableLearnset, @@ -496,13 +496,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Charizard, .iconPalIndex = 0, FOOTPRINT(Charizard) - FOLLOWER( + OVERWORLD( sPicTable_Charizard, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Charizard, - gShinyFollowerPalette_Charizard + gOverworldPalette_Charizard, + gShinyOverworldPalette_Charizard ) .levelUpLearnset = sCharizardLevelUpLearnset, .teachableLearnset = sCharizardTeachableLearnset, @@ -728,13 +728,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Squirtle, .iconPalIndex = 0, FOOTPRINT(Squirtle) - FOLLOWER( + OVERWORLD( sPicTable_Squirtle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Squirtle, - gShinyFollowerPalette_Squirtle + gOverworldPalette_Squirtle, + gShinyOverworldPalette_Squirtle ) .levelUpLearnset = sSquirtleLevelUpLearnset, .teachableLearnset = sSquirtleTeachableLearnset, @@ -791,13 +791,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Wartortle, .iconPalIndex = 2, FOOTPRINT(Wartortle) - FOLLOWER( + OVERWORLD( sPicTable_Wartortle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Wartortle, - gShinyFollowerPalette_Wartortle + gOverworldPalette_Wartortle, + gShinyOverworldPalette_Wartortle ) .levelUpLearnset = sWartortleLevelUpLearnset, .teachableLearnset = sWartortleTeachableLearnset, @@ -859,13 +859,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Blastoise, .iconPalIndex = 2, FOOTPRINT(Blastoise) - FOLLOWER( + OVERWORLD( sPicTable_Blastoise, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Blastoise, - gShinyFollowerPalette_Blastoise + gOverworldPalette_Blastoise, + gShinyOverworldPalette_Blastoise ) .levelUpLearnset = sBlastoiseLevelUpLearnset, .teachableLearnset = sBlastoiseTeachableLearnset, @@ -1037,13 +1037,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Caterpie, .iconPalIndex = 1, FOOTPRINT(Caterpie) - FOLLOWER( + OVERWORLD( sPicTable_Caterpie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Caterpie, - gShinyFollowerPalette_Caterpie + gOverworldPalette_Caterpie, + gShinyOverworldPalette_Caterpie ) .tmIlliterate = TRUE, .levelUpLearnset = sCaterpieLevelUpLearnset, @@ -1099,13 +1099,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Metapod, .iconPalIndex = 1, FOOTPRINT(Metapod) - FOLLOWER( + OVERWORLD( sPicTable_Metapod, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Metapod, - gShinyFollowerPalette_Metapod + gOverworldPalette_Metapod, + gShinyOverworldPalette_Metapod ) .tmIlliterate = TRUE, .levelUpLearnset = sMetapodLevelUpLearnset, @@ -1178,13 +1178,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Butterfree, .iconPalIndex = 0, FOOTPRINT(Butterfree) - FOLLOWER( + OVERWORLD( sPicTable_Butterfree, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Butterfree, - gShinyFollowerPalette_Butterfree + gOverworldPalette_Butterfree, + gShinyOverworldPalette_Butterfree ) .levelUpLearnset = sButterfreeLevelUpLearnset, .teachableLearnset = sButterfreeTeachableLearnset, @@ -1303,13 +1303,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Weedle, .iconPalIndex = 2, FOOTPRINT(Weedle) - FOLLOWER( + OVERWORLD( sPicTable_Weedle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Weedle, - gShinyFollowerPalette_Weedle + gOverworldPalette_Weedle, + gShinyOverworldPalette_Weedle ) .tmIlliterate = TRUE, .levelUpLearnset = sWeedleLevelUpLearnset, @@ -1366,13 +1366,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Kakuna, .iconPalIndex = 2, FOOTPRINT(Kakuna) - FOLLOWER( + OVERWORLD( sPicTable_Kakuna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Kakuna, - gShinyFollowerPalette_Kakuna + gOverworldPalette_Kakuna, + gShinyOverworldPalette_Kakuna ) .tmIlliterate = TRUE, .levelUpLearnset = sKakunaLevelUpLearnset, @@ -1441,13 +1441,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Beedrill, .iconPalIndex = 2, FOOTPRINT(Beedrill) - FOLLOWER( + OVERWORLD( sPicTable_Beedrill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Beedrill, - gShinyFollowerPalette_Beedrill + gOverworldPalette_Beedrill, + gShinyOverworldPalette_Beedrill ) .levelUpLearnset = sBeedrillLevelUpLearnset, .teachableLearnset = sBeedrillTeachableLearnset, @@ -1565,13 +1565,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Pidgey, .iconPalIndex = 0, FOOTPRINT(Pidgey) - FOLLOWER( + OVERWORLD( sPicTable_Pidgey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pidgey, - gShinyFollowerPalette_Pidgey + gOverworldPalette_Pidgey, + gShinyOverworldPalette_Pidgey ) .levelUpLearnset = sPidgeyLevelUpLearnset, .teachableLearnset = sPidgeyTeachableLearnset, @@ -1628,13 +1628,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Pidgeotto, .iconPalIndex = 0, FOOTPRINT(Pidgeotto) - FOLLOWER( + OVERWORLD( sPicTable_Pidgeotto, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pidgeotto, - gShinyFollowerPalette_Pidgeotto + gOverworldPalette_Pidgeotto, + gShinyOverworldPalette_Pidgeotto ) .levelUpLearnset = sPidgeottoLevelUpLearnset, .teachableLearnset = sPidgeottoTeachableLearnset, @@ -1700,13 +1700,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Pidgeot, .iconPalIndex = 0, FOOTPRINT(Pidgeot) - FOLLOWER( + OVERWORLD( sPicTable_Pidgeot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pidgeot, - gShinyFollowerPalette_Pidgeot + gOverworldPalette_Pidgeot, + gShinyOverworldPalette_Pidgeot ) .levelUpLearnset = sPidgeotLevelUpLearnset, .teachableLearnset = sPidgeotTeachableLearnset, @@ -1825,13 +1825,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Rattata, .iconPalIndex = 2, FOOTPRINT(Rattata) - FOLLOWER( + OVERWORLD( sPicTable_Rattata, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rattata, - gShinyFollowerPalette_Rattata + gOverworldPalette_Rattata, + gShinyOverworldPalette_Rattata ) .levelUpLearnset = sRattataLevelUpLearnset, .teachableLearnset = sRattataTeachableLearnset, @@ -1892,13 +1892,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Raticate, .iconPalIndex = 2, FOOTPRINT(Raticate) - FOLLOWER( + OVERWORLD( sPicTable_Raticate, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Raticate, - gShinyFollowerPalette_Raticate + gOverworldPalette_Raticate, + gShinyOverworldPalette_Raticate ) .levelUpLearnset = sRaticateLevelUpLearnset, .teachableLearnset = sRaticateTeachableLearnset, @@ -1955,13 +1955,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_RattataAlolan, .iconPalIndex = 2, FOOTPRINT(Rattata) - FOLLOWER( + OVERWORLD( sPicTable_RattataAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_RattataAlolan, - gShinyFollowerPalette_RattataAlolan + gOverworldPalette_RattataAlolan, + gShinyOverworldPalette_RattataAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sRattataAlolanLevelUpLearnset, @@ -2017,13 +2017,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_RaticateAlolan, .iconPalIndex = 2, FOOTPRINT(Raticate) - FOLLOWER( + OVERWORLD( sPicTable_RaticateAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_RaticateAlolan, - gShinyFollowerPalette_RaticateAlolan + gOverworldPalette_RaticateAlolan, + gShinyOverworldPalette_RaticateAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sRaticateAlolanLevelUpLearnset, @@ -2135,13 +2135,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Spearow, .iconPalIndex = 0, FOOTPRINT(Spearow) - FOLLOWER( + OVERWORLD( sPicTable_Spearow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Spearow, - gShinyFollowerPalette_Spearow + gOverworldPalette_Spearow, + gShinyOverworldPalette_Spearow ) .levelUpLearnset = sSpearowLevelUpLearnset, .teachableLearnset = sSpearowTeachableLearnset, @@ -2200,13 +2200,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Fearow, .iconPalIndex = 0, FOOTPRINT(Fearow) - FOLLOWER( + OVERWORLD( sPicTable_Fearow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Fearow, - gShinyFollowerPalette_Fearow + gOverworldPalette_Fearow, + gShinyOverworldPalette_Fearow ) .levelUpLearnset = sFearowLevelUpLearnset, .teachableLearnset = sFearowTeachableLearnset, @@ -2263,13 +2263,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Ekans, .iconPalIndex = 2, FOOTPRINT(Ekans) - FOLLOWER( + OVERWORLD( sPicTable_Ekans, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Ekans, - gShinyFollowerPalette_Ekans + gOverworldPalette_Ekans, + gShinyOverworldPalette_Ekans ) .levelUpLearnset = sEkansLevelUpLearnset, .teachableLearnset = sEkansTeachableLearnset, @@ -2331,13 +2331,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Arbok, .iconPalIndex = 2, FOOTPRINT(Arbok) - FOLLOWER( + OVERWORLD( sPicTable_Arbok, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Arbok, - gShinyFollowerPalette_Arbok + gOverworldPalette_Arbok, + gShinyOverworldPalette_Arbok ) .levelUpLearnset = sArbokLevelUpLearnset, .teachableLearnset = sArbokTeachableLearnset, @@ -2391,13 +2391,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Pichu, .iconPalIndex = 1, FOOTPRINT(Pichu) - FOLLOWER( + OVERWORLD( sPicTable_Pichu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pichu, - gShinyFollowerPalette_Pichu + gOverworldPalette_Pichu, + gShinyOverworldPalette_Pichu ) .levelUpLearnset = sPichuLevelUpLearnset, .teachableLearnset = sPichuTeachableLearnset, @@ -2451,13 +2451,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_PichuSpikyEared, .iconPalIndex = 1, FOOTPRINT(Pichu) - FOLLOWER( + OVERWORLD( sPicTable_PichuSpikyEared, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_PichuSpikyEared, - gShinyFollowerPalette_PichuSpikyEared + gOverworldPalette_PichuSpikyEared, + gShinyOverworldPalette_PichuSpikyEared ) .levelUpLearnset = sPichuLevelUpLearnset, .teachableLearnset = sPichuTeachableLearnset, @@ -2527,13 +2527,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSpriteFemale = gMonIcon_PikachuF, .iconPalIndexFemale = 2, #endif - FOLLOWER( + OVERWORLD( sPicTable_Pikachu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pikachu, - gShinyFollowerPalette_Pikachu + gOverworldPalette_Pikachu, + gShinyOverworldPalette_Pikachu ) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3467,13 +3467,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Raichu, .iconPalIndex = 0, FOOTPRINT(Raichu) - FOLLOWER( + OVERWORLD( sPicTable_Raichu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Raichu, - gShinyFollowerPalette_Raichu + gOverworldPalette_Raichu, + gShinyOverworldPalette_Raichu ) .levelUpLearnset = sRaichuLevelUpLearnset, .teachableLearnset = sRaichuTeachableLearnset, @@ -3530,13 +3530,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_RaichuAlolan, .iconPalIndex = 2, FOOTPRINT(Raichu) - FOLLOWER( + OVERWORLD( sPicTable_RaichuAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_RaichuAlolan, - gShinyFollowerPalette_RaichuAlolan + gOverworldPalette_RaichuAlolan, + gShinyOverworldPalette_RaichuAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sRaichuAlolanLevelUpLearnset, @@ -3596,13 +3596,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Sandshrew, .iconPalIndex = 2, FOOTPRINT(Sandshrew) - FOLLOWER( + OVERWORLD( sPicTable_Sandshrew, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sandshrew, - gShinyFollowerPalette_Sandshrew + gOverworldPalette_Sandshrew, + gShinyOverworldPalette_Sandshrew ) .levelUpLearnset = sSandshrewLevelUpLearnset, .teachableLearnset = sSandshrewTeachableLearnset, @@ -3660,13 +3660,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Sandslash, .iconPalIndex = 2, FOOTPRINT(Sandslash) - FOLLOWER( + OVERWORLD( sPicTable_Sandslash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sandslash, - gShinyFollowerPalette_Sandslash + gOverworldPalette_Sandslash, + gShinyOverworldPalette_Sandslash ) .levelUpLearnset = sSandslashLevelUpLearnset, .teachableLearnset = sSandslashTeachableLearnset, @@ -3723,13 +3723,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_SandshrewAlolan, .iconPalIndex = 0, FOOTPRINT(Sandshrew) - FOLLOWER( + OVERWORLD( sPicTable_SandshrewAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SandshrewAlolan, - gShinyFollowerPalette_SandshrewAlolan + gOverworldPalette_SandshrewAlolan, + gShinyOverworldPalette_SandshrewAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sSandshrewAlolanLevelUpLearnset, @@ -3788,13 +3788,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_SandslashAlolan, .iconPalIndex = 0, FOOTPRINT(Sandslash) - FOLLOWER( + OVERWORLD( sPicTable_SandslashAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SandslashAlolan, - gShinyFollowerPalette_SandslashAlolan + gOverworldPalette_SandslashAlolan, + gShinyOverworldPalette_SandslashAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sSandslashAlolanLevelUpLearnset, @@ -3854,13 +3854,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_NidoranF, .iconPalIndex = 0, FOOTPRINT(NidoranF) - FOLLOWER( + OVERWORLD( sPicTable_NidoranF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_NidoranF, - gShinyFollowerPalette_NidoranF + gOverworldPalette_NidoranF, + gShinyOverworldPalette_NidoranF ) .levelUpLearnset = sNidoranFLevelUpLearnset, .teachableLearnset = sNidoranFTeachableLearnset, @@ -3916,13 +3916,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Nidorina, .iconPalIndex = 0, FOOTPRINT(Nidorina) - FOLLOWER( + OVERWORLD( sPicTable_Nidorina, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Nidorina, - gShinyFollowerPalette_Nidorina + gOverworldPalette_Nidorina, + gShinyOverworldPalette_Nidorina ) .levelUpLearnset = sNidorinaLevelUpLearnset, .teachableLearnset = sNidorinaTeachableLearnset, @@ -3985,13 +3985,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Nidoqueen, .iconPalIndex = 2, FOOTPRINT(Nidoqueen) - FOLLOWER( + OVERWORLD( sPicTable_Nidoqueen, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Nidoqueen, - gShinyFollowerPalette_Nidoqueen + gOverworldPalette_Nidoqueen, + gShinyOverworldPalette_Nidoqueen ) .levelUpLearnset = sNidoqueenLevelUpLearnset, .teachableLearnset = sNidoqueenTeachableLearnset, @@ -4045,13 +4045,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_NidoranM, .iconPalIndex = 2, FOOTPRINT(NidoranM) - FOLLOWER( + OVERWORLD( sPicTable_NidoranM, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_NidoranM, - gShinyFollowerPalette_NidoranM + gOverworldPalette_NidoranM, + gShinyOverworldPalette_NidoranM ) .levelUpLearnset = sNidoranMLevelUpLearnset, .teachableLearnset = sNidoranMTeachableLearnset, @@ -4107,13 +4107,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Nidorino, .iconPalIndex = 2, FOOTPRINT(Nidorino) - FOLLOWER( + OVERWORLD( sPicTable_Nidorino, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Nidorino, - gShinyFollowerPalette_Nidorino + gOverworldPalette_Nidorino, + gShinyOverworldPalette_Nidorino ) .levelUpLearnset = sNidorinoLevelUpLearnset, .teachableLearnset = sNidorinoTeachableLearnset, @@ -4177,13 +4177,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Nidoking, .iconPalIndex = 2, FOOTPRINT(Nidoking) - FOLLOWER( + OVERWORLD( sPicTable_Nidoking, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Nidoking, - gShinyFollowerPalette_Nidoking + gOverworldPalette_Nidoking, + gShinyOverworldPalette_Nidoking ) .levelUpLearnset = sNidokingLevelUpLearnset, .teachableLearnset = sNidokingTeachableLearnset, @@ -4248,13 +4248,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Cleffa, .iconPalIndex = 0, FOOTPRINT(Cleffa) - FOLLOWER( + OVERWORLD( sPicTable_Cleffa, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cleffa, - gShinyFollowerPalette_Cleffa + gOverworldPalette_Cleffa, + gShinyOverworldPalette_Cleffa ) .levelUpLearnset = sCleffaLevelUpLearnset, .teachableLearnset = sCleffaTeachableLearnset, @@ -4313,13 +4313,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Clefairy, .iconPalIndex = 0, FOOTPRINT(Clefairy) - FOLLOWER( + OVERWORLD( sPicTable_Clefairy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Clefairy, - gShinyFollowerPalette_Clefairy + gOverworldPalette_Clefairy, + gShinyOverworldPalette_Clefairy ) .levelUpLearnset = sClefairyLevelUpLearnset, .teachableLearnset = sClefairyTeachableLearnset, @@ -4384,13 +4384,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Clefable, .iconPalIndex = 0, FOOTPRINT(Clefable) - FOLLOWER( + OVERWORLD( sPicTable_Clefable, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Clefable, - gShinyFollowerPalette_Clefable + gOverworldPalette_Clefable, + gShinyOverworldPalette_Clefable ) .levelUpLearnset = sClefableLevelUpLearnset, .teachableLearnset = sClefableTeachableLearnset, @@ -4447,13 +4447,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Vulpix, .iconPalIndex = 5, FOOTPRINT(Vulpix) - FOLLOWER( + OVERWORLD( sPicTable_Vulpix, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vulpix, - gShinyFollowerPalette_Vulpix + gOverworldPalette_Vulpix, + gShinyOverworldPalette_Vulpix ) .levelUpLearnset = sVulpixLevelUpLearnset, .teachableLearnset = sVulpixTeachableLearnset, @@ -4512,13 +4512,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Ninetales, .iconPalIndex = 3, FOOTPRINT(Ninetales) - FOLLOWER( + OVERWORLD( sPicTable_Ninetales, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ninetales, - gShinyFollowerPalette_Ninetales + gOverworldPalette_Ninetales, + gShinyOverworldPalette_Ninetales ) .levelUpLearnset = sNinetalesLevelUpLearnset, .teachableLearnset = sNinetalesTeachableLearnset, @@ -4575,13 +4575,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_VulpixAlolan, .iconPalIndex = 2, FOOTPRINT(Vulpix) - FOLLOWER( + OVERWORLD( sPicTable_VulpixAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_VulpixAlolan, - gShinyFollowerPalette_VulpixAlolan + gOverworldPalette_VulpixAlolan, + gShinyOverworldPalette_VulpixAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sVulpixAlolanLevelUpLearnset, @@ -4641,13 +4641,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_NinetalesAlolan, .iconPalIndex = 2, FOOTPRINT(Ninetales) - FOLLOWER( + OVERWORLD( sPicTable_NinetalesAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_NinetalesAlolan, - gShinyFollowerPalette_NinetalesAlolan + gOverworldPalette_NinetalesAlolan, + gShinyOverworldPalette_NinetalesAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sNinetalesAlolanLevelUpLearnset, @@ -4714,13 +4714,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Igglybuff, .iconPalIndex = 1, FOOTPRINT(Igglybuff) - FOLLOWER( + OVERWORLD( sPicTable_Igglybuff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Igglybuff, - gShinyFollowerPalette_Igglybuff + gOverworldPalette_Igglybuff, + gShinyOverworldPalette_Igglybuff ) .levelUpLearnset = sIgglybuffLevelUpLearnset, .teachableLearnset = sIgglybuffTeachableLearnset, @@ -4779,13 +4779,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Jigglypuff, .iconPalIndex = 0, FOOTPRINT(Jigglypuff) - FOLLOWER( + OVERWORLD( sPicTable_Jigglypuff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Jigglypuff, - gShinyFollowerPalette_Jigglypuff + gOverworldPalette_Jigglypuff, + gShinyOverworldPalette_Jigglypuff ) .levelUpLearnset = sJigglypuffLevelUpLearnset, .teachableLearnset = sJigglypuffTeachableLearnset, @@ -4850,13 +4850,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Wigglytuff, .iconPalIndex = 0, FOOTPRINT(Wigglytuff) - FOLLOWER( + OVERWORLD( sPicTable_Wigglytuff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Wigglytuff, - gShinyFollowerPalette_Wigglytuff + gOverworldPalette_Wigglytuff, + gShinyOverworldPalette_Wigglytuff ) .levelUpLearnset = sWigglytuffLevelUpLearnset, .teachableLearnset = sWigglytuffTeachableLearnset, @@ -4917,13 +4917,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Zubat, .iconPalIndex = 2, FOOTPRINT(Zubat) - FOLLOWER( + OVERWORLD( sPicTable_Zubat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zubat, - gShinyFollowerPalette_Zubat + gOverworldPalette_Zubat, + gShinyOverworldPalette_Zubat ) .levelUpLearnset = sZubatLevelUpLearnset, .teachableLearnset = sZubatTeachableLearnset, @@ -4984,13 +4984,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Golbat, .iconPalIndex = 2, FOOTPRINT(Golbat) - FOLLOWER( + OVERWORLD( sPicTable_Golbat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Golbat, - gShinyFollowerPalette_Golbat + gOverworldPalette_Golbat, + gShinyOverworldPalette_Golbat ) .levelUpLearnset = sGolbatLevelUpLearnset, .teachableLearnset = sGolbatTeachableLearnset, @@ -5053,13 +5053,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Crobat, .iconPalIndex = 2, FOOTPRINT(Crobat) - FOLLOWER( + OVERWORLD( sPicTable_Crobat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Crobat, - gShinyFollowerPalette_Crobat + gOverworldPalette_Crobat, + gShinyOverworldPalette_Crobat ) .levelUpLearnset = sCrobatLevelUpLearnset, .teachableLearnset = sCrobatTeachableLearnset, @@ -5117,13 +5117,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Oddish, .iconPalIndex = 4, FOOTPRINT(Oddish) - FOLLOWER( + OVERWORLD( sPicTable_Oddish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Oddish, - gShinyFollowerPalette_Oddish + gOverworldPalette_Oddish, + gShinyOverworldPalette_Oddish ) .levelUpLearnset = sOddishLevelUpLearnset, .teachableLearnset = sOddishTeachableLearnset, @@ -5184,13 +5184,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Gloom, .iconPalIndex = 0, FOOTPRINT(Gloom) - FOLLOWER( + OVERWORLD( sPicTable_Gloom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gloom, - gShinyFollowerPalette_Gloom + gOverworldPalette_Gloom, + gShinyOverworldPalette_Gloom ) .levelUpLearnset = sGloomLevelUpLearnset, .teachableLearnset = sGloomTeachableLearnset, @@ -5259,13 +5259,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Vileplume, .iconPalIndex = 0, FOOTPRINT(Vileplume) - FOLLOWER( + OVERWORLD( sPicTable_Vileplume, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vileplume, - gShinyFollowerPalette_Vileplume + gOverworldPalette_Vileplume, + gShinyOverworldPalette_Vileplume ) .levelUpLearnset = sVileplumeLevelUpLearnset, .teachableLearnset = sVileplumeTeachableLearnset, @@ -5329,13 +5329,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Bellossom, .iconPalIndex = 1, FOOTPRINT(Bellossom) - FOLLOWER( + OVERWORLD( sPicTable_Bellossom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bellossom, - gShinyFollowerPalette_Bellossom + gOverworldPalette_Bellossom, + gShinyOverworldPalette_Bellossom ) .levelUpLearnset = sBellossomLevelUpLearnset, .teachableLearnset = sBellossomTeachableLearnset, @@ -5395,13 +5395,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Paras, .iconPalIndex = 0, FOOTPRINT(Paras) - FOLLOWER( + OVERWORLD( sPicTable_Paras, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Paras, - gShinyFollowerPalette_Paras + gOverworldPalette_Paras, + gShinyOverworldPalette_Paras ) .levelUpLearnset = sParasLevelUpLearnset, .teachableLearnset = sParasTeachableLearnset, @@ -5461,13 +5461,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Parasect, .iconPalIndex = 0, FOOTPRINT(Parasect) - FOLLOWER( + OVERWORLD( sPicTable_Parasect, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Parasect, - gShinyFollowerPalette_Parasect + gOverworldPalette_Parasect, + gShinyOverworldPalette_Parasect ) .levelUpLearnset = sParasectLevelUpLearnset, .teachableLearnset = sParasectTeachableLearnset, @@ -5524,13 +5524,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Venonat, .iconPalIndex = 2, FOOTPRINT(Venonat) - FOLLOWER( + OVERWORLD( sPicTable_Venonat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Venonat, - gShinyFollowerPalette_Venonat + gOverworldPalette_Venonat, + gShinyOverworldPalette_Venonat ) .levelUpLearnset = sVenonatLevelUpLearnset, .teachableLearnset = sVenonatTeachableLearnset, @@ -5589,13 +5589,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Venomoth, .iconPalIndex = 2, FOOTPRINT(Venomoth) - FOLLOWER( + OVERWORLD( sPicTable_Venomoth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Venomoth, - gShinyFollowerPalette_Venomoth + gOverworldPalette_Venomoth, + gShinyOverworldPalette_Venomoth ) .levelUpLearnset = sVenomothLevelUpLearnset, .teachableLearnset = sVenomothTeachableLearnset, @@ -5664,13 +5664,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Diglett, .iconPalIndex = 2, FOOTPRINT(Diglett) - FOLLOWER( + OVERWORLD( sPicTable_Diglett, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Diglett, - gShinyFollowerPalette_Diglett + gOverworldPalette_Diglett, + gShinyOverworldPalette_Diglett ) .levelUpLearnset = sDiglettLevelUpLearnset, .teachableLearnset = sDiglettTeachableLearnset, @@ -5729,13 +5729,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Dugtrio, .iconPalIndex = 2, FOOTPRINT(Dugtrio) - FOLLOWER( + OVERWORLD( sPicTable_Dugtrio, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Dugtrio, - gShinyFollowerPalette_Dugtrio + gOverworldPalette_Dugtrio, + gShinyOverworldPalette_Dugtrio ) .levelUpLearnset = sDugtrioLevelUpLearnset, .teachableLearnset = sDugtrioTeachableLearnset, @@ -5792,13 +5792,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_DiglettAlolan, .iconPalIndex = 2, FOOTPRINT(Diglett) - FOLLOWER( + OVERWORLD( sPicTable_DiglettAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DiglettAlolan, - gShinyFollowerPalette_DiglettAlolan + gOverworldPalette_DiglettAlolan, + gShinyOverworldPalette_DiglettAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sDiglettAlolanLevelUpLearnset, @@ -5858,13 +5858,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_DugtrioAlolan, .iconPalIndex = 2, FOOTPRINT(Dugtrio) - FOLLOWER( + OVERWORLD( sPicTable_DugtrioAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DugtrioAlolan, - gShinyFollowerPalette_DugtrioAlolan + gOverworldPalette_DugtrioAlolan, + gShinyOverworldPalette_DugtrioAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sDugtrioAlolanLevelUpLearnset, @@ -5925,13 +5925,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Meowth, .iconPalIndex = 1, FOOTPRINT(Meowth) - FOLLOWER( + OVERWORLD( sPicTable_Meowth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Meowth, - gShinyFollowerPalette_Meowth + gOverworldPalette_Meowth, + gShinyOverworldPalette_Meowth ) .levelUpLearnset = sMeowthLevelUpLearnset, .teachableLearnset = sMeowthTeachableLearnset, @@ -5991,13 +5991,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Persian, .iconPalIndex = 1, FOOTPRINT(Persian) - FOLLOWER( + OVERWORLD( sPicTable_Persian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Persian, - gShinyFollowerPalette_Persian + gOverworldPalette_Persian, + gShinyOverworldPalette_Persian ) .levelUpLearnset = sPersianLevelUpLearnset, .teachableLearnset = sPersianTeachableLearnset, @@ -6054,13 +6054,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_MeowthAlolan, .iconPalIndex = 2, FOOTPRINT(Meowth) - FOLLOWER( + OVERWORLD( sPicTable_MeowthAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MeowthAlolan, - gShinyFollowerPalette_MeowthAlolan + gOverworldPalette_MeowthAlolan, + gShinyOverworldPalette_MeowthAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sMeowthAlolanLevelUpLearnset, @@ -6119,13 +6119,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_PersianAlolan, .iconPalIndex = 2, FOOTPRINT(Persian) - FOLLOWER( + OVERWORLD( sPicTable_PersianAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_PersianAlolan, - gShinyFollowerPalette_PersianAlolan + gOverworldPalette_PersianAlolan, + gShinyOverworldPalette_PersianAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sPersianAlolanLevelUpLearnset, @@ -6183,13 +6183,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_MeowthGalarian, .iconPalIndex = 0, FOOTPRINT(Meowth) - FOLLOWER( + OVERWORLD( sPicTable_MeowthGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MeowthGalarian, - gShinyFollowerPalette_MeowthGalarian + gOverworldPalette_MeowthGalarian, + gShinyOverworldPalette_MeowthGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sMeowthGalarianLevelUpLearnset, @@ -6246,13 +6246,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Perrserker, .iconPalIndex = 2, FOOTPRINT(Perrserker) - FOLLOWER( + OVERWORLD( sPicTable_Perrserker, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Perrserker, - gShinyFollowerPalette_Perrserker + gOverworldPalette_Perrserker, + gShinyOverworldPalette_Perrserker ) .levelUpLearnset = sPerrserkerLevelUpLearnset, .teachableLearnset = sPerrserkerTeachableLearnset, @@ -6368,13 +6368,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Psyduck, .iconPalIndex = 1, FOOTPRINT(Psyduck) - FOLLOWER( + OVERWORLD( sPicTable_Psyduck, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Psyduck, - gShinyFollowerPalette_Psyduck + gOverworldPalette_Psyduck, + gShinyOverworldPalette_Psyduck ) .levelUpLearnset = sPsyduckLevelUpLearnset, .teachableLearnset = sPsyduckTeachableLearnset, @@ -6430,13 +6430,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Golduck, .iconPalIndex = 0, FOOTPRINT(Golduck) - FOLLOWER( + OVERWORLD( sPicTable_Golduck, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Golduck, - gShinyFollowerPalette_Golduck + gOverworldPalette_Golduck, + gShinyOverworldPalette_Golduck ) .levelUpLearnset = sGolduckLevelUpLearnset, .teachableLearnset = sGolduckTeachableLearnset, @@ -6493,13 +6493,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Mankey, .iconPalIndex = 1, FOOTPRINT(Mankey) - FOLLOWER( + OVERWORLD( sPicTable_Mankey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mankey, - gShinyFollowerPalette_Mankey + gOverworldPalette_Mankey, + gShinyOverworldPalette_Mankey ) .levelUpLearnset = sMankeyLevelUpLearnset, .teachableLearnset = sMankeyTeachableLearnset, @@ -6555,13 +6555,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Primeape, .iconPalIndex = 2, FOOTPRINT(Primeape) - FOLLOWER( + OVERWORLD( sPicTable_Primeape, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Primeape, - gShinyFollowerPalette_Primeape + gOverworldPalette_Primeape, + gShinyOverworldPalette_Primeape ) .levelUpLearnset = sPrimeapeLevelUpLearnset, .teachableLearnset = sPrimeapeTeachableLearnset, @@ -6673,13 +6673,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Growlithe, .iconPalIndex = 3, FOOTPRINT(Growlithe) - FOLLOWER( + OVERWORLD( sPicTable_Growlithe, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Growlithe, - gShinyFollowerPalette_Growlithe + gOverworldPalette_Growlithe, + gShinyOverworldPalette_Growlithe ) .levelUpLearnset = sGrowlitheLevelUpLearnset, .teachableLearnset = sGrowlitheTeachableLearnset, @@ -6737,13 +6737,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Arcanine, .iconPalIndex = 3, FOOTPRINT(Arcanine) - FOLLOWER( + OVERWORLD( sPicTable_Arcanine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Arcanine, - gShinyFollowerPalette_Arcanine + gOverworldPalette_Arcanine, + gShinyOverworldPalette_Arcanine ) .levelUpLearnset = sArcanineLevelUpLearnset, .teachableLearnset = sArcanineTeachableLearnset, @@ -6799,13 +6799,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_GrowlitheHisuian, .iconPalIndex = 0, FOOTPRINT(Growlithe) - FOLLOWER( + OVERWORLD( sPicTable_GrowlitheHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_GrowlitheHisuian, - gShinyFollowerPalette_GrowlitheHisuian + gOverworldPalette_GrowlitheHisuian, + gShinyOverworldPalette_GrowlitheHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sGrowlitheHisuianLevelUpLearnset, @@ -6862,13 +6862,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_ArcanineHisuian, .iconPalIndex = 0, FOOTPRINT(Arcanine) - FOLLOWER( + OVERWORLD( sPicTable_ArcanineHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ArcanineHisuian, - gShinyFollowerPalette_ArcanineHisuian + gOverworldPalette_ArcanineHisuian, + gShinyOverworldPalette_ArcanineHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sArcanineHisuianLevelUpLearnset, @@ -6928,13 +6928,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Poliwag, .iconPalIndex = 0, FOOTPRINT(Poliwag) - FOLLOWER( + OVERWORLD( sPicTable_Poliwag, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Poliwag, - gShinyFollowerPalette_Poliwag + gOverworldPalette_Poliwag, + gShinyOverworldPalette_Poliwag ) .levelUpLearnset = sPoliwagLevelUpLearnset, .teachableLearnset = sPoliwagTeachableLearnset, @@ -6993,13 +6993,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Poliwhirl, .iconPalIndex = 0, FOOTPRINT(Poliwhirl) - FOLLOWER( + OVERWORLD( sPicTable_Poliwhirl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Poliwhirl, - gShinyFollowerPalette_Poliwhirl + gOverworldPalette_Poliwhirl, + gShinyOverworldPalette_Poliwhirl ) .levelUpLearnset = sPoliwhirlLevelUpLearnset, .teachableLearnset = sPoliwhirlTeachableLearnset, @@ -7066,13 +7066,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Poliwrath, .iconPalIndex = 0, FOOTPRINT(Poliwrath) - FOLLOWER( + OVERWORLD( sPicTable_Poliwrath, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Poliwrath, - gShinyFollowerPalette_Poliwrath + gOverworldPalette_Poliwrath, + gShinyOverworldPalette_Poliwrath ) .levelUpLearnset = sPoliwrathLevelUpLearnset, .teachableLearnset = sPoliwrathTeachableLearnset, @@ -7140,13 +7140,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Politoed, .iconPalIndex = 1, FOOTPRINT(Politoed) - FOLLOWER( + OVERWORLD( sPicTable_Politoed, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Politoed, - gShinyFollowerPalette_Politoed + gOverworldPalette_Politoed, + gShinyOverworldPalette_Politoed ) .levelUpLearnset = sPolitoedLevelUpLearnset, .teachableLearnset = sPolitoedTeachableLearnset, @@ -7210,13 +7210,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Abra, .iconPalIndex = 2, FOOTPRINT(Abra) - FOLLOWER( + OVERWORLD( sPicTable_Abra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Abra, - gShinyFollowerPalette_Abra + gOverworldPalette_Abra, + gShinyOverworldPalette_Abra ) .levelUpLearnset = sAbraLevelUpLearnset, .teachableLearnset = sAbraTeachableLearnset, @@ -7278,13 +7278,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Kadabra, .iconPalIndex = 2, FOOTPRINT(Kadabra) - FOLLOWER( + OVERWORLD( sPicTable_Kadabra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Kadabra, - gShinyFollowerPalette_Kadabra + gOverworldPalette_Kadabra, + gShinyOverworldPalette_Kadabra ) .levelUpLearnset = sKadabraLevelUpLearnset, .teachableLearnset = sKadabraTeachableLearnset, @@ -7355,13 +7355,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Alakazam, .iconPalIndex = 2, FOOTPRINT(Alakazam) - FOLLOWER( + OVERWORLD( sPicTable_Alakazam, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Alakazam, - gShinyFollowerPalette_Alakazam + gOverworldPalette_Alakazam, + gShinyOverworldPalette_Alakazam ) .levelUpLearnset = sAlakazamLevelUpLearnset, .teachableLearnset = sAlakazamTeachableLearnset, @@ -7484,13 +7484,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Machop, .iconPalIndex = 0, FOOTPRINT(Machop) - FOLLOWER( + OVERWORLD( sPicTable_Machop, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Machop, - gShinyFollowerPalette_Machop + gOverworldPalette_Machop, + gShinyOverworldPalette_Machop ) .levelUpLearnset = sMachopLevelUpLearnset, .teachableLearnset = sMachopTeachableLearnset, @@ -7548,13 +7548,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Machoke, .iconPalIndex = 2, FOOTPRINT(Machoke) - FOLLOWER( + OVERWORLD( sPicTable_Machoke, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Machoke, - gShinyFollowerPalette_Machoke + gOverworldPalette_Machoke, + gShinyOverworldPalette_Machoke ) .levelUpLearnset = sMachokeLevelUpLearnset, .teachableLearnset = sMachokeTeachableLearnset, @@ -7619,13 +7619,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Machamp, .iconPalIndex = 0, FOOTPRINT(Machamp) - FOLLOWER( + OVERWORLD( sPicTable_Machamp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Machamp, - gShinyFollowerPalette_Machamp + gOverworldPalette_Machamp, + gShinyOverworldPalette_Machamp ) .levelUpLearnset = sMachampLevelUpLearnset, .teachableLearnset = sMachampTeachableLearnset, @@ -7741,13 +7741,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Bellsprout, .iconPalIndex = 1, FOOTPRINT(Bellsprout) - FOLLOWER( + OVERWORLD( sPicTable_Bellsprout, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bellsprout, - gShinyFollowerPalette_Bellsprout + gOverworldPalette_Bellsprout, + gShinyOverworldPalette_Bellsprout ) .levelUpLearnset = sBellsproutLevelUpLearnset, .teachableLearnset = sBellsproutTeachableLearnset, @@ -7804,13 +7804,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Weepinbell, .iconPalIndex = 1, FOOTPRINT(Weepinbell) - FOLLOWER( + OVERWORLD( sPicTable_Weepinbell, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Weepinbell, - gShinyFollowerPalette_Weepinbell + gOverworldPalette_Weepinbell, + gShinyOverworldPalette_Weepinbell ) .levelUpLearnset = sWeepinbellLevelUpLearnset, .teachableLearnset = sWeepinbellTeachableLearnset, @@ -7873,13 +7873,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Victreebel, .iconPalIndex = 1, FOOTPRINT(Victreebel) - FOLLOWER( + OVERWORLD( sPicTable_Victreebel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Victreebel, - gShinyFollowerPalette_Victreebel + gOverworldPalette_Victreebel, + gShinyOverworldPalette_Victreebel ) .levelUpLearnset = sVictreebelLevelUpLearnset, .teachableLearnset = sVictreebelTeachableLearnset, @@ -7936,13 +7936,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Tentacool, .iconPalIndex = 0, FOOTPRINT(Tentacool) - FOLLOWER( + OVERWORLD( sPicTable_Tentacool, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Tentacool, - gShinyFollowerPalette_Tentacool + gOverworldPalette_Tentacool, + gShinyOverworldPalette_Tentacool ) .levelUpLearnset = sTentacoolLevelUpLearnset, .teachableLearnset = sTentacoolTeachableLearnset, @@ -7999,13 +7999,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Tentacruel, .iconPalIndex = 0, FOOTPRINT(Tentacruel) - FOLLOWER( + OVERWORLD( sPicTable_Tentacruel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Tentacruel, - gShinyFollowerPalette_Tentacruel + gOverworldPalette_Tentacruel, + gShinyOverworldPalette_Tentacruel ) .levelUpLearnset = sTentacruelLevelUpLearnset, .teachableLearnset = sTentacruelTeachableLearnset, @@ -8084,13 +8084,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Geodude, .iconPalIndex = 1, FOOTPRINT(Geodude) - FOLLOWER( + OVERWORLD( sPicTable_Geodude, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Geodude, - gShinyFollowerPalette_Geodude + gOverworldPalette_Geodude, + gShinyOverworldPalette_Geodude ) .levelUpLearnset = sGeodudeLevelUpLearnset, .teachableLearnset = sGeodudeTeachableLearnset, @@ -8148,13 +8148,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Graveler, .iconPalIndex = 1, FOOTPRINT(Graveler) - FOLLOWER( + OVERWORLD( sPicTable_Graveler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Graveler, - gShinyFollowerPalette_Graveler + gOverworldPalette_Graveler, + gShinyOverworldPalette_Graveler ) .levelUpLearnset = sGravelerLevelUpLearnset, .teachableLearnset = sGravelerTeachableLearnset, @@ -8212,13 +8212,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Golem, .iconPalIndex = 2, FOOTPRINT(Golem) - FOLLOWER( + OVERWORLD( sPicTable_Golem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Golem, - gShinyFollowerPalette_Golem + gOverworldPalette_Golem, + gShinyOverworldPalette_Golem ) .levelUpLearnset = sGolemLevelUpLearnset, .teachableLearnset = sGolemTeachableLearnset, @@ -8276,13 +8276,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_GeodudeAlolan, .iconPalIndex = 2, FOOTPRINT(Geodude) - FOLLOWER( + OVERWORLD( sPicTable_GeodudeAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_GeodudeAlolan, - gShinyFollowerPalette_GeodudeAlolan + gOverworldPalette_GeodudeAlolan, + gShinyOverworldPalette_GeodudeAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sGeodudeAlolanLevelUpLearnset, @@ -8341,13 +8341,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_GravelerAlolan, .iconPalIndex = 2, FOOTPRINT(Graveler) - FOLLOWER( + OVERWORLD( sPicTable_GravelerAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_GravelerAlolan, - gShinyFollowerPalette_GravelerAlolan + gOverworldPalette_GravelerAlolan, + gShinyOverworldPalette_GravelerAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sGravelerAlolanLevelUpLearnset, @@ -8406,13 +8406,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_GolemAlolan, .iconPalIndex = 2, FOOTPRINT(Golem) - FOLLOWER( + OVERWORLD( sPicTable_GolemAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_GolemAlolan, - gShinyFollowerPalette_GolemAlolan + gOverworldPalette_GolemAlolan, + gShinyOverworldPalette_GolemAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sGolemAlolanLevelUpLearnset, @@ -8472,13 +8472,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Ponyta, .iconPalIndex = 3, FOOTPRINT(Ponyta) - FOLLOWER( + OVERWORLD( sPicTable_Ponyta, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ponyta, - gShinyFollowerPalette_Ponyta + gOverworldPalette_Ponyta, + gShinyOverworldPalette_Ponyta ) .levelUpLearnset = sPonytaLevelUpLearnset, .teachableLearnset = sPonytaTeachableLearnset, @@ -8535,13 +8535,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Rapidash, .iconPalIndex = 3, FOOTPRINT(Rapidash) - FOLLOWER( + OVERWORLD( sPicTable_Rapidash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rapidash, - gShinyFollowerPalette_Rapidash + gOverworldPalette_Rapidash, + gShinyOverworldPalette_Rapidash ) .levelUpLearnset = sRapidashLevelUpLearnset, .teachableLearnset = sRapidashTeachableLearnset, @@ -8597,13 +8597,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_PonytaGalarian, .iconPalIndex = 2, FOOTPRINT(Ponyta) - FOLLOWER( + OVERWORLD( sPicTable_PonytaGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_PonytaGalarian, - gShinyFollowerPalette_PonytaGalarian + gOverworldPalette_PonytaGalarian, + gShinyOverworldPalette_PonytaGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sPonytaGalarianLevelUpLearnset, @@ -8661,13 +8661,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_RapidashGalarian, .iconPalIndex = 2, FOOTPRINT(Rapidash) - FOLLOWER( + OVERWORLD( sPicTable_RapidashGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_RapidashGalarian, - gShinyFollowerPalette_RapidashGalarian + gOverworldPalette_RapidashGalarian, + gShinyOverworldPalette_RapidashGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sRapidashGalarianLevelUpLearnset, @@ -8727,13 +8727,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Slowpoke, .iconPalIndex = 0, FOOTPRINT(Slowpoke) - FOLLOWER( + OVERWORLD( sPicTable_Slowpoke, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Slowpoke, - gShinyFollowerPalette_Slowpoke + gOverworldPalette_Slowpoke, + gShinyOverworldPalette_Slowpoke ) .levelUpLearnset = sSlowpokeLevelUpLearnset, .teachableLearnset = sSlowpokeTeachableLearnset, @@ -8793,13 +8793,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Slowbro, .iconPalIndex = 0, FOOTPRINT(Slowbro) - FOLLOWER( + OVERWORLD( sPicTable_Slowbro, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Slowbro, - gShinyFollowerPalette_Slowbro + gOverworldPalette_Slowbro, + gShinyOverworldPalette_Slowbro ) .levelUpLearnset = sSlowbroLevelUpLearnset, .teachableLearnset = sSlowbroTeachableLearnset, @@ -8857,13 +8857,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Slowking, .iconPalIndex = 0, FOOTPRINT(Slowking) - FOLLOWER( + OVERWORLD( sPicTable_Slowking, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Slowking, - gShinyFollowerPalette_Slowking + gOverworldPalette_Slowking, + gShinyOverworldPalette_Slowking ) .levelUpLearnset = sSlowkingLevelUpLearnset, .teachableLearnset = sSlowkingTeachableLearnset, @@ -8978,13 +8978,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_SlowpokeGalarian, .iconPalIndex = 0, FOOTPRINT(Slowpoke) - FOLLOWER( + OVERWORLD( sPicTable_SlowpokeGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SlowpokeGalarian, - gShinyFollowerPalette_SlowpokeGalarian + gOverworldPalette_SlowpokeGalarian, + gShinyOverworldPalette_SlowpokeGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sSlowpokeGalarianLevelUpLearnset, @@ -9044,13 +9044,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_SlowbroGalarian, .iconPalIndex = 0, FOOTPRINT(Slowbro) - FOLLOWER( + OVERWORLD( sPicTable_SlowbroGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SlowbroGalarian, - gShinyFollowerPalette_SlowbroGalarian + gOverworldPalette_SlowbroGalarian, + gShinyOverworldPalette_SlowbroGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sSlowbroGalarianLevelUpLearnset, @@ -9107,13 +9107,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_SlowkingGalarian, .iconPalIndex = 0, FOOTPRINT(Slowking) - FOLLOWER( + OVERWORLD( sPicTable_SlowkingGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SlowkingGalarian, - gShinyFollowerPalette_SlowkingGalarian + gOverworldPalette_SlowkingGalarian, + gShinyOverworldPalette_SlowkingGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sSlowkingGalarianLevelUpLearnset, @@ -9175,13 +9175,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Magnemite, .iconPalIndex = 0, FOOTPRINT(Magnemite) - FOLLOWER( + OVERWORLD( sPicTable_Magnemite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Magnemite, - gShinyFollowerPalette_Magnemite + gOverworldPalette_Magnemite, + gShinyOverworldPalette_Magnemite ) .levelUpLearnset = sMagnemiteLevelUpLearnset, .teachableLearnset = sMagnemiteTeachableLearnset, @@ -9238,13 +9238,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Magneton, .iconPalIndex = 0, FOOTPRINT(Magneton) - FOLLOWER( + OVERWORLD( sPicTable_Magneton, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Magneton, - gShinyFollowerPalette_Magneton + gOverworldPalette_Magneton, + gShinyOverworldPalette_Magneton ) .levelUpLearnset = sMagnetonLevelUpLearnset, .teachableLearnset = sMagnetonTeachableLearnset, @@ -9309,13 +9309,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Magnezone, .iconPalIndex = 0, FOOTPRINT(Magnezone) - FOLLOWER( + OVERWORLD( sPicTable_Magnezone, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Magnezone, - gShinyFollowerPalette_Magnezone + gOverworldPalette_Magnezone, + gShinyOverworldPalette_Magnezone ) .levelUpLearnset = sMagnezoneLevelUpLearnset, .teachableLearnset = sMagnezoneTeachableLearnset, @@ -9383,13 +9383,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Farfetchd, .iconPalIndex = 1, FOOTPRINT(Farfetchd) - FOLLOWER( + OVERWORLD( sPicTable_Farfetchd, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Farfetchd, - gShinyFollowerPalette_Farfetchd + gOverworldPalette_Farfetchd, + gShinyOverworldPalette_Farfetchd ) .levelUpLearnset = sFarfetchdLevelUpLearnset, .teachableLearnset = sFarfetchdTeachableLearnset, @@ -9447,13 +9447,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_FarfetchdGalarian, .iconPalIndex = 1, FOOTPRINT(Farfetchd) - FOLLOWER( + OVERWORLD( sPicTable_FarfetchdGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_FarfetchdGalarian, - gShinyFollowerPalette_FarfetchdGalarian + gOverworldPalette_FarfetchdGalarian, + gShinyOverworldPalette_FarfetchdGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sFarfetchdGalarianLevelUpLearnset, @@ -9512,13 +9512,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Sirfetchd, .iconPalIndex = 1, FOOTPRINT(Sirfetchd) - FOLLOWER( + OVERWORLD( sPicTable_Sirfetchd, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sirfetchd, - gShinyFollowerPalette_Sirfetchd + gOverworldPalette_Sirfetchd, + gShinyOverworldPalette_Sirfetchd ) .levelUpLearnset = sSirfetchdLevelUpLearnset, .teachableLearnset = sSirfetchdTeachableLearnset, @@ -9580,13 +9580,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Doduo, .iconPalIndex = 2, FOOTPRINT(Doduo) - FOLLOWER( + OVERWORLD( sPicTable_Doduo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Doduo, - gShinyFollowerPalette_Doduo + gOverworldPalette_Doduo, + gShinyOverworldPalette_Doduo ) .levelUpLearnset = sDoduoLevelUpLearnset, .teachableLearnset = sDoduoTeachableLearnset, @@ -9653,13 +9653,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Dodrio, .iconPalIndex = 2, FOOTPRINT(Dodrio) - FOLLOWER( + OVERWORLD( sPicTable_Dodrio, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dodrio, - gShinyFollowerPalette_Dodrio + gOverworldPalette_Dodrio, + gShinyOverworldPalette_Dodrio ) .levelUpLearnset = sDodrioLevelUpLearnset, .teachableLearnset = sDodrioTeachableLearnset, @@ -9715,13 +9715,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Seel, .iconPalIndex = 0, FOOTPRINT(Seel) - FOLLOWER( + OVERWORLD( sPicTable_Seel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Seel, - gShinyFollowerPalette_Seel + gOverworldPalette_Seel, + gShinyOverworldPalette_Seel ) .levelUpLearnset = sSeelLevelUpLearnset, .teachableLearnset = sSeelTeachableLearnset, @@ -9777,13 +9777,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Dewgong, .iconPalIndex = 2, FOOTPRINT(Dewgong) - FOLLOWER( + OVERWORLD( sPicTable_Dewgong, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dewgong, - gShinyFollowerPalette_Dewgong + gOverworldPalette_Dewgong, + gShinyOverworldPalette_Dewgong ) .levelUpLearnset = sDewgongLevelUpLearnset, .teachableLearnset = sDewgongTeachableLearnset, @@ -9840,13 +9840,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Grimer, .iconPalIndex = 2, FOOTPRINT(Grimer) - FOLLOWER( + OVERWORLD( sPicTable_Grimer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Grimer, - gShinyFollowerPalette_Grimer + gOverworldPalette_Grimer, + gShinyOverworldPalette_Grimer ) .levelUpLearnset = sGrimerLevelUpLearnset, .teachableLearnset = sGrimerTeachableLearnset, @@ -9906,13 +9906,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Muk, .iconPalIndex = 2, FOOTPRINT(Muk) - FOLLOWER( + OVERWORLD( sPicTable_Muk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Muk, - gShinyFollowerPalette_Muk + gOverworldPalette_Muk, + gShinyOverworldPalette_Muk ) .levelUpLearnset = sMukLevelUpLearnset, .teachableLearnset = sMukTeachableLearnset, @@ -9969,13 +9969,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_GrimerAlolan, .iconPalIndex = 1, FOOTPRINT(Grimer) - FOLLOWER( + OVERWORLD( sPicTable_GrimerAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_GrimerAlolan, - gShinyFollowerPalette_GrimerAlolan + gOverworldPalette_GrimerAlolan, + gShinyOverworldPalette_GrimerAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sGrimerAlolanLevelUpLearnset, @@ -10036,13 +10036,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_MukAlolan, .iconPalIndex = 0, FOOTPRINT(Muk) - FOLLOWER( + OVERWORLD( sPicTable_MukAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MukAlolan, - gShinyFollowerPalette_MukAlolan + gOverworldPalette_MukAlolan, + gShinyOverworldPalette_MukAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sMukAlolanLevelUpLearnset, @@ -10104,13 +10104,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Shellder, .iconPalIndex = 2, FOOTPRINT(Shellder) - FOLLOWER( + OVERWORLD( sPicTable_Shellder, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Shellder, - gShinyFollowerPalette_Shellder + gOverworldPalette_Shellder, + gShinyOverworldPalette_Shellder ) .levelUpLearnset = sShellderLevelUpLearnset, .teachableLearnset = sShellderTeachableLearnset, @@ -10168,13 +10168,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Cloyster, .iconPalIndex = 2, FOOTPRINT(Cloyster) - FOLLOWER( + OVERWORLD( sPicTable_Cloyster, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Cloyster, - gShinyFollowerPalette_Cloyster + gOverworldPalette_Cloyster, + gShinyOverworldPalette_Cloyster ) .levelUpLearnset = sCloysterLevelUpLearnset, .teachableLearnset = sCloysterTeachableLearnset, @@ -10231,13 +10231,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Gastly, .iconPalIndex = 2, FOOTPRINT(Gastly) - FOLLOWER( + OVERWORLD( sPicTable_Gastly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Gastly, - gShinyFollowerPalette_Gastly + gOverworldPalette_Gastly, + gShinyOverworldPalette_Gastly ) .levelUpLearnset = sGastlyLevelUpLearnset, .teachableLearnset = sGastlyTeachableLearnset, @@ -10295,13 +10295,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Haunter, .iconPalIndex = 2, FOOTPRINT(Haunter) - FOLLOWER( + OVERWORLD( sPicTable_Haunter, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Haunter, - gShinyFollowerPalette_Haunter + gOverworldPalette_Haunter, + gShinyOverworldPalette_Haunter ) .levelUpLearnset = sHaunterLevelUpLearnset, .teachableLearnset = sHaunterTeachableLearnset, @@ -10369,13 +10369,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Gengar, .iconPalIndex = 2, FOOTPRINT(Gengar) - FOLLOWER( + OVERWORLD( sPicTable_Gengar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gengar, - gShinyFollowerPalette_Gengar + gOverworldPalette_Gengar, + gShinyOverworldPalette_Gengar ) .levelUpLearnset = sGengarLevelUpLearnset, .teachableLearnset = sGengarTeachableLearnset, @@ -10547,13 +10547,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Onix, .iconPalIndex = 2, FOOTPRINT(Onix) - FOLLOWER( + OVERWORLD( sPicTable_Onix, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Onix, - gShinyFollowerPalette_Onix + gOverworldPalette_Onix, + gShinyOverworldPalette_Onix ) .levelUpLearnset = sOnixLevelUpLearnset, .teachableLearnset = sOnixTeachableLearnset, @@ -10617,13 +10617,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Steelix, .iconPalIndex = 0, FOOTPRINT(Steelix) - FOLLOWER( + OVERWORLD( sPicTable_Steelix, SIZE_64x64, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Steelix, - gShinyFollowerPalette_Steelix + gOverworldPalette_Steelix, + gShinyOverworldPalette_Steelix ) .levelUpLearnset = sSteelixLevelUpLearnset, .teachableLearnset = sSteelixTeachableLearnset, @@ -10741,13 +10741,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Drowzee, .iconPalIndex = 2, FOOTPRINT(Drowzee) - FOLLOWER( + OVERWORLD( sPicTable_Drowzee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Drowzee, - gShinyFollowerPalette_Drowzee + gOverworldPalette_Drowzee, + gShinyOverworldPalette_Drowzee ) .levelUpLearnset = sDrowzeeLevelUpLearnset, .teachableLearnset = sDrowzeeTeachableLearnset, @@ -10808,13 +10808,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Hypno, .iconPalIndex = 2, FOOTPRINT(Hypno) - FOLLOWER( + OVERWORLD( sPicTable_Hypno, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hypno, - gShinyFollowerPalette_Hypno + gOverworldPalette_Hypno, + gShinyOverworldPalette_Hypno ) .levelUpLearnset = sHypnoLevelUpLearnset, .teachableLearnset = sHypnoTeachableLearnset, @@ -10870,13 +10870,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Krabby, .iconPalIndex = 0, FOOTPRINT(Krabby) - FOLLOWER( + OVERWORLD( sPicTable_Krabby, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Krabby, - gShinyFollowerPalette_Krabby + gOverworldPalette_Krabby, + gShinyOverworldPalette_Krabby ) .levelUpLearnset = sKrabbyLevelUpLearnset, .teachableLearnset = sKrabbyTeachableLearnset, @@ -10934,13 +10934,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Kingler, .iconPalIndex = 0, FOOTPRINT(Kingler) - FOLLOWER( + OVERWORLD( sPicTable_Kingler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kingler, - gShinyFollowerPalette_Kingler + gOverworldPalette_Kingler, + gShinyOverworldPalette_Kingler ) .levelUpLearnset = sKinglerLevelUpLearnset, .teachableLearnset = sKinglerTeachableLearnset, @@ -11064,13 +11064,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Voltorb, .iconPalIndex = 0, FOOTPRINT(Voltorb) - FOLLOWER( + OVERWORLD( sPicTable_Voltorb, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Voltorb, - gShinyFollowerPalette_Voltorb + gOverworldPalette_Voltorb, + gShinyOverworldPalette_Voltorb ) .levelUpLearnset = sVoltorbLevelUpLearnset, .teachableLearnset = sVoltorbTeachableLearnset, @@ -11126,13 +11126,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Electrode, .iconPalIndex = 0, FOOTPRINT(Electrode) - FOLLOWER( + OVERWORLD( sPicTable_Electrode, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Electrode, - gShinyFollowerPalette_Electrode + gOverworldPalette_Electrode, + gShinyOverworldPalette_Electrode ) .levelUpLearnset = sElectrodeLevelUpLearnset, .teachableLearnset = sElectrodeTeachableLearnset, @@ -11188,13 +11188,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_VoltorbHisuian, .iconPalIndex = 0, FOOTPRINT(Voltorb) - FOLLOWER( + OVERWORLD( sPicTable_VoltorbHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_VoltorbHisuian, - gShinyFollowerPalette_VoltorbHisuian + gOverworldPalette_VoltorbHisuian, + gShinyOverworldPalette_VoltorbHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sVoltorbHisuianLevelUpLearnset, @@ -11251,13 +11251,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_ElectrodeHisuian, .iconPalIndex = 1, FOOTPRINT(Electrode) - FOLLOWER( + OVERWORLD( sPicTable_ElectrodeHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ElectrodeHisuian, - gShinyFollowerPalette_ElectrodeHisuian + gOverworldPalette_ElectrodeHisuian, + gShinyOverworldPalette_ElectrodeHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sElectrodeHisuianLevelUpLearnset, @@ -11317,13 +11317,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Exeggcute, .iconPalIndex = 0, FOOTPRINT(Exeggcute) - FOLLOWER( + OVERWORLD( sPicTable_Exeggcute, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Exeggcute, - gShinyFollowerPalette_Exeggcute + gOverworldPalette_Exeggcute, + gShinyOverworldPalette_Exeggcute ) .levelUpLearnset = sExeggcuteLevelUpLearnset, .teachableLearnset = sExeggcuteTeachableLearnset, @@ -11390,13 +11390,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Exeggutor, .iconPalIndex = 1, FOOTPRINT(Exeggutor) - FOLLOWER( + OVERWORLD( sPicTable_Exeggutor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Exeggutor, - gShinyFollowerPalette_Exeggutor + gOverworldPalette_Exeggutor, + gShinyOverworldPalette_Exeggutor ) .levelUpLearnset = sExeggutorLevelUpLearnset, .teachableLearnset = sExeggutorTeachableLearnset, @@ -11452,13 +11452,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_ExeggutorAlolan, .iconPalIndex = 1, FOOTPRINT(Exeggutor) - FOLLOWER( + OVERWORLD( sPicTable_ExeggutorAlolan, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ExeggutorAlolan, - gShinyFollowerPalette_ExeggutorAlolan + gOverworldPalette_ExeggutorAlolan, + gShinyOverworldPalette_ExeggutorAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sExeggutorAlolanLevelUpLearnset, @@ -11519,13 +11519,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Cubone, .iconPalIndex = 2, FOOTPRINT(Cubone) - FOLLOWER( + OVERWORLD( sPicTable_Cubone, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cubone, - gShinyFollowerPalette_Cubone + gOverworldPalette_Cubone, + gShinyOverworldPalette_Cubone ) .levelUpLearnset = sCuboneLevelUpLearnset, .teachableLearnset = sCuboneTeachableLearnset, @@ -11584,13 +11584,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Marowak, .iconPalIndex = 2, FOOTPRINT(Marowak) - FOLLOWER( + OVERWORLD( sPicTable_Marowak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Marowak, - gShinyFollowerPalette_Marowak + gOverworldPalette_Marowak, + gShinyOverworldPalette_Marowak ) .levelUpLearnset = sMarowakLevelUpLearnset, .teachableLearnset = sMarowakTeachableLearnset, @@ -11643,13 +11643,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_MarowakAlolan, .iconPalIndex = 1, FOOTPRINT(Marowak) - FOLLOWER( + OVERWORLD( sPicTable_MarowakAlolan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MarowakAlolan, - gShinyFollowerPalette_MarowakAlolan + gOverworldPalette_MarowakAlolan, + gShinyOverworldPalette_MarowakAlolan ) .isAlolanForm = TRUE, .levelUpLearnset = sMarowakAlolanLevelUpLearnset, @@ -11761,13 +11761,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Tyrogue, .iconPalIndex = 2, FOOTPRINT(Tyrogue) - FOLLOWER( + OVERWORLD( sPicTable_Tyrogue, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tyrogue, - gShinyFollowerPalette_Tyrogue + gOverworldPalette_Tyrogue, + gShinyOverworldPalette_Tyrogue ) .levelUpLearnset = sTyrogueLevelUpLearnset, .teachableLearnset = sTyrogueTeachableLearnset, @@ -11826,13 +11826,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Hitmonlee, .iconPalIndex = 2, FOOTPRINT(Hitmonlee) - FOLLOWER( + OVERWORLD( sPicTable_Hitmonlee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hitmonlee, - gShinyFollowerPalette_Hitmonlee + gOverworldPalette_Hitmonlee, + gShinyOverworldPalette_Hitmonlee ) .levelUpLearnset = sHitmonleeLevelUpLearnset, .teachableLearnset = sHitmonleeTeachableLearnset, @@ -11886,13 +11886,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Hitmonchan, .iconPalIndex = 2, FOOTPRINT(Hitmonchan) - FOLLOWER( + OVERWORLD( sPicTable_Hitmonchan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hitmonchan, - gShinyFollowerPalette_Hitmonchan + gOverworldPalette_Hitmonchan, + gShinyOverworldPalette_Hitmonchan ) .levelUpLearnset = sHitmonchanLevelUpLearnset, .teachableLearnset = sHitmonchanTeachableLearnset, @@ -11947,13 +11947,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Hitmontop, .iconPalIndex = 2, FOOTPRINT(Hitmontop) - FOLLOWER( + OVERWORLD( sPicTable_Hitmontop, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hitmontop, - gShinyFollowerPalette_Hitmontop + gOverworldPalette_Hitmontop, + gShinyOverworldPalette_Hitmontop ) .levelUpLearnset = sHitmontopLevelUpLearnset, .teachableLearnset = sHitmontopTeachableLearnset, @@ -12011,13 +12011,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Lickitung, .iconPalIndex = 0, FOOTPRINT(Lickitung) - FOLLOWER( + OVERWORLD( sPicTable_Lickitung, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lickitung, - gShinyFollowerPalette_Lickitung + gOverworldPalette_Lickitung, + gShinyOverworldPalette_Lickitung ) .levelUpLearnset = sLickitungLevelUpLearnset, .teachableLearnset = sLickitungTeachableLearnset, @@ -12075,13 +12075,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Lickilicky, .iconPalIndex = 1, FOOTPRINT(Lickilicky) - FOLLOWER( + OVERWORLD( sPicTable_Lickilicky, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lickilicky, - gShinyFollowerPalette_Lickilicky + gOverworldPalette_Lickilicky, + gShinyOverworldPalette_Lickilicky ) .levelUpLearnset = sLickilickyLevelUpLearnset, .teachableLearnset = sLickilickyTeachableLearnset, @@ -12144,13 +12144,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Koffing, .iconPalIndex = 2, FOOTPRINT(Koffing) - FOLLOWER( + OVERWORLD( sPicTable_Koffing, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Koffing, - gShinyFollowerPalette_Koffing + gOverworldPalette_Koffing, + gShinyOverworldPalette_Koffing ) .levelUpLearnset = sKoffingLevelUpLearnset, .teachableLearnset = sKoffingTeachableLearnset, @@ -12214,13 +12214,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Weezing, .iconPalIndex = 2, FOOTPRINT(Weezing) - FOLLOWER( + OVERWORLD( sPicTable_Weezing, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Weezing, - gShinyFollowerPalette_Weezing + gOverworldPalette_Weezing, + gShinyOverworldPalette_Weezing ) .levelUpLearnset = sWeezingLevelUpLearnset, .teachableLearnset = sWeezingTeachableLearnset, @@ -12279,13 +12279,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_WeezingGalarian, .iconPalIndex = 1, FOOTPRINT(Weezing) - FOLLOWER( + OVERWORLD( sPicTable_WeezingGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_WeezingGalarian, - gShinyFollowerPalette_WeezingGalarian + gOverworldPalette_WeezingGalarian, + gShinyOverworldPalette_WeezingGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sWeezingGalarianLevelUpLearnset, @@ -12348,13 +12348,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Rhyhorn, .iconPalIndex = 1, FOOTPRINT(Rhyhorn) - FOLLOWER( + OVERWORLD( sPicTable_Rhyhorn, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rhyhorn, - gShinyFollowerPalette_Rhyhorn + gOverworldPalette_Rhyhorn, + gShinyOverworldPalette_Rhyhorn ) .levelUpLearnset = sRhyhornLevelUpLearnset, .teachableLearnset = sRhyhornTeachableLearnset, @@ -12414,13 +12414,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Rhydon, .iconPalIndex = 1, FOOTPRINT(Rhydon) - FOLLOWER( + OVERWORLD( sPicTable_Rhydon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rhydon, - gShinyFollowerPalette_Rhydon + gOverworldPalette_Rhydon, + gShinyOverworldPalette_Rhydon ) .levelUpLearnset = sRhydonLevelUpLearnset, .teachableLearnset = sRhydonTeachableLearnset, @@ -12487,13 +12487,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Rhyperior, .iconPalIndex = 0, FOOTPRINT(Rhyperior) - FOLLOWER( + OVERWORLD( sPicTable_Rhyperior, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rhyperior, - gShinyFollowerPalette_Rhyperior + gOverworldPalette_Rhyperior, + gShinyOverworldPalette_Rhyperior ) .levelUpLearnset = sRhyperiorLevelUpLearnset, .teachableLearnset = sRhyperiorTeachableLearnset, @@ -12552,13 +12552,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Happiny, .iconPalIndex = 0, FOOTPRINT(Happiny) - FOLLOWER( + OVERWORLD( sPicTable_Happiny, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Happiny, - gShinyFollowerPalette_Happiny + gOverworldPalette_Happiny, + gShinyOverworldPalette_Happiny ) .levelUpLearnset = sHappinyLevelUpLearnset, .teachableLearnset = sHappinyTeachableLearnset, @@ -12617,13 +12617,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Chansey, .iconPalIndex = 0, FOOTPRINT(Chansey) - FOLLOWER( + OVERWORLD( sPicTable_Chansey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Chansey, - gShinyFollowerPalette_Chansey + gOverworldPalette_Chansey, + gShinyOverworldPalette_Chansey ) .levelUpLearnset = sChanseyLevelUpLearnset, .teachableLearnset = sChanseyTeachableLearnset, @@ -12681,13 +12681,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Blissey, .iconPalIndex = 0, FOOTPRINT(Blissey) - FOLLOWER( + OVERWORLD( sPicTable_Blissey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Blissey, - gShinyFollowerPalette_Blissey + gOverworldPalette_Blissey, + gShinyOverworldPalette_Blissey ) .levelUpLearnset = sBlisseyLevelUpLearnset, .teachableLearnset = sBlisseyTeachableLearnset, @@ -12744,13 +12744,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Tangela, .iconPalIndex = 0, FOOTPRINT(Tangela) - FOLLOWER( + OVERWORLD( sPicTable_Tangela, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tangela, - gShinyFollowerPalette_Tangela + gOverworldPalette_Tangela, + gShinyOverworldPalette_Tangela ) .levelUpLearnset = sTangelaLevelUpLearnset, .teachableLearnset = sTangelaTeachableLearnset, @@ -12809,13 +12809,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Tangrowth, .iconPalIndex = 0, FOOTPRINT(Tangrowth) - FOLLOWER( + OVERWORLD( sPicTable_Tangrowth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tangrowth, - gShinyFollowerPalette_Tangrowth + gOverworldPalette_Tangrowth, + gShinyOverworldPalette_Tangrowth ) .levelUpLearnset = sTangrowthLevelUpLearnset, .teachableLearnset = sTangrowthTeachableLearnset, @@ -12872,13 +12872,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Kangaskhan, .iconPalIndex = 2, FOOTPRINT(Kangaskhan) - FOLLOWER( + OVERWORLD( sPicTable_Kangaskhan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kangaskhan, - gShinyFollowerPalette_Kangaskhan + gOverworldPalette_Kangaskhan, + gShinyOverworldPalette_Kangaskhan ) .levelUpLearnset = sKangaskhanLevelUpLearnset, .teachableLearnset = sKangaskhanTeachableLearnset, @@ -12996,13 +12996,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Horsea, .iconPalIndex = 0, FOOTPRINT(Horsea) - FOLLOWER( + OVERWORLD( sPicTable_Horsea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Horsea, - gShinyFollowerPalette_Horsea + gOverworldPalette_Horsea, + gShinyOverworldPalette_Horsea ) .levelUpLearnset = sHorseaLevelUpLearnset, .teachableLearnset = sHorseaTeachableLearnset, @@ -13060,13 +13060,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Seadra, .iconPalIndex = 0, FOOTPRINT(Seadra) - FOLLOWER( + OVERWORLD( sPicTable_Seadra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Seadra, - gShinyFollowerPalette_Seadra + gOverworldPalette_Seadra, + gShinyOverworldPalette_Seadra ) .levelUpLearnset = sSeadraLevelUpLearnset, .teachableLearnset = sSeadraTeachableLearnset, @@ -13132,13 +13132,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Kingdra, .iconPalIndex = 0, FOOTPRINT(Kingdra) - FOLLOWER( + OVERWORLD( sPicTable_Kingdra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Kingdra, - gShinyFollowerPalette_Kingdra + gOverworldPalette_Kingdra, + gShinyOverworldPalette_Kingdra ) .levelUpLearnset = sKingdraLevelUpLearnset, .teachableLearnset = sKingdraTeachableLearnset, @@ -13200,13 +13200,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Goldeen, .iconPalIndex = 0, FOOTPRINT(Goldeen) - FOLLOWER( + OVERWORLD( sPicTable_Goldeen, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Goldeen, - gShinyFollowerPalette_Goldeen + gOverworldPalette_Goldeen, + gShinyOverworldPalette_Goldeen ) .levelUpLearnset = sGoldeenLevelUpLearnset, .teachableLearnset = sGoldeenTeachableLearnset, @@ -13267,13 +13267,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Seaking, .iconPalIndex = 0, FOOTPRINT(Seaking) - FOLLOWER( + OVERWORLD( sPicTable_Seaking, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Seaking, - gShinyFollowerPalette_Seaking + gOverworldPalette_Seaking, + gShinyOverworldPalette_Seaking ) .levelUpLearnset = sSeakingLevelUpLearnset, .teachableLearnset = sSeakingTeachableLearnset, @@ -13332,13 +13332,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Staryu, .iconPalIndex = 2, FOOTPRINT(Staryu) - FOLLOWER( + OVERWORLD( sPicTable_Staryu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Staryu, - gShinyFollowerPalette_Staryu + gOverworldPalette_Staryu, + gShinyOverworldPalette_Staryu ) .levelUpLearnset = sStaryuLevelUpLearnset, .teachableLearnset = sStaryuTeachableLearnset, @@ -13395,13 +13395,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Starmie, .iconPalIndex = 2, FOOTPRINT(Starmie) - FOLLOWER( + OVERWORLD( sPicTable_Starmie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Starmie, - gShinyFollowerPalette_Starmie + gOverworldPalette_Starmie, + gShinyOverworldPalette_Starmie ) .levelUpLearnset = sStarmieLevelUpLearnset, .teachableLearnset = sStarmieTeachableLearnset, @@ -13462,13 +13462,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_MimeJr, .iconPalIndex = 0, FOOTPRINT(MimeJr) - FOLLOWER( + OVERWORLD( sPicTable_MimeJr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MimeJr, - gShinyFollowerPalette_MimeJr + gOverworldPalette_MimeJr, + gShinyOverworldPalette_MimeJr ) .levelUpLearnset = sMimeJrLevelUpLearnset, .teachableLearnset = sMimeJrTeachableLearnset, @@ -13530,13 +13530,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_MrMime, .iconPalIndex = 0, FOOTPRINT(MrMime) - FOLLOWER( + OVERWORLD( sPicTable_MrMime, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MrMime, - gShinyFollowerPalette_MrMime + gOverworldPalette_MrMime, + gShinyOverworldPalette_MrMime ) .levelUpLearnset = sMrMimeLevelUpLearnset, .teachableLearnset = sMrMimeTeachableLearnset, @@ -13593,13 +13593,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_MrMimeGalarian, .iconPalIndex = 0, FOOTPRINT(MrMime) - FOLLOWER( + OVERWORLD( sPicTable_MrMimeGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MrMimeGalarian, - gShinyFollowerPalette_MrMimeGalarian + gOverworldPalette_MrMimeGalarian, + gShinyOverworldPalette_MrMimeGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sMrMimeGalarianLevelUpLearnset, @@ -13656,13 +13656,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_MrRime, .iconPalIndex = 0, FOOTPRINT(MrRime) - FOLLOWER( + OVERWORLD( sPicTable_MrRime, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MrRime, - gShinyFollowerPalette_MrRime + gOverworldPalette_MrRime, + gShinyOverworldPalette_MrRime ) .levelUpLearnset = sMrRimeLevelUpLearnset, .teachableLearnset = sMrRimeTeachableLearnset, @@ -13722,13 +13722,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Scyther, .iconPalIndex = 1, FOOTPRINT(Scyther) - FOLLOWER( + OVERWORLD( sPicTable_Scyther, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Scyther, - gShinyFollowerPalette_Scyther + gOverworldPalette_Scyther, + gShinyOverworldPalette_Scyther ) .levelUpLearnset = sScytherLevelUpLearnset, .teachableLearnset = sScytherTeachableLearnset, @@ -13790,13 +13790,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Scizor, .iconPalIndex = 0, FOOTPRINT(Scizor) - FOLLOWER( + OVERWORLD( sPicTable_Scizor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Scizor, - gShinyFollowerPalette_Scizor + gOverworldPalette_Scizor, + gShinyOverworldPalette_Scizor ) .levelUpLearnset = sScizorLevelUpLearnset, .teachableLearnset = sScizorTeachableLearnset, @@ -13911,13 +13911,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Kleavor, .iconPalIndex = 2, FOOTPRINT(Kleavor) - FOLLOWER( + OVERWORLD( sPicTable_Kleavor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kleavor, - gShinyFollowerPalette_Kleavor + gOverworldPalette_Kleavor, + gShinyOverworldPalette_Kleavor ) .levelUpLearnset = sKleavorLevelUpLearnset, .teachableLearnset = sKleavorTeachableLearnset, @@ -13976,13 +13976,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Smoochum, .iconPalIndex = 1, FOOTPRINT(Smoochum) - FOLLOWER( + OVERWORLD( sPicTable_Smoochum, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Smoochum, - gShinyFollowerPalette_Smoochum + gOverworldPalette_Smoochum, + gShinyOverworldPalette_Smoochum ) .levelUpLearnset = sSmoochumLevelUpLearnset, .teachableLearnset = sSmoochumTeachableLearnset, @@ -14039,13 +14039,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Jynx, .iconPalIndex = 2, FOOTPRINT(Jynx) - FOLLOWER( + OVERWORLD( sPicTable_Jynx, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Jynx, - gShinyFollowerPalette_Jynx + gOverworldPalette_Jynx, + gShinyOverworldPalette_Jynx ) .levelUpLearnset = sJynxLevelUpLearnset, .teachableLearnset = sJynxTeachableLearnset, @@ -14104,13 +14104,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Elekid, .iconPalIndex = 1, FOOTPRINT(Elekid) - FOLLOWER( + OVERWORLD( sPicTable_Elekid, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Elekid, - gShinyFollowerPalette_Elekid + gOverworldPalette_Elekid, + gShinyOverworldPalette_Elekid ) .levelUpLearnset = sElekidLevelUpLearnset, .teachableLearnset = sElekidTeachableLearnset, @@ -14169,13 +14169,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Electabuzz, .iconPalIndex = 1, FOOTPRINT(Electabuzz) - FOLLOWER( + OVERWORLD( sPicTable_Electabuzz, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Electabuzz, - gShinyFollowerPalette_Electabuzz + gOverworldPalette_Electabuzz, + gShinyOverworldPalette_Electabuzz ) .levelUpLearnset = sElectabuzzLevelUpLearnset, .teachableLearnset = sElectabuzzTeachableLearnset, @@ -14239,13 +14239,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Electivire, .iconPalIndex = 1, FOOTPRINT(Electivire) - FOLLOWER( + OVERWORLD( sPicTable_Electivire, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Electivire, - gShinyFollowerPalette_Electivire + gOverworldPalette_Electivire, + gShinyOverworldPalette_Electivire ) .levelUpLearnset = sElectivireLevelUpLearnset, .teachableLearnset = sElectivireTeachableLearnset, @@ -14305,13 +14305,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Magby, .iconPalIndex = 0, FOOTPRINT(Magby) - FOLLOWER( + OVERWORLD( sPicTable_Magby, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Magby, - gShinyFollowerPalette_Magby + gOverworldPalette_Magby, + gShinyOverworldPalette_Magby ) .levelUpLearnset = sMagbyLevelUpLearnset, .teachableLearnset = sMagbyTeachableLearnset, @@ -14369,13 +14369,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Magmar, .iconPalIndex = 0, FOOTPRINT(Magmar) - FOLLOWER( + OVERWORLD( sPicTable_Magmar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Magmar, - gShinyFollowerPalette_Magmar + gOverworldPalette_Magmar, + gShinyOverworldPalette_Magmar ) .levelUpLearnset = sMagmarLevelUpLearnset, .teachableLearnset = sMagmarTeachableLearnset, @@ -14440,13 +14440,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Magmortar, .iconPalIndex = 0, FOOTPRINT(Magmortar) - FOLLOWER( + OVERWORLD( sPicTable_Magmortar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Magmortar, - gShinyFollowerPalette_Magmortar + gOverworldPalette_Magmortar, + gShinyOverworldPalette_Magmortar ) .levelUpLearnset = sMagmortarLevelUpLearnset, .teachableLearnset = sMagmortarTeachableLearnset, @@ -14503,13 +14503,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Pinsir, .iconPalIndex = 2, FOOTPRINT(Pinsir) - FOLLOWER( + OVERWORLD( sPicTable_Pinsir, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pinsir, - gShinyFollowerPalette_Pinsir + gOverworldPalette_Pinsir, + gShinyOverworldPalette_Pinsir ) .levelUpLearnset = sPinsirLevelUpLearnset, .teachableLearnset = sPinsirTeachableLearnset, @@ -14629,13 +14629,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Tauros, .iconPalIndex = 2, FOOTPRINT(Tauros) - FOLLOWER( + OVERWORLD( sPicTable_Tauros, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tauros, - gShinyFollowerPalette_Tauros + gOverworldPalette_Tauros, + gShinyOverworldPalette_Tauros ) .levelUpLearnset = sTaurosLevelUpLearnset, .teachableLearnset = sTaurosTeachableLearnset, @@ -14863,13 +14863,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Magikarp, .iconPalIndex = 0, FOOTPRINT(Magikarp) - FOLLOWER( + OVERWORLD( sPicTable_Magikarp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Magikarp, - gShinyFollowerPalette_Magikarp + gOverworldPalette_Magikarp, + gShinyOverworldPalette_Magikarp ) .tmIlliterate = TRUE, .levelUpLearnset = sMagikarpLevelUpLearnset, @@ -14929,13 +14929,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Gyarados, .iconPalIndex = 0, FOOTPRINT(Gyarados) - FOLLOWER( + OVERWORLD( sPicTable_Gyarados, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Gyarados, - gShinyFollowerPalette_Gyarados + gOverworldPalette_Gyarados, + gShinyOverworldPalette_Gyarados ) .levelUpLearnset = sGyaradosLevelUpLearnset, .teachableLearnset = sGyaradosTeachableLearnset, @@ -15053,13 +15053,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Lapras, .iconPalIndex = 2, FOOTPRINT(Lapras) - FOLLOWER( + OVERWORLD( sPicTable_Lapras, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Lapras, - gShinyFollowerPalette_Lapras + gOverworldPalette_Lapras, + gShinyOverworldPalette_Lapras ) .levelUpLearnset = sLaprasLevelUpLearnset, .teachableLearnset = sLaprasTeachableLearnset, @@ -15180,13 +15180,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Ditto, .iconPalIndex = 2, FOOTPRINT(Ditto) - FOLLOWER( + OVERWORLD( sPicTable_Ditto, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Ditto, - gShinyFollowerPalette_Ditto + gOverworldPalette_Ditto, + gShinyOverworldPalette_Ditto ) .tmIlliterate = TRUE, .levelUpLearnset = sDittoLevelUpLearnset, @@ -15243,13 +15243,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Eevee, .iconPalIndex = 2, FOOTPRINT(Eevee) - FOLLOWER( + OVERWORLD( sPicTable_Eevee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Eevee, - gShinyFollowerPalette_Eevee + gOverworldPalette_Eevee, + gShinyOverworldPalette_Eevee ) .levelUpLearnset = sEeveeLevelUpLearnset, .teachableLearnset = sEeveeTeachableLearnset, @@ -15434,13 +15434,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Vaporeon, .iconPalIndex = 0, FOOTPRINT(Vaporeon) - FOLLOWER( + OVERWORLD( sPicTable_Vaporeon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vaporeon, - gShinyFollowerPalette_Vaporeon + gOverworldPalette_Vaporeon, + gShinyOverworldPalette_Vaporeon ) .levelUpLearnset = sVaporeonLevelUpLearnset, .teachableLearnset = sVaporeonTeachableLearnset, @@ -15494,13 +15494,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Jolteon, .iconPalIndex = 2, FOOTPRINT(Jolteon) - FOLLOWER( + OVERWORLD( sPicTable_Jolteon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Jolteon, - gShinyFollowerPalette_Jolteon + gOverworldPalette_Jolteon, + gShinyOverworldPalette_Jolteon ) .levelUpLearnset = sJolteonLevelUpLearnset, .teachableLearnset = sJolteonTeachableLearnset, @@ -15554,13 +15554,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Flareon, .iconPalIndex = 3, FOOTPRINT(Flareon) - FOLLOWER( + OVERWORLD( sPicTable_Flareon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Flareon, - gShinyFollowerPalette_Flareon + gOverworldPalette_Flareon, + gShinyOverworldPalette_Flareon ) .levelUpLearnset = sFlareonLevelUpLearnset, .teachableLearnset = sFlareonTeachableLearnset, @@ -15615,13 +15615,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Espeon, .iconPalIndex = 2, FOOTPRINT(Espeon) - FOLLOWER( + OVERWORLD( sPicTable_Espeon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Espeon, - gShinyFollowerPalette_Espeon + gOverworldPalette_Espeon, + gShinyOverworldPalette_Espeon ) .levelUpLearnset = sEspeonLevelUpLearnset, .teachableLearnset = sEspeonTeachableLearnset, @@ -15675,13 +15675,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Umbreon, .iconPalIndex = 0, FOOTPRINT(Umbreon) - FOLLOWER( + OVERWORLD( sPicTable_Umbreon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Umbreon, - gShinyFollowerPalette_Umbreon + gOverworldPalette_Umbreon, + gShinyOverworldPalette_Umbreon ) .levelUpLearnset = sUmbreonLevelUpLearnset, .teachableLearnset = sUmbreonTeachableLearnset, @@ -15737,13 +15737,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Leafeon, .iconPalIndex = 1, FOOTPRINT(Leafeon) - FOLLOWER( + OVERWORLD( sPicTable_Leafeon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Leafeon, - gShinyFollowerPalette_Leafeon + gOverworldPalette_Leafeon, + gShinyOverworldPalette_Leafeon ) .levelUpLearnset = sLeafeonLevelUpLearnset, .teachableLearnset = sLeafeonTeachableLearnset, @@ -15797,13 +15797,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Glaceon, .iconPalIndex = 0, FOOTPRINT(Glaceon) - FOLLOWER( + OVERWORLD( sPicTable_Glaceon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Glaceon, - gShinyFollowerPalette_Glaceon + gOverworldPalette_Glaceon, + gShinyOverworldPalette_Glaceon ) .levelUpLearnset = sGlaceonLevelUpLearnset, .teachableLearnset = sGlaceonTeachableLearnset, @@ -15860,13 +15860,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Sylveon, .iconPalIndex = 0, FOOTPRINT(Sylveon) - FOLLOWER( + OVERWORLD( sPicTable_Sylveon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sylveon, - gShinyFollowerPalette_Sylveon + gOverworldPalette_Sylveon, + gShinyOverworldPalette_Sylveon ) .levelUpLearnset = sSylveonLevelUpLearnset, .teachableLearnset = sSylveonTeachableLearnset, @@ -15923,13 +15923,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Porygon, .iconPalIndex = 0, FOOTPRINT(Porygon) - FOLLOWER( + OVERWORLD( sPicTable_Porygon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Porygon, - gShinyFollowerPalette_Porygon + gOverworldPalette_Porygon, + gShinyOverworldPalette_Porygon ) .levelUpLearnset = sPorygonLevelUpLearnset, .teachableLearnset = sPorygonTeachableLearnset, @@ -15987,13 +15987,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Porygon2, .iconPalIndex = 0, FOOTPRINT(Porygon2) - FOLLOWER( + OVERWORLD( sPicTable_Porygon2, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Porygon2, - gShinyFollowerPalette_Porygon2 + gOverworldPalette_Porygon2, + gShinyOverworldPalette_Porygon2 ) .levelUpLearnset = sPorygon2LevelUpLearnset, .teachableLearnset = sPorygon2TeachableLearnset, @@ -16057,13 +16057,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_PorygonZ, .iconPalIndex = 0, FOOTPRINT(PorygonZ) - FOLLOWER( + OVERWORLD( sPicTable_PorygonZ, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_PorygonZ, - gShinyFollowerPalette_PorygonZ + gOverworldPalette_PorygonZ, + gShinyOverworldPalette_PorygonZ ) .levelUpLearnset = sPorygonZLevelUpLearnset, .teachableLearnset = sPorygonZTeachableLearnset, @@ -16127,13 +16127,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Omanyte, .iconPalIndex = 0, FOOTPRINT(Omanyte) - FOLLOWER( + OVERWORLD( sPicTable_Omanyte, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Omanyte, - gShinyFollowerPalette_Omanyte + gOverworldPalette_Omanyte, + gShinyOverworldPalette_Omanyte ) .levelUpLearnset = sOmanyteLevelUpLearnset, .teachableLearnset = sOmanyteTeachableLearnset, @@ -16189,13 +16189,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Omastar, .iconPalIndex = 0, FOOTPRINT(Omastar) - FOLLOWER( + OVERWORLD( sPicTable_Omastar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Omastar, - gShinyFollowerPalette_Omastar + gOverworldPalette_Omastar, + gShinyOverworldPalette_Omastar ) .levelUpLearnset = sOmastarLevelUpLearnset, .teachableLearnset = sOmastarTeachableLearnset, @@ -16257,13 +16257,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Kabuto, .iconPalIndex = 2, FOOTPRINT(Kabuto) - FOLLOWER( + OVERWORLD( sPicTable_Kabuto, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Kabuto, - gShinyFollowerPalette_Kabuto + gOverworldPalette_Kabuto, + gShinyOverworldPalette_Kabuto ) .levelUpLearnset = sKabutoLevelUpLearnset, .teachableLearnset = sKabutoTeachableLearnset, @@ -16325,13 +16325,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Kabutops, .iconPalIndex = 2, FOOTPRINT(Kabutops) - FOLLOWER( + OVERWORLD( sPicTable_Kabutops, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kabutops, - gShinyFollowerPalette_Kabutops + gOverworldPalette_Kabutops, + gShinyOverworldPalette_Kabutops ) .levelUpLearnset = sKabutopsLevelUpLearnset, .teachableLearnset = sKabutopsTeachableLearnset, @@ -16388,13 +16388,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Aerodactyl, .iconPalIndex = 2, FOOTPRINT(Aerodactyl) - FOLLOWER( + OVERWORLD( sPicTable_Aerodactyl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Aerodactyl, - gShinyFollowerPalette_Aerodactyl + gOverworldPalette_Aerodactyl, + gShinyOverworldPalette_Aerodactyl ) .levelUpLearnset = sAerodactylLevelUpLearnset, .teachableLearnset = sAerodactylTeachableLearnset, @@ -16514,13 +16514,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Munchlax, .iconPalIndex = 3, FOOTPRINT(Munchlax) - FOLLOWER( + OVERWORLD( sPicTable_Munchlax, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Munchlax, - gShinyFollowerPalette_Munchlax + gOverworldPalette_Munchlax, + gShinyOverworldPalette_Munchlax ) .levelUpLearnset = sMunchlaxLevelUpLearnset, .teachableLearnset = sMunchlaxTeachableLearnset, @@ -16579,13 +16579,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Snorlax, .iconPalIndex = 3, FOOTPRINT(Snorlax) - FOLLOWER( + OVERWORLD( sPicTable_Snorlax, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Snorlax, - gShinyFollowerPalette_Snorlax + gOverworldPalette_Snorlax, + gShinyOverworldPalette_Snorlax ) .levelUpLearnset = sSnorlaxLevelUpLearnset, .teachableLearnset = sSnorlaxTeachableLearnset, @@ -16710,13 +16710,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Articuno, .iconPalIndex = 2, FOOTPRINT(Articuno) - FOLLOWER( + OVERWORLD( sPicTable_Articuno, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Articuno, - gShinyFollowerPalette_Articuno + gOverworldPalette_Articuno, + gShinyOverworldPalette_Articuno ) .isLegendary = TRUE, .levelUpLearnset = sArticunoLevelUpLearnset, @@ -16774,13 +16774,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_ArticunoGalarian, .iconPalIndex = 2, FOOTPRINT(Articuno) - FOLLOWER( + OVERWORLD( sPicTable_ArticunoGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ArticunoGalarian, - gShinyFollowerPalette_ArticunoGalarian + gOverworldPalette_ArticunoGalarian, + gShinyOverworldPalette_ArticunoGalarian ) .isLegendary = TRUE, .isGalarianForm = TRUE, @@ -16851,13 +16851,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Zapdos, .iconPalIndex = 0, FOOTPRINT(Zapdos) - FOLLOWER( + OVERWORLD( sPicTable_Zapdos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Zapdos, - gShinyFollowerPalette_Zapdos + gOverworldPalette_Zapdos, + gShinyOverworldPalette_Zapdos ) .isLegendary = TRUE, .levelUpLearnset = sZapdosLevelUpLearnset, @@ -16914,13 +16914,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_ZapdosGalarian, .iconPalIndex = 0, FOOTPRINT(Zapdos) - FOLLOWER( + OVERWORLD( sPicTable_ZapdosGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ZapdosGalarian, - gShinyFollowerPalette_ZapdosGalarian + gOverworldPalette_ZapdosGalarian, + gShinyOverworldPalette_ZapdosGalarian ) .isLegendary = TRUE, .isGalarianForm = TRUE, @@ -16986,13 +16986,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Moltres, .iconPalIndex = 0, FOOTPRINT(Moltres) - FOLLOWER( + OVERWORLD( sPicTable_Moltres, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Moltres, - gShinyFollowerPalette_Moltres + gOverworldPalette_Moltres, + gShinyOverworldPalette_Moltres ) .isLegendary = TRUE, .levelUpLearnset = sMoltresLevelUpLearnset, @@ -17049,13 +17049,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_MoltresGalarian, .iconPalIndex = 0, FOOTPRINT(Moltres) - FOLLOWER( + OVERWORLD( sPicTable_MoltresGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MoltresGalarian, - gShinyFollowerPalette_MoltresGalarian + gOverworldPalette_MoltresGalarian, + gShinyOverworldPalette_MoltresGalarian ) .isLegendary = TRUE, .isGalarianForm = TRUE, @@ -17116,13 +17116,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Dratini, .iconPalIndex = 0, FOOTPRINT(Dratini) - FOLLOWER( + OVERWORLD( sPicTable_Dratini, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Dratini, - gShinyFollowerPalette_Dratini + gOverworldPalette_Dratini, + gShinyOverworldPalette_Dratini ) .levelUpLearnset = sDratiniLevelUpLearnset, .teachableLearnset = sDratiniTeachableLearnset, @@ -17179,13 +17179,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Dragonair, .iconPalIndex = 0, FOOTPRINT(Dragonair) - FOLLOWER( + OVERWORLD( sPicTable_Dragonair, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Dragonair, - gShinyFollowerPalette_Dragonair + gOverworldPalette_Dragonair, + gShinyOverworldPalette_Dragonair ) .levelUpLearnset = sDragonairLevelUpLearnset, .teachableLearnset = sDragonairTeachableLearnset, @@ -17247,13 +17247,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Dragonite, .iconPalIndex = 2, FOOTPRINT(Dragonite) - FOLLOWER( + OVERWORLD( sPicTable_Dragonite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Dragonite, - gShinyFollowerPalette_Dragonite + gOverworldPalette_Dragonite, + gShinyOverworldPalette_Dragonite ) .levelUpLearnset = sDragoniteLevelUpLearnset, .teachableLearnset = sDragoniteTeachableLearnset, @@ -17315,13 +17315,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Mewtwo, .iconPalIndex = 2, FOOTPRINT(Mewtwo) - FOLLOWER( + OVERWORLD( sPicTable_Mewtwo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mewtwo, - gShinyFollowerPalette_Mewtwo + gOverworldPalette_Mewtwo, + gShinyOverworldPalette_Mewtwo ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -17507,13 +17507,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconSprite = gMonIcon_Mew, .iconPalIndex = 0, FOOTPRINT(Mew) - FOLLOWER( + OVERWORLD( sPicTable_Mew, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Mew, - gShinyFollowerPalette_Mew + gOverworldPalette_Mew, + gShinyOverworldPalette_Mew ) .isMythical = TRUE, .isFrontierBanned = TRUE, diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index d9b9339d0f..ed6e9e23fb 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -52,13 +52,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Chikorita, .iconPalIndex = 1, FOOTPRINT(Chikorita) - FOLLOWER( + OVERWORLD( sPicTable_Chikorita, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Chikorita, - gShinyFollowerPalette_Chikorita + gOverworldPalette_Chikorita, + gShinyOverworldPalette_Chikorita ) .levelUpLearnset = sChikoritaLevelUpLearnset, .teachableLearnset = sChikoritaTeachableLearnset, @@ -115,13 +115,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Bayleef, .iconPalIndex = 1, FOOTPRINT(Bayleef) - FOLLOWER( + OVERWORLD( sPicTable_Bayleef, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bayleef, - gShinyFollowerPalette_Bayleef + gOverworldPalette_Bayleef, + gShinyOverworldPalette_Bayleef ) .levelUpLearnset = sBayleefLevelUpLearnset, .teachableLearnset = sBayleefTeachableLearnset, @@ -187,13 +187,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Meganium, .iconPalIndex = 1, FOOTPRINT(Meganium) - FOLLOWER( + OVERWORLD( sPicTable_Meganium, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Meganium, - gShinyFollowerPalette_Meganium + gOverworldPalette_Meganium, + gShinyOverworldPalette_Meganium ) .levelUpLearnset = sMeganiumLevelUpLearnset, .teachableLearnset = sMeganiumTeachableLearnset, @@ -249,13 +249,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Cyndaquil, .iconPalIndex = 3, FOOTPRINT(Cyndaquil) - FOLLOWER( + OVERWORLD( sPicTable_Cyndaquil, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cyndaquil, - gShinyFollowerPalette_Cyndaquil + gOverworldPalette_Cyndaquil, + gShinyOverworldPalette_Cyndaquil ) .levelUpLearnset = sCyndaquilLevelUpLearnset, .teachableLearnset = sCyndaquilTeachableLearnset, @@ -312,13 +312,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Quilava, .iconPalIndex = 3, FOOTPRINT(Quilava) - FOLLOWER( + OVERWORLD( sPicTable_Quilava, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Quilava, - gShinyFollowerPalette_Quilava + gOverworldPalette_Quilava, + gShinyOverworldPalette_Quilava ) .levelUpLearnset = sQuilavaLevelUpLearnset, .teachableLearnset = sQuilavaTeachableLearnset, @@ -383,13 +383,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Typhlosion, .iconPalIndex = 3, FOOTPRINT(Typhlosion) - FOLLOWER( + OVERWORLD( sPicTable_Typhlosion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Typhlosion, - gShinyFollowerPalette_Typhlosion + gOverworldPalette_Typhlosion, + gShinyOverworldPalette_Typhlosion ) .levelUpLearnset = sTyphlosionLevelUpLearnset, .teachableLearnset = sTyphlosionTeachableLearnset, @@ -445,13 +445,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_TyphlosionHisuian, .iconPalIndex = 1, FOOTPRINT(Typhlosion) - FOLLOWER( + OVERWORLD( sPicTable_TyphlosionHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_TyphlosionHisuian, - gShinyFollowerPalette_TyphlosionHisuian + gOverworldPalette_TyphlosionHisuian, + gShinyOverworldPalette_TyphlosionHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sTyphlosionHisuianLevelUpLearnset, @@ -510,13 +510,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Totodile, .iconPalIndex = 0, FOOTPRINT(Totodile) - FOLLOWER( + OVERWORLD( sPicTable_Totodile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Totodile, - gShinyFollowerPalette_Totodile + gOverworldPalette_Totodile, + gShinyOverworldPalette_Totodile ) .levelUpLearnset = sTotodileLevelUpLearnset, .teachableLearnset = sTotodileTeachableLearnset, @@ -574,13 +574,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Croconaw, .iconPalIndex = 0, FOOTPRINT(Croconaw) - FOLLOWER( + OVERWORLD( sPicTable_Croconaw, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Croconaw, - gShinyFollowerPalette_Croconaw + gOverworldPalette_Croconaw, + gShinyOverworldPalette_Croconaw ) .levelUpLearnset = sCroconawLevelUpLearnset, .teachableLearnset = sCroconawTeachableLearnset, @@ -643,13 +643,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Feraligatr, .iconPalIndex = 0, FOOTPRINT(Feraligatr) - FOLLOWER( + OVERWORLD( sPicTable_Feraligatr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Feraligatr, - gShinyFollowerPalette_Feraligatr + gOverworldPalette_Feraligatr, + gShinyOverworldPalette_Feraligatr ) .levelUpLearnset = sFeraligatrLevelUpLearnset, .teachableLearnset = sFeraligatrTeachableLearnset, @@ -705,13 +705,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Sentret, .iconPalIndex = 2, FOOTPRINT(Sentret) - FOLLOWER( + OVERWORLD( sPicTable_Sentret, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sentret, - gShinyFollowerPalette_Sentret + gOverworldPalette_Sentret, + gShinyOverworldPalette_Sentret ) .levelUpLearnset = sSentretLevelUpLearnset, .teachableLearnset = sSentretTeachableLearnset, @@ -767,13 +767,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Furret, .iconPalIndex = 2, FOOTPRINT(Furret) - FOLLOWER( + OVERWORLD( sPicTable_Furret, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Furret, - gShinyFollowerPalette_Furret + gOverworldPalette_Furret, + gShinyOverworldPalette_Furret ) .levelUpLearnset = sFurretLevelUpLearnset, .teachableLearnset = sFurretTeachableLearnset, @@ -829,13 +829,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Hoothoot, .iconPalIndex = 2, FOOTPRINT(Hoothoot) - FOLLOWER( + OVERWORLD( sPicTable_Hoothoot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hoothoot, - gShinyFollowerPalette_Hoothoot + gOverworldPalette_Hoothoot, + gShinyOverworldPalette_Hoothoot ) .levelUpLearnset = sHoothootLevelUpLearnset, .teachableLearnset = sHoothootTeachableLearnset, @@ -897,13 +897,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Noctowl, .iconPalIndex = 2, FOOTPRINT(Noctowl) - FOLLOWER( + OVERWORLD( sPicTable_Noctowl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Noctowl, - gShinyFollowerPalette_Noctowl + gOverworldPalette_Noctowl, + gShinyOverworldPalette_Noctowl ) .levelUpLearnset = sNoctowlLevelUpLearnset, .teachableLearnset = sNoctowlTeachableLearnset, @@ -963,13 +963,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Ledyba, .iconPalIndex = 0, FOOTPRINT(Ledyba) - FOLLOWER( + OVERWORLD( sPicTable_Ledyba, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Ledyba, - gShinyFollowerPalette_Ledyba + gOverworldPalette_Ledyba, + gShinyOverworldPalette_Ledyba ) .levelUpLearnset = sLedybaLevelUpLearnset, .teachableLearnset = sLedybaTeachableLearnset, @@ -1030,13 +1030,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Ledian, .iconPalIndex = 0, FOOTPRINT(Ledian) - FOLLOWER( + OVERWORLD( sPicTable_Ledian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ledian, - gShinyFollowerPalette_Ledian + gOverworldPalette_Ledian, + gShinyOverworldPalette_Ledian ) .levelUpLearnset = sLedianLevelUpLearnset, .teachableLearnset = sLedianTeachableLearnset, @@ -1092,13 +1092,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Spinarak, .iconPalIndex = 1, FOOTPRINT(Spinarak) - FOLLOWER( + OVERWORLD( sPicTable_Spinarak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Spinarak, - gShinyFollowerPalette_Spinarak + gOverworldPalette_Spinarak, + gShinyOverworldPalette_Spinarak ) .levelUpLearnset = sSpinarakLevelUpLearnset, .teachableLearnset = sSpinarakTeachableLearnset, @@ -1160,13 +1160,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Ariados, .iconPalIndex = 0, FOOTPRINT(Ariados) - FOLLOWER( + OVERWORLD( sPicTable_Ariados, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Ariados, - gShinyFollowerPalette_Ariados + gOverworldPalette_Ariados, + gShinyOverworldPalette_Ariados ) .levelUpLearnset = sAriadosLevelUpLearnset, .teachableLearnset = sAriadosTeachableLearnset, @@ -1223,13 +1223,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Chinchou, .iconPalIndex = 2, FOOTPRINT(Chinchou) - FOLLOWER( + OVERWORLD( sPicTable_Chinchou, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Chinchou, - gShinyFollowerPalette_Chinchou + gOverworldPalette_Chinchou, + gShinyOverworldPalette_Chinchou ) .levelUpLearnset = sChinchouLevelUpLearnset, .teachableLearnset = sChinchouTeachableLearnset, @@ -1286,13 +1286,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Lanturn, .iconPalIndex = 0, FOOTPRINT(Lanturn) - FOLLOWER( + OVERWORLD( sPicTable_Lanturn, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Lanturn, - gShinyFollowerPalette_Lanturn + gOverworldPalette_Lanturn, + gShinyOverworldPalette_Lanturn ) .levelUpLearnset = sLanturnLevelUpLearnset, .teachableLearnset = sLanturnTeachableLearnset, @@ -1350,13 +1350,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Togepi, .iconPalIndex = 0, FOOTPRINT(Togepi) - FOLLOWER( + OVERWORLD( sPicTable_Togepi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Togepi, - gShinyFollowerPalette_Togepi + gOverworldPalette_Togepi, + gShinyOverworldPalette_Togepi ) .levelUpLearnset = sTogepiLevelUpLearnset, .teachableLearnset = sTogepiTeachableLearnset, @@ -1412,13 +1412,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Togetic, .iconPalIndex = 0, FOOTPRINT(Togetic) - FOLLOWER( + OVERWORLD( sPicTable_Togetic, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Togetic, - gShinyFollowerPalette_Togetic + gOverworldPalette_Togetic, + gShinyOverworldPalette_Togetic ) .levelUpLearnset = sTogeticLevelUpLearnset, .teachableLearnset = sTogeticTeachableLearnset, @@ -1483,13 +1483,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Togekiss, .iconPalIndex = 2, FOOTPRINT(Togekiss) - FOLLOWER( + OVERWORLD( sPicTable_Togekiss, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Togekiss, - gShinyFollowerPalette_Togekiss + gOverworldPalette_Togekiss, + gShinyOverworldPalette_Togekiss ) .levelUpLearnset = sTogekissLevelUpLearnset, .teachableLearnset = sTogekissTeachableLearnset, @@ -1547,13 +1547,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Natu, .iconPalIndex = 1, FOOTPRINT(Natu) - FOLLOWER( + OVERWORLD( sPicTable_Natu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Natu, - gShinyFollowerPalette_Natu + gOverworldPalette_Natu, + gShinyOverworldPalette_Natu ) .levelUpLearnset = sNatuLevelUpLearnset, .teachableLearnset = sNatuTeachableLearnset, @@ -1612,13 +1612,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Xatu, .iconPalIndex = 1, FOOTPRINT(Xatu) - FOLLOWER( + OVERWORLD( sPicTable_Xatu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Xatu, - gShinyFollowerPalette_Xatu + gOverworldPalette_Xatu, + gShinyOverworldPalette_Xatu ) .levelUpLearnset = sXatuLevelUpLearnset, .teachableLearnset = sXatuTeachableLearnset, @@ -1675,13 +1675,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Mareep, .iconPalIndex = 0, FOOTPRINT(Mareep) - FOLLOWER( + OVERWORLD( sPicTable_Mareep, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mareep, - gShinyFollowerPalette_Mareep + gOverworldPalette_Mareep, + gShinyOverworldPalette_Mareep ) .levelUpLearnset = sMareepLevelUpLearnset, .teachableLearnset = sMareepTeachableLearnset, @@ -1737,13 +1737,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Flaaffy, .iconPalIndex = 0, FOOTPRINT(Flaaffy) - FOLLOWER( + OVERWORLD( sPicTable_Flaaffy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Flaaffy, - gShinyFollowerPalette_Flaaffy + gOverworldPalette_Flaaffy, + gShinyOverworldPalette_Flaaffy ) .levelUpLearnset = sFlaaffyLevelUpLearnset, .teachableLearnset = sFlaaffyTeachableLearnset, @@ -1809,13 +1809,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Ampharos, .iconPalIndex = 0, FOOTPRINT(Ampharos) - FOLLOWER( + OVERWORLD( sPicTable_Ampharos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ampharos, - gShinyFollowerPalette_Ampharos + gOverworldPalette_Ampharos, + gShinyOverworldPalette_Ampharos ) .levelUpLearnset = sAmpharosLevelUpLearnset, .teachableLearnset = sAmpharosTeachableLearnset, @@ -1935,13 +1935,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Azurill, .iconPalIndex = 0, FOOTPRINT(Azurill) - FOLLOWER( + OVERWORLD( sPicTable_Azurill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Azurill, - gShinyFollowerPalette_Azurill + gOverworldPalette_Azurill, + gShinyOverworldPalette_Azurill ) .levelUpLearnset = sAzurillLevelUpLearnset, .teachableLearnset = sAzurillTeachableLearnset, @@ -2002,13 +2002,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Marill, .iconPalIndex = 0, FOOTPRINT(Marill) - FOLLOWER( + OVERWORLD( sPicTable_Marill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Marill, - gShinyFollowerPalette_Marill + gOverworldPalette_Marill, + gShinyOverworldPalette_Marill ) .levelUpLearnset = sMarillLevelUpLearnset, .teachableLearnset = sMarillTeachableLearnset, @@ -2076,13 +2076,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Azumarill, .iconPalIndex = 0, FOOTPRINT(Azumarill) - FOLLOWER( + OVERWORLD( sPicTable_Azumarill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Azumarill, - gShinyFollowerPalette_Azumarill + gOverworldPalette_Azumarill, + gShinyOverworldPalette_Azumarill ) .levelUpLearnset = sAzumarillLevelUpLearnset, .teachableLearnset = sAzumarillTeachableLearnset, @@ -2139,13 +2139,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Bonsly, .iconPalIndex = 1, FOOTPRINT(Bonsly) - FOLLOWER( + OVERWORLD( sPicTable_Bonsly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bonsly, - gShinyFollowerPalette_Bonsly + gOverworldPalette_Bonsly, + gShinyOverworldPalette_Bonsly ) .levelUpLearnset = sBonslyLevelUpLearnset, .teachableLearnset = sBonslyTeachableLearnset, @@ -2206,13 +2206,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Sudowoodo, .iconPalIndex = 1, FOOTPRINT(Sudowoodo) - FOLLOWER( + OVERWORLD( sPicTable_Sudowoodo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sudowoodo, - gShinyFollowerPalette_Sudowoodo + gOverworldPalette_Sudowoodo, + gShinyOverworldPalette_Sudowoodo ) .levelUpLearnset = sSudowoodoLevelUpLearnset, .teachableLearnset = sSudowoodoTeachableLearnset, @@ -2270,13 +2270,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Hoppip, .iconPalIndex = 1, FOOTPRINT(Hoppip) - FOLLOWER( + OVERWORLD( sPicTable_Hoppip, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Hoppip, - gShinyFollowerPalette_Hoppip + gOverworldPalette_Hoppip, + gShinyOverworldPalette_Hoppip ) .levelUpLearnset = sHoppipLevelUpLearnset, .teachableLearnset = sHoppipTeachableLearnset, @@ -2333,13 +2333,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Skiploom, .iconPalIndex = 1, FOOTPRINT(Skiploom) - FOLLOWER( + OVERWORLD( sPicTable_Skiploom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Skiploom, - gShinyFollowerPalette_Skiploom + gOverworldPalette_Skiploom, + gShinyOverworldPalette_Skiploom ) .levelUpLearnset = sSkiploomLevelUpLearnset, .teachableLearnset = sSkiploomTeachableLearnset, @@ -2403,13 +2403,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Jumpluff, .iconPalIndex = 2, FOOTPRINT(Jumpluff) - FOLLOWER( + OVERWORLD( sPicTable_Jumpluff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Jumpluff, - gShinyFollowerPalette_Jumpluff + gOverworldPalette_Jumpluff, + gShinyOverworldPalette_Jumpluff ) .levelUpLearnset = sJumpluffLevelUpLearnset, .teachableLearnset = sJumpluffTeachableLearnset, @@ -2469,13 +2469,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Aipom, .iconPalIndex = 2, FOOTPRINT(Aipom) - FOLLOWER( + OVERWORLD( sPicTable_Aipom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Aipom, - gShinyFollowerPalette_Aipom + gOverworldPalette_Aipom, + gShinyOverworldPalette_Aipom ) .levelUpLearnset = sAipomLevelUpLearnset, .teachableLearnset = sAipomTeachableLearnset, @@ -2536,13 +2536,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Ambipom, .iconPalIndex = 2, FOOTPRINT(Ambipom) - FOLLOWER( + OVERWORLD( sPicTable_Ambipom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ambipom, - gShinyFollowerPalette_Ambipom + gOverworldPalette_Ambipom, + gShinyOverworldPalette_Ambipom ) .levelUpLearnset = sAmbipomLevelUpLearnset, .teachableLearnset = sAmbipomTeachableLearnset, @@ -2599,13 +2599,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Sunkern, .iconPalIndex = 1, FOOTPRINT(Sunkern) - FOLLOWER( + OVERWORLD( sPicTable_Sunkern, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Sunkern, - gShinyFollowerPalette_Sunkern + gOverworldPalette_Sunkern, + gShinyOverworldPalette_Sunkern ) .levelUpLearnset = sSunkernLevelUpLearnset, .teachableLearnset = sSunkernTeachableLearnset, @@ -2661,13 +2661,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Sunflora, .iconPalIndex = 1, FOOTPRINT(Sunflora) - FOLLOWER( + OVERWORLD( sPicTable_Sunflora, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sunflora, - gShinyFollowerPalette_Sunflora + gOverworldPalette_Sunflora, + gShinyOverworldPalette_Sunflora ) .levelUpLearnset = sSunfloraLevelUpLearnset, .teachableLearnset = sSunfloraTeachableLearnset, @@ -2725,13 +2725,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Yanma, .iconPalIndex = 1, FOOTPRINT(Yanma) - FOLLOWER( + OVERWORLD( sPicTable_Yanma, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Yanma, - gShinyFollowerPalette_Yanma + gOverworldPalette_Yanma, + gShinyOverworldPalette_Yanma ) .levelUpLearnset = sYanmaLevelUpLearnset, .teachableLearnset = sYanmaTeachableLearnset, @@ -2790,13 +2790,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Yanmega, .iconPalIndex = 1, FOOTPRINT(Yanmega) - FOLLOWER( + OVERWORLD( sPicTable_Yanmega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Yanmega, - gShinyFollowerPalette_Yanmega + gOverworldPalette_Yanmega, + gShinyOverworldPalette_Yanmega ) .levelUpLearnset = sYanmegaLevelUpLearnset, .teachableLearnset = sYanmegaTeachableLearnset, @@ -2857,13 +2857,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Wooper, .iconPalIndex = 0, FOOTPRINT(Wooper) - FOLLOWER( + OVERWORLD( sPicTable_Wooper, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Wooper, - gShinyFollowerPalette_Wooper + gOverworldPalette_Wooper, + gShinyOverworldPalette_Wooper ) .levelUpLearnset = sWooperLevelUpLearnset, .teachableLearnset = sWooperTeachableLearnset, @@ -2924,13 +2924,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Quagsire, .iconPalIndex = 0, FOOTPRINT(Quagsire) - FOLLOWER( + OVERWORLD( sPicTable_Quagsire, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Quagsire, - gShinyFollowerPalette_Quagsire + gOverworldPalette_Quagsire, + gShinyOverworldPalette_Quagsire ) .levelUpLearnset = sQuagsireLevelUpLearnset, .teachableLearnset = sQuagsireTeachableLearnset, @@ -3101,13 +3101,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Murkrow, .iconPalIndex = 2, FOOTPRINT(Murkrow) - FOLLOWER( + OVERWORLD( sPicTable_Murkrow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Murkrow, - gShinyFollowerPalette_Murkrow + gOverworldPalette_Murkrow, + gShinyOverworldPalette_Murkrow ) .levelUpLearnset = sMurkrowLevelUpLearnset, .teachableLearnset = sMurkrowTeachableLearnset, @@ -3164,13 +3164,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Honchkrow, .iconPalIndex = 2, FOOTPRINT(Honchkrow) - FOLLOWER( + OVERWORLD( sPicTable_Honchkrow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Honchkrow, - gShinyFollowerPalette_Honchkrow + gOverworldPalette_Honchkrow, + gShinyOverworldPalette_Honchkrow ) .levelUpLearnset = sHonchkrowLevelUpLearnset, .teachableLearnset = sHonchkrowTeachableLearnset, @@ -3229,13 +3229,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Misdreavus, .iconPalIndex = 0, FOOTPRINT(Misdreavus) - FOLLOWER( + OVERWORLD( sPicTable_Misdreavus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Misdreavus, - gShinyFollowerPalette_Misdreavus + gOverworldPalette_Misdreavus, + gShinyOverworldPalette_Misdreavus ) .levelUpLearnset = sMisdreavusLevelUpLearnset, .teachableLearnset = sMisdreavusTeachableLearnset, @@ -3294,13 +3294,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Mismagius, .iconPalIndex = 2, FOOTPRINT(Mismagius) - FOLLOWER( + OVERWORLD( sPicTable_Mismagius, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mismagius, - gShinyFollowerPalette_Mismagius + gOverworldPalette_Mismagius, + gShinyOverworldPalette_Mismagius ) .levelUpLearnset = sMismagiusLevelUpLearnset, .teachableLearnset = sMismagiusTeachableLearnset, @@ -3356,13 +3356,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Unown ##letter, \ .iconPalIndex = 0, \ FOOTPRINT(Unown) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Unown ##letter, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_NONE, \ - gFollowerPalette_Unown, \ - gShinyFollowerPalette_Unown, \ + gOverworldPalette_Unown, \ + gShinyOverworldPalette_Unown, \ ) \ .levelUpLearnset = sUnownLevelUpLearnset, \ .teachableLearnset = sUnownTeachableLearnset, \ @@ -3451,13 +3451,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Wynaut, .iconPalIndex = 0, FOOTPRINT(Wynaut) - FOLLOWER( + OVERWORLD( sPicTable_Wynaut, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Wynaut, - gShinyFollowerPalette_Wynaut + gOverworldPalette_Wynaut, + gShinyOverworldPalette_Wynaut ) .tmIlliterate = TRUE, .levelUpLearnset = sWynautLevelUpLearnset, @@ -3522,13 +3522,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconPalIndexFemale = 0, #endif FOOTPRINT(Wobbuffet) - FOLLOWER( + OVERWORLD( sPicTable_Wobbuffet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Wobbuffet, - gShinyFollowerPalette_Wobbuffet + gOverworldPalette_Wobbuffet, + gShinyOverworldPalette_Wobbuffet ) .tmIlliterate = TRUE, .levelUpLearnset = sWobbuffetLevelUpLearnset, @@ -3589,13 +3589,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Girafarig, .iconPalIndex = 1, FOOTPRINT(Girafarig) - FOLLOWER( + OVERWORLD( sPicTable_Girafarig, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Girafarig, - gShinyFollowerPalette_Girafarig + gOverworldPalette_Girafarig, + gShinyOverworldPalette_Girafarig ) .levelUpLearnset = sGirafarigLevelUpLearnset, .teachableLearnset = sGirafarigTeachableLearnset, @@ -3707,13 +3707,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Pineco, .iconPalIndex = 0, FOOTPRINT(Pineco) - FOLLOWER( + OVERWORLD( sPicTable_Pineco, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Pineco, - gShinyFollowerPalette_Pineco + gOverworldPalette_Pineco, + gShinyOverworldPalette_Pineco ) .levelUpLearnset = sPinecoLevelUpLearnset, .teachableLearnset = sPinecoTeachableLearnset, @@ -3769,13 +3769,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Forretress, .iconPalIndex = 2, FOOTPRINT(Forretress) - FOLLOWER( + OVERWORLD( sPicTable_Forretress, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Forretress, - gShinyFollowerPalette_Forretress + gOverworldPalette_Forretress, + gShinyOverworldPalette_Forretress ) .levelUpLearnset = sForretressLevelUpLearnset, .teachableLearnset = sForretressTeachableLearnset, @@ -3838,13 +3838,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Dunsparce, .iconPalIndex = 0, FOOTPRINT(Dunsparce) - FOLLOWER( + OVERWORLD( sPicTable_Dunsparce, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Dunsparce, - gShinyFollowerPalette_Dunsparce + gOverworldPalette_Dunsparce, + gShinyOverworldPalette_Dunsparce ) .levelUpLearnset = sDunsparceLevelUpLearnset, .teachableLearnset = sDunsparceTeachableLearnset, @@ -4016,13 +4016,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Gligar, .iconPalIndex = 0, FOOTPRINT(Gligar) - FOLLOWER( + OVERWORLD( sPicTable_Gligar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Gligar, - gShinyFollowerPalette_Gligar + gOverworldPalette_Gligar, + gShinyOverworldPalette_Gligar ) .levelUpLearnset = sGligarLevelUpLearnset, .teachableLearnset = sGligarTeachableLearnset, @@ -4081,13 +4081,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Gliscor, .iconPalIndex = 2, FOOTPRINT(Gliscor) - FOLLOWER( + OVERWORLD( sPicTable_Gliscor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gliscor, - gShinyFollowerPalette_Gliscor + gOverworldPalette_Gliscor, + gShinyOverworldPalette_Gliscor ) .levelUpLearnset = sGliscorLevelUpLearnset, .teachableLearnset = sGliscorTeachableLearnset, @@ -4148,13 +4148,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Snubbull, .iconPalIndex = 0, FOOTPRINT(Snubbull) - FOLLOWER( + OVERWORLD( sPicTable_Snubbull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Snubbull, - gShinyFollowerPalette_Snubbull + gOverworldPalette_Snubbull, + gShinyOverworldPalette_Snubbull ) .levelUpLearnset = sSnubbullLevelUpLearnset, .teachableLearnset = sSnubbullTeachableLearnset, @@ -4214,13 +4214,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Granbull, .iconPalIndex = 2, FOOTPRINT(Granbull) - FOLLOWER( + OVERWORLD( sPicTable_Granbull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Granbull, - gShinyFollowerPalette_Granbull + gOverworldPalette_Granbull, + gShinyOverworldPalette_Granbull ) .levelUpLearnset = sGranbullLevelUpLearnset, .teachableLearnset = sGranbullTeachableLearnset, @@ -4287,13 +4287,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Qwilfish, .iconPalIndex = 0, FOOTPRINT(Qwilfish) - FOLLOWER( + OVERWORLD( sPicTable_Qwilfish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Qwilfish, - gShinyFollowerPalette_Qwilfish + gOverworldPalette_Qwilfish, + gShinyOverworldPalette_Qwilfish ) .levelUpLearnset = sQwilfishLevelUpLearnset, .teachableLearnset = sQwilfishTeachableLearnset, @@ -4352,13 +4352,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_QwilfishHisuian, .iconPalIndex = 1, FOOTPRINT(Qwilfish) - FOLLOWER( + OVERWORLD( sPicTable_QwilfishHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_QwilfishHisuian, - gShinyFollowerPalette_QwilfishHisuian + gOverworldPalette_QwilfishHisuian, + gShinyOverworldPalette_QwilfishHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sQwilfishHisuianLevelUpLearnset, @@ -4415,13 +4415,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Overqwil, .iconPalIndex = 2, FOOTPRINT(Overqwil) - FOLLOWER( + OVERWORLD( sPicTable_Overqwil, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Overqwil, - gShinyFollowerPalette_Overqwil + gOverworldPalette_Overqwil, + gShinyOverworldPalette_Overqwil ) .levelUpLearnset = sOverqwilLevelUpLearnset, .teachableLearnset = sOverqwilTeachableLearnset, @@ -4481,13 +4481,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Shuckle, .iconPalIndex = 1, FOOTPRINT(Shuckle) - FOLLOWER( + OVERWORLD( sPicTable_Shuckle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Shuckle, - gShinyFollowerPalette_Shuckle + gOverworldPalette_Shuckle, + gShinyOverworldPalette_Shuckle ) .levelUpLearnset = sShuckleLevelUpLearnset, .teachableLearnset = sShuckleTeachableLearnset, @@ -4548,13 +4548,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Heracross, .iconPalIndex = 0, FOOTPRINT(Heracross) - FOLLOWER( + OVERWORLD( sPicTable_Heracross, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Heracross, - gShinyFollowerPalette_Heracross + gOverworldPalette_Heracross, + gShinyOverworldPalette_Heracross ) .levelUpLearnset = sHeracrossLevelUpLearnset, .teachableLearnset = sHeracrossTeachableLearnset, @@ -4677,13 +4677,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Sneasel, .iconPalIndex = 0, FOOTPRINT(Sneasel) - FOLLOWER( + OVERWORLD( sPicTable_Sneasel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sneasel, - gShinyFollowerPalette_Sneasel + gOverworldPalette_Sneasel, + gShinyOverworldPalette_Sneasel ) .levelUpLearnset = sSneaselLevelUpLearnset, .teachableLearnset = sSneaselTeachableLearnset, @@ -4748,13 +4748,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Weavile, .iconPalIndex = 0, FOOTPRINT(Weavile) - FOLLOWER( + OVERWORLD( sPicTable_Weavile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Weavile, - gShinyFollowerPalette_Weavile + gOverworldPalette_Weavile, + gShinyOverworldPalette_Weavile ) .levelUpLearnset = sWeavileLevelUpLearnset, .teachableLearnset = sWeavileTeachableLearnset, @@ -4816,13 +4816,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_SneaselHisuian, .iconPalIndex = 0, FOOTPRINT(Sneasel) - FOLLOWER( + OVERWORLD( sPicTable_SneaselHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SneaselHisuian, - gShinyFollowerPalette_SneaselHisuian + gOverworldPalette_SneaselHisuian, + gShinyOverworldPalette_SneaselHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sSneaselHisuianLevelUpLearnset, @@ -4880,13 +4880,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Sneasler, .iconPalIndex = 2, FOOTPRINT(Sneasler) - FOLLOWER( + OVERWORLD( sPicTable_Sneasler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sneasler, - gShinyFollowerPalette_Sneasler + gOverworldPalette_Sneasler, + gShinyOverworldPalette_Sneasler ) .levelUpLearnset = sSneaslerLevelUpLearnset, .teachableLearnset = sSneaslerTeachableLearnset, @@ -4945,13 +4945,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Teddiursa, .iconPalIndex = 0, FOOTPRINT(Teddiursa) - FOLLOWER( + OVERWORLD( sPicTable_Teddiursa, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Teddiursa, - gShinyFollowerPalette_Teddiursa + gOverworldPalette_Teddiursa, + gShinyOverworldPalette_Teddiursa ) .levelUpLearnset = sTeddiursaLevelUpLearnset, .teachableLearnset = sTeddiursaTeachableLearnset, @@ -5011,13 +5011,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Ursaring, .iconPalIndex = 2, FOOTPRINT(Ursaring) - FOLLOWER( + OVERWORLD( sPicTable_Ursaring, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ursaring, - gShinyFollowerPalette_Ursaring + gOverworldPalette_Ursaring, + gShinyOverworldPalette_Ursaring ) .levelUpLearnset = sUrsaringLevelUpLearnset, .teachableLearnset = sUrsaringTeachableLearnset, @@ -5073,13 +5073,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Ursaluna, .iconPalIndex = 2, FOOTPRINT(Ursaluna) - FOLLOWER( + OVERWORLD( sPicTable_Ursaluna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ursaluna, - gShinyFollowerPalette_Ursaluna + gOverworldPalette_Ursaluna, + gShinyOverworldPalette_Ursaluna ) .levelUpLearnset = sUrsalunaLevelUpLearnset, .teachableLearnset = sUrsalunaTeachableLearnset, @@ -5190,13 +5190,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Slugma, .iconPalIndex = 0, FOOTPRINT(Slugma) - FOLLOWER( + OVERWORLD( sPicTable_Slugma, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Slugma, - gShinyFollowerPalette_Slugma + gOverworldPalette_Slugma, + gShinyOverworldPalette_Slugma ) .levelUpLearnset = sSlugmaLevelUpLearnset, .teachableLearnset = sSlugmaTeachableLearnset, @@ -5259,13 +5259,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Magcargo, .iconPalIndex = 0, FOOTPRINT(Magcargo) - FOLLOWER( + OVERWORLD( sPicTable_Magcargo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Magcargo, - gShinyFollowerPalette_Magcargo + gOverworldPalette_Magcargo, + gShinyOverworldPalette_Magcargo ) .levelUpLearnset = sMagcargoLevelUpLearnset, .teachableLearnset = sMagcargoTeachableLearnset, @@ -5321,13 +5321,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Swinub, .iconPalIndex = 2, FOOTPRINT(Swinub) - FOLLOWER( + OVERWORLD( sPicTable_Swinub, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Swinub, - gShinyFollowerPalette_Swinub + gOverworldPalette_Swinub, + gShinyOverworldPalette_Swinub ) .levelUpLearnset = sSwinubLevelUpLearnset, .teachableLearnset = sSwinubTeachableLearnset, @@ -5388,13 +5388,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Piloswine, .iconPalIndex = 2, FOOTPRINT(Piloswine) - FOLLOWER( + OVERWORLD( sPicTable_Piloswine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Piloswine, - gShinyFollowerPalette_Piloswine + gOverworldPalette_Piloswine, + gShinyOverworldPalette_Piloswine ) .levelUpLearnset = sPiloswineLevelUpLearnset, .teachableLearnset = sPiloswineTeachableLearnset, @@ -5458,13 +5458,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Mamoswine, .iconPalIndex = 2, FOOTPRINT(Mamoswine) - FOLLOWER( + OVERWORLD( sPicTable_Mamoswine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mamoswine, - gShinyFollowerPalette_Mamoswine + gOverworldPalette_Mamoswine, + gShinyOverworldPalette_Mamoswine ) .levelUpLearnset = sMamoswineLevelUpLearnset, .teachableLearnset = sMamoswineTeachableLearnset, @@ -5533,13 +5533,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Corsola, .iconPalIndex = 0, FOOTPRINT(Corsola) - FOLLOWER( + OVERWORLD( sPicTable_Corsola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Corsola, - gShinyFollowerPalette_Corsola + gOverworldPalette_Corsola, + gShinyOverworldPalette_Corsola ) .levelUpLearnset = sCorsolaLevelUpLearnset, .teachableLearnset = sCorsolaTeachableLearnset, @@ -5596,13 +5596,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_CorsolaGalarian, .iconPalIndex = 0, FOOTPRINT(Corsola) - FOLLOWER( + OVERWORLD( sPicTable_CorsolaGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_CorsolaGalarian, - gShinyFollowerPalette_CorsolaGalarian + gOverworldPalette_CorsolaGalarian, + gShinyOverworldPalette_CorsolaGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sCorsolaGalarianLevelUpLearnset, @@ -5660,13 +5660,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Cursola, .iconPalIndex = 0, FOOTPRINT(Cursola) - FOLLOWER( + OVERWORLD( sPicTable_Cursola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cursola, - gShinyFollowerPalette_Cursola + gOverworldPalette_Cursola, + gShinyOverworldPalette_Cursola ) .levelUpLearnset = sCursolaLevelUpLearnset, .teachableLearnset = sCursolaTeachableLearnset, @@ -5723,13 +5723,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Remoraid, .iconPalIndex = 0, FOOTPRINT(Remoraid) - FOLLOWER( + OVERWORLD( sPicTable_Remoraid, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Remoraid, - gShinyFollowerPalette_Remoraid + gOverworldPalette_Remoraid, + gShinyOverworldPalette_Remoraid ) .levelUpLearnset = sRemoraidLevelUpLearnset, .teachableLearnset = sRemoraidTeachableLearnset, @@ -5791,13 +5791,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Octillery, .iconPalIndex = 0, FOOTPRINT(Octillery) - FOLLOWER( + OVERWORLD( sPicTable_Octillery, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Octillery, - gShinyFollowerPalette_Octillery + gOverworldPalette_Octillery, + gShinyOverworldPalette_Octillery ) .levelUpLearnset = sOctilleryLevelUpLearnset, .teachableLearnset = sOctilleryTeachableLearnset, @@ -5853,13 +5853,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Delibird, .iconPalIndex = 1, FOOTPRINT(Delibird) - FOLLOWER( + OVERWORLD( sPicTable_Delibird, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Delibird, - gShinyFollowerPalette_Delibird + gOverworldPalette_Delibird, + gShinyOverworldPalette_Delibird ) .levelUpLearnset = sDelibirdLevelUpLearnset, .teachableLearnset = sDelibirdTeachableLearnset, @@ -5917,13 +5917,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Mantyke, .iconPalIndex = 0, FOOTPRINT(Mantyke) - FOLLOWER( + OVERWORLD( sPicTable_Mantyke, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mantyke, - gShinyFollowerPalette_Mantyke + gOverworldPalette_Mantyke, + gShinyOverworldPalette_Mantyke ) .levelUpLearnset = sMantykeLevelUpLearnset, .teachableLearnset = sMantykeTeachableLearnset, @@ -5987,13 +5987,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Mantine, .iconPalIndex = 2, FOOTPRINT(Mantine) - FOLLOWER( + OVERWORLD( sPicTable_Mantine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Mantine, - gShinyFollowerPalette_Mantine + gOverworldPalette_Mantine, + gShinyOverworldPalette_Mantine ) .levelUpLearnset = sMantineLevelUpLearnset, .teachableLearnset = sMantineTeachableLearnset, @@ -6051,13 +6051,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Skarmory, .iconPalIndex = 0, FOOTPRINT(Skarmory) - FOLLOWER( + OVERWORLD( sPicTable_Skarmory, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Skarmory, - gShinyFollowerPalette_Skarmory + gOverworldPalette_Skarmory, + gShinyOverworldPalette_Skarmory ) .levelUpLearnset = sSkarmoryLevelUpLearnset, .teachableLearnset = sSkarmoryTeachableLearnset, @@ -6114,13 +6114,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Houndour, .iconPalIndex = 0, FOOTPRINT(Houndour) - FOLLOWER( + OVERWORLD( sPicTable_Houndour, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Houndour, - gShinyFollowerPalette_Houndour + gOverworldPalette_Houndour, + gShinyOverworldPalette_Houndour ) .levelUpLearnset = sHoundourLevelUpLearnset, .teachableLearnset = sHoundourTeachableLearnset, @@ -6180,13 +6180,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Houndoom, .iconPalIndex = 0, FOOTPRINT(Houndoom) - FOLLOWER( + OVERWORLD( sPicTable_Houndoom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Houndoom, - gShinyFollowerPalette_Houndoom + gOverworldPalette_Houndoom, + gShinyOverworldPalette_Houndoom ) .levelUpLearnset = sHoundoomLevelUpLearnset, .teachableLearnset = sHoundoomTeachableLearnset, @@ -6300,13 +6300,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Phanpy, .iconPalIndex = 0, FOOTPRINT(Phanpy) - FOLLOWER( + OVERWORLD( sPicTable_Phanpy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Phanpy, - gShinyFollowerPalette_Phanpy + gOverworldPalette_Phanpy, + gShinyOverworldPalette_Phanpy ) .levelUpLearnset = sPhanpyLevelUpLearnset, .teachableLearnset = sPhanpyTeachableLearnset, @@ -6367,13 +6367,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Donphan, .iconPalIndex = 0, FOOTPRINT(Donphan) - FOLLOWER( + OVERWORLD( sPicTable_Donphan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Donphan, - gShinyFollowerPalette_Donphan + gOverworldPalette_Donphan, + gShinyOverworldPalette_Donphan ) .levelUpLearnset = sDonphanLevelUpLearnset, .teachableLearnset = sDonphanTeachableLearnset, @@ -6429,13 +6429,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Stantler, .iconPalIndex = 2, FOOTPRINT(Stantler) - FOLLOWER( + OVERWORLD( sPicTable_Stantler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Stantler, - gShinyFollowerPalette_Stantler + gOverworldPalette_Stantler, + gShinyOverworldPalette_Stantler ) .levelUpLearnset = sStantlerLevelUpLearnset, .teachableLearnset = sStantlerTeachableLearnset, @@ -6493,13 +6493,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Wyrdeer, .iconPalIndex = 2, FOOTPRINT(Wyrdeer) - FOLLOWER( + OVERWORLD( sPicTable_Wyrdeer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Wyrdeer, - gShinyFollowerPalette_Wyrdeer + gOverworldPalette_Wyrdeer, + gShinyOverworldPalette_Wyrdeer ) .levelUpLearnset = sWyrdeerLevelUpLearnset, .teachableLearnset = sWyrdeerTeachableLearnset, @@ -6556,13 +6556,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Smeargle, .iconPalIndex = 1, FOOTPRINT(Smeargle) - FOLLOWER( + OVERWORLD( sPicTable_Smeargle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Smeargle, - gShinyFollowerPalette_Smeargle + gOverworldPalette_Smeargle, + gShinyOverworldPalette_Smeargle ) .tmIlliterate = TRUE, .levelUpLearnset = sSmeargleLevelUpLearnset, @@ -6621,13 +6621,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Miltank, .iconPalIndex = 0, FOOTPRINT(Miltank) - FOLLOWER( + OVERWORLD( sPicTable_Miltank, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Miltank, - gShinyFollowerPalette_Miltank + gOverworldPalette_Miltank, + gShinyOverworldPalette_Miltank ) .levelUpLearnset = sMiltankLevelUpLearnset, .teachableLearnset = sMiltankTeachableLearnset, @@ -6695,13 +6695,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Raikou, .iconPalIndex = 2, FOOTPRINT(Raikou) - FOLLOWER( + OVERWORLD( sPicTable_Raikou, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Raikou, - gShinyFollowerPalette_Raikou + gOverworldPalette_Raikou, + gShinyOverworldPalette_Raikou ) .isLegendary = TRUE, .levelUpLearnset = sRaikouLevelUpLearnset, @@ -6769,13 +6769,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Entei, .iconPalIndex = 2, FOOTPRINT(Entei) - FOLLOWER( + OVERWORLD( sPicTable_Entei, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Entei, - gShinyFollowerPalette_Entei + gOverworldPalette_Entei, + gShinyOverworldPalette_Entei ) .isLegendary = TRUE, .levelUpLearnset = sEnteiLevelUpLearnset, @@ -6843,13 +6843,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Suicune, .iconPalIndex = 2, FOOTPRINT(Suicune) - FOLLOWER( + OVERWORLD( sPicTable_Suicune, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Suicune, - gShinyFollowerPalette_Suicune + gOverworldPalette_Suicune, + gShinyOverworldPalette_Suicune ) .isLegendary = TRUE, .levelUpLearnset = sSuicuneLevelUpLearnset, @@ -6906,13 +6906,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Larvitar, .iconPalIndex = 1, FOOTPRINT(Larvitar) - FOLLOWER( + OVERWORLD( sPicTable_Larvitar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Larvitar, - gShinyFollowerPalette_Larvitar + gOverworldPalette_Larvitar, + gShinyOverworldPalette_Larvitar ) .levelUpLearnset = sLarvitarLevelUpLearnset, .teachableLearnset = sLarvitarTeachableLearnset, @@ -6968,13 +6968,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Pupitar, .iconPalIndex = 2, FOOTPRINT(Pupitar) - FOLLOWER( + OVERWORLD( sPicTable_Pupitar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Pupitar, - gShinyFollowerPalette_Pupitar + gOverworldPalette_Pupitar, + gShinyOverworldPalette_Pupitar ) .levelUpLearnset = sPupitarLevelUpLearnset, .teachableLearnset = sPupitarTeachableLearnset, @@ -7036,13 +7036,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Tyranitar, .iconPalIndex = 4, FOOTPRINT(Tyranitar) - FOLLOWER( + OVERWORLD( sPicTable_Tyranitar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tyranitar, - gShinyFollowerPalette_Tyranitar + gOverworldPalette_Tyranitar, + gShinyOverworldPalette_Tyranitar ) .levelUpLearnset = sTyranitarLevelUpLearnset, .teachableLearnset = sTyranitarTeachableLearnset, @@ -7165,13 +7165,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Lugia, .iconPalIndex = 0, FOOTPRINT(Lugia) - FOLLOWER( + OVERWORLD( sPicTable_Lugia, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Lugia, - gShinyFollowerPalette_Lugia + gOverworldPalette_Lugia, + gShinyOverworldPalette_Lugia ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -7238,13 +7238,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_HoOh, .iconPalIndex = 1, FOOTPRINT(HoOh) - FOLLOWER( + OVERWORLD( sPicTable_HoOh, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_HoOh, - gShinyFollowerPalette_HoOh + gOverworldPalette_HoOh, + gShinyOverworldPalette_HoOh ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -7311,13 +7311,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconSprite = gMonIcon_Celebi, .iconPalIndex = 1, FOOTPRINT(Celebi) - FOLLOWER( + OVERWORLD( sPicTable_Celebi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Celebi, - gShinyFollowerPalette_Celebi + gOverworldPalette_Celebi, + gShinyOverworldPalette_Celebi ) .isMythical = TRUE, .isFrontierBanned = TRUE, diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h index 2a2519a554..2da10d3711 100644 --- a/src/data/pokemon/species_info/gen_3_families.h +++ b/src/data/pokemon/species_info/gen_3_families.h @@ -52,13 +52,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Treecko, .iconPalIndex = 1, FOOTPRINT(Treecko) - FOLLOWER( + OVERWORLD( sPicTable_Treecko, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Treecko, - gShinyFollowerPalette_Treecko + gOverworldPalette_Treecko, + gShinyOverworldPalette_Treecko ) .levelUpLearnset = sTreeckoLevelUpLearnset, .teachableLearnset = sTreeckoTeachableLearnset, @@ -114,13 +114,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Grovyle, .iconPalIndex = 1, FOOTPRINT(Grovyle) - FOLLOWER( + OVERWORLD( sPicTable_Grovyle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Grovyle, - gShinyFollowerPalette_Grovyle + gOverworldPalette_Grovyle, + gShinyOverworldPalette_Grovyle ) .levelUpLearnset = sGrovyleLevelUpLearnset, .teachableLearnset = sGrovyleTeachableLearnset, @@ -181,13 +181,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Sceptile, .iconPalIndex = 1, FOOTPRINT(Sceptile) - FOLLOWER( + OVERWORLD( sPicTable_Sceptile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sceptile, - gShinyFollowerPalette_Sceptile + gOverworldPalette_Sceptile, + gShinyOverworldPalette_Sceptile ) .levelUpLearnset = sSceptileLevelUpLearnset, .teachableLearnset = sSceptileTeachableLearnset, @@ -304,13 +304,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Torchic, .iconPalIndex = 0, FOOTPRINT(Torchic) - FOLLOWER( + OVERWORLD( sPicTable_Torchic, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Torchic, - gShinyFollowerPalette_Torchic + gOverworldPalette_Torchic, + gShinyOverworldPalette_Torchic ) .levelUpLearnset = sTorchicLevelUpLearnset, .teachableLearnset = sTorchicTeachableLearnset, @@ -371,13 +371,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Combusken, .iconPalIndex = 0, FOOTPRINT(Combusken) - FOLLOWER( + OVERWORLD( sPicTable_Combusken, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Combusken, - gShinyFollowerPalette_Combusken + gOverworldPalette_Combusken, + gShinyOverworldPalette_Combusken ) .levelUpLearnset = sCombuskenLevelUpLearnset, .teachableLearnset = sCombuskenTeachableLearnset, @@ -442,13 +442,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Blaziken, .iconPalIndex = 0, FOOTPRINT(Blaziken) - FOLLOWER( + OVERWORLD( sPicTable_Blaziken, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Blaziken, - gShinyFollowerPalette_Blaziken + gOverworldPalette_Blaziken, + gShinyOverworldPalette_Blaziken ) .levelUpLearnset = sBlazikenLevelUpLearnset, .teachableLearnset = sBlazikenTeachableLearnset, @@ -563,13 +563,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Mudkip, .iconPalIndex = 0, FOOTPRINT(Mudkip) - FOLLOWER( + OVERWORLD( sPicTable_Mudkip, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mudkip, - gShinyFollowerPalette_Mudkip + gOverworldPalette_Mudkip, + gShinyOverworldPalette_Mudkip ) .levelUpLearnset = sMudkipLevelUpLearnset, .teachableLearnset = sMudkipTeachableLearnset, @@ -625,13 +625,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Marshtomp, .iconPalIndex = 0, FOOTPRINT(Marshtomp) - FOLLOWER( + OVERWORLD( sPicTable_Marshtomp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Marshtomp, - gShinyFollowerPalette_Marshtomp + gOverworldPalette_Marshtomp, + gShinyOverworldPalette_Marshtomp ) .levelUpLearnset = sMarshtompLevelUpLearnset, .teachableLearnset = sMarshtompTeachableLearnset, @@ -692,13 +692,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Swampert, .iconPalIndex = 0, FOOTPRINT(Swampert) - FOLLOWER( + OVERWORLD( sPicTable_Swampert, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Swampert, - gShinyFollowerPalette_Swampert + gOverworldPalette_Swampert, + gShinyOverworldPalette_Swampert ) .levelUpLearnset = sSwampertLevelUpLearnset, .teachableLearnset = sSwampertTeachableLearnset, @@ -819,13 +819,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Poochyena, .iconPalIndex = 2, FOOTPRINT(Poochyena) - FOLLOWER( + OVERWORLD( sPicTable_Poochyena, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Poochyena, - gShinyFollowerPalette_Poochyena + gOverworldPalette_Poochyena, + gShinyOverworldPalette_Poochyena ) .levelUpLearnset = sPoochyenaLevelUpLearnset, .teachableLearnset = sPoochyenaTeachableLearnset, @@ -881,13 +881,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Mightyena, .iconPalIndex = 2, FOOTPRINT(Mightyena) - FOLLOWER( + OVERWORLD( sPicTable_Mightyena, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mightyena, - gShinyFollowerPalette_Mightyena + gOverworldPalette_Mightyena, + gShinyOverworldPalette_Mightyena ) .levelUpLearnset = sMightyenaLevelUpLearnset, .teachableLearnset = sMightyenaTeachableLearnset, @@ -953,13 +953,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Zigzagoon, .iconPalIndex = 2, FOOTPRINT(Zigzagoon) - FOLLOWER( + OVERWORLD( sPicTable_Zigzagoon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zigzagoon, - gShinyFollowerPalette_Zigzagoon + gOverworldPalette_Zigzagoon, + gShinyOverworldPalette_Zigzagoon ) .levelUpLearnset = sZigzagoonLevelUpLearnset, .teachableLearnset = sZigzagoonTeachableLearnset, @@ -1018,13 +1018,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Linoone, .iconPalIndex = 2, FOOTPRINT(Linoone) - FOLLOWER( + OVERWORLD( sPicTable_Linoone, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Linoone, - gShinyFollowerPalette_Linoone + gOverworldPalette_Linoone, + gShinyOverworldPalette_Linoone ) .levelUpLearnset = sLinooneLevelUpLearnset, .teachableLearnset = sLinooneTeachableLearnset, @@ -1080,13 +1080,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_ZigzagoonGalarian, .iconPalIndex = 0, FOOTPRINT(Zigzagoon) - FOLLOWER( + OVERWORLD( sPicTable_ZigzagoonGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ZigzagoonGalarian, - gShinyFollowerPalette_ZigzagoonGalarian + gOverworldPalette_ZigzagoonGalarian, + gShinyOverworldPalette_ZigzagoonGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sZigzagoonGalarianLevelUpLearnset, @@ -1144,13 +1144,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_LinooneGalarian, .iconPalIndex = 0, FOOTPRINT(Linoone) - FOLLOWER( + OVERWORLD( sPicTable_LinooneGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_LinooneGalarian, - gShinyFollowerPalette_LinooneGalarian + gOverworldPalette_LinooneGalarian, + gShinyOverworldPalette_LinooneGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sLinooneGalarianLevelUpLearnset, @@ -1207,13 +1207,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Obstagoon, .iconPalIndex = 0, FOOTPRINT(Obstagoon) - FOLLOWER( + OVERWORLD( sPicTable_Obstagoon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Obstagoon, - gShinyFollowerPalette_Obstagoon + gOverworldPalette_Obstagoon, + gShinyOverworldPalette_Obstagoon ) .levelUpLearnset = sObstagoonLevelUpLearnset, .teachableLearnset = sObstagoonTeachableLearnset, @@ -1278,13 +1278,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Wurmple, .iconPalIndex = 0, FOOTPRINT(Wurmple) - FOLLOWER( + OVERWORLD( sPicTable_Wurmple, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Wurmple, - gShinyFollowerPalette_Wurmple + gOverworldPalette_Wurmple, + gShinyOverworldPalette_Wurmple ) .tmIlliterate = TRUE, .levelUpLearnset = sWurmpleLevelUpLearnset, @@ -1341,13 +1341,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Silcoon, .iconPalIndex = 2, FOOTPRINT(Silcoon) - FOLLOWER( + OVERWORLD( sPicTable_Silcoon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Silcoon, - gShinyFollowerPalette_Silcoon + gOverworldPalette_Silcoon, + gShinyOverworldPalette_Silcoon ) .tmIlliterate = TRUE, .levelUpLearnset = sSilcoonLevelUpLearnset, @@ -1417,13 +1417,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Beautifly, .iconPalIndex = 0, FOOTPRINT(Beautifly) - FOLLOWER( + OVERWORLD( sPicTable_Beautifly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Beautifly, - gShinyFollowerPalette_Beautifly + gOverworldPalette_Beautifly, + gShinyOverworldPalette_Beautifly ) .levelUpLearnset = sBeautiflyLevelUpLearnset, .teachableLearnset = sBeautiflyTeachableLearnset, @@ -1483,13 +1483,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Cascoon, .iconPalIndex = 2, FOOTPRINT(Cascoon) - FOLLOWER( + OVERWORLD( sPicTable_Cascoon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Cascoon, - gShinyFollowerPalette_Cascoon + gOverworldPalette_Cascoon, + gShinyOverworldPalette_Cascoon ) .tmIlliterate = TRUE, .levelUpLearnset = sCascoonLevelUpLearnset, @@ -1561,13 +1561,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Dustox, .iconPalIndex = 5, FOOTPRINT(Dustox) - FOLLOWER( + OVERWORLD( sPicTable_Dustox, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Dustox, - gShinyFollowerPalette_Dustox + gOverworldPalette_Dustox, + gShinyOverworldPalette_Dustox ) .levelUpLearnset = sDustoxLevelUpLearnset, .teachableLearnset = sDustoxTeachableLearnset, @@ -1624,13 +1624,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Lotad, .iconPalIndex = 4, FOOTPRINT(Lotad) - FOLLOWER( + OVERWORLD( sPicTable_Lotad, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lotad, - gShinyFollowerPalette_Lotad + gOverworldPalette_Lotad, + gShinyOverworldPalette_Lotad ) .levelUpLearnset = sLotadLevelUpLearnset, .teachableLearnset = sLotadTeachableLearnset, @@ -1687,13 +1687,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Lombre, .iconPalIndex = 1, FOOTPRINT(Lombre) - FOLLOWER( + OVERWORLD( sPicTable_Lombre, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lombre, - gShinyFollowerPalette_Lombre + gOverworldPalette_Lombre, + gShinyOverworldPalette_Lombre ) .levelUpLearnset = sLombreLevelUpLearnset, .teachableLearnset = sLombreTeachableLearnset, @@ -1759,13 +1759,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Ludicolo, .iconPalIndex = 1, FOOTPRINT(Ludicolo) - FOLLOWER( + OVERWORLD( sPicTable_Ludicolo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ludicolo, - gShinyFollowerPalette_Ludicolo + gOverworldPalette_Ludicolo, + gShinyOverworldPalette_Ludicolo ) .levelUpLearnset = sLudicoloLevelUpLearnset, .teachableLearnset = sLudicoloTeachableLearnset, @@ -1822,13 +1822,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Seedot, .iconPalIndex = 2, FOOTPRINT(Seedot) - FOLLOWER( + OVERWORLD( sPicTable_Seedot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Seedot, - gShinyFollowerPalette_Seedot + gOverworldPalette_Seedot, + gShinyOverworldPalette_Seedot ) .levelUpLearnset = sSeedotLevelUpLearnset, .teachableLearnset = sSeedotTeachableLearnset, @@ -1889,13 +1889,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Nuzleaf, .iconPalIndex = 1, FOOTPRINT(Nuzleaf) - FOLLOWER( + OVERWORLD( sPicTable_Nuzleaf, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Nuzleaf, - gShinyFollowerPalette_Nuzleaf + gOverworldPalette_Nuzleaf, + gShinyOverworldPalette_Nuzleaf ) .levelUpLearnset = sNuzleafLevelUpLearnset, .teachableLearnset = sNuzleafTeachableLearnset, @@ -1965,13 +1965,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Shiftry, .iconPalIndex = 5, FOOTPRINT(Shiftry) - FOLLOWER( + OVERWORLD( sPicTable_Shiftry, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Shiftry, - gShinyFollowerPalette_Shiftry + gOverworldPalette_Shiftry, + gShinyOverworldPalette_Shiftry ) .levelUpLearnset = sShiftryLevelUpLearnset, .teachableLearnset = sShiftryTeachableLearnset, @@ -2027,13 +2027,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Taillow, .iconPalIndex = 2, FOOTPRINT(Taillow) - FOLLOWER( + OVERWORLD( sPicTable_Taillow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Taillow, - gShinyFollowerPalette_Taillow + gOverworldPalette_Taillow, + gShinyOverworldPalette_Taillow ) .levelUpLearnset = sTaillowLevelUpLearnset, .teachableLearnset = sTaillowTeachableLearnset, @@ -2095,13 +2095,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Swellow, .iconPalIndex = 2, FOOTPRINT(Swellow) - FOLLOWER( + OVERWORLD( sPicTable_Swellow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Swellow, - gShinyFollowerPalette_Swellow + gOverworldPalette_Swellow, + gShinyOverworldPalette_Swellow ) .levelUpLearnset = sSwellowLevelUpLearnset, .teachableLearnset = sSwellowTeachableLearnset, @@ -2159,13 +2159,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Wingull, .iconPalIndex = 0, FOOTPRINT(Wingull) - FOLLOWER( + OVERWORLD( sPicTable_Wingull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Wingull, - gShinyFollowerPalette_Wingull + gOverworldPalette_Wingull, + gShinyOverworldPalette_Wingull ) .levelUpLearnset = sWingullLevelUpLearnset, .teachableLearnset = sWingullTeachableLearnset, @@ -2229,13 +2229,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Pelipper, .iconPalIndex = 2, FOOTPRINT(Pelipper) - FOLLOWER( + OVERWORLD( sPicTable_Pelipper, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Pelipper, - gShinyFollowerPalette_Pelipper + gOverworldPalette_Pelipper, + gShinyOverworldPalette_Pelipper ) .levelUpLearnset = sPelipperLevelUpLearnset, .teachableLearnset = sPelipperTeachableLearnset, @@ -2299,13 +2299,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Ralts, .iconPalIndex = 1, FOOTPRINT(Ralts) - FOLLOWER( + OVERWORLD( sPicTable_Ralts, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ralts, - gShinyFollowerPalette_Ralts + gOverworldPalette_Ralts, + gShinyOverworldPalette_Ralts ) .levelUpLearnset = sRaltsLevelUpLearnset, .teachableLearnset = sRaltsTeachableLearnset, @@ -2361,13 +2361,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Kirlia, .iconPalIndex = 1, FOOTPRINT(Kirlia) - FOLLOWER( + OVERWORLD( sPicTable_Kirlia, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kirlia, - gShinyFollowerPalette_Kirlia + gOverworldPalette_Kirlia, + gShinyOverworldPalette_Kirlia ) .levelUpLearnset = sKirliaLevelUpLearnset, .teachableLearnset = sKirliaTeachableLearnset, @@ -2429,13 +2429,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Gardevoir, .iconPalIndex = 1, FOOTPRINT(Gardevoir) - FOLLOWER( + OVERWORLD( sPicTable_Gardevoir, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gardevoir, - gShinyFollowerPalette_Gardevoir + gOverworldPalette_Gardevoir, + gShinyOverworldPalette_Gardevoir ) .levelUpLearnset = sGardevoirLevelUpLearnset, .teachableLearnset = sGardevoirTeachableLearnset, @@ -2559,13 +2559,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Gallade, .iconPalIndex = 1, FOOTPRINT(Gallade) - FOLLOWER( + OVERWORLD( sPicTable_Gallade, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gallade, - gShinyFollowerPalette_Gallade + gOverworldPalette_Gallade, + gShinyOverworldPalette_Gallade ) .levelUpLearnset = sGalladeLevelUpLearnset, .teachableLearnset = sGalladeTeachableLearnset, @@ -2682,13 +2682,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Surskit, .iconPalIndex = 0, FOOTPRINT(Surskit) - FOLLOWER( + OVERWORLD( sPicTable_Surskit, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Surskit, - gShinyFollowerPalette_Surskit + gOverworldPalette_Surskit, + gShinyOverworldPalette_Surskit ) .levelUpLearnset = sSurskitLevelUpLearnset, .teachableLearnset = sSurskitTeachableLearnset, @@ -2753,13 +2753,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Masquerain, .iconPalIndex = 0, FOOTPRINT(Masquerain) - FOLLOWER( + OVERWORLD( sPicTable_Masquerain, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Masquerain, - gShinyFollowerPalette_Masquerain + gOverworldPalette_Masquerain, + gShinyOverworldPalette_Masquerain ) .levelUpLearnset = sMasquerainLevelUpLearnset, .teachableLearnset = sMasquerainTeachableLearnset, @@ -2817,13 +2817,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Shroomish, .iconPalIndex = 1, FOOTPRINT(Shroomish) - FOLLOWER( + OVERWORLD( sPicTable_Shroomish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Shroomish, - gShinyFollowerPalette_Shroomish + gOverworldPalette_Shroomish, + gShinyOverworldPalette_Shroomish ) .levelUpLearnset = sShroomishLevelUpLearnset, .teachableLearnset = sShroomishTeachableLearnset, @@ -2881,13 +2881,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Breloom, .iconPalIndex = 1, FOOTPRINT(Breloom) - FOLLOWER( + OVERWORLD( sPicTable_Breloom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Breloom, - gShinyFollowerPalette_Breloom + gOverworldPalette_Breloom, + gShinyOverworldPalette_Breloom ) .levelUpLearnset = sBreloomLevelUpLearnset, .teachableLearnset = sBreloomTeachableLearnset, @@ -2943,13 +2943,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Slakoth, .iconPalIndex = 2, FOOTPRINT(Slakoth) - FOLLOWER( + OVERWORLD( sPicTable_Slakoth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Slakoth, - gShinyFollowerPalette_Slakoth + gOverworldPalette_Slakoth, + gShinyOverworldPalette_Slakoth ) .levelUpLearnset = sSlakothLevelUpLearnset, .teachableLearnset = sSlakothTeachableLearnset, @@ -3005,13 +3005,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Vigoroth, .iconPalIndex = 2, FOOTPRINT(Vigoroth) - FOLLOWER( + OVERWORLD( sPicTable_Vigoroth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vigoroth, - gShinyFollowerPalette_Vigoroth + gOverworldPalette_Vigoroth, + gShinyOverworldPalette_Vigoroth ) .levelUpLearnset = sVigorothLevelUpLearnset, .teachableLearnset = sVigorothTeachableLearnset, @@ -3072,13 +3072,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Slaking, .iconPalIndex = 2, FOOTPRINT(Slaking) - FOLLOWER( + OVERWORLD( sPicTable_Slaking, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Slaking, - gShinyFollowerPalette_Slaking + gOverworldPalette_Slaking, + gShinyOverworldPalette_Slaking ) .levelUpLearnset = sSlakingLevelUpLearnset, .teachableLearnset = sSlakingTeachableLearnset, @@ -3135,13 +3135,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Nincada, .iconPalIndex = 1, FOOTPRINT(Nincada) - FOLLOWER( + OVERWORLD( sPicTable_Nincada, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Nincada, - gShinyFollowerPalette_Nincada + gOverworldPalette_Nincada, + gShinyOverworldPalette_Nincada ) .levelUpLearnset = sNincadaLevelUpLearnset, .teachableLearnset = sNincadaTeachableLearnset, @@ -3199,13 +3199,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Ninjask, .iconPalIndex = 1, FOOTPRINT(Ninjask) - FOLLOWER( + OVERWORLD( sPicTable_Ninjask, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Ninjask, - gShinyFollowerPalette_Ninjask + gOverworldPalette_Ninjask, + gShinyOverworldPalette_Ninjask ) .levelUpLearnset = sNinjaskLevelUpLearnset, .teachableLearnset = sNinjaskTeachableLearnset, @@ -3260,13 +3260,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Shedinja, .iconPalIndex = 1, FOOTPRINT(Shedinja) - FOLLOWER( + OVERWORLD( sPicTable_Shedinja, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Shedinja, - gShinyFollowerPalette_Shedinja + gOverworldPalette_Shedinja, + gShinyOverworldPalette_Shedinja ) .levelUpLearnset = sShedinjaLevelUpLearnset, .teachableLearnset = sShedinjaTeachableLearnset, @@ -3322,13 +3322,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Whismur, .iconPalIndex = 1, FOOTPRINT(Whismur) - FOLLOWER( + OVERWORLD( sPicTable_Whismur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Whismur, - gShinyFollowerPalette_Whismur + gOverworldPalette_Whismur, + gShinyOverworldPalette_Whismur ) .levelUpLearnset = sWhismurLevelUpLearnset, .teachableLearnset = sWhismurTeachableLearnset, @@ -3384,13 +3384,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Loudred, .iconPalIndex = 2, FOOTPRINT(Loudred) - FOLLOWER( + OVERWORLD( sPicTable_Loudred, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Loudred, - gShinyFollowerPalette_Loudred + gOverworldPalette_Loudred, + gShinyOverworldPalette_Loudred ) .levelUpLearnset = sLoudredLevelUpLearnset, .teachableLearnset = sLoudredTeachableLearnset, @@ -3453,13 +3453,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Exploud, .iconPalIndex = 2, FOOTPRINT(Exploud) - FOLLOWER( + OVERWORLD( sPicTable_Exploud, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Exploud, - gShinyFollowerPalette_Exploud + gOverworldPalette_Exploud, + gShinyOverworldPalette_Exploud ) .levelUpLearnset = sExploudLevelUpLearnset, .teachableLearnset = sExploudTeachableLearnset, @@ -3516,13 +3516,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Makuhita, .iconPalIndex = 1, FOOTPRINT(Makuhita) - FOLLOWER( + OVERWORLD( sPicTable_Makuhita, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Makuhita, - gShinyFollowerPalette_Makuhita + gOverworldPalette_Makuhita, + gShinyOverworldPalette_Makuhita ) .levelUpLearnset = sMakuhitaLevelUpLearnset, .teachableLearnset = sMakuhitaTeachableLearnset, @@ -3579,13 +3579,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Hariyama, .iconPalIndex = 2, FOOTPRINT(Hariyama) - FOLLOWER( + OVERWORLD( sPicTable_Hariyama, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hariyama, - gShinyFollowerPalette_Hariyama + gOverworldPalette_Hariyama, + gShinyOverworldPalette_Hariyama ) .levelUpLearnset = sHariyamaLevelUpLearnset, .teachableLearnset = sHariyamaTeachableLearnset, @@ -3642,13 +3642,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Nosepass, .iconPalIndex = 0, FOOTPRINT(Nosepass) - FOLLOWER( + OVERWORLD( sPicTable_Nosepass, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Nosepass, - gShinyFollowerPalette_Nosepass + gOverworldPalette_Nosepass, + gShinyOverworldPalette_Nosepass ) .levelUpLearnset = sNosepassLevelUpLearnset, .teachableLearnset = sNosepassTeachableLearnset, @@ -3709,13 +3709,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Probopass, .iconPalIndex = 0, FOOTPRINT(Probopass) - FOLLOWER( + OVERWORLD( sPicTable_Probopass, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Probopass, - gShinyFollowerPalette_Probopass + gOverworldPalette_Probopass, + gShinyOverworldPalette_Probopass ) .levelUpLearnset = sProbopassLevelUpLearnset, .teachableLearnset = sProbopassTeachableLearnset, @@ -3772,13 +3772,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Skitty, .iconPalIndex = 0, FOOTPRINT(Skitty) - FOLLOWER( + OVERWORLD( sPicTable_Skitty, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Skitty, - gShinyFollowerPalette_Skitty + gOverworldPalette_Skitty, + gShinyOverworldPalette_Skitty ) .levelUpLearnset = sSkittyLevelUpLearnset, .teachableLearnset = sSkittyTeachableLearnset, @@ -3841,13 +3841,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Delcatty, .iconPalIndex = 2, FOOTPRINT(Delcatty) - FOLLOWER( + OVERWORLD( sPicTable_Delcatty, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Delcatty, - gShinyFollowerPalette_Delcatty + gOverworldPalette_Delcatty, + gShinyOverworldPalette_Delcatty ) .levelUpLearnset = sDelcattyLevelUpLearnset, .teachableLearnset = sDelcattyTeachableLearnset, @@ -3905,13 +3905,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Sableye, .iconPalIndex = 2, FOOTPRINT(Sableye) - FOLLOWER( + OVERWORLD( sPicTable_Sableye, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sableye, - gShinyFollowerPalette_Sableye + gOverworldPalette_Sableye, + gShinyOverworldPalette_Sableye ) .levelUpLearnset = sSableyeLevelUpLearnset, .teachableLearnset = sSableyeTeachableLearnset, @@ -4036,13 +4036,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Mawile, .iconPalIndex = 2, FOOTPRINT(Mawile) - FOLLOWER( + OVERWORLD( sPicTable_Mawile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mawile, - gShinyFollowerPalette_Mawile + gOverworldPalette_Mawile, + gShinyOverworldPalette_Mawile ) .levelUpLearnset = sMawileLevelUpLearnset, .teachableLearnset = sMawileTeachableLearnset, @@ -4161,13 +4161,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Aron, .iconPalIndex = 2, FOOTPRINT(Aron) - FOLLOWER( + OVERWORLD( sPicTable_Aron, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Aron, - gShinyFollowerPalette_Aron + gOverworldPalette_Aron, + gShinyOverworldPalette_Aron ) .levelUpLearnset = sAronLevelUpLearnset, .teachableLearnset = sAronTeachableLearnset, @@ -4224,13 +4224,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Lairon, .iconPalIndex = 2, FOOTPRINT(Lairon) - FOLLOWER( + OVERWORLD( sPicTable_Lairon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lairon, - gShinyFollowerPalette_Lairon + gOverworldPalette_Lairon, + gShinyOverworldPalette_Lairon ) .levelUpLearnset = sLaironLevelUpLearnset, .teachableLearnset = sLaironTeachableLearnset, @@ -4292,13 +4292,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Aggron, .iconPalIndex = 2, FOOTPRINT(Aggron) - FOLLOWER( + OVERWORLD( sPicTable_Aggron, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Aggron, - gShinyFollowerPalette_Aggron + gOverworldPalette_Aggron, + gShinyOverworldPalette_Aggron ) .levelUpLearnset = sAggronLevelUpLearnset, .teachableLearnset = sAggronTeachableLearnset, @@ -4418,13 +4418,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Meditite, .iconPalIndex = 0, FOOTPRINT(Meditite) - FOLLOWER( + OVERWORLD( sPicTable_Meditite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Meditite, - gShinyFollowerPalette_Meditite + gOverworldPalette_Meditite, + gShinyOverworldPalette_Meditite ) .levelUpLearnset = sMedititeLevelUpLearnset, .teachableLearnset = sMedititeTeachableLearnset, @@ -4484,13 +4484,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Medicham, .iconPalIndex = 0, FOOTPRINT(Medicham) - FOLLOWER( + OVERWORLD( sPicTable_Medicham, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Medicham, - gShinyFollowerPalette_Medicham + gOverworldPalette_Medicham, + gShinyOverworldPalette_Medicham ) .levelUpLearnset = sMedichamLevelUpLearnset, .teachableLearnset = sMedichamTeachableLearnset, @@ -4605,13 +4605,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Electrike, .iconPalIndex = 1, FOOTPRINT(Electrike) - FOLLOWER( + OVERWORLD( sPicTable_Electrike, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Electrike, - gShinyFollowerPalette_Electrike + gOverworldPalette_Electrike, + gShinyOverworldPalette_Electrike ) .levelUpLearnset = sElectrikeLevelUpLearnset, .teachableLearnset = sElectrikeTeachableLearnset, @@ -4667,13 +4667,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Manectric, .iconPalIndex = 0, FOOTPRINT(Manectric) - FOLLOWER( + OVERWORLD( sPicTable_Manectric, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Manectric, - gShinyFollowerPalette_Manectric + gOverworldPalette_Manectric, + gShinyOverworldPalette_Manectric ) .levelUpLearnset = sManectricLevelUpLearnset, .teachableLearnset = sManectricTeachableLearnset, @@ -4788,13 +4788,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Plusle, .iconPalIndex = 0, FOOTPRINT(Plusle) - FOLLOWER( + OVERWORLD( sPicTable_Plusle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Plusle, - gShinyFollowerPalette_Plusle + gOverworldPalette_Plusle, + gShinyOverworldPalette_Plusle ) .levelUpLearnset = sPlusleLevelUpLearnset, .teachableLearnset = sPlusleTeachableLearnset, @@ -4852,13 +4852,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Minun, .iconPalIndex = 0, FOOTPRINT(Minun) - FOLLOWER( + OVERWORLD( sPicTable_Minun, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Minun, - gShinyFollowerPalette_Minun + gOverworldPalette_Minun, + gShinyOverworldPalette_Minun ) .levelUpLearnset = sMinunLevelUpLearnset, .teachableLearnset = sMinunTeachableLearnset, @@ -4922,13 +4922,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Volbeat, .iconPalIndex = 0, FOOTPRINT(Volbeat) - FOLLOWER( + OVERWORLD( sPicTable_Volbeat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Volbeat, - gShinyFollowerPalette_Volbeat + gOverworldPalette_Volbeat, + gShinyOverworldPalette_Volbeat ) .levelUpLearnset = sVolbeatLevelUpLearnset, .teachableLearnset = sVolbeatTeachableLearnset, @@ -4990,13 +4990,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Illumise, .iconPalIndex = 2, FOOTPRINT(Illumise) - FOLLOWER( + OVERWORLD( sPicTable_Illumise, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Illumise, - gShinyFollowerPalette_Illumise + gOverworldPalette_Illumise, + gShinyOverworldPalette_Illumise ) .levelUpLearnset = sIllumiseLevelUpLearnset, .teachableLearnset = sIllumiseTeachableLearnset, @@ -5056,13 +5056,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Budew, .iconPalIndex = 1, FOOTPRINT(Budew) - FOLLOWER( + OVERWORLD( sPicTable_Budew, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Budew, - gShinyFollowerPalette_Budew + gOverworldPalette_Budew, + gShinyOverworldPalette_Budew ) .levelUpLearnset = sBudewLevelUpLearnset, .teachableLearnset = sBudewTeachableLearnset, @@ -5125,13 +5125,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Roselia, .iconPalIndex = 4, FOOTPRINT(Roselia) - FOLLOWER( + OVERWORLD( sPicTable_Roselia, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Roselia, - gShinyFollowerPalette_Roselia + gOverworldPalette_Roselia, + gShinyOverworldPalette_Roselia ) .levelUpLearnset = sRoseliaLevelUpLearnset, .teachableLearnset = sRoseliaTeachableLearnset, @@ -5202,13 +5202,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Roserade, .iconPalIndex = 0, FOOTPRINT(Roserade) - FOLLOWER( + OVERWORLD( sPicTable_Roserade, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Roserade, - gShinyFollowerPalette_Roserade + gOverworldPalette_Roserade, + gShinyOverworldPalette_Roserade ) .levelUpLearnset = sRoseradeLevelUpLearnset, .teachableLearnset = sRoseradeTeachableLearnset, @@ -5271,13 +5271,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Gulpin, .iconPalIndex = 1, FOOTPRINT(Gulpin) - FOLLOWER( + OVERWORLD( sPicTable_Gulpin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Gulpin, - gShinyFollowerPalette_Gulpin + gOverworldPalette_Gulpin, + gShinyOverworldPalette_Gulpin ) .levelUpLearnset = sGulpinLevelUpLearnset, .teachableLearnset = sGulpinTeachableLearnset, @@ -5339,13 +5339,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Swalot, .iconPalIndex = 2, FOOTPRINT(Swalot) - FOLLOWER( + OVERWORLD( sPicTable_Swalot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Swalot, - gShinyFollowerPalette_Swalot + gOverworldPalette_Swalot, + gShinyOverworldPalette_Swalot ) .levelUpLearnset = sSwalotLevelUpLearnset, .teachableLearnset = sSwalotTeachableLearnset, @@ -5402,13 +5402,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Carvanha, .iconPalIndex = 0, FOOTPRINT(Carvanha) - FOLLOWER( + OVERWORLD( sPicTable_Carvanha, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Carvanha, - gShinyFollowerPalette_Carvanha + gOverworldPalette_Carvanha, + gShinyOverworldPalette_Carvanha ) .levelUpLearnset = sCarvanhaLevelUpLearnset, .teachableLearnset = sCarvanhaTeachableLearnset, @@ -5465,13 +5465,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Sharpedo, .iconPalIndex = 0, FOOTPRINT(Sharpedo) - FOLLOWER( + OVERWORLD( sPicTable_Sharpedo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Sharpedo, - gShinyFollowerPalette_Sharpedo + gOverworldPalette_Sharpedo, + gShinyOverworldPalette_Sharpedo ) .levelUpLearnset = sSharpedoLevelUpLearnset, .teachableLearnset = sSharpedoTeachableLearnset, @@ -5588,13 +5588,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Wailmer, .iconPalIndex = 2, FOOTPRINT(Wailmer) - FOLLOWER( + OVERWORLD( sPicTable_Wailmer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Wailmer, - gShinyFollowerPalette_Wailmer + gOverworldPalette_Wailmer, + gShinyOverworldPalette_Wailmer ) .levelUpLearnset = sWailmerLevelUpLearnset, .teachableLearnset = sWailmerTeachableLearnset, @@ -5651,13 +5651,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Wailord, .iconPalIndex = 0, FOOTPRINT(Wailord) - FOLLOWER( + OVERWORLD( sPicTable_Wailord, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Wailord, - gShinyFollowerPalette_Wailord + gOverworldPalette_Wailord, + gShinyOverworldPalette_Wailord ) .levelUpLearnset = sWailordLevelUpLearnset, .teachableLearnset = sWailordTeachableLearnset, @@ -5717,13 +5717,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Numel, .iconPalIndex = 1, FOOTPRINT(Numel) - FOLLOWER( + OVERWORLD( sPicTable_Numel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Numel, - gShinyFollowerPalette_Numel + gOverworldPalette_Numel, + gShinyOverworldPalette_Numel ) .levelUpLearnset = sNumelLevelUpLearnset, .teachableLearnset = sNumelTeachableLearnset, @@ -5784,13 +5784,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Camerupt, .iconPalIndex = 0, FOOTPRINT(Camerupt) - FOLLOWER( + OVERWORLD( sPicTable_Camerupt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Camerupt, - gShinyFollowerPalette_Camerupt + gOverworldPalette_Camerupt, + gShinyOverworldPalette_Camerupt ) .levelUpLearnset = sCameruptLevelUpLearnset, .teachableLearnset = sCameruptTeachableLearnset, @@ -5907,13 +5907,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Torkoal, .iconPalIndex = 2, FOOTPRINT(Torkoal) - FOLLOWER( + OVERWORLD( sPicTable_Torkoal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Torkoal, - gShinyFollowerPalette_Torkoal + gOverworldPalette_Torkoal, + gShinyOverworldPalette_Torkoal ) .levelUpLearnset = sTorkoalLevelUpLearnset, .teachableLearnset = sTorkoalTeachableLearnset, @@ -5970,13 +5970,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Spoink, .iconPalIndex = 0, FOOTPRINT(Spoink) - FOLLOWER( + OVERWORLD( sPicTable_Spoink, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Spoink, - gShinyFollowerPalette_Spoink + gOverworldPalette_Spoink, + gShinyOverworldPalette_Spoink ) .levelUpLearnset = sSpoinkLevelUpLearnset, .teachableLearnset = sSpoinkTeachableLearnset, @@ -6033,13 +6033,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Grumpig, .iconPalIndex = 2, FOOTPRINT(Grumpig) - FOLLOWER( + OVERWORLD( sPicTable_Grumpig, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Grumpig, - gShinyFollowerPalette_Grumpig + gOverworldPalette_Grumpig, + gShinyOverworldPalette_Grumpig ) .levelUpLearnset = sGrumpigLevelUpLearnset, .teachableLearnset = sGrumpigTeachableLearnset, @@ -6096,13 +6096,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Spinda, .iconPalIndex = 1, FOOTPRINT(Spinda) - FOLLOWER( + OVERWORLD( sPicTable_Spinda, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Spinda, - gShinyFollowerPalette_Spinda + gOverworldPalette_Spinda, + gShinyOverworldPalette_Spinda ) .levelUpLearnset = sSpindaLevelUpLearnset, .teachableLearnset = sSpindaTeachableLearnset, @@ -6164,13 +6164,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Trapinch, .iconPalIndex = 0, FOOTPRINT(Trapinch) - FOLLOWER( + OVERWORLD( sPicTable_Trapinch, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Trapinch, - gShinyFollowerPalette_Trapinch + gOverworldPalette_Trapinch, + gShinyOverworldPalette_Trapinch ) .levelUpLearnset = sTrapinchLevelUpLearnset, .teachableLearnset = sTrapinchTeachableLearnset, @@ -6231,13 +6231,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Vibrava, .iconPalIndex = 1, FOOTPRINT(Vibrava) - FOLLOWER( + OVERWORLD( sPicTable_Vibrava, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vibrava, - gShinyFollowerPalette_Vibrava + gOverworldPalette_Vibrava, + gShinyOverworldPalette_Vibrava ) .levelUpLearnset = sVibravaLevelUpLearnset, .teachableLearnset = sVibravaTeachableLearnset, @@ -6304,13 +6304,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Flygon, .iconPalIndex = 1, FOOTPRINT(Flygon) - FOLLOWER( + OVERWORLD( sPicTable_Flygon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Flygon, - gShinyFollowerPalette_Flygon + gOverworldPalette_Flygon, + gShinyOverworldPalette_Flygon ) .levelUpLearnset = sFlygonLevelUpLearnset, .teachableLearnset = sFlygonTeachableLearnset, @@ -6367,13 +6367,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Cacnea, .iconPalIndex = 1, FOOTPRINT(Cacnea) - FOLLOWER( + OVERWORLD( sPicTable_Cacnea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cacnea, - gShinyFollowerPalette_Cacnea + gOverworldPalette_Cacnea, + gShinyOverworldPalette_Cacnea ) .levelUpLearnset = sCacneaLevelUpLearnset, .teachableLearnset = sCacneaTeachableLearnset, @@ -6433,13 +6433,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Cacturne, .iconPalIndex = 1, FOOTPRINT(Cacturne) - FOLLOWER( + OVERWORLD( sPicTable_Cacturne, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cacturne, - gShinyFollowerPalette_Cacturne + gOverworldPalette_Cacturne, + gShinyOverworldPalette_Cacturne ) .levelUpLearnset = sCacturneLevelUpLearnset, .teachableLearnset = sCacturneTeachableLearnset, @@ -6495,13 +6495,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Swablu, .iconPalIndex = 0, FOOTPRINT(Swablu) - FOLLOWER( + OVERWORLD( sPicTable_Swablu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Swablu, - gShinyFollowerPalette_Swablu + gOverworldPalette_Swablu, + gShinyOverworldPalette_Swablu ) .levelUpLearnset = sSwabluLevelUpLearnset, .teachableLearnset = sSwabluTeachableLearnset, @@ -6557,13 +6557,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Altaria, .iconPalIndex = 0, FOOTPRINT(Altaria) - FOLLOWER( + OVERWORLD( sPicTable_Altaria, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Altaria, - gShinyFollowerPalette_Altaria + gOverworldPalette_Altaria, + gShinyOverworldPalette_Altaria ) .levelUpLearnset = sAltariaLevelUpLearnset, .teachableLearnset = sAltariaTeachableLearnset, @@ -6681,13 +6681,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Zangoose, .iconPalIndex = 0, FOOTPRINT(Zangoose) - FOLLOWER( + OVERWORLD( sPicTable_Zangoose, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zangoose, - gShinyFollowerPalette_Zangoose + gOverworldPalette_Zangoose, + gShinyOverworldPalette_Zangoose ) .levelUpLearnset = sZangooseLevelUpLearnset, .teachableLearnset = sZangooseTeachableLearnset, @@ -6747,13 +6747,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Seviper, .iconPalIndex = 2, FOOTPRINT(Seviper) - FOLLOWER( + OVERWORLD( sPicTable_Seviper, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BIKE_TIRE, - gFollowerPalette_Seviper, - gShinyFollowerPalette_Seviper + gOverworldPalette_Seviper, + gShinyOverworldPalette_Seviper ) .levelUpLearnset = sSeviperLevelUpLearnset, .teachableLearnset = sSeviperTeachableLearnset, @@ -6819,13 +6819,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Lunatone, .iconPalIndex = 1, FOOTPRINT(Lunatone) - FOLLOWER( + OVERWORLD( sPicTable_Lunatone, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Lunatone, - gShinyFollowerPalette_Lunatone + gOverworldPalette_Lunatone, + gShinyOverworldPalette_Lunatone ) .levelUpLearnset = sLunatoneLevelUpLearnset, .teachableLearnset = sLunatoneTeachableLearnset, @@ -6890,13 +6890,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Solrock, .iconPalIndex = 0, FOOTPRINT(Solrock) - FOLLOWER( + OVERWORLD( sPicTable_Solrock, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Solrock, - gShinyFollowerPalette_Solrock + gOverworldPalette_Solrock, + gShinyOverworldPalette_Solrock ) .levelUpLearnset = sSolrockLevelUpLearnset, .teachableLearnset = sSolrockTeachableLearnset, @@ -6953,13 +6953,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Barboach, .iconPalIndex = 0, FOOTPRINT(Barboach) - FOLLOWER( + OVERWORLD( sPicTable_Barboach, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Barboach, - gShinyFollowerPalette_Barboach + gOverworldPalette_Barboach, + gShinyOverworldPalette_Barboach ) .levelUpLearnset = sBarboachLevelUpLearnset, .teachableLearnset = sBarboachTeachableLearnset, @@ -7015,13 +7015,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Whiscash, .iconPalIndex = 0, FOOTPRINT(Whiscash) - FOLLOWER( + OVERWORLD( sPicTable_Whiscash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Whiscash, - gShinyFollowerPalette_Whiscash + gOverworldPalette_Whiscash, + gShinyOverworldPalette_Whiscash ) .levelUpLearnset = sWhiscashLevelUpLearnset, .teachableLearnset = sWhiscashTeachableLearnset, @@ -7077,13 +7077,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Corphish, .iconPalIndex = 0, FOOTPRINT(Corphish) - FOLLOWER( + OVERWORLD( sPicTable_Corphish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Corphish, - gShinyFollowerPalette_Corphish + gOverworldPalette_Corphish, + gShinyOverworldPalette_Corphish ) .levelUpLearnset = sCorphishLevelUpLearnset, .teachableLearnset = sCorphishTeachableLearnset, @@ -7139,13 +7139,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Crawdaunt, .iconPalIndex = 0, FOOTPRINT(Crawdaunt) - FOLLOWER( + OVERWORLD( sPicTable_Crawdaunt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Crawdaunt, - gShinyFollowerPalette_Crawdaunt + gOverworldPalette_Crawdaunt, + gShinyOverworldPalette_Crawdaunt ) .levelUpLearnset = sCrawdauntLevelUpLearnset, .teachableLearnset = sCrawdauntTeachableLearnset, @@ -7203,13 +7203,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Baltoy, .iconPalIndex = 2, FOOTPRINT(Baltoy) - FOLLOWER( + OVERWORLD( sPicTable_Baltoy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Baltoy, - gShinyFollowerPalette_Baltoy + gOverworldPalette_Baltoy, + gShinyOverworldPalette_Baltoy ) .levelUpLearnset = sBaltoyLevelUpLearnset, .teachableLearnset = sBaltoyTeachableLearnset, @@ -7266,13 +7266,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Claydol, .iconPalIndex = 0, FOOTPRINT(Claydol) - FOLLOWER( + OVERWORLD( sPicTable_Claydol, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Claydol, - gShinyFollowerPalette_Claydol + gOverworldPalette_Claydol, + gShinyOverworldPalette_Claydol ) .levelUpLearnset = sClaydolLevelUpLearnset, .teachableLearnset = sClaydolTeachableLearnset, @@ -7335,13 +7335,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Lileep, .iconPalIndex = 2, FOOTPRINT(Lileep) - FOLLOWER( + OVERWORLD( sPicTable_Lileep, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Lileep, - gShinyFollowerPalette_Lileep + gOverworldPalette_Lileep, + gShinyOverworldPalette_Lileep ) .levelUpLearnset = sLileepLevelUpLearnset, .teachableLearnset = sLileepTeachableLearnset, @@ -7404,13 +7404,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Cradily, .iconPalIndex = 1, FOOTPRINT(Cradily) - FOLLOWER( + OVERWORLD( sPicTable_Cradily, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Cradily, - gShinyFollowerPalette_Cradily + gOverworldPalette_Cradily, + gShinyOverworldPalette_Cradily ) .levelUpLearnset = sCradilyLevelUpLearnset, .teachableLearnset = sCradilyTeachableLearnset, @@ -7472,13 +7472,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Anorith, .iconPalIndex = 0, FOOTPRINT(Anorith) - FOLLOWER( + OVERWORLD( sPicTable_Anorith, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, - gFollowerPalette_Anorith, - gShinyFollowerPalette_Anorith + gOverworldPalette_Anorith, + gShinyOverworldPalette_Anorith ) .levelUpLearnset = sAnorithLevelUpLearnset, .teachableLearnset = sAnorithTeachableLearnset, @@ -7540,13 +7540,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Armaldo, .iconPalIndex = 2, FOOTPRINT(Armaldo) - FOLLOWER( + OVERWORLD( sPicTable_Armaldo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Armaldo, - gShinyFollowerPalette_Armaldo + gOverworldPalette_Armaldo, + gShinyOverworldPalette_Armaldo ) .levelUpLearnset = sArmaldoLevelUpLearnset, .teachableLearnset = sArmaldoTeachableLearnset, @@ -7602,13 +7602,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Feebas, .iconPalIndex = 2, FOOTPRINT(Feebas) - FOLLOWER( + OVERWORLD( sPicTable_Feebas, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Feebas, - gShinyFollowerPalette_Feebas + gOverworldPalette_Feebas, + gShinyOverworldPalette_Feebas ) .levelUpLearnset = sFeebasLevelUpLearnset, .teachableLearnset = sFeebasTeachableLearnset, @@ -7671,13 +7671,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Milotic, .iconPalIndex = 2, FOOTPRINT(Milotic) - FOLLOWER( + OVERWORLD( sPicTable_Milotic, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Milotic, - gShinyFollowerPalette_Milotic + gOverworldPalette_Milotic, + gShinyOverworldPalette_Milotic ) .levelUpLearnset = sMiloticLevelUpLearnset, .teachableLearnset = sMiloticTeachableLearnset, @@ -7736,13 +7736,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_CastformNormal, .iconPalIndex = 0, FOOTPRINT(Castform) - FOLLOWER( + OVERWORLD( sPicTable_CastformNormal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_CastformNormal, - gShinyFollowerPalette_CastformNormal + gOverworldPalette_CastformNormal, + gShinyOverworldPalette_CastformNormal ) .levelUpLearnset = sCastformLevelUpLearnset, .teachableLearnset = sCastformTeachableLearnset, @@ -7802,13 +7802,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_CastformSunny, .iconPalIndex = 0, FOOTPRINT(Castform) - FOLLOWER( + OVERWORLD( sPicTable_CastformSunny, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_CastformSunny, - gShinyFollowerPalette_CastformSunny + gOverworldPalette_CastformSunny, + gShinyOverworldPalette_CastformSunny ) .levelUpLearnset = sCastformLevelUpLearnset, .teachableLearnset = sCastformTeachableLearnset, @@ -7868,13 +7868,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_CastformRainy, .iconPalIndex = 0, FOOTPRINT(Castform) - FOLLOWER( + OVERWORLD( sPicTable_CastformRainy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_CastformRainy, - gShinyFollowerPalette_CastformRainy + gOverworldPalette_CastformRainy, + gShinyOverworldPalette_CastformRainy ) .levelUpLearnset = sCastformLevelUpLearnset, .teachableLearnset = sCastformTeachableLearnset, @@ -7934,13 +7934,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_CastformSnowy, .iconPalIndex = 0, FOOTPRINT(Castform) - FOLLOWER( + OVERWORLD( sPicTable_CastformSnowy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_CastformSnowy, - gShinyFollowerPalette_CastformSnowy + gOverworldPalette_CastformSnowy, + gShinyOverworldPalette_CastformSnowy ) .levelUpLearnset = sCastformLevelUpLearnset, .teachableLearnset = sCastformTeachableLearnset, @@ -8000,13 +8000,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Kecleon, .iconPalIndex = 1, FOOTPRINT(Kecleon) - FOLLOWER( + OVERWORLD( sPicTable_Kecleon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kecleon, - gShinyFollowerPalette_Kecleon + gOverworldPalette_Kecleon, + gShinyOverworldPalette_Kecleon ) .levelUpLearnset = sKecleonLevelUpLearnset, .teachableLearnset = sKecleonTeachableLearnset, @@ -8065,13 +8065,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Shuppet, .iconPalIndex = 0, FOOTPRINT(Shuppet) - FOLLOWER( + OVERWORLD( sPicTable_Shuppet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Shuppet, - gShinyFollowerPalette_Shuppet + gOverworldPalette_Shuppet, + gShinyOverworldPalette_Shuppet ) .levelUpLearnset = sShuppetLevelUpLearnset, .teachableLearnset = sShuppetTeachableLearnset, @@ -8128,13 +8128,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Banette, .iconPalIndex = 0, FOOTPRINT(Banette) - FOLLOWER( + OVERWORLD( sPicTable_Banette, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Banette, - gShinyFollowerPalette_Banette + gOverworldPalette_Banette, + gShinyOverworldPalette_Banette ) .levelUpLearnset = sBanetteLevelUpLearnset, .teachableLearnset = sBanetteTeachableLearnset, @@ -8253,13 +8253,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Duskull, .iconPalIndex = 0, FOOTPRINT(Duskull) - FOLLOWER( + OVERWORLD( sPicTable_Duskull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Duskull, - gShinyFollowerPalette_Duskull + gOverworldPalette_Duskull, + gShinyOverworldPalette_Duskull ) .levelUpLearnset = sDuskullLevelUpLearnset, .teachableLearnset = sDuskullTeachableLearnset, @@ -8318,13 +8318,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Dusclops, .iconPalIndex = 0, FOOTPRINT(Dusclops) - FOLLOWER( + OVERWORLD( sPicTable_Dusclops, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dusclops, - gShinyFollowerPalette_Dusclops + gOverworldPalette_Dusclops, + gShinyOverworldPalette_Dusclops ) .levelUpLearnset = sDusclopsLevelUpLearnset, .teachableLearnset = sDusclopsTeachableLearnset, @@ -8390,13 +8390,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Dusknoir, .iconPalIndex = 2, FOOTPRINT(Dusknoir) - FOLLOWER( + OVERWORLD( sPicTable_Dusknoir, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dusknoir, - gShinyFollowerPalette_Dusknoir + gOverworldPalette_Dusknoir, + gShinyOverworldPalette_Dusknoir ) .levelUpLearnset = sDusknoirLevelUpLearnset, .teachableLearnset = sDusknoirTeachableLearnset, @@ -8453,13 +8453,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Tropius, .iconPalIndex = 1, FOOTPRINT(Tropius) - FOLLOWER( + OVERWORLD( sPicTable_Tropius, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tropius, - gShinyFollowerPalette_Tropius + gOverworldPalette_Tropius, + gShinyOverworldPalette_Tropius ) .levelUpLearnset = sTropiusLevelUpLearnset, .teachableLearnset = sTropiusTeachableLearnset, @@ -8518,13 +8518,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Chingling, .iconPalIndex = 1, FOOTPRINT(Chingling) - FOLLOWER( + OVERWORLD( sPicTable_Chingling, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Chingling, - gShinyFollowerPalette_Chingling + gOverworldPalette_Chingling, + gShinyOverworldPalette_Chingling ) .levelUpLearnset = sChinglingLevelUpLearnset, .teachableLearnset = sChinglingTeachableLearnset, @@ -8590,13 +8590,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Chimecho, .iconPalIndex = 0, FOOTPRINT(Chimecho) - FOLLOWER( + OVERWORLD( sPicTable_Chimecho, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Chimecho, - gShinyFollowerPalette_Chimecho + gOverworldPalette_Chimecho, + gShinyOverworldPalette_Chimecho ) .levelUpLearnset = sChimechoLevelUpLearnset, .teachableLearnset = sChimechoTeachableLearnset, @@ -8655,13 +8655,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Absol, .iconPalIndex = 0, FOOTPRINT(Absol) - FOLLOWER( + OVERWORLD( sPicTable_Absol, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Absol, - gShinyFollowerPalette_Absol + gOverworldPalette_Absol, + gShinyOverworldPalette_Absol ) .levelUpLearnset = sAbsolLevelUpLearnset, .teachableLearnset = sAbsolTeachableLearnset, @@ -8781,13 +8781,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Snorunt, .iconPalIndex = 2, FOOTPRINT(Snorunt) - FOLLOWER( + OVERWORLD( sPicTable_Snorunt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Snorunt, - gShinyFollowerPalette_Snorunt + gOverworldPalette_Snorunt, + gShinyOverworldPalette_Snorunt ) .levelUpLearnset = sSnoruntLevelUpLearnset, .teachableLearnset = sSnoruntTeachableLearnset, @@ -8845,13 +8845,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Glalie, .iconPalIndex = 0, FOOTPRINT(Glalie) - FOLLOWER( + OVERWORLD( sPicTable_Glalie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Glalie, - gShinyFollowerPalette_Glalie + gOverworldPalette_Glalie, + gShinyOverworldPalette_Glalie ) .levelUpLearnset = sGlalieLevelUpLearnset, .teachableLearnset = sGlalieTeachableLearnset, @@ -8966,13 +8966,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Froslass, .iconPalIndex = 0, FOOTPRINT(Froslass) - FOLLOWER( + OVERWORLD( sPicTable_Froslass, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Froslass, - gShinyFollowerPalette_Froslass + gOverworldPalette_Froslass, + gShinyOverworldPalette_Froslass ) .levelUpLearnset = sFroslassLevelUpLearnset, .teachableLearnset = sFroslassTeachableLearnset, @@ -9030,13 +9030,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Spheal, .iconPalIndex = 2, FOOTPRINT(Spheal) - FOLLOWER( + OVERWORLD( sPicTable_Spheal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Spheal, - gShinyFollowerPalette_Spheal + gOverworldPalette_Spheal, + gShinyOverworldPalette_Spheal ) .levelUpLearnset = sSphealLevelUpLearnset, .teachableLearnset = sSphealTeachableLearnset, @@ -9092,13 +9092,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Sealeo, .iconPalIndex = 2, FOOTPRINT(Sealeo) - FOLLOWER( + OVERWORLD( sPicTable_Sealeo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sealeo, - gShinyFollowerPalette_Sealeo + gOverworldPalette_Sealeo, + gShinyOverworldPalette_Sealeo ) .levelUpLearnset = sSealeoLevelUpLearnset, .teachableLearnset = sSealeoTeachableLearnset, @@ -9159,13 +9159,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Walrein, .iconPalIndex = 0, FOOTPRINT(Walrein) - FOLLOWER( + OVERWORLD( sPicTable_Walrein, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Walrein, - gShinyFollowerPalette_Walrein + gOverworldPalette_Walrein, + gShinyOverworldPalette_Walrein ) .levelUpLearnset = sWalreinLevelUpLearnset, .teachableLearnset = sWalreinTeachableLearnset, @@ -9223,13 +9223,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Clamperl, .iconPalIndex = 0, FOOTPRINT(Clamperl) - FOLLOWER( + OVERWORLD( sPicTable_Clamperl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Clamperl, - gShinyFollowerPalette_Clamperl + gOverworldPalette_Clamperl, + gShinyOverworldPalette_Clamperl ) .levelUpLearnset = sClamperlLevelUpLearnset, .teachableLearnset = sClamperlTeachableLearnset, @@ -9290,13 +9290,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Huntail, .iconPalIndex = 0, FOOTPRINT(Huntail) - FOLLOWER( + OVERWORLD( sPicTable_Huntail, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Huntail, - gShinyFollowerPalette_Huntail + gOverworldPalette_Huntail, + gShinyOverworldPalette_Huntail ) .levelUpLearnset = sHuntailLevelUpLearnset, .teachableLearnset = sHuntailTeachableLearnset, @@ -9351,13 +9351,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Gorebyss, .iconPalIndex = 0, FOOTPRINT(Gorebyss) - FOLLOWER( + OVERWORLD( sPicTable_Gorebyss, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, - gFollowerPalette_Gorebyss, - gShinyFollowerPalette_Gorebyss + gOverworldPalette_Gorebyss, + gShinyOverworldPalette_Gorebyss ) .levelUpLearnset = sGorebyssLevelUpLearnset, .teachableLearnset = sGorebyssTeachableLearnset, @@ -9419,13 +9419,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Relicanth, .iconPalIndex = 2, FOOTPRINT(Relicanth) - FOLLOWER( + OVERWORLD( sPicTable_Relicanth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Relicanth, - gShinyFollowerPalette_Relicanth + gOverworldPalette_Relicanth, + gShinyOverworldPalette_Relicanth ) .levelUpLearnset = sRelicanthLevelUpLearnset, .teachableLearnset = sRelicanthTeachableLearnset, @@ -9483,13 +9483,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Luvdisc, .iconPalIndex = 0, FOOTPRINT(Luvdisc) - FOLLOWER( + OVERWORLD( sPicTable_Luvdisc, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, - gFollowerPalette_Luvdisc, - gShinyFollowerPalette_Luvdisc + gOverworldPalette_Luvdisc, + gShinyOverworldPalette_Luvdisc ) .levelUpLearnset = sLuvdiscLevelUpLearnset, .teachableLearnset = sLuvdiscTeachableLearnset, @@ -9547,13 +9547,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Bagon, .iconPalIndex = 0, FOOTPRINT(Bagon) - FOLLOWER( + OVERWORLD( sPicTable_Bagon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bagon, - gShinyFollowerPalette_Bagon + gOverworldPalette_Bagon, + gShinyOverworldPalette_Bagon ) .levelUpLearnset = sBagonLevelUpLearnset, .teachableLearnset = sBagonTeachableLearnset, @@ -9610,13 +9610,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Shelgon, .iconPalIndex = 2, FOOTPRINT(Shelgon) - FOLLOWER( + OVERWORLD( sPicTable_Shelgon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Shelgon, - gShinyFollowerPalette_Shelgon + gOverworldPalette_Shelgon, + gShinyOverworldPalette_Shelgon ) .levelUpLearnset = sShelgonLevelUpLearnset, .teachableLearnset = sShelgonTeachableLearnset, @@ -9679,13 +9679,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Salamence, .iconPalIndex = 0, FOOTPRINT(Salamence) - FOLLOWER( + OVERWORLD( sPicTable_Salamence, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Salamence, - gShinyFollowerPalette_Salamence + gOverworldPalette_Salamence, + gShinyOverworldPalette_Salamence ) .levelUpLearnset = sSalamenceLevelUpLearnset, .teachableLearnset = sSalamenceTeachableLearnset, @@ -9803,13 +9803,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Beldum, .iconPalIndex = 0, FOOTPRINT(Beldum) - FOLLOWER( + OVERWORLD( sPicTable_Beldum, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Beldum, - gShinyFollowerPalette_Beldum + gOverworldPalette_Beldum, + gShinyOverworldPalette_Beldum ) .tmIlliterate = TRUE, .levelUpLearnset = sBeldumLevelUpLearnset, @@ -9866,13 +9866,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Metang, .iconPalIndex = 0, FOOTPRINT(Metang) - FOLLOWER( + OVERWORLD( sPicTable_Metang, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Metang, - gShinyFollowerPalette_Metang + gOverworldPalette_Metang, + gShinyOverworldPalette_Metang ) .levelUpLearnset = sMetangLevelUpLearnset, .teachableLearnset = sMetangTeachableLearnset, @@ -9934,13 +9934,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Metagross, .iconPalIndex = 0, FOOTPRINT(Metagross) - FOLLOWER( + OVERWORLD( sPicTable_Metagross, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Metagross, - gShinyFollowerPalette_Metagross + gOverworldPalette_Metagross, + gShinyOverworldPalette_Metagross ) .levelUpLearnset = sMetagrossLevelUpLearnset, .teachableLearnset = sMetagrossTeachableLearnset, @@ -10063,13 +10063,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Regirock, .iconPalIndex = 2, FOOTPRINT(Regirock) - FOLLOWER( + OVERWORLD( sPicTable_Regirock, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Regirock, - gShinyFollowerPalette_Regirock + gOverworldPalette_Regirock, + gShinyOverworldPalette_Regirock ) .isLegendary = TRUE, .levelUpLearnset = sRegirockLevelUpLearnset, @@ -10132,13 +10132,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Regice, .iconPalIndex = 0, FOOTPRINT(Regice) - FOLLOWER( + OVERWORLD( sPicTable_Regice, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Regice, - gShinyFollowerPalette_Regice + gOverworldPalette_Regice, + gShinyOverworldPalette_Regice ) .isLegendary = TRUE, .levelUpLearnset = sRegiceLevelUpLearnset, @@ -10202,13 +10202,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Registeel, .iconPalIndex = 2, FOOTPRINT(Registeel) - FOLLOWER( + OVERWORLD( sPicTable_Registeel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Registeel, - gShinyFollowerPalette_Registeel + gOverworldPalette_Registeel, + gShinyOverworldPalette_Registeel ) .isLegendary = TRUE, .levelUpLearnset = sRegisteelLevelUpLearnset, @@ -10272,13 +10272,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Latias, .iconPalIndex = 0, FOOTPRINT(Latias) - FOLLOWER( + OVERWORLD( sPicTable_Latias, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Latias, - gShinyFollowerPalette_Latias + gOverworldPalette_Latias, + gShinyOverworldPalette_Latias ) .isLegendary = TRUE, .levelUpLearnset = sLatiasLevelUpLearnset, @@ -10403,13 +10403,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Latios, .iconPalIndex = 0, FOOTPRINT(Latios) - FOLLOWER( + OVERWORLD( sPicTable_Latios, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Latios, - gShinyFollowerPalette_Latios + gOverworldPalette_Latios, + gShinyOverworldPalette_Latios ) .isLegendary = TRUE, .levelUpLearnset = sLatiosLevelUpLearnset, @@ -10534,13 +10534,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Kyogre, .iconPalIndex = 2, FOOTPRINT(Kyogre) - FOLLOWER( + OVERWORLD( sPicTable_Kyogre, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Kyogre, - gShinyFollowerPalette_Kyogre + gOverworldPalette_Kyogre, + gShinyOverworldPalette_Kyogre ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -10664,13 +10664,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Groudon, .iconPalIndex = 0, FOOTPRINT(Groudon) - FOLLOWER( + OVERWORLD( sPicTable_Groudon, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Groudon, - gShinyFollowerPalette_Groudon + gOverworldPalette_Groudon, + gShinyOverworldPalette_Groudon ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -10798,13 +10798,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Rayquaza, .iconPalIndex = 1, FOOTPRINT(Rayquaza) - FOLLOWER( + OVERWORLD( sPicTable_Rayquaza, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Rayquaza, - gShinyFollowerPalette_Rayquaza + gOverworldPalette_Rayquaza, + gShinyOverworldPalette_Rayquaza ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -10934,13 +10934,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_Jirachi, .iconPalIndex = 0, FOOTPRINT(Jirachi) - FOLLOWER( + OVERWORLD( sPicTable_Jirachi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_Jirachi, - gShinyFollowerPalette_Jirachi + gOverworldPalette_Jirachi, + gShinyOverworldPalette_Jirachi ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -11004,13 +11004,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_DeoxysNormal, .iconPalIndex = 0, FOOTPRINT(Deoxys) - FOLLOWER( + OVERWORLD( sPicTable_DeoxysNormal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DeoxysNormal, - gShinyFollowerPalette_DeoxysNormal + gOverworldPalette_DeoxysNormal, + gShinyOverworldPalette_DeoxysNormal ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -11065,13 +11065,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_DeoxysAttack, .iconPalIndex = 0, FOOTPRINT(Deoxys) - FOLLOWER( + OVERWORLD( sPicTable_DeoxysAttack, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DeoxysAttack, - gShinyFollowerPalette_DeoxysAttack + gOverworldPalette_DeoxysAttack, + gShinyOverworldPalette_DeoxysAttack ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -11126,13 +11126,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_DeoxysDefense, .iconPalIndex = 0, FOOTPRINT(Deoxys) - FOLLOWER( + OVERWORLD( sPicTable_DeoxysDefense, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DeoxysDefense, - gShinyFollowerPalette_DeoxysDefense + gOverworldPalette_DeoxysDefense, + gShinyOverworldPalette_DeoxysDefense ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -11187,13 +11187,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .iconSprite = gMonIcon_DeoxysSpeed, .iconPalIndex = 0, FOOTPRINT(Deoxys) - FOLLOWER( + OVERWORLD( sPicTable_DeoxysSpeed, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DeoxysSpeed, - gShinyFollowerPalette_DeoxysSpeed + gOverworldPalette_DeoxysSpeed, + gShinyOverworldPalette_DeoxysSpeed ) .isMythical = TRUE, .isFrontierBanned = TRUE, diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h index 84362ed2e6..ed95691513 100644 --- a/src/data/pokemon/species_info/gen_4_families.h +++ b/src/data/pokemon/species_info/gen_4_families.h @@ -52,13 +52,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Turtwig, .iconPalIndex = 1, FOOTPRINT(Turtwig) - FOLLOWER( + OVERWORLD( sPicTable_Turtwig, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Turtwig, - gShinyFollowerPalette_Turtwig + gOverworldPalette_Turtwig, + gShinyOverworldPalette_Turtwig ) .levelUpLearnset = sTurtwigLevelUpLearnset, .teachableLearnset = sTurtwigTeachableLearnset, @@ -115,13 +115,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Grotle, .iconPalIndex = 1, FOOTPRINT(Grotle) - FOLLOWER( + OVERWORLD( sPicTable_Grotle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Grotle, - gShinyFollowerPalette_Grotle + gOverworldPalette_Grotle, + gShinyOverworldPalette_Grotle ) .levelUpLearnset = sGrotleLevelUpLearnset, .teachableLearnset = sGrotleTeachableLearnset, @@ -184,13 +184,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Torterra, .iconPalIndex = 1, FOOTPRINT(Torterra) - FOLLOWER( + OVERWORLD( sPicTable_Torterra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Torterra, - gShinyFollowerPalette_Torterra + gOverworldPalette_Torterra, + gShinyOverworldPalette_Torterra ) .levelUpLearnset = sTorterraLevelUpLearnset, .teachableLearnset = sTorterraTeachableLearnset, @@ -247,13 +247,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Chimchar, .iconPalIndex = 1, FOOTPRINT(Chimchar) - FOLLOWER( + OVERWORLD( sPicTable_Chimchar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Chimchar, - gShinyFollowerPalette_Chimchar + gOverworldPalette_Chimchar, + gShinyOverworldPalette_Chimchar ) .levelUpLearnset = sChimcharLevelUpLearnset, .teachableLearnset = sChimcharTeachableLearnset, @@ -311,13 +311,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Monferno, .iconPalIndex = 0, FOOTPRINT(Monferno) - FOLLOWER( + OVERWORLD( sPicTable_Monferno, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Monferno, - gShinyFollowerPalette_Monferno + gOverworldPalette_Monferno, + gShinyOverworldPalette_Monferno ) .levelUpLearnset = sMonfernoLevelUpLearnset, .teachableLearnset = sMonfernoTeachableLearnset, @@ -380,13 +380,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Infernape, .iconPalIndex = 0, FOOTPRINT(Infernape) - FOLLOWER( + OVERWORLD( sPicTable_Infernape, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Infernape, - gShinyFollowerPalette_Infernape + gOverworldPalette_Infernape, + gShinyOverworldPalette_Infernape ) .levelUpLearnset = sInfernapeLevelUpLearnset, .teachableLearnset = sInfernapeTeachableLearnset, @@ -446,13 +446,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Piplup, .iconPalIndex = 0, FOOTPRINT(Piplup) - FOLLOWER( + OVERWORLD( sPicTable_Piplup, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Piplup, - gShinyFollowerPalette_Piplup + gOverworldPalette_Piplup, + gShinyOverworldPalette_Piplup ) .levelUpLearnset = sPiplupLevelUpLearnset, .teachableLearnset = sPiplupTeachableLearnset, @@ -512,13 +512,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Prinplup, .iconPalIndex = 0, FOOTPRINT(Prinplup) - FOLLOWER( + OVERWORLD( sPicTable_Prinplup, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Prinplup, - gShinyFollowerPalette_Prinplup + gOverworldPalette_Prinplup, + gShinyOverworldPalette_Prinplup ) .levelUpLearnset = sPrinplupLevelUpLearnset, .teachableLearnset = sPrinplupTeachableLearnset, @@ -583,13 +583,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Empoleon, .iconPalIndex = 0, FOOTPRINT(Empoleon) - FOLLOWER( + OVERWORLD( sPicTable_Empoleon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Empoleon, - gShinyFollowerPalette_Empoleon + gOverworldPalette_Empoleon, + gShinyOverworldPalette_Empoleon ) .levelUpLearnset = sEmpoleonLevelUpLearnset, .teachableLearnset = sEmpoleonTeachableLearnset, @@ -649,13 +649,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Starly, .iconPalIndex = 0, FOOTPRINT(Starly) - FOLLOWER( + OVERWORLD( sPicTable_Starly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Starly, - gShinyFollowerPalette_Starly + gOverworldPalette_Starly, + gShinyOverworldPalette_Starly ) .levelUpLearnset = sStarlyLevelUpLearnset, .teachableLearnset = sStarlyTeachableLearnset, @@ -715,13 +715,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Staravia, .iconPalIndex = 0, FOOTPRINT(Staravia) - FOLLOWER( + OVERWORLD( sPicTable_Staravia, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Staravia, - gShinyFollowerPalette_Staravia + gOverworldPalette_Staravia, + gShinyOverworldPalette_Staravia ) .levelUpLearnset = sStaraviaLevelUpLearnset, .teachableLearnset = sStaraviaTeachableLearnset, @@ -786,13 +786,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Staraptor, .iconPalIndex = 0, FOOTPRINT(Staraptor) - FOLLOWER( + OVERWORLD( sPicTable_Staraptor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Staraptor, - gShinyFollowerPalette_Staraptor + gOverworldPalette_Staraptor, + gShinyOverworldPalette_Staraptor ) .levelUpLearnset = sStaraptorLevelUpLearnset, .teachableLearnset = sStaraptorTeachableLearnset, @@ -852,13 +852,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Bidoof, .iconPalIndex = 2, FOOTPRINT(Bidoof) - FOLLOWER( + OVERWORLD( sPicTable_Bidoof, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bidoof, - gShinyFollowerPalette_Bidoof + gOverworldPalette_Bidoof, + gShinyOverworldPalette_Bidoof ) .levelUpLearnset = sBidoofLevelUpLearnset, .teachableLearnset = sBidoofTeachableLearnset, @@ -916,13 +916,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Bibarel, .iconPalIndex = 2, FOOTPRINT(Bibarel) - FOLLOWER( + OVERWORLD( sPicTable_Bibarel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bibarel, - gShinyFollowerPalette_Bibarel + gOverworldPalette_Bibarel, + gShinyOverworldPalette_Bibarel ) .levelUpLearnset = sBibarelLevelUpLearnset, .teachableLearnset = sBibarelTeachableLearnset, @@ -983,13 +983,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Kricketot, .iconPalIndex = 2, FOOTPRINT(Kricketot) - FOLLOWER( + OVERWORLD( sPicTable_Kricketot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kricketot, - gShinyFollowerPalette_Kricketot + gOverworldPalette_Kricketot, + gShinyOverworldPalette_Kricketot ) .tmIlliterate = TRUE, .levelUpLearnset = sKricketotLevelUpLearnset, @@ -1050,13 +1050,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Kricketune, .iconPalIndex = 2, FOOTPRINT(Kricketune) - FOLLOWER( + OVERWORLD( sPicTable_Kricketune, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kricketune, - gShinyFollowerPalette_Kricketune + gOverworldPalette_Kricketune, + gShinyOverworldPalette_Kricketune ) .levelUpLearnset = sKricketuneLevelUpLearnset, .teachableLearnset = sKricketuneTeachableLearnset, @@ -1116,13 +1116,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Shinx, .iconPalIndex = 0, FOOTPRINT(Shinx) - FOLLOWER( + OVERWORLD( sPicTable_Shinx, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Shinx, - gShinyFollowerPalette_Shinx + gOverworldPalette_Shinx, + gShinyOverworldPalette_Shinx ) .levelUpLearnset = sShinxLevelUpLearnset, .teachableLearnset = sShinxTeachableLearnset, @@ -1182,13 +1182,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Luxio, .iconPalIndex = 0, FOOTPRINT(Luxio) - FOLLOWER( + OVERWORLD( sPicTable_Luxio, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Luxio, - gShinyFollowerPalette_Luxio + gOverworldPalette_Luxio, + gShinyOverworldPalette_Luxio ) .levelUpLearnset = sLuxioLevelUpLearnset, .teachableLearnset = sLuxioTeachableLearnset, @@ -1253,13 +1253,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Luxray, .iconPalIndex = 0, FOOTPRINT(Luxray) - FOLLOWER( + OVERWORLD( sPicTable_Luxray, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Luxray, - gShinyFollowerPalette_Luxray + gOverworldPalette_Luxray, + gShinyOverworldPalette_Luxray ) .levelUpLearnset = sLuxrayLevelUpLearnset, .teachableLearnset = sLuxrayTeachableLearnset, @@ -1315,13 +1315,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Cranidos, .iconPalIndex = 0, FOOTPRINT(Cranidos) - FOLLOWER( + OVERWORLD( sPicTable_Cranidos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cranidos, - gShinyFollowerPalette_Cranidos + gOverworldPalette_Cranidos, + gShinyOverworldPalette_Cranidos ) .levelUpLearnset = sCranidosLevelUpLearnset, .teachableLearnset = sCranidosTeachableLearnset, @@ -1377,13 +1377,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Rampardos, .iconPalIndex = 0, FOOTPRINT(Rampardos) - FOLLOWER( + OVERWORLD( sPicTable_Rampardos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rampardos, - gShinyFollowerPalette_Rampardos + gOverworldPalette_Rampardos, + gShinyOverworldPalette_Rampardos ) .levelUpLearnset = sRampardosLevelUpLearnset, .teachableLearnset = sRampardosTeachableLearnset, @@ -1439,13 +1439,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Shieldon, .iconPalIndex = 1, FOOTPRINT(Shieldon) - FOLLOWER( + OVERWORLD( sPicTable_Shieldon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Shieldon, - gShinyFollowerPalette_Shieldon + gOverworldPalette_Shieldon, + gShinyOverworldPalette_Shieldon ) .levelUpLearnset = sShieldonLevelUpLearnset, .teachableLearnset = sShieldonTeachableLearnset, @@ -1501,13 +1501,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Bastiodon, .iconPalIndex = 1, FOOTPRINT(Bastiodon) - FOLLOWER( + OVERWORLD( sPicTable_Bastiodon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bastiodon, - gShinyFollowerPalette_Bastiodon + gOverworldPalette_Bastiodon, + gShinyOverworldPalette_Bastiodon ) .levelUpLearnset = sBastiodonLevelUpLearnset, .teachableLearnset = sBastiodonTeachableLearnset, @@ -1564,13 +1564,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_BurmyPlantCloak, .iconPalIndex = 1, FOOTPRINT(Burmy) - FOLLOWER( + OVERWORLD( sPicTable_BurmyPlantCloak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_BurmyPlantCloak, - gShinyFollowerPalette_BurmyPlantCloak + gOverworldPalette_BurmyPlantCloak, + gShinyOverworldPalette_BurmyPlantCloak ) .tmIlliterate = TRUE, .levelUpLearnset = sBurmyLevelUpLearnset, @@ -1630,13 +1630,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_BurmySandyCloak, .iconPalIndex = 1, FOOTPRINT(Burmy) - FOLLOWER( + OVERWORLD( sPicTable_BurmySandyCloak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_BurmySandyCloak, - gShinyFollowerPalette_BurmySandyCloak + gOverworldPalette_BurmySandyCloak, + gShinyOverworldPalette_BurmySandyCloak ) .tmIlliterate = TRUE, .levelUpLearnset = sBurmyLevelUpLearnset, @@ -1696,13 +1696,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_BurmyTrashCloak, .iconPalIndex = 0, FOOTPRINT(Burmy) - FOLLOWER( + OVERWORLD( sPicTable_BurmyTrashCloak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_BurmyTrashCloak, - gShinyFollowerPalette_BurmyTrashCloak + gOverworldPalette_BurmyTrashCloak, + gShinyOverworldPalette_BurmyTrashCloak ) .tmIlliterate = TRUE, .levelUpLearnset = sBurmyLevelUpLearnset, @@ -1763,13 +1763,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_WormadamPlantCloak, .iconPalIndex = 1, FOOTPRINT(Wormadam) - FOLLOWER( + OVERWORLD( sPicTable_WormadamPlantCloak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_WormadamPlantCloak, - gShinyFollowerPalette_WormadamPlantCloak + gOverworldPalette_WormadamPlantCloak, + gShinyOverworldPalette_WormadamPlantCloak ) .levelUpLearnset = sWormadamPlantCloakLevelUpLearnset, .teachableLearnset = sWormadamPlantCloakTeachableLearnset, @@ -1826,13 +1826,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_WormadamSandyCloak, .iconPalIndex = 1, FOOTPRINT(Wormadam) - FOLLOWER( + OVERWORLD( sPicTable_WormadamSandyCloak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_WormadamSandyCloak, - gShinyFollowerPalette_WormadamSandyCloak + gOverworldPalette_WormadamSandyCloak, + gShinyOverworldPalette_WormadamSandyCloak ) .levelUpLearnset = sWormadamSandyCloakLevelUpLearnset, .teachableLearnset = sWormadamSandyCloakTeachableLearnset, @@ -1890,13 +1890,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_WormadamTrashCloak, .iconPalIndex = 0, FOOTPRINT(Wormadam) - FOLLOWER( + OVERWORLD( sPicTable_WormadamTrashCloak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_WormadamTrashCloak, - gShinyFollowerPalette_WormadamTrashCloak + gOverworldPalette_WormadamTrashCloak, + gShinyOverworldPalette_WormadamTrashCloak ) .levelUpLearnset = sWormadamTrashCloakLevelUpLearnset, .teachableLearnset = sWormadamTrashCloakTeachableLearnset, @@ -1950,13 +1950,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Mothim, \ .iconPalIndex = 0, \ FOOTPRINT(Mothim) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Mothim, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Mothim, \ - gShinyFollowerPalette_Mothim \ + gOverworldPalette_Mothim, \ + gShinyOverworldPalette_Mothim \ ) \ .levelUpLearnset = sMothimLevelUpLearnset, \ .teachableLearnset = sMothimTeachableLearnset, \ @@ -2021,13 +2021,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Combee, .iconPalIndex = 0, FOOTPRINT(Combee) - FOLLOWER( + OVERWORLD( sPicTable_Combee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Combee, - gShinyFollowerPalette_Combee + gOverworldPalette_Combee, + gShinyOverworldPalette_Combee ) .tmIlliterate = TRUE, .levelUpLearnset = sCombeeLevelUpLearnset, @@ -2086,13 +2086,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Vespiquen, .iconPalIndex = 0, FOOTPRINT(Vespiquen) - FOLLOWER( + OVERWORLD( sPicTable_Vespiquen, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vespiquen, - gShinyFollowerPalette_Vespiquen + gOverworldPalette_Vespiquen, + gShinyOverworldPalette_Vespiquen ) .levelUpLearnset = sVespiquenLevelUpLearnset, .teachableLearnset = sVespiquenTeachableLearnset, @@ -2150,13 +2150,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Pachirisu, .iconPalIndex = 0, FOOTPRINT(Pachirisu) - FOLLOWER( + OVERWORLD( sPicTable_Pachirisu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pachirisu, - gShinyFollowerPalette_Pachirisu + gOverworldPalette_Pachirisu, + gShinyOverworldPalette_Pachirisu ) .levelUpLearnset = sPachirisuLevelUpLearnset, .teachableLearnset = sPachirisuTeachableLearnset, @@ -2215,13 +2215,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Buizel, .iconPalIndex = 0, FOOTPRINT(Buizel) - FOLLOWER( + OVERWORLD( sPicTable_Buizel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Buizel, - gShinyFollowerPalette_Buizel + gOverworldPalette_Buizel, + gShinyOverworldPalette_Buizel ) .levelUpLearnset = sBuizelLevelUpLearnset, .teachableLearnset = sBuizelTeachableLearnset, @@ -2279,13 +2279,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Floatzel, .iconPalIndex = 0, FOOTPRINT(Floatzel) - FOLLOWER( + OVERWORLD( sPicTable_Floatzel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Floatzel, - gShinyFollowerPalette_Floatzel + gOverworldPalette_Floatzel, + gShinyOverworldPalette_Floatzel ) .levelUpLearnset = sFloatzelLevelUpLearnset, .teachableLearnset = sFloatzelTeachableLearnset, @@ -2342,13 +2342,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Cherubi, .iconPalIndex = 1, FOOTPRINT(Cherubi) - FOLLOWER( + OVERWORLD( sPicTable_Cherubi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cherubi, - gShinyFollowerPalette_Cherubi + gOverworldPalette_Cherubi, + gShinyOverworldPalette_Cherubi ) .levelUpLearnset = sCherubiLevelUpLearnset, .teachableLearnset = sCherubiTeachableLearnset, @@ -2405,13 +2405,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_CherrimOvercast, .iconPalIndex = 0, FOOTPRINT(Cherrim) - FOLLOWER( + OVERWORLD( sPicTable_CherrimOvercast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_CherrimOvercast, - gShinyFollowerPalette_CherrimOvercast + gOverworldPalette_CherrimOvercast, + gShinyOverworldPalette_CherrimOvercast ) .levelUpLearnset = sCherrimLevelUpLearnset, .teachableLearnset = sCherrimTeachableLearnset, @@ -2524,13 +2524,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_ShellosWestSea, .iconPalIndex = 0, FOOTPRINT(Shellos) - FOLLOWER( + OVERWORLD( sPicTable_ShellosWestSea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ShellosWestSea, - gShinyFollowerPalette_ShellosWestSea + gOverworldPalette_ShellosWestSea, + gShinyOverworldPalette_ShellosWestSea ) .levelUpLearnset = sShellosLevelUpLearnset, .teachableLearnset = sShellosTeachableLearnset, @@ -2587,13 +2587,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_ShellosEastSea, .iconPalIndex = 0, FOOTPRINT(Shellos) - FOLLOWER( + OVERWORLD( sPicTable_ShellosEastSea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ShellosEastSea, - gShinyFollowerPalette_ShellosEastSea + gOverworldPalette_ShellosEastSea, + gShinyOverworldPalette_ShellosEastSea ) .levelUpLearnset = sShellosLevelUpLearnset, .teachableLearnset = sShellosTeachableLearnset, @@ -2650,13 +2650,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_GastrodonWestSea, .iconPalIndex = 0, FOOTPRINT(Gastrodon) - FOLLOWER( + OVERWORLD( sPicTable_GastrodonWestSea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_GastrodonWestSea, - gShinyFollowerPalette_GastrodonWestSea + gOverworldPalette_GastrodonWestSea, + gShinyOverworldPalette_GastrodonWestSea ) .levelUpLearnset = sGastrodonLevelUpLearnset, .teachableLearnset = sGastrodonTeachableLearnset, @@ -2711,13 +2711,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_GastrodonEastSea, .iconPalIndex = 0, FOOTPRINT(Gastrodon) - FOLLOWER( + OVERWORLD( sPicTable_GastrodonEastSea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_GastrodonEastSea, - gShinyFollowerPalette_GastrodonEastSea + gOverworldPalette_GastrodonEastSea, + gShinyOverworldPalette_GastrodonEastSea ) .levelUpLearnset = sGastrodonLevelUpLearnset, .teachableLearnset = sGastrodonTeachableLearnset, @@ -2775,13 +2775,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Drifloon, .iconPalIndex = 2, FOOTPRINT(Drifloon) - FOLLOWER( + OVERWORLD( sPicTable_Drifloon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Drifloon, - gShinyFollowerPalette_Drifloon + gOverworldPalette_Drifloon, + gShinyOverworldPalette_Drifloon ) .levelUpLearnset = sDrifloonLevelUpLearnset, .teachableLearnset = sDrifloonTeachableLearnset, @@ -2838,13 +2838,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Drifblim, .iconPalIndex = 2, FOOTPRINT(Drifblim) - FOLLOWER( + OVERWORLD( sPicTable_Drifblim, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Drifblim, - gShinyFollowerPalette_Drifblim + gOverworldPalette_Drifblim, + gShinyOverworldPalette_Drifblim ) .levelUpLearnset = sDrifblimLevelUpLearnset, .teachableLearnset = sDrifblimTeachableLearnset, @@ -2900,13 +2900,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Buneary, .iconPalIndex = 2, FOOTPRINT(Buneary) - FOLLOWER( + OVERWORLD( sPicTable_Buneary, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Buneary, - gShinyFollowerPalette_Buneary + gOverworldPalette_Buneary, + gShinyOverworldPalette_Buneary ) .levelUpLearnset = sBunearyLevelUpLearnset, .teachableLearnset = sBunearyTeachableLearnset, @@ -2962,13 +2962,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Lopunny, .iconPalIndex = 2, FOOTPRINT(Lopunny) - FOLLOWER( + OVERWORLD( sPicTable_Lopunny, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lopunny, - gShinyFollowerPalette_Lopunny + gOverworldPalette_Lopunny, + gShinyOverworldPalette_Lopunny ) .levelUpLearnset = sLopunnyLevelUpLearnset, .teachableLearnset = sLopunnyTeachableLearnset, @@ -3083,13 +3083,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Glameow, .iconPalIndex = 0, FOOTPRINT(Glameow) - FOLLOWER( + OVERWORLD( sPicTable_Glameow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Glameow, - gShinyFollowerPalette_Glameow + gOverworldPalette_Glameow, + gShinyOverworldPalette_Glameow ) .levelUpLearnset = sGlameowLevelUpLearnset, .teachableLearnset = sGlameowTeachableLearnset, @@ -3145,13 +3145,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Purugly, .iconPalIndex = 0, FOOTPRINT(Purugly) - FOLLOWER( + OVERWORLD( sPicTable_Purugly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Purugly, - gShinyFollowerPalette_Purugly + gOverworldPalette_Purugly, + gShinyOverworldPalette_Purugly ) .levelUpLearnset = sPuruglyLevelUpLearnset, .teachableLearnset = sPuruglyTeachableLearnset, @@ -3207,13 +3207,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Stunky, .iconPalIndex = 2, FOOTPRINT(Stunky) - FOLLOWER( + OVERWORLD( sPicTable_Stunky, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Stunky, - gShinyFollowerPalette_Stunky + gOverworldPalette_Stunky, + gShinyOverworldPalette_Stunky ) .levelUpLearnset = sStunkyLevelUpLearnset, .teachableLearnset = sStunkyTeachableLearnset, @@ -3269,13 +3269,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Skuntank, .iconPalIndex = 2, FOOTPRINT(Skuntank) - FOLLOWER( + OVERWORLD( sPicTable_Skuntank, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Skuntank, - gShinyFollowerPalette_Skuntank + gOverworldPalette_Skuntank, + gShinyOverworldPalette_Skuntank ) .levelUpLearnset = sSkuntankLevelUpLearnset, .teachableLearnset = sSkuntankTeachableLearnset, @@ -3333,13 +3333,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Bronzor, .iconPalIndex = 0, FOOTPRINT(Bronzor) - FOLLOWER( + OVERWORLD( sPicTable_Bronzor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bronzor, - gShinyFollowerPalette_Bronzor + gOverworldPalette_Bronzor, + gShinyOverworldPalette_Bronzor ) .levelUpLearnset = sBronzorLevelUpLearnset, .teachableLearnset = sBronzorTeachableLearnset, @@ -3397,13 +3397,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Bronzong, .iconPalIndex = 0, FOOTPRINT(Bronzong) - FOLLOWER( + OVERWORLD( sPicTable_Bronzong, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bronzong, - gShinyFollowerPalette_Bronzong + gOverworldPalette_Bronzong, + gShinyOverworldPalette_Bronzong ) .levelUpLearnset = sBronzongLevelUpLearnset, .teachableLearnset = sBronzongTeachableLearnset, @@ -3460,13 +3460,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Chatot, .iconPalIndex = 0, FOOTPRINT(Chatot) - FOLLOWER( + OVERWORLD( sPicTable_Chatot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Chatot, - gShinyFollowerPalette_Chatot + gOverworldPalette_Chatot, + gShinyOverworldPalette_Chatot ) .levelUpLearnset = sChatotLevelUpLearnset, .teachableLearnset = sChatotTeachableLearnset, @@ -3524,13 +3524,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Spiritomb, .iconPalIndex = 5, FOOTPRINT(Spiritomb) - FOLLOWER( + OVERWORLD( sPicTable_Spiritomb, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Spiritomb, - gShinyFollowerPalette_Spiritomb + gOverworldPalette_Spiritomb, + gShinyOverworldPalette_Spiritomb ) .levelUpLearnset = sSpiritombLevelUpLearnset, .teachableLearnset = sSpiritombTeachableLearnset, @@ -3591,13 +3591,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Gible, .iconPalIndex = 0, FOOTPRINT(Gible) - FOLLOWER( + OVERWORLD( sPicTable_Gible, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gible, - gShinyFollowerPalette_Gible + gOverworldPalette_Gible, + gShinyOverworldPalette_Gible ) .levelUpLearnset = sGibleLevelUpLearnset, .teachableLearnset = sGibleTeachableLearnset, @@ -3657,13 +3657,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Gabite, .iconPalIndex = 0, FOOTPRINT(Gabite) - FOLLOWER( + OVERWORLD( sPicTable_Gabite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gabite, - gShinyFollowerPalette_Gabite + gOverworldPalette_Gabite, + gShinyOverworldPalette_Gabite ) .levelUpLearnset = sGabiteLevelUpLearnset, .teachableLearnset = sGabiteTeachableLearnset, @@ -3726,13 +3726,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Garchomp, .iconPalIndex = 0, FOOTPRINT(Garchomp) - FOLLOWER( + OVERWORLD( sPicTable_Garchomp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Garchomp, - gShinyFollowerPalette_Garchomp + gOverworldPalette_Garchomp, + gShinyOverworldPalette_Garchomp ) .levelUpLearnset = sGarchompLevelUpLearnset, .teachableLearnset = sGarchompTeachableLearnset, @@ -3847,13 +3847,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Riolu, .iconPalIndex = 2, FOOTPRINT(Riolu) - FOLLOWER( + OVERWORLD( sPicTable_Riolu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Riolu, - gShinyFollowerPalette_Riolu + gOverworldPalette_Riolu, + gShinyOverworldPalette_Riolu ) .levelUpLearnset = sRioluLevelUpLearnset, .teachableLearnset = sRioluTeachableLearnset, @@ -3910,13 +3910,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Lucario, .iconPalIndex = 2, FOOTPRINT(Lucario) - FOLLOWER( + OVERWORLD( sPicTable_Lucario, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lucario, - gShinyFollowerPalette_Lucario + gOverworldPalette_Lucario, + gShinyOverworldPalette_Lucario ) .levelUpLearnset = sLucarioLevelUpLearnset, .teachableLearnset = sLucarioTeachableLearnset, @@ -4038,13 +4038,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconPalIndexFemale = 1, #endif FOOTPRINT(Hippopotas) - FOLLOWER( + OVERWORLD( sPicTable_Hippopotas, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hippopotas, - gShinyFollowerPalette_Hippopotas + gOverworldPalette_Hippopotas, + gShinyOverworldPalette_Hippopotas ) .levelUpLearnset = sHippopotasLevelUpLearnset, .teachableLearnset = sHippopotasTeachableLearnset, @@ -4106,13 +4106,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconPalIndexFemale = 1, #endif FOOTPRINT(Hippowdon) - FOLLOWER( + OVERWORLD( sPicTable_Hippowdon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hippowdon, - gShinyFollowerPalette_Hippowdon + gOverworldPalette_Hippowdon, + gShinyOverworldPalette_Hippowdon ) .levelUpLearnset = sHippowdonLevelUpLearnset, .teachableLearnset = sHippowdonTeachableLearnset, @@ -4169,13 +4169,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Skorupi, .iconPalIndex = 0, FOOTPRINT(Skorupi) - FOLLOWER( + OVERWORLD( sPicTable_Skorupi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Skorupi, - gShinyFollowerPalette_Skorupi + gOverworldPalette_Skorupi, + gShinyOverworldPalette_Skorupi ) .levelUpLearnset = sSkorupiLevelUpLearnset, .teachableLearnset = sSkorupiTeachableLearnset, @@ -4232,13 +4232,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Drapion, .iconPalIndex = 2, FOOTPRINT(Drapion) - FOLLOWER( + OVERWORLD( sPicTable_Drapion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Drapion, - gShinyFollowerPalette_Drapion + gOverworldPalette_Drapion, + gShinyOverworldPalette_Drapion ) .levelUpLearnset = sDrapionLevelUpLearnset, .teachableLearnset = sDrapionTeachableLearnset, @@ -4299,13 +4299,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Croagunk, .iconPalIndex = 0, FOOTPRINT(Croagunk) - FOLLOWER( + OVERWORLD( sPicTable_Croagunk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Croagunk, - gShinyFollowerPalette_Croagunk + gOverworldPalette_Croagunk, + gShinyOverworldPalette_Croagunk ) .levelUpLearnset = sCroagunkLevelUpLearnset, .teachableLearnset = sCroagunkTeachableLearnset, @@ -4366,13 +4366,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Toxicroak, .iconPalIndex = 0, FOOTPRINT(Toxicroak) - FOLLOWER( + OVERWORLD( sPicTable_Toxicroak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Toxicroak, - gShinyFollowerPalette_Toxicroak + gOverworldPalette_Toxicroak, + gShinyOverworldPalette_Toxicroak ) .levelUpLearnset = sToxicroakLevelUpLearnset, .teachableLearnset = sToxicroakTeachableLearnset, @@ -4429,13 +4429,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Carnivine, .iconPalIndex = 1, FOOTPRINT(Carnivine) - FOLLOWER( + OVERWORLD( sPicTable_Carnivine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Carnivine, - gShinyFollowerPalette_Carnivine + gOverworldPalette_Carnivine, + gShinyOverworldPalette_Carnivine ) .levelUpLearnset = sCarnivineLevelUpLearnset, .teachableLearnset = sCarnivineTeachableLearnset, @@ -4496,13 +4496,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Finneon, .iconPalIndex = 0, FOOTPRINT(Finneon) - FOLLOWER( + OVERWORLD( sPicTable_Finneon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Finneon, - gShinyFollowerPalette_Finneon + gOverworldPalette_Finneon, + gShinyOverworldPalette_Finneon ) .levelUpLearnset = sFinneonLevelUpLearnset, .teachableLearnset = sFinneonTeachableLearnset, @@ -4562,13 +4562,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Lumineon, .iconPalIndex = 0, FOOTPRINT(Lumineon) - FOLLOWER( + OVERWORLD( sPicTable_Lumineon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lumineon, - gShinyFollowerPalette_Lumineon + gOverworldPalette_Lumineon, + gShinyOverworldPalette_Lumineon ) .levelUpLearnset = sLumineonLevelUpLearnset, .teachableLearnset = sLumineonTeachableLearnset, @@ -4629,13 +4629,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Snover, .iconPalIndex = 1, FOOTPRINT(Snover) - FOLLOWER( + OVERWORLD( sPicTable_Snover, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Snover, - gShinyFollowerPalette_Snover + gOverworldPalette_Snover, + gShinyOverworldPalette_Snover ) .levelUpLearnset = sSnoverLevelUpLearnset, .teachableLearnset = sSnoverTeachableLearnset, @@ -4695,13 +4695,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Abomasnow, .iconPalIndex = 1, FOOTPRINT(Abomasnow) - FOLLOWER( + OVERWORLD( sPicTable_Abomasnow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Abomasnow, - gShinyFollowerPalette_Abomasnow + gOverworldPalette_Abomasnow, + gShinyOverworldPalette_Abomasnow ) .levelUpLearnset = sAbomasnowLevelUpLearnset, .teachableLearnset = sAbomasnowTeachableLearnset, @@ -4820,13 +4820,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Rotom, .iconPalIndex = 0, FOOTPRINT(Rotom) - FOLLOWER( + OVERWORLD( sPicTable_Rotom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rotom, - gShinyFollowerPalette_Rotom + gOverworldPalette_Rotom, + gShinyOverworldPalette_Rotom ) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, @@ -4892,13 +4892,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_RotomHeat, .iconPalIndex = 0, FOOTPRINT(Rotom) - FOLLOWER( + OVERWORLD( sPicTable_RotomHeat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_RotomHeat, - gShinyFollowerPalette_RotomHeat + gOverworldPalette_RotomHeat, + gShinyOverworldPalette_RotomHeat ) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, @@ -4957,13 +4957,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_RotomWash, .iconPalIndex = 0, FOOTPRINT(Rotom) - FOLLOWER( + OVERWORLD( sPicTable_RotomWash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_RotomWash, - gShinyFollowerPalette_RotomWash + gOverworldPalette_RotomWash, + gShinyOverworldPalette_RotomWash ) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, @@ -5021,13 +5021,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_RotomFrost, .iconPalIndex = 5, FOOTPRINT(Rotom) - FOLLOWER( + OVERWORLD( sPicTable_RotomFrost, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_RotomFrost, - gShinyFollowerPalette_RotomFrost + gOverworldPalette_RotomFrost, + gShinyOverworldPalette_RotomFrost ) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, @@ -5086,13 +5086,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_RotomFan, .iconPalIndex = 0, FOOTPRINT(Rotom) - FOLLOWER( + OVERWORLD( sPicTable_RotomFan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_RotomFan, - gShinyFollowerPalette_RotomFan + gOverworldPalette_RotomFan, + gShinyOverworldPalette_RotomFan ) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, @@ -5150,13 +5150,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_RotomMow, .iconPalIndex = 0, FOOTPRINT(Rotom) - FOLLOWER( + OVERWORLD( sPicTable_RotomMow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_RotomMow, - gShinyFollowerPalette_RotomMow + gOverworldPalette_RotomMow, + gShinyOverworldPalette_RotomMow ) .levelUpLearnset = sRotomLevelUpLearnset, .teachableLearnset = sRotomTeachableLearnset, @@ -5222,13 +5222,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Uxie, .iconPalIndex = 0, FOOTPRINT(Uxie) - FOLLOWER( + OVERWORLD( sPicTable_Uxie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Uxie, - gShinyFollowerPalette_Uxie + gOverworldPalette_Uxie, + gShinyOverworldPalette_Uxie ) .isLegendary = TRUE, .levelUpLearnset = sUxieLevelUpLearnset, @@ -5294,13 +5294,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Mesprit, .iconPalIndex = 0, FOOTPRINT(Mesprit) - FOLLOWER( + OVERWORLD( sPicTable_Mesprit, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mesprit, - gShinyFollowerPalette_Mesprit + gOverworldPalette_Mesprit, + gShinyOverworldPalette_Mesprit ) .isLegendary = TRUE, .levelUpLearnset = sMespritLevelUpLearnset, @@ -5365,13 +5365,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Azelf, .iconPalIndex = 0, FOOTPRINT(Azelf) - FOLLOWER( + OVERWORLD( sPicTable_Azelf, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Azelf, - gShinyFollowerPalette_Azelf + gOverworldPalette_Azelf, + gShinyOverworldPalette_Azelf ) .isLegendary = TRUE, .levelUpLearnset = sAzelfLevelUpLearnset, @@ -5436,13 +5436,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Dialga, .iconPalIndex = 2, FOOTPRINT(Dialga) - FOLLOWER( + OVERWORLD( sPicTable_Dialga, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dialga, - gShinyFollowerPalette_Dialga + gOverworldPalette_Dialga, + gShinyOverworldPalette_Dialga ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5500,13 +5500,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_DialgaOrigin, .iconPalIndex = 0, FOOTPRINT(Dialga) - FOLLOWER( + OVERWORLD( sPicTable_DialgaOrigin, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_DialgaOrigin - //, gShinyFollowerPalette_DialgaOrigin + gOverworldPalette_DialgaOrigin + //, gShinyOverworldPalette_DialgaOrigin ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5574,13 +5574,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Palkia, .iconPalIndex = 2, FOOTPRINT(Palkia) - FOLLOWER( + OVERWORLD( sPicTable_Palkia, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Palkia, - gShinyFollowerPalette_Palkia + gOverworldPalette_Palkia, + gShinyOverworldPalette_Palkia ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5638,13 +5638,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_PalkiaOrigin, .iconPalIndex = 2, FOOTPRINT(Palkia) - FOLLOWER( + OVERWORLD( sPicTable_PalkiaOrigin, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, - gFollowerPalette_PalkiaOrigin - //, gShinyFollowerPalette_PalkiaOrigin + gOverworldPalette_PalkiaOrigin + //, gShinyOverworldPalette_PalkiaOrigin ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5710,13 +5710,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Heatran, .iconPalIndex = 0, FOOTPRINT(Heatran) - FOLLOWER( + OVERWORLD( sPicTable_Heatran, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Heatran, - gShinyFollowerPalette_Heatran + gOverworldPalette_Heatran, + gShinyOverworldPalette_Heatran ) .isLegendary = TRUE, .levelUpLearnset = sHeatranLevelUpLearnset, @@ -5779,13 +5779,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Regigigas, .iconPalIndex = 0, FOOTPRINT(Regigigas) - FOLLOWER( + OVERWORLD( sPicTable_Regigigas, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Regigigas, - gShinyFollowerPalette_Regigigas + gOverworldPalette_Regigigas, + gShinyOverworldPalette_Regigigas ) .isLegendary = TRUE, .levelUpLearnset = sRegigigasLevelUpLearnset, @@ -5850,13 +5850,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_GiratinaAltered, .iconPalIndex = 0, FOOTPRINT(GiratinaAltered) - FOLLOWER( + OVERWORLD( sPicTable_GiratinaAltered, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_GiratinaAltered, - gShinyFollowerPalette_GiratinaAltered + gOverworldPalette_GiratinaAltered, + gShinyOverworldPalette_GiratinaAltered ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5915,13 +5915,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_GiratinaOrigin, .iconPalIndex = 0, FOOTPRINT(GiratinaOrigin) - FOLLOWER( + OVERWORLD( sPicTable_GiratinaOrigin, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_GiratinaOrigin - //, gShinyFollowerPalette_GiratinaOrigin + gOverworldPalette_GiratinaOrigin + //, gShinyOverworldPalette_GiratinaOrigin ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5988,13 +5988,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Cresselia, .iconPalIndex = 0, FOOTPRINT(Cresselia) - FOLLOWER( + OVERWORLD( sPicTable_Cresselia, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cresselia, - gShinyFollowerPalette_Cresselia + gOverworldPalette_Cresselia, + gShinyOverworldPalette_Cresselia ) .isLegendary = TRUE, .levelUpLearnset = sCresseliaLevelUpLearnset, @@ -6058,13 +6058,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Phione, .iconPalIndex = 0, FOOTPRINT(Phione) - FOLLOWER( + OVERWORLD( sPicTable_Phione, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Phione, - gShinyFollowerPalette_Phione + gOverworldPalette_Phione, + gShinyOverworldPalette_Phione ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -6127,13 +6127,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Manaphy, .iconPalIndex = 0, FOOTPRINT(Manaphy) - FOLLOWER( + OVERWORLD( sPicTable_Manaphy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Manaphy, - gShinyFollowerPalette_Manaphy + gOverworldPalette_Manaphy, + gShinyOverworldPalette_Manaphy ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -6199,13 +6199,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_Darkrai, .iconPalIndex = 0, FOOTPRINT(Darkrai) - FOLLOWER( + OVERWORLD( sPicTable_Darkrai, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Darkrai, - gShinyFollowerPalette_Darkrai + gOverworldPalette_Darkrai, + gShinyOverworldPalette_Darkrai ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -6273,13 +6273,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconSprite = gMonIcon_ShayminLand, .iconPalIndex = 1, FOOTPRINT(Shaymin) - FOLLOWER( + OVERWORLD( sPicTable_ShayminLand, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ShayminLand, - gShinyFollowerPalette_ShayminLand + gOverworldPalette_ShayminLand, + gShinyOverworldPalette_ShayminLand ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -6414,13 +6414,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Arceus ##typeName, \ ARCEUS_ICON(typeName, iconPal) \ FOOTPRINT(Arceus) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Arceus ##typeName, \ SIZE_64x64, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Arceus ##typeName, \ - gShinyFollowerPalette_Arceus ##typeName \ + gOverworldPalette_Arceus ##typeName, \ + gShinyOverworldPalette_Arceus ##typeName \ ) \ .levelUpLearnset = sArceusLevelUpLearnset, \ .teachableLearnset = sArceusTeachableLearnset, \ diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index 0592d5b5fe..be00b1ee6d 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -52,13 +52,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Victini, .iconPalIndex = 0, FOOTPRINT(Victini) - FOLLOWER( + OVERWORLD( sPicTable_Victini, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Victini, - gShinyFollowerPalette_Victini + gOverworldPalette_Victini, + gShinyOverworldPalette_Victini ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -116,13 +116,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Snivy, .iconPalIndex = 1, FOOTPRINT(Snivy) - FOLLOWER( + OVERWORLD( sPicTable_Snivy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Snivy, - gShinyFollowerPalette_Snivy + gOverworldPalette_Snivy, + gShinyOverworldPalette_Snivy ) .levelUpLearnset = sSnivyLevelUpLearnset, .teachableLearnset = sSnivyTeachableLearnset, @@ -178,13 +178,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Servine, .iconPalIndex = 1, FOOTPRINT(Servine) - FOLLOWER( + OVERWORLD( sPicTable_Servine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Servine, - gShinyFollowerPalette_Servine + gOverworldPalette_Servine, + gShinyOverworldPalette_Servine ) .levelUpLearnset = sServineLevelUpLearnset, .teachableLearnset = sServineTeachableLearnset, @@ -239,13 +239,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Serperior, .iconPalIndex = 1, FOOTPRINT(Serperior) - FOLLOWER( + OVERWORLD( sPicTable_Serperior, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Serperior, - gShinyFollowerPalette_Serperior + gOverworldPalette_Serperior, + gShinyOverworldPalette_Serperior ) .levelUpLearnset = sSerperiorLevelUpLearnset, .teachableLearnset = sSerperiorTeachableLearnset, @@ -301,13 +301,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Tepig, .iconPalIndex = 0, FOOTPRINT(Tepig) - FOLLOWER( + OVERWORLD( sPicTable_Tepig, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tepig, - gShinyFollowerPalette_Tepig + gOverworldPalette_Tepig, + gShinyOverworldPalette_Tepig ) .levelUpLearnset = sTepigLevelUpLearnset, .teachableLearnset = sTepigTeachableLearnset, @@ -363,13 +363,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Pignite, .iconPalIndex = 0, FOOTPRINT(Pignite) - FOLLOWER( + OVERWORLD( sPicTable_Pignite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pignite, - gShinyFollowerPalette_Pignite + gOverworldPalette_Pignite, + gShinyOverworldPalette_Pignite ) .levelUpLearnset = sPigniteLevelUpLearnset, .teachableLearnset = sPigniteTeachableLearnset, @@ -425,13 +425,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Emboar, .iconPalIndex = 0, FOOTPRINT(Emboar) - FOLLOWER( + OVERWORLD( sPicTable_Emboar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Emboar, - gShinyFollowerPalette_Emboar + gOverworldPalette_Emboar, + gShinyOverworldPalette_Emboar ) .levelUpLearnset = sEmboarLevelUpLearnset, .teachableLearnset = sEmboarTeachableLearnset, @@ -487,13 +487,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Oshawott, .iconPalIndex = 0, FOOTPRINT(Oshawott) - FOLLOWER( + OVERWORLD( sPicTable_Oshawott, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Oshawott, - gShinyFollowerPalette_Oshawott + gOverworldPalette_Oshawott, + gShinyOverworldPalette_Oshawott ) .levelUpLearnset = sOshawottLevelUpLearnset, .teachableLearnset = sOshawottTeachableLearnset, @@ -549,13 +549,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Dewott, .iconPalIndex = 0, FOOTPRINT(Dewott) - FOLLOWER( + OVERWORLD( sPicTable_Dewott, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dewott, - gShinyFollowerPalette_Dewott + gOverworldPalette_Dewott, + gShinyOverworldPalette_Dewott ) .levelUpLearnset = sDewottLevelUpLearnset, .teachableLearnset = sDewottTeachableLearnset, @@ -611,13 +611,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Samurott, .iconPalIndex = 2, FOOTPRINT(Samurott) - FOLLOWER( + OVERWORLD( sPicTable_Samurott, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Samurott, - gShinyFollowerPalette_Samurott + gOverworldPalette_Samurott, + gShinyOverworldPalette_Samurott ) .levelUpLearnset = sSamurottLevelUpLearnset, .teachableLearnset = sSamurottTeachableLearnset, @@ -673,13 +673,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_SamurottHisuian, .iconPalIndex = 0, FOOTPRINT(Samurott) - FOLLOWER( + OVERWORLD( sPicTable_SamurottHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SamurottHisuian, - gShinyFollowerPalette_SamurottHisuian + gOverworldPalette_SamurottHisuian, + gShinyOverworldPalette_SamurottHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sSamurottHisuianLevelUpLearnset, @@ -738,13 +738,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Patrat, .iconPalIndex = 2, FOOTPRINT(Patrat) - FOLLOWER( + OVERWORLD( sPicTable_Patrat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Patrat, - gShinyFollowerPalette_Patrat + gOverworldPalette_Patrat, + gShinyOverworldPalette_Patrat ) .levelUpLearnset = sPatratLevelUpLearnset, .teachableLearnset = sPatratTeachableLearnset, @@ -800,13 +800,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Watchog, .iconPalIndex = 2, FOOTPRINT(Watchog) - FOLLOWER( + OVERWORLD( sPicTable_Watchog, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Watchog, - gShinyFollowerPalette_Watchog + gOverworldPalette_Watchog, + gShinyOverworldPalette_Watchog ) .levelUpLearnset = sWatchogLevelUpLearnset, .teachableLearnset = sWatchogTeachableLearnset, @@ -862,13 +862,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Lillipup, .iconPalIndex = 2, FOOTPRINT(Lillipup) - FOLLOWER( + OVERWORLD( sPicTable_Lillipup, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lillipup, - gShinyFollowerPalette_Lillipup + gOverworldPalette_Lillipup, + gShinyOverworldPalette_Lillipup ) .levelUpLearnset = sLillipupLevelUpLearnset, .teachableLearnset = sLillipupTeachableLearnset, @@ -924,13 +924,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Herdier, .iconPalIndex = 2, FOOTPRINT(Herdier) - FOLLOWER( + OVERWORLD( sPicTable_Herdier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Herdier, - gShinyFollowerPalette_Herdier + gOverworldPalette_Herdier, + gShinyOverworldPalette_Herdier ) .levelUpLearnset = sHerdierLevelUpLearnset, .teachableLearnset = sHerdierTeachableLearnset, @@ -991,13 +991,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Stoutland, .iconPalIndex = 2, FOOTPRINT(Stoutland) - FOLLOWER( + OVERWORLD( sPicTable_Stoutland, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Stoutland, - gShinyFollowerPalette_Stoutland + gOverworldPalette_Stoutland, + gShinyOverworldPalette_Stoutland ) .levelUpLearnset = sStoutlandLevelUpLearnset, .teachableLearnset = sStoutlandTeachableLearnset, @@ -1053,13 +1053,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Purrloin, .iconPalIndex = 0, FOOTPRINT(Purrloin) - FOLLOWER( + OVERWORLD( sPicTable_Purrloin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Purrloin, - gShinyFollowerPalette_Purrloin + gOverworldPalette_Purrloin, + gShinyOverworldPalette_Purrloin ) .levelUpLearnset = sPurrloinLevelUpLearnset, .teachableLearnset = sPurrloinTeachableLearnset, @@ -1115,13 +1115,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Liepard, .iconPalIndex = 0, FOOTPRINT(Liepard) - FOLLOWER( + OVERWORLD( sPicTable_Liepard, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Liepard, - gShinyFollowerPalette_Liepard + gOverworldPalette_Liepard, + gShinyOverworldPalette_Liepard ) .levelUpLearnset = sLiepardLevelUpLearnset, .teachableLearnset = sLiepardTeachableLearnset, @@ -1177,13 +1177,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Pansage, .iconPalIndex = 1, FOOTPRINT(Pansage) - FOLLOWER( + OVERWORLD( sPicTable_Pansage, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pansage, - gShinyFollowerPalette_Pansage + gOverworldPalette_Pansage, + gShinyOverworldPalette_Pansage ) .levelUpLearnset = sPansageLevelUpLearnset, .teachableLearnset = sPansageTeachableLearnset, @@ -1239,13 +1239,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Simisage, .iconPalIndex = 1, FOOTPRINT(Simisage) - FOLLOWER( + OVERWORLD( sPicTable_Simisage, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Simisage, - gShinyFollowerPalette_Simisage + gOverworldPalette_Simisage, + gShinyOverworldPalette_Simisage ) .levelUpLearnset = sSimisageLevelUpLearnset, .teachableLearnset = sSimisageTeachableLearnset, @@ -1302,13 +1302,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Pansear, .iconPalIndex = 2, FOOTPRINT(Pansear) - FOLLOWER( + OVERWORLD( sPicTable_Pansear, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pansear, - gShinyFollowerPalette_Pansear + gOverworldPalette_Pansear, + gShinyOverworldPalette_Pansear ) .levelUpLearnset = sPansearLevelUpLearnset, .teachableLearnset = sPansearTeachableLearnset, @@ -1365,13 +1365,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Simisear, .iconPalIndex = 2, FOOTPRINT(Simisear) - FOLLOWER( + OVERWORLD( sPicTable_Simisear, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Simisear, - gShinyFollowerPalette_Simisear + gOverworldPalette_Simisear, + gShinyOverworldPalette_Simisear ) .levelUpLearnset = sSimisearLevelUpLearnset, .teachableLearnset = sSimisearTeachableLearnset, @@ -1427,13 +1427,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Panpour, .iconPalIndex = 2, FOOTPRINT(Panpour) - FOLLOWER( + OVERWORLD( sPicTable_Panpour, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Panpour, - gShinyFollowerPalette_Panpour + gOverworldPalette_Panpour, + gShinyOverworldPalette_Panpour ) .levelUpLearnset = sPanpourLevelUpLearnset, .teachableLearnset = sPanpourTeachableLearnset, @@ -1489,13 +1489,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Simipour, .iconPalIndex = 2, FOOTPRINT(Simipour) - FOLLOWER( + OVERWORLD( sPicTable_Simipour, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Simipour, - gShinyFollowerPalette_Simipour + gOverworldPalette_Simipour, + gShinyOverworldPalette_Simipour ) .levelUpLearnset = sSimipourLevelUpLearnset, .teachableLearnset = sSimipourTeachableLearnset, @@ -1552,13 +1552,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Munna, .iconPalIndex = 0, FOOTPRINT(Munna) - FOLLOWER( + OVERWORLD( sPicTable_Munna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Munna, - gShinyFollowerPalette_Munna + gOverworldPalette_Munna, + gShinyOverworldPalette_Munna ) .levelUpLearnset = sMunnaLevelUpLearnset, .teachableLearnset = sMunnaTeachableLearnset, @@ -1615,13 +1615,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Musharna, .iconPalIndex = 0, FOOTPRINT(Musharna) - FOLLOWER( + OVERWORLD( sPicTable_Musharna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Musharna, - gShinyFollowerPalette_Musharna + gOverworldPalette_Musharna, + gShinyOverworldPalette_Musharna ) .levelUpLearnset = sMusharnaLevelUpLearnset, .teachableLearnset = sMusharnaTeachableLearnset, @@ -1677,13 +1677,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Pidove, .iconPalIndex = 0, FOOTPRINT(Pidove) - FOLLOWER( + OVERWORLD( sPicTable_Pidove, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pidove, - gShinyFollowerPalette_Pidove + gOverworldPalette_Pidove, + gShinyOverworldPalette_Pidove ) .levelUpLearnset = sPidoveLevelUpLearnset, .teachableLearnset = sPidoveTeachableLearnset, @@ -1739,13 +1739,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Tranquill, .iconPalIndex = 0, FOOTPRINT(Tranquill) - FOLLOWER( + OVERWORLD( sPicTable_Tranquill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tranquill, - gShinyFollowerPalette_Tranquill + gOverworldPalette_Tranquill, + gShinyOverworldPalette_Tranquill ) .levelUpLearnset = sTranquillLevelUpLearnset, .teachableLearnset = sTranquillTeachableLearnset, @@ -1814,13 +1814,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconPalIndex = 1, .iconPalIndexFemale = 1, FOOTPRINT(Unfezant) - FOLLOWER( + OVERWORLD( sPicTable_Unfezant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Unfezant, - gShinyFollowerPalette_Unfezant + gOverworldPalette_Unfezant, + gShinyOverworldPalette_Unfezant ) .levelUpLearnset = sUnfezantLevelUpLearnset, .teachableLearnset = sUnfezantTeachableLearnset, @@ -1876,13 +1876,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Blitzle, .iconPalIndex = 2, FOOTPRINT(Blitzle) - FOLLOWER( + OVERWORLD( sPicTable_Blitzle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Blitzle, - gShinyFollowerPalette_Blitzle + gOverworldPalette_Blitzle, + gShinyOverworldPalette_Blitzle ) .levelUpLearnset = sBlitzleLevelUpLearnset, .teachableLearnset = sBlitzleTeachableLearnset, @@ -1938,13 +1938,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Zebstrika, .iconPalIndex = 2, FOOTPRINT(Zebstrika) - FOLLOWER( + OVERWORLD( sPicTable_Zebstrika, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zebstrika, - gShinyFollowerPalette_Zebstrika + gOverworldPalette_Zebstrika, + gShinyOverworldPalette_Zebstrika ) .levelUpLearnset = sZebstrikaLevelUpLearnset, .teachableLearnset = sZebstrikaTeachableLearnset, @@ -2002,13 +2002,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Roggenrola, .iconPalIndex = 2, FOOTPRINT(Roggenrola) - FOLLOWER( + OVERWORLD( sPicTable_Roggenrola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Roggenrola, - gShinyFollowerPalette_Roggenrola + gOverworldPalette_Roggenrola, + gShinyOverworldPalette_Roggenrola ) .levelUpLearnset = sRoggenrolaLevelUpLearnset, .teachableLearnset = sRoggenrolaTeachableLearnset, @@ -2067,13 +2067,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Boldore, .iconPalIndex = 0, FOOTPRINT(Boldore) - FOLLOWER( + OVERWORLD( sPicTable_Boldore, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Boldore, - gShinyFollowerPalette_Boldore + gOverworldPalette_Boldore, + gShinyOverworldPalette_Boldore ) .levelUpLearnset = sBoldoreLevelUpLearnset, .teachableLearnset = sBoldoreTeachableLearnset, @@ -2137,13 +2137,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Gigalith, .iconPalIndex = 0, FOOTPRINT(Gigalith) - FOLLOWER( + OVERWORLD( sPicTable_Gigalith, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gigalith, - gShinyFollowerPalette_Gigalith + gOverworldPalette_Gigalith, + gShinyOverworldPalette_Gigalith ) .levelUpLearnset = sGigalithLevelUpLearnset, .teachableLearnset = sGigalithTeachableLearnset, @@ -2200,13 +2200,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Woobat, .iconPalIndex = 0, FOOTPRINT(Woobat) - FOLLOWER( + OVERWORLD( sPicTable_Woobat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Woobat, - gShinyFollowerPalette_Woobat + gOverworldPalette_Woobat, + gShinyOverworldPalette_Woobat ) .levelUpLearnset = sWoobatLevelUpLearnset, .teachableLearnset = sWoobatTeachableLearnset, @@ -2263,13 +2263,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Swoobat, .iconPalIndex = 0, FOOTPRINT(Swoobat) - FOLLOWER( + OVERWORLD( sPicTable_Swoobat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Swoobat, - gShinyFollowerPalette_Swoobat + gOverworldPalette_Swoobat, + gShinyOverworldPalette_Swoobat ) .levelUpLearnset = sSwoobatLevelUpLearnset, .teachableLearnset = sSwoobatTeachableLearnset, @@ -2326,13 +2326,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Drilbur, .iconPalIndex = 0, FOOTPRINT(Drilbur) - FOLLOWER( + OVERWORLD( sPicTable_Drilbur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Drilbur, - gShinyFollowerPalette_Drilbur + gOverworldPalette_Drilbur, + gShinyOverworldPalette_Drilbur ) .levelUpLearnset = sDrilburLevelUpLearnset, .teachableLearnset = sDrilburTeachableLearnset, @@ -2389,13 +2389,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Excadrill, .iconPalIndex = 0, FOOTPRINT(Excadrill) - FOLLOWER( + OVERWORLD( sPicTable_Excadrill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Excadrill, - gShinyFollowerPalette_Excadrill + gOverworldPalette_Excadrill, + gShinyOverworldPalette_Excadrill ) .levelUpLearnset = sExcadrillLevelUpLearnset, .teachableLearnset = sExcadrillTeachableLearnset, @@ -2453,13 +2453,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Audino, .iconPalIndex = 1, FOOTPRINT(Audino) - FOLLOWER( + OVERWORLD( sPicTable_Audino, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Audino, - gShinyFollowerPalette_Audino + gOverworldPalette_Audino, + gShinyOverworldPalette_Audino ) .levelUpLearnset = sAudinoLevelUpLearnset, .teachableLearnset = sAudinoTeachableLearnset, @@ -2578,13 +2578,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Timburr, .iconPalIndex = 1, FOOTPRINT(Timburr) - FOLLOWER( + OVERWORLD( sPicTable_Timburr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Timburr, - gShinyFollowerPalette_Timburr + gOverworldPalette_Timburr, + gShinyOverworldPalette_Timburr ) .levelUpLearnset = sTimburrLevelUpLearnset, .teachableLearnset = sTimburrTeachableLearnset, @@ -2640,13 +2640,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Gurdurr, .iconPalIndex = 1, FOOTPRINT(Gurdurr) - FOLLOWER( + OVERWORLD( sPicTable_Gurdurr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gurdurr, - gShinyFollowerPalette_Gurdurr + gOverworldPalette_Gurdurr, + gShinyOverworldPalette_Gurdurr ) .levelUpLearnset = sGurdurrLevelUpLearnset, .teachableLearnset = sGurdurrTeachableLearnset, @@ -2702,13 +2702,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Conkeldurr, .iconPalIndex = 1, FOOTPRINT(Conkeldurr) - FOLLOWER( + OVERWORLD( sPicTable_Conkeldurr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Conkeldurr, - gShinyFollowerPalette_Conkeldurr + gOverworldPalette_Conkeldurr, + gShinyOverworldPalette_Conkeldurr ) .levelUpLearnset = sConkeldurrLevelUpLearnset, .teachableLearnset = sConkeldurrTeachableLearnset, @@ -2764,13 +2764,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Tympole, .iconPalIndex = 2, FOOTPRINT(Tympole) - FOLLOWER( + OVERWORLD( sPicTable_Tympole, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tympole, - gShinyFollowerPalette_Tympole + gOverworldPalette_Tympole, + gShinyOverworldPalette_Tympole ) .levelUpLearnset = sTympoleLevelUpLearnset, .teachableLearnset = sTympoleTeachableLearnset, @@ -2826,13 +2826,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Palpitoad, .iconPalIndex = 2, FOOTPRINT(Palpitoad) - FOLLOWER( + OVERWORLD( sPicTable_Palpitoad, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Palpitoad, - gShinyFollowerPalette_Palpitoad + gOverworldPalette_Palpitoad, + gShinyOverworldPalette_Palpitoad ) .levelUpLearnset = sPalpitoadLevelUpLearnset, .teachableLearnset = sPalpitoadTeachableLearnset, @@ -2893,13 +2893,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Seismitoad, .iconPalIndex = 0, FOOTPRINT(Seismitoad) - FOLLOWER( + OVERWORLD( sPicTable_Seismitoad, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Seismitoad, - gShinyFollowerPalette_Seismitoad + gOverworldPalette_Seismitoad, + gShinyOverworldPalette_Seismitoad ) .levelUpLearnset = sSeismitoadLevelUpLearnset, .teachableLearnset = sSeismitoadTeachableLearnset, @@ -2956,13 +2956,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Throh, .iconPalIndex = 0, FOOTPRINT(Throh) - FOLLOWER( + OVERWORLD( sPicTable_Throh, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Throh, - gShinyFollowerPalette_Throh + gOverworldPalette_Throh, + gShinyOverworldPalette_Throh ) .levelUpLearnset = sThrohLevelUpLearnset, .teachableLearnset = sThrohTeachableLearnset, @@ -3020,13 +3020,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Sawk, .iconPalIndex = 0, FOOTPRINT(Sawk) - FOLLOWER( + OVERWORLD( sPicTable_Sawk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sawk, - gShinyFollowerPalette_Sawk + gOverworldPalette_Sawk, + gShinyOverworldPalette_Sawk ) .levelUpLearnset = sSawkLevelUpLearnset, .teachableLearnset = sSawkTeachableLearnset, @@ -3083,13 +3083,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Sewaddle, .iconPalIndex = 1, FOOTPRINT(Sewaddle) - FOLLOWER( + OVERWORLD( sPicTable_Sewaddle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sewaddle, - gShinyFollowerPalette_Sewaddle + gOverworldPalette_Sewaddle, + gShinyOverworldPalette_Sewaddle ) .levelUpLearnset = sSewaddleLevelUpLearnset, .teachableLearnset = sSewaddleTeachableLearnset, @@ -3146,13 +3146,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Swadloon, .iconPalIndex = 1, FOOTPRINT(Swadloon) - FOLLOWER( + OVERWORLD( sPicTable_Swadloon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Swadloon, - gShinyFollowerPalette_Swadloon + gOverworldPalette_Swadloon, + gShinyOverworldPalette_Swadloon ) .levelUpLearnset = sSwadloonLevelUpLearnset, .teachableLearnset = sSwadloonTeachableLearnset, @@ -3214,13 +3214,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Leavanny, .iconPalIndex = 1, FOOTPRINT(Leavanny) - FOLLOWER( + OVERWORLD( sPicTable_Leavanny, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Leavanny, - gShinyFollowerPalette_Leavanny + gOverworldPalette_Leavanny, + gShinyOverworldPalette_Leavanny ) .levelUpLearnset = sLeavannyLevelUpLearnset, .teachableLearnset = sLeavannyTeachableLearnset, @@ -3281,13 +3281,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Venipede, .iconPalIndex = 1, FOOTPRINT(Venipede) - FOLLOWER( + OVERWORLD( sPicTable_Venipede, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Venipede, - gShinyFollowerPalette_Venipede + gOverworldPalette_Venipede, + gShinyOverworldPalette_Venipede ) .levelUpLearnset = sVenipedeLevelUpLearnset, .teachableLearnset = sVenipedeTeachableLearnset, @@ -3348,13 +3348,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Whirlipede, .iconPalIndex = 2, FOOTPRINT(Whirlipede) - FOLLOWER( + OVERWORLD( sPicTable_Whirlipede, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Whirlipede, - gShinyFollowerPalette_Whirlipede + gOverworldPalette_Whirlipede, + gShinyOverworldPalette_Whirlipede ) .levelUpLearnset = sWhirlipedeLevelUpLearnset, .teachableLearnset = sWhirlipedeTeachableLearnset, @@ -3420,13 +3420,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Scolipede, .iconPalIndex = 2, FOOTPRINT(Scolipede) - FOLLOWER( + OVERWORLD( sPicTable_Scolipede, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Scolipede, - gShinyFollowerPalette_Scolipede + gOverworldPalette_Scolipede, + gShinyOverworldPalette_Scolipede ) .levelUpLearnset = sScolipedeLevelUpLearnset, .teachableLearnset = sScolipedeTeachableLearnset, @@ -3489,13 +3489,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Cottonee, .iconPalIndex = 1, FOOTPRINT(Cottonee) - FOLLOWER( + OVERWORLD( sPicTable_Cottonee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cottonee, - gShinyFollowerPalette_Cottonee + gOverworldPalette_Cottonee, + gShinyOverworldPalette_Cottonee ) .levelUpLearnset = sCottoneeLevelUpLearnset, .teachableLearnset = sCottoneeTeachableLearnset, @@ -3552,13 +3552,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Whimsicott, .iconPalIndex = 1, FOOTPRINT(Whimsicott) - FOLLOWER( + OVERWORLD( sPicTable_Whimsicott, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Whimsicott, - gShinyFollowerPalette_Whimsicott + gOverworldPalette_Whimsicott, + gShinyOverworldPalette_Whimsicott ) .levelUpLearnset = sWhimsicottLevelUpLearnset, .teachableLearnset = sWhimsicottTeachableLearnset, @@ -3616,13 +3616,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Petilil, .iconPalIndex = 1, FOOTPRINT(Petilil) - FOLLOWER( + OVERWORLD( sPicTable_Petilil, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Petilil, - gShinyFollowerPalette_Petilil + gOverworldPalette_Petilil, + gShinyOverworldPalette_Petilil ) .levelUpLearnset = sPetililLevelUpLearnset, .teachableLearnset = sPetililTeachableLearnset, @@ -3681,13 +3681,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Lilligant, .iconPalIndex = 1, FOOTPRINT(Lilligant) - FOLLOWER( + OVERWORLD( sPicTable_Lilligant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lilligant, - gShinyFollowerPalette_Lilligant + gOverworldPalette_Lilligant, + gShinyOverworldPalette_Lilligant ) .levelUpLearnset = sLilligantLevelUpLearnset, .teachableLearnset = sLilligantTeachableLearnset, @@ -3746,13 +3746,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_LilligantHisuian, .iconPalIndex = 1, FOOTPRINT(Lilligant) - FOLLOWER( + OVERWORLD( sPicTable_LilligantHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_LilligantHisuian, - gShinyFollowerPalette_LilligantHisuian + gOverworldPalette_LilligantHisuian, + gShinyOverworldPalette_LilligantHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sLilligantHisuianLevelUpLearnset, @@ -3813,13 +3813,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_BasculinRedStriped, .iconPalIndex = 1, FOOTPRINT(Basculin) - FOLLOWER( + OVERWORLD( sPicTable_BasculinRedStriped, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_BasculinRedStriped, - gShinyFollowerPalette_BasculinRedStriped + gOverworldPalette_BasculinRedStriped, + gShinyOverworldPalette_BasculinRedStriped ) .levelUpLearnset = sBasculinLevelUpLearnset, .teachableLearnset = sBasculinTeachableLearnset, @@ -3877,13 +3877,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_BasculinBlueStriped, .iconPalIndex = 0, FOOTPRINT(Basculin) - FOLLOWER( + OVERWORLD( sPicTable_BasculinBlueStriped, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_BasculinBlueStriped, - gShinyFollowerPalette_BasculinBlueStriped + gOverworldPalette_BasculinBlueStriped, + gShinyOverworldPalette_BasculinBlueStriped ) .levelUpLearnset = sBasculinLevelUpLearnset, .teachableLearnset = sBasculinTeachableLearnset, @@ -3942,13 +3942,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_BasculinWhiteStriped, .iconPalIndex = 0, FOOTPRINT(Basculin) - FOLLOWER( + OVERWORLD( sPicTable_BasculinWhiteStriped, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_BasculinWhiteStriped, - gShinyFollowerPalette_BasculinWhiteStriped + gOverworldPalette_BasculinWhiteStriped, + gShinyOverworldPalette_BasculinWhiteStriped ) .levelUpLearnset = sBasculinWhiteStripedLevelUpLearnset, .teachableLearnset = sBasculinWhiteStripedTeachableLearnset, @@ -4006,13 +4006,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_BasculegionMale, .iconPalIndex = 1, FOOTPRINT(Basculegion) - FOLLOWER( + OVERWORLD( sPicTable_BasculegionMale, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_BasculegionMale, - gShinyFollowerPalette_BasculegionMale + gOverworldPalette_BasculegionMale, + gShinyOverworldPalette_BasculegionMale ) .levelUpLearnset = sBasculegionLevelUpLearnset, .teachableLearnset = sBasculegionTeachableLearnset, @@ -4067,13 +4067,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_BasculegionFemale, .iconPalIndex = 0, FOOTPRINT(Basculegion) - FOLLOWER( + OVERWORLD( sPicTable_BasculegionFemale, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_BasculegionFemale, - gShinyFollowerPalette_BasculegionFemale + gOverworldPalette_BasculegionFemale, + gShinyOverworldPalette_BasculegionFemale ) .levelUpLearnset = sBasculegionLevelUpLearnset, .teachableLearnset = sBasculegionTeachableLearnset, @@ -4132,13 +4132,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Sandile, .iconPalIndex = 1, FOOTPRINT(Sandile) - FOLLOWER( + OVERWORLD( sPicTable_Sandile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sandile, - gShinyFollowerPalette_Sandile + gOverworldPalette_Sandile, + gShinyOverworldPalette_Sandile ) .levelUpLearnset = sSandileLevelUpLearnset, .teachableLearnset = sSandileTeachableLearnset, @@ -4195,13 +4195,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Krokorok, .iconPalIndex = 1, FOOTPRINT(Krokorok) - FOLLOWER( + OVERWORLD( sPicTable_Krokorok, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Krokorok, - gShinyFollowerPalette_Krokorok + gOverworldPalette_Krokorok, + gShinyOverworldPalette_Krokorok ) .levelUpLearnset = sKrokorokLevelUpLearnset, .teachableLearnset = sKrokorokTeachableLearnset, @@ -4263,13 +4263,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Krookodile, .iconPalIndex = 0, FOOTPRINT(Krookodile) - FOLLOWER( + OVERWORLD( sPicTable_Krookodile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Krookodile, - gShinyFollowerPalette_Krookodile + gOverworldPalette_Krookodile, + gShinyOverworldPalette_Krookodile ) .levelUpLearnset = sKrookodileLevelUpLearnset, .teachableLearnset = sKrookodileTeachableLearnset, @@ -4325,13 +4325,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Darumaka, .iconPalIndex = 0, FOOTPRINT(Darumaka) - FOLLOWER( + OVERWORLD( sPicTable_Darumaka, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Darumaka, - gShinyFollowerPalette_Darumaka + gOverworldPalette_Darumaka, + gShinyOverworldPalette_Darumaka ) .levelUpLearnset = sDarumakaLevelUpLearnset, .teachableLearnset = sDarumakaTeachableLearnset, @@ -4388,13 +4388,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_DarmanitanStandardMode, .iconPalIndex = 0, FOOTPRINT(Darmanitan) - FOLLOWER( + OVERWORLD( sPicTable_DarmanitanStandardMode, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DarmanitanStandardMode, - gShinyFollowerPalette_DarmanitanStandardMode + gOverworldPalette_DarmanitanStandardMode, + gShinyOverworldPalette_DarmanitanStandardMode ) .levelUpLearnset = sDarmanitanLevelUpLearnset, .teachableLearnset = sDarmanitanTeachableLearnset, @@ -4504,13 +4504,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_DarumakaGalarian, .iconPalIndex = 0, FOOTPRINT(Darumaka) - FOLLOWER( + OVERWORLD( sPicTable_DarumakaGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DarumakaGalarian, - gShinyFollowerPalette_DarumakaGalarian + gOverworldPalette_DarumakaGalarian, + gShinyOverworldPalette_DarumakaGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sDarumakaGalarianLevelUpLearnset, @@ -4568,13 +4568,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_DarmanitanGalarianStandardMode, .iconPalIndex = 0, FOOTPRINT(Darmanitan) - FOLLOWER( + OVERWORLD( sPicTable_DarmanitanGalarianStandardMode, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DarmanitanGalarianStandardMode, - gShinyFollowerPalette_DarmanitanGalarianStandardMode + gOverworldPalette_DarmanitanGalarianStandardMode, + gShinyOverworldPalette_DarmanitanGalarianStandardMode ) .isGalarianForm = TRUE, .levelUpLearnset = sDarmanitanGalarianLevelUpLearnset, @@ -4690,13 +4690,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Maractus, .iconPalIndex = 1, FOOTPRINT(Maractus) - FOLLOWER( + OVERWORLD( sPicTable_Maractus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Maractus, - gShinyFollowerPalette_Maractus + gOverworldPalette_Maractus, + gShinyOverworldPalette_Maractus ) .levelUpLearnset = sMaractusLevelUpLearnset, .teachableLearnset = sMaractusTeachableLearnset, @@ -4754,13 +4754,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Dwebble, .iconPalIndex = 0, FOOTPRINT(Dwebble) - FOLLOWER( + OVERWORLD( sPicTable_Dwebble, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dwebble, - gShinyFollowerPalette_Dwebble + gOverworldPalette_Dwebble, + gShinyOverworldPalette_Dwebble ) .levelUpLearnset = sDwebbleLevelUpLearnset, .teachableLearnset = sDwebbleTeachableLearnset, @@ -4817,13 +4817,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Crustle, .iconPalIndex = 2, FOOTPRINT(Crustle) - FOLLOWER( + OVERWORLD( sPicTable_Crustle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Crustle, - gShinyFollowerPalette_Crustle + gOverworldPalette_Crustle, + gShinyOverworldPalette_Crustle ) .levelUpLearnset = sCrustleLevelUpLearnset, .teachableLearnset = sCrustleTeachableLearnset, @@ -4880,13 +4880,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Scraggy, .iconPalIndex = 2, FOOTPRINT(Scraggy) - FOLLOWER( + OVERWORLD( sPicTable_Scraggy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Scraggy, - gShinyFollowerPalette_Scraggy + gOverworldPalette_Scraggy, + gShinyOverworldPalette_Scraggy ) .levelUpLearnset = sScraggyLevelUpLearnset, .teachableLearnset = sScraggyTeachableLearnset, @@ -4944,13 +4944,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Scrafty, .iconPalIndex = 0, FOOTPRINT(Scrafty) - FOLLOWER( + OVERWORLD( sPicTable_Scrafty, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Scrafty, - gShinyFollowerPalette_Scrafty + gOverworldPalette_Scrafty, + gShinyOverworldPalette_Scrafty ) .levelUpLearnset = sScraftyLevelUpLearnset, .teachableLearnset = sScraftyTeachableLearnset, @@ -5007,13 +5007,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Sigilyph, .iconPalIndex = 0, FOOTPRINT(Sigilyph) - FOLLOWER( + OVERWORLD( sPicTable_Sigilyph, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sigilyph, - gShinyFollowerPalette_Sigilyph + gOverworldPalette_Sigilyph, + gShinyOverworldPalette_Sigilyph ) .levelUpLearnset = sSigilyphLevelUpLearnset, .teachableLearnset = sSigilyphTeachableLearnset, @@ -5072,13 +5072,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Yamask, .iconPalIndex = 0, FOOTPRINT(Yamask) - FOLLOWER( + OVERWORLD( sPicTable_Yamask, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Yamask, - gShinyFollowerPalette_Yamask + gOverworldPalette_Yamask, + gShinyOverworldPalette_Yamask ) .levelUpLearnset = sYamaskLevelUpLearnset, .teachableLearnset = sYamaskTeachableLearnset, @@ -5136,13 +5136,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Cofagrigus, .iconPalIndex = 0, FOOTPRINT(Cofagrigus) - FOLLOWER( + OVERWORLD( sPicTable_Cofagrigus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cofagrigus, - gShinyFollowerPalette_Cofagrigus + gOverworldPalette_Cofagrigus, + gShinyOverworldPalette_Cofagrigus ) .levelUpLearnset = sCofagrigusLevelUpLearnset, .teachableLearnset = sCofagrigusTeachableLearnset, @@ -5198,13 +5198,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_YamaskGalarian, .iconPalIndex = 2, FOOTPRINT(Yamask) - FOLLOWER( + OVERWORLD( sPicTable_YamaskGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_YamaskGalarian, - gShinyFollowerPalette_YamaskGalarian + gOverworldPalette_YamaskGalarian, + gShinyOverworldPalette_YamaskGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sYamaskGalarianLevelUpLearnset, @@ -5262,13 +5262,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Runerigus, .iconPalIndex = 2, FOOTPRINT(Runerigus) - FOLLOWER( + OVERWORLD( sPicTable_Runerigus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Runerigus, - gShinyFollowerPalette_Runerigus + gOverworldPalette_Runerigus, + gShinyOverworldPalette_Runerigus ) .levelUpLearnset = sRunerigusLevelUpLearnset, .teachableLearnset = sRunerigusTeachableLearnset, @@ -5325,13 +5325,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Tirtouga, .iconPalIndex = 2, FOOTPRINT(Tirtouga) - FOLLOWER( + OVERWORLD( sPicTable_Tirtouga, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tirtouga, - gShinyFollowerPalette_Tirtouga + gOverworldPalette_Tirtouga, + gShinyOverworldPalette_Tirtouga ) .levelUpLearnset = sTirtougaLevelUpLearnset, .teachableLearnset = sTirtougaTeachableLearnset, @@ -5387,13 +5387,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Carracosta, .iconPalIndex = 2, FOOTPRINT(Carracosta) - FOLLOWER( + OVERWORLD( sPicTable_Carracosta, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Carracosta, - gShinyFollowerPalette_Carracosta + gOverworldPalette_Carracosta, + gShinyOverworldPalette_Carracosta ) .levelUpLearnset = sCarracostaLevelUpLearnset, .teachableLearnset = sCarracostaTeachableLearnset, @@ -5449,13 +5449,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Archen, .iconPalIndex = 0, FOOTPRINT(Archen) - FOLLOWER( + OVERWORLD( sPicTable_Archen, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Archen, - gShinyFollowerPalette_Archen + gOverworldPalette_Archen, + gShinyOverworldPalette_Archen ) .levelUpLearnset = sArchenLevelUpLearnset, .teachableLearnset = sArchenTeachableLearnset, @@ -5512,13 +5512,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Archeops, .iconPalIndex = 0, FOOTPRINT(Archeops) - FOLLOWER( + OVERWORLD( sPicTable_Archeops, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Archeops, - gShinyFollowerPalette_Archeops + gOverworldPalette_Archeops, + gShinyOverworldPalette_Archeops ) .levelUpLearnset = sArcheopsLevelUpLearnset, .teachableLearnset = sArcheopsTeachableLearnset, @@ -5575,13 +5575,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Trubbish, .iconPalIndex = 1, FOOTPRINT(Trubbish) - FOLLOWER( + OVERWORLD( sPicTable_Trubbish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Trubbish, - gShinyFollowerPalette_Trubbish + gOverworldPalette_Trubbish, + gShinyOverworldPalette_Trubbish ) .levelUpLearnset = sTrubbishLevelUpLearnset, .teachableLearnset = sTrubbishTeachableLearnset, @@ -5640,13 +5640,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Garbodor, .iconPalIndex = 1, FOOTPRINT(Garbodor) - FOLLOWER( + OVERWORLD( sPicTable_Garbodor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Garbodor, - gShinyFollowerPalette_Garbodor + gOverworldPalette_Garbodor, + gShinyOverworldPalette_Garbodor ) .levelUpLearnset = sGarbodorLevelUpLearnset, .teachableLearnset = sGarbodorTeachableLearnset, @@ -5764,13 +5764,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Zorua, .iconPalIndex = 0, FOOTPRINT(Zorua) - FOLLOWER( + OVERWORLD( sPicTable_Zorua, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zorua, - gShinyFollowerPalette_Zorua + gOverworldPalette_Zorua, + gShinyOverworldPalette_Zorua ) .levelUpLearnset = sZoruaLevelUpLearnset, .teachableLearnset = sZoruaTeachableLearnset, @@ -5827,13 +5827,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Zoroark, .iconPalIndex = 0, FOOTPRINT(Zoroark) - FOLLOWER( + OVERWORLD( sPicTable_Zoroark, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zoroark, - gShinyFollowerPalette_Zoroark + gOverworldPalette_Zoroark, + gShinyOverworldPalette_Zoroark ) .levelUpLearnset = sZoroarkLevelUpLearnset, .teachableLearnset = sZoroarkTeachableLearnset, @@ -5889,13 +5889,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_ZoruaHisuian, .iconPalIndex = 0, FOOTPRINT(Zorua) - FOLLOWER( + OVERWORLD( sPicTable_ZoruaHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ZoruaHisuian, - gShinyFollowerPalette_ZoruaHisuian + gOverworldPalette_ZoruaHisuian, + gShinyOverworldPalette_ZoruaHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sZoruaHisuianLevelUpLearnset, @@ -5952,13 +5952,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_ZoroarkHisuian, .iconPalIndex = 0, FOOTPRINT(Zoroark) - FOLLOWER( + OVERWORLD( sPicTable_ZoroarkHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ZoroarkHisuian, - gShinyFollowerPalette_ZoroarkHisuian + gOverworldPalette_ZoroarkHisuian, + gShinyOverworldPalette_ZoroarkHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sZoroarkHisuianLevelUpLearnset, @@ -6017,13 +6017,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Minccino, .iconPalIndex = 0, FOOTPRINT(Minccino) - FOLLOWER( + OVERWORLD( sPicTable_Minccino, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Minccino, - gShinyFollowerPalette_Minccino + gOverworldPalette_Minccino, + gShinyOverworldPalette_Minccino ) .levelUpLearnset = sMinccinoLevelUpLearnset, .teachableLearnset = sMinccinoTeachableLearnset, @@ -6080,13 +6080,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Cinccino, .iconPalIndex = 0, FOOTPRINT(Cinccino) - FOLLOWER( + OVERWORLD( sPicTable_Cinccino, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cinccino, - gShinyFollowerPalette_Cinccino + gOverworldPalette_Cinccino, + gShinyOverworldPalette_Cinccino ) .levelUpLearnset = sCinccinoLevelUpLearnset, .teachableLearnset = sCinccinoTeachableLearnset, @@ -6142,13 +6142,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Gothita, .iconPalIndex = 2, FOOTPRINT(Gothita) - FOLLOWER( + OVERWORLD( sPicTable_Gothita, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gothita, - gShinyFollowerPalette_Gothita + gOverworldPalette_Gothita, + gShinyOverworldPalette_Gothita ) .levelUpLearnset = sGothitaLevelUpLearnset, .teachableLearnset = sGothitaTeachableLearnset, @@ -6204,13 +6204,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Gothorita, .iconPalIndex = 2, FOOTPRINT(Gothorita) - FOLLOWER( + OVERWORLD( sPicTable_Gothorita, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gothorita, - gShinyFollowerPalette_Gothorita + gOverworldPalette_Gothorita, + gShinyOverworldPalette_Gothorita ) .levelUpLearnset = sGothoritaLevelUpLearnset, .teachableLearnset = sGothoritaTeachableLearnset, @@ -6265,13 +6265,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Gothitelle, .iconPalIndex = 2, FOOTPRINT(Gothitelle) - FOLLOWER( + OVERWORLD( sPicTable_Gothitelle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gothitelle, - gShinyFollowerPalette_Gothitelle + gOverworldPalette_Gothitelle, + gShinyOverworldPalette_Gothitelle ) .levelUpLearnset = sGothitelleLevelUpLearnset, .teachableLearnset = sGothitelleTeachableLearnset, @@ -6329,13 +6329,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Solosis, .iconPalIndex = 1, FOOTPRINT(Solosis) - FOLLOWER( + OVERWORLD( sPicTable_Solosis, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Solosis, - gShinyFollowerPalette_Solosis + gOverworldPalette_Solosis, + gShinyOverworldPalette_Solosis ) .levelUpLearnset = sSolosisLevelUpLearnset, .teachableLearnset = sSolosisTeachableLearnset, @@ -6392,13 +6392,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Duosion, .iconPalIndex = 1, FOOTPRINT(Duosion) - FOLLOWER( + OVERWORLD( sPicTable_Duosion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Duosion, - gShinyFollowerPalette_Duosion + gOverworldPalette_Duosion, + gShinyOverworldPalette_Duosion ) .levelUpLearnset = sDuosionLevelUpLearnset, .teachableLearnset = sDuosionTeachableLearnset, @@ -6454,13 +6454,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Reuniclus, .iconPalIndex = 1, FOOTPRINT(Reuniclus) - FOLLOWER( + OVERWORLD( sPicTable_Reuniclus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Reuniclus, - gShinyFollowerPalette_Reuniclus + gOverworldPalette_Reuniclus, + gShinyOverworldPalette_Reuniclus ) .levelUpLearnset = sReuniclusLevelUpLearnset, .teachableLearnset = sReuniclusTeachableLearnset, @@ -6516,13 +6516,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Ducklett, .iconPalIndex = 0, FOOTPRINT(Ducklett) - FOLLOWER( + OVERWORLD( sPicTable_Ducklett, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ducklett, - gShinyFollowerPalette_Ducklett + gOverworldPalette_Ducklett, + gShinyOverworldPalette_Ducklett ) .levelUpLearnset = sDucklettLevelUpLearnset, .teachableLearnset = sDucklettTeachableLearnset, @@ -6578,13 +6578,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Swanna, .iconPalIndex = 2, FOOTPRINT(Swanna) - FOLLOWER( + OVERWORLD( sPicTable_Swanna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Swanna, - gShinyFollowerPalette_Swanna + gOverworldPalette_Swanna, + gShinyOverworldPalette_Swanna ) .levelUpLearnset = sSwannaLevelUpLearnset, .teachableLearnset = sSwannaTeachableLearnset, @@ -6641,13 +6641,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Vanillite, .iconPalIndex = 0, FOOTPRINT(Vanillite) - FOLLOWER( + OVERWORLD( sPicTable_Vanillite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vanillite, - gShinyFollowerPalette_Vanillite + gOverworldPalette_Vanillite, + gShinyOverworldPalette_Vanillite ) .levelUpLearnset = sVanilliteLevelUpLearnset, .teachableLearnset = sVanilliteTeachableLearnset, @@ -6704,13 +6704,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Vanillish, .iconPalIndex = 2, FOOTPRINT(Vanillish) - FOLLOWER( + OVERWORLD( sPicTable_Vanillish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vanillish, - gShinyFollowerPalette_Vanillish + gOverworldPalette_Vanillish, + gShinyOverworldPalette_Vanillish ) .levelUpLearnset = sVanillishLevelUpLearnset, .teachableLearnset = sVanillishTeachableLearnset, @@ -6766,13 +6766,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Vanilluxe, .iconPalIndex = 2, FOOTPRINT(Vanilluxe) - FOLLOWER( + OVERWORLD( sPicTable_Vanilluxe, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vanilluxe, - gShinyFollowerPalette_Vanilluxe + gOverworldPalette_Vanilluxe, + gShinyOverworldPalette_Vanilluxe ) .levelUpLearnset = sVanilluxeLevelUpLearnset, .teachableLearnset = sVanilluxeTeachableLearnset, @@ -6828,13 +6828,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_DeerlingSpring, .iconPalIndex = 1, FOOTPRINT(Deerling) - FOLLOWER( + OVERWORLD( sPicTable_DeerlingSpring, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DeerlingSpring, - gShinyFollowerPalette_DeerlingSpring + gOverworldPalette_DeerlingSpring, + gShinyOverworldPalette_DeerlingSpring ) .levelUpLearnset = sDeerlingLevelUpLearnset, .teachableLearnset = sDeerlingTeachableLearnset, @@ -6891,13 +6891,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_DeerlingSummer, .iconPalIndex = 1, FOOTPRINT(Deerling) - FOLLOWER( + OVERWORLD( sPicTable_DeerlingSummer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DeerlingSummer, - gShinyFollowerPalette_DeerlingSummer + gOverworldPalette_DeerlingSummer, + gShinyOverworldPalette_DeerlingSummer ) .levelUpLearnset = sDeerlingLevelUpLearnset, .teachableLearnset = sDeerlingTeachableLearnset, @@ -6954,13 +6954,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_DeerlingAutumn, .iconPalIndex = 0, FOOTPRINT(Deerling) - FOLLOWER( + OVERWORLD( sPicTable_DeerlingAutumn, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DeerlingAutumn, - gShinyFollowerPalette_DeerlingAutumn + gOverworldPalette_DeerlingAutumn, + gShinyOverworldPalette_DeerlingAutumn ) .levelUpLearnset = sDeerlingLevelUpLearnset, .teachableLearnset = sDeerlingTeachableLearnset, @@ -7017,13 +7017,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_DeerlingWinter, .iconPalIndex = 2, FOOTPRINT(Deerling) - FOLLOWER( + OVERWORLD( sPicTable_DeerlingWinter, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DeerlingWinter, - gShinyFollowerPalette_DeerlingWinter + gOverworldPalette_DeerlingWinter, + gShinyOverworldPalette_DeerlingWinter ) .levelUpLearnset = sDeerlingLevelUpLearnset, .teachableLearnset = sDeerlingTeachableLearnset, @@ -7080,13 +7080,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_SawsbuckSpring, .iconPalIndex = 1, FOOTPRINT(Sawsbuck) - FOLLOWER( + OVERWORLD( sPicTable_SawsbuckSpring, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SawsbuckSpring, - gShinyFollowerPalette_SawsbuckSpring + gOverworldPalette_SawsbuckSpring, + gShinyOverworldPalette_SawsbuckSpring ) .levelUpLearnset = sSawsbuckLevelUpLearnset, .teachableLearnset = sSawsbuckTeachableLearnset, @@ -7141,13 +7141,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_SawsbuckSummer, .iconPalIndex = 1, FOOTPRINT(Sawsbuck) - FOLLOWER( + OVERWORLD( sPicTable_SawsbuckSummer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SawsbuckSummer, - gShinyFollowerPalette_SawsbuckSummer + gOverworldPalette_SawsbuckSummer, + gShinyOverworldPalette_SawsbuckSummer ) .levelUpLearnset = sSawsbuckLevelUpLearnset, .teachableLearnset = sSawsbuckTeachableLearnset, @@ -7202,13 +7202,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_SawsbuckAutumn, .iconPalIndex = 1, FOOTPRINT(Sawsbuck) - FOLLOWER( + OVERWORLD( sPicTable_SawsbuckAutumn, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SawsbuckAutumn, - gShinyFollowerPalette_SawsbuckAutumn + gOverworldPalette_SawsbuckAutumn, + gShinyOverworldPalette_SawsbuckAutumn ) .levelUpLearnset = sSawsbuckLevelUpLearnset, .teachableLearnset = sSawsbuckTeachableLearnset, @@ -7263,13 +7263,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_SawsbuckWinter, .iconPalIndex = 1, FOOTPRINT(Sawsbuck) - FOLLOWER( + OVERWORLD( sPicTable_SawsbuckWinter, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SawsbuckWinter, - gShinyFollowerPalette_SawsbuckWinter + gOverworldPalette_SawsbuckWinter, + gShinyOverworldPalette_SawsbuckWinter ) .levelUpLearnset = sSawsbuckLevelUpLearnset, .teachableLearnset = sSawsbuckTeachableLearnset, @@ -7328,13 +7328,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Emolga, .iconPalIndex = 2, FOOTPRINT(Emolga) - FOLLOWER( + OVERWORLD( sPicTable_Emolga, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Emolga, - gShinyFollowerPalette_Emolga + gOverworldPalette_Emolga, + gShinyOverworldPalette_Emolga ) .levelUpLearnset = sEmolgaLevelUpLearnset, .teachableLearnset = sEmolgaTeachableLearnset, @@ -7391,13 +7391,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Karrablast, .iconPalIndex = 0, FOOTPRINT(Karrablast) - FOLLOWER( + OVERWORLD( sPicTable_Karrablast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Karrablast, - gShinyFollowerPalette_Karrablast + gOverworldPalette_Karrablast, + gShinyOverworldPalette_Karrablast ) .levelUpLearnset = sKarrablastLevelUpLearnset, .teachableLearnset = sKarrablastTeachableLearnset, @@ -7453,13 +7453,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Escavalier, .iconPalIndex = 0, FOOTPRINT(Escavalier) - FOLLOWER( + OVERWORLD( sPicTable_Escavalier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Escavalier, - gShinyFollowerPalette_Escavalier + gOverworldPalette_Escavalier, + gShinyOverworldPalette_Escavalier ) .levelUpLearnset = sEscavalierLevelUpLearnset, .teachableLearnset = sEscavalierTeachableLearnset, @@ -7517,13 +7517,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Foongus, .iconPalIndex = 0, FOOTPRINT(Foongus) - FOLLOWER( + OVERWORLD( sPicTable_Foongus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Foongus, - gShinyFollowerPalette_Foongus + gOverworldPalette_Foongus, + gShinyOverworldPalette_Foongus ) .levelUpLearnset = sFoongusLevelUpLearnset, .teachableLearnset = sFoongusTeachableLearnset, @@ -7582,13 +7582,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Amoonguss, .iconPalIndex = 1, FOOTPRINT(Amoonguss) - FOLLOWER( + OVERWORLD( sPicTable_Amoonguss, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Amoonguss, - gShinyFollowerPalette_Amoonguss + gOverworldPalette_Amoonguss, + gShinyOverworldPalette_Amoonguss ) .levelUpLearnset = sAmoongussLevelUpLearnset, .teachableLearnset = sAmoongussTeachableLearnset, @@ -7652,13 +7652,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconPalIndex = 0, .iconPalIndexFemale = 1, FOOTPRINT(Frillish) - FOLLOWER( + OVERWORLD( sPicTable_Frillish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Frillish, - gShinyFollowerPalette_Frillish + gOverworldPalette_Frillish, + gShinyOverworldPalette_Frillish ) .levelUpLearnset = sFrillishLevelUpLearnset, .teachableLearnset = sFrillishTeachableLearnset, @@ -7722,13 +7722,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconPalIndex = 0, .iconPalIndexFemale = 1, FOOTPRINT(Jellicent) - FOLLOWER( + OVERWORLD( sPicTable_Jellicent, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Jellicent, - gShinyFollowerPalette_Jellicent + gOverworldPalette_Jellicent, + gShinyOverworldPalette_Jellicent ) .levelUpLearnset = sJellicentLevelUpLearnset, .teachableLearnset = sJellicentTeachableLearnset, @@ -7784,13 +7784,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Alomomola, .iconPalIndex = 0, FOOTPRINT(Alomomola) - FOLLOWER( + OVERWORLD( sPicTable_Alomomola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Alomomola, - gShinyFollowerPalette_Alomomola + gOverworldPalette_Alomomola, + gShinyOverworldPalette_Alomomola ) .levelUpLearnset = sAlomomolaLevelUpLearnset, .teachableLearnset = sAlomomolaTeachableLearnset, @@ -7847,13 +7847,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Joltik, .iconPalIndex = 0, FOOTPRINT(Joltik) - FOLLOWER( + OVERWORLD( sPicTable_Joltik, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Joltik, - gShinyFollowerPalette_Joltik + gOverworldPalette_Joltik, + gShinyOverworldPalette_Joltik ) .levelUpLearnset = sJoltikLevelUpLearnset, .teachableLearnset = sJoltikTeachableLearnset, @@ -7909,13 +7909,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Galvantula, .iconPalIndex = 2, FOOTPRINT(Galvantula) - FOLLOWER( + OVERWORLD( sPicTable_Galvantula, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Galvantula, - gShinyFollowerPalette_Galvantula + gOverworldPalette_Galvantula, + gShinyOverworldPalette_Galvantula ) .levelUpLearnset = sGalvantulaLevelUpLearnset, .teachableLearnset = sGalvantulaTeachableLearnset, @@ -7972,13 +7972,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Ferroseed, .iconPalIndex = 1, FOOTPRINT(Ferroseed) - FOLLOWER( + OVERWORLD( sPicTable_Ferroseed, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ferroseed, - gShinyFollowerPalette_Ferroseed + gOverworldPalette_Ferroseed, + gShinyOverworldPalette_Ferroseed ) .levelUpLearnset = sFerroseedLevelUpLearnset, .teachableLearnset = sFerroseedTeachableLearnset, @@ -8036,13 +8036,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Ferrothorn, .iconPalIndex = 1, FOOTPRINT(Ferrothorn) - FOLLOWER( + OVERWORLD( sPicTable_Ferrothorn, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ferrothorn, - gShinyFollowerPalette_Ferrothorn + gOverworldPalette_Ferrothorn, + gShinyOverworldPalette_Ferrothorn ) .levelUpLearnset = sFerrothornLevelUpLearnset, .teachableLearnset = sFerrothornTeachableLearnset, @@ -8100,13 +8100,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Klink, .iconPalIndex = 0, FOOTPRINT(Klink) - FOLLOWER( + OVERWORLD( sPicTable_Klink, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Klink, - gShinyFollowerPalette_Klink + gOverworldPalette_Klink, + gShinyOverworldPalette_Klink ) .levelUpLearnset = sKlinkLevelUpLearnset, .teachableLearnset = sKlinkTeachableLearnset, @@ -8163,13 +8163,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Klang, .iconPalIndex = 0, FOOTPRINT(Klang) - FOLLOWER( + OVERWORLD( sPicTable_Klang, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Klang, - gShinyFollowerPalette_Klang + gOverworldPalette_Klang, + gShinyOverworldPalette_Klang ) .levelUpLearnset = sKlangLevelUpLearnset, .teachableLearnset = sKlangTeachableLearnset, @@ -8226,13 +8226,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Klinklang, .iconPalIndex = 0, FOOTPRINT(Klinklang) - FOLLOWER( + OVERWORLD( sPicTable_Klinklang, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Klinklang, - gShinyFollowerPalette_Klinklang + gOverworldPalette_Klinklang, + gShinyOverworldPalette_Klinklang ) .levelUpLearnset = sKlinklangLevelUpLearnset, .teachableLearnset = sKlinklangTeachableLearnset, @@ -8289,13 +8289,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Tynamo, .iconPalIndex = 0, FOOTPRINT(Tynamo) - FOLLOWER( + OVERWORLD( sPicTable_Tynamo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tynamo, - gShinyFollowerPalette_Tynamo + gOverworldPalette_Tynamo, + gShinyOverworldPalette_Tynamo ) .tmIlliterate = TRUE, .levelUpLearnset = sTynamoLevelUpLearnset, @@ -8352,13 +8352,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Eelektrik, .iconPalIndex = 0, FOOTPRINT(Eelektrik) - FOLLOWER( + OVERWORLD( sPicTable_Eelektrik, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Eelektrik, - gShinyFollowerPalette_Eelektrik + gOverworldPalette_Eelektrik, + gShinyOverworldPalette_Eelektrik ) .levelUpLearnset = sEelektrikLevelUpLearnset, .teachableLearnset = sEelektrikTeachableLearnset, @@ -8414,13 +8414,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Eelektross, .iconPalIndex = 0, FOOTPRINT(Eelektross) - FOLLOWER( + OVERWORLD( sPicTable_Eelektross, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Eelektross, - gShinyFollowerPalette_Eelektross + gOverworldPalette_Eelektross, + gShinyOverworldPalette_Eelektross ) .levelUpLearnset = sEelektrossLevelUpLearnset, .teachableLearnset = sEelektrossTeachableLearnset, @@ -8476,13 +8476,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Elgyem, .iconPalIndex = 0, FOOTPRINT(Elgyem) - FOLLOWER( + OVERWORLD( sPicTable_Elgyem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Elgyem, - gShinyFollowerPalette_Elgyem + gOverworldPalette_Elgyem, + gShinyOverworldPalette_Elgyem ) .levelUpLearnset = sElgyemLevelUpLearnset, .teachableLearnset = sElgyemTeachableLearnset, @@ -8538,13 +8538,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Beheeyem, .iconPalIndex = 2, FOOTPRINT(Beheeyem) - FOLLOWER( + OVERWORLD( sPicTable_Beheeyem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Beheeyem, - gShinyFollowerPalette_Beheeyem + gOverworldPalette_Beheeyem, + gShinyOverworldPalette_Beheeyem ) .levelUpLearnset = sBeheeyemLevelUpLearnset, .teachableLearnset = sBeheeyemTeachableLearnset, @@ -8605,13 +8605,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Litwick, .iconPalIndex = 2, FOOTPRINT(Litwick) - FOLLOWER( + OVERWORLD( sPicTable_Litwick, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Litwick, - gShinyFollowerPalette_Litwick + gOverworldPalette_Litwick, + gShinyOverworldPalette_Litwick ) .levelUpLearnset = sLitwickLevelUpLearnset, .teachableLearnset = sLitwickTeachableLearnset, @@ -8672,13 +8672,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Lampent, .iconPalIndex = 2, FOOTPRINT(Lampent) - FOLLOWER( + OVERWORLD( sPicTable_Lampent, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lampent, - gShinyFollowerPalette_Lampent + gOverworldPalette_Lampent, + gShinyOverworldPalette_Lampent ) .levelUpLearnset = sLampentLevelUpLearnset, .teachableLearnset = sLampentTeachableLearnset, @@ -8738,13 +8738,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Chandelure, .iconPalIndex = 2, FOOTPRINT(Chandelure) - FOLLOWER( + OVERWORLD( sPicTable_Chandelure, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Chandelure, - gShinyFollowerPalette_Chandelure + gOverworldPalette_Chandelure, + gShinyOverworldPalette_Chandelure ) .levelUpLearnset = sChandelureLevelUpLearnset, .teachableLearnset = sChandelureTeachableLearnset, @@ -8800,13 +8800,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Axew, .iconPalIndex = 1, FOOTPRINT(Axew) - FOLLOWER( + OVERWORLD( sPicTable_Axew, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Axew, - gShinyFollowerPalette_Axew + gOverworldPalette_Axew, + gShinyOverworldPalette_Axew ) .levelUpLearnset = sAxewLevelUpLearnset, .teachableLearnset = sAxewTeachableLearnset, @@ -8862,13 +8862,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Fraxure, .iconPalIndex = 1, FOOTPRINT(Fraxure) - FOLLOWER( + OVERWORLD( sPicTable_Fraxure, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Fraxure, - gShinyFollowerPalette_Fraxure + gOverworldPalette_Fraxure, + gShinyOverworldPalette_Fraxure ) .levelUpLearnset = sFraxureLevelUpLearnset, .teachableLearnset = sFraxureTeachableLearnset, @@ -8923,13 +8923,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Haxorus, .iconPalIndex = 2, FOOTPRINT(Haxorus) - FOLLOWER( + OVERWORLD( sPicTable_Haxorus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Haxorus, - gShinyFollowerPalette_Haxorus + gOverworldPalette_Haxorus, + gShinyOverworldPalette_Haxorus ) .levelUpLearnset = sHaxorusLevelUpLearnset, .teachableLearnset = sHaxorusTeachableLearnset, @@ -8985,13 +8985,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Cubchoo, .iconPalIndex = 0, FOOTPRINT(Cubchoo) - FOLLOWER( + OVERWORLD( sPicTable_Cubchoo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cubchoo, - gShinyFollowerPalette_Cubchoo + gOverworldPalette_Cubchoo, + gShinyOverworldPalette_Cubchoo ) .levelUpLearnset = sCubchooLevelUpLearnset, .teachableLearnset = sCubchooTeachableLearnset, @@ -9047,13 +9047,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Beartic, .iconPalIndex = 0, FOOTPRINT(Beartic) - FOLLOWER( + OVERWORLD( sPicTable_Beartic, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Beartic, - gShinyFollowerPalette_Beartic + gOverworldPalette_Beartic, + gShinyOverworldPalette_Beartic ) .levelUpLearnset = sBearticLevelUpLearnset, .teachableLearnset = sBearticTeachableLearnset, @@ -9111,13 +9111,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Cryogonal, .iconPalIndex = 0, FOOTPRINT(Cryogonal) - FOLLOWER( + OVERWORLD( sPicTable_Cryogonal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cryogonal, - gShinyFollowerPalette_Cryogonal + gOverworldPalette_Cryogonal, + gShinyOverworldPalette_Cryogonal ) .levelUpLearnset = sCryogonalLevelUpLearnset, .teachableLearnset = sCryogonalTeachableLearnset, @@ -9173,13 +9173,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Shelmet, .iconPalIndex = 1, FOOTPRINT(Shelmet) - FOLLOWER( + OVERWORLD( sPicTable_Shelmet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Shelmet, - gShinyFollowerPalette_Shelmet + gOverworldPalette_Shelmet, + gShinyOverworldPalette_Shelmet ) .levelUpLearnset = sShelmetLevelUpLearnset, .teachableLearnset = sShelmetTeachableLearnset, @@ -9235,13 +9235,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Accelgor, .iconPalIndex = 1, FOOTPRINT(Accelgor) - FOLLOWER( + OVERWORLD( sPicTable_Accelgor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Accelgor, - gShinyFollowerPalette_Accelgor + gOverworldPalette_Accelgor, + gShinyOverworldPalette_Accelgor ) .levelUpLearnset = sAccelgorLevelUpLearnset, .teachableLearnset = sAccelgorTeachableLearnset, @@ -9298,13 +9298,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Stunfisk, .iconPalIndex = 2, FOOTPRINT(Stunfisk) - FOLLOWER( + OVERWORLD( sPicTable_Stunfisk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Stunfisk, - gShinyFollowerPalette_Stunfisk + gOverworldPalette_Stunfisk, + gShinyOverworldPalette_Stunfisk ) .levelUpLearnset = sStunfiskLevelUpLearnset, .teachableLearnset = sStunfiskTeachableLearnset, @@ -9361,13 +9361,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_StunfiskGalarian, .iconPalIndex = 1, FOOTPRINT(Stunfisk) - FOLLOWER( + OVERWORLD( sPicTable_StunfiskGalarian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_StunfiskGalarian, - gShinyFollowerPalette_StunfiskGalarian + gOverworldPalette_StunfiskGalarian, + gShinyOverworldPalette_StunfiskGalarian ) .isGalarianForm = TRUE, .levelUpLearnset = sStunfiskGalarianLevelUpLearnset, @@ -9427,13 +9427,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Mienfoo, .iconPalIndex = 1, FOOTPRINT(Mienfoo) - FOLLOWER( + OVERWORLD( sPicTable_Mienfoo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mienfoo, - gShinyFollowerPalette_Mienfoo + gOverworldPalette_Mienfoo, + gShinyOverworldPalette_Mienfoo ) .levelUpLearnset = sMienfooLevelUpLearnset, .teachableLearnset = sMienfooTeachableLearnset, @@ -9489,13 +9489,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Mienshao, .iconPalIndex = 2, FOOTPRINT(Mienshao) - FOLLOWER( + OVERWORLD( sPicTable_Mienshao, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mienshao, - gShinyFollowerPalette_Mienshao + gOverworldPalette_Mienshao, + gShinyOverworldPalette_Mienshao ) .levelUpLearnset = sMienshaoLevelUpLearnset, .teachableLearnset = sMienshaoTeachableLearnset, @@ -9552,13 +9552,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Druddigon, .iconPalIndex = 0, FOOTPRINT(Druddigon) - FOLLOWER( + OVERWORLD( sPicTable_Druddigon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Druddigon, - gShinyFollowerPalette_Druddigon + gOverworldPalette_Druddigon, + gShinyOverworldPalette_Druddigon ) .levelUpLearnset = sDruddigonLevelUpLearnset, .teachableLearnset = sDruddigonTeachableLearnset, @@ -9617,13 +9617,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Golett, .iconPalIndex = 0, FOOTPRINT(Golett) - FOLLOWER( + OVERWORLD( sPicTable_Golett, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Golett, - gShinyFollowerPalette_Golett + gOverworldPalette_Golett, + gShinyOverworldPalette_Golett ) .levelUpLearnset = sGolettLevelUpLearnset, .teachableLearnset = sGolettTeachableLearnset, @@ -9680,13 +9680,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Golurk, .iconPalIndex = 0, FOOTPRINT(Golurk) - FOLLOWER( + OVERWORLD( sPicTable_Golurk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Golurk, - gShinyFollowerPalette_Golurk + gOverworldPalette_Golurk, + gShinyOverworldPalette_Golurk ) .levelUpLearnset = sGolurkLevelUpLearnset, .teachableLearnset = sGolurkTeachableLearnset, @@ -9742,13 +9742,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Pawniard, .iconPalIndex = 0, FOOTPRINT(Pawniard) - FOLLOWER( + OVERWORLD( sPicTable_Pawniard, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pawniard, - gShinyFollowerPalette_Pawniard + gOverworldPalette_Pawniard, + gShinyOverworldPalette_Pawniard ) .levelUpLearnset = sPawniardLevelUpLearnset, .teachableLearnset = sPawniardTeachableLearnset, @@ -9805,13 +9805,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Bisharp, .iconPalIndex = 0, FOOTPRINT(Bisharp) - FOLLOWER( + OVERWORLD( sPicTable_Bisharp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bisharp, - gShinyFollowerPalette_Bisharp + gOverworldPalette_Bisharp, + gShinyOverworldPalette_Bisharp ) .levelUpLearnset = sBisharpLevelUpLearnset, .teachableLearnset = sBisharpTeachableLearnset, @@ -9922,13 +9922,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Bouffalant, .iconPalIndex = 2, FOOTPRINT(Bouffalant) - FOLLOWER( + OVERWORLD( sPicTable_Bouffalant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bouffalant, - gShinyFollowerPalette_Bouffalant + gOverworldPalette_Bouffalant, + gShinyOverworldPalette_Bouffalant ) .levelUpLearnset = sBouffalantLevelUpLearnset, .teachableLearnset = sBouffalantTeachableLearnset, @@ -9985,13 +9985,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Rufflet, .iconPalIndex = 2, FOOTPRINT(Rufflet) - FOLLOWER( + OVERWORLD( sPicTable_Rufflet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rufflet, - gShinyFollowerPalette_Rufflet + gOverworldPalette_Rufflet, + gShinyOverworldPalette_Rufflet ) .levelUpLearnset = sRuffletLevelUpLearnset, .teachableLearnset = sRuffletTeachableLearnset, @@ -10048,13 +10048,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Braviary, .iconPalIndex = 0, FOOTPRINT(Braviary) - FOLLOWER( + OVERWORLD( sPicTable_Braviary, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Braviary, - gShinyFollowerPalette_Braviary + gOverworldPalette_Braviary, + gShinyOverworldPalette_Braviary ) .levelUpLearnset = sBraviaryLevelUpLearnset, .teachableLearnset = sBraviaryTeachableLearnset, @@ -10110,13 +10110,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_BraviaryHisuian, .iconPalIndex = 2, FOOTPRINT(Braviary) - FOLLOWER( + OVERWORLD( sPicTable_BraviaryHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_BraviaryHisuian, - gShinyFollowerPalette_BraviaryHisuian + gOverworldPalette_BraviaryHisuian, + gShinyOverworldPalette_BraviaryHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sBraviaryHisuianLevelUpLearnset, @@ -10175,13 +10175,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Vullaby, .iconPalIndex = 0, FOOTPRINT(Vullaby) - FOLLOWER( + OVERWORLD( sPicTable_Vullaby, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vullaby, - gShinyFollowerPalette_Vullaby + gOverworldPalette_Vullaby, + gShinyOverworldPalette_Vullaby ) .levelUpLearnset = sVullabyLevelUpLearnset, .teachableLearnset = sVullabyTeachableLearnset, @@ -10237,13 +10237,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Mandibuzz, .iconPalIndex = 1, FOOTPRINT(Mandibuzz) - FOLLOWER( + OVERWORLD( sPicTable_Mandibuzz, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mandibuzz, - gShinyFollowerPalette_Mandibuzz + gOverworldPalette_Mandibuzz, + gShinyOverworldPalette_Mandibuzz ) .levelUpLearnset = sMandibuzzLevelUpLearnset, .teachableLearnset = sMandibuzzTeachableLearnset, @@ -10299,13 +10299,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Heatmor, .iconPalIndex = 2, FOOTPRINT(Heatmor) - FOLLOWER( + OVERWORLD( sPicTable_Heatmor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Heatmor, - gShinyFollowerPalette_Heatmor + gOverworldPalette_Heatmor, + gShinyOverworldPalette_Heatmor ) .levelUpLearnset = sHeatmorLevelUpLearnset, .teachableLearnset = sHeatmorTeachableLearnset, @@ -10362,13 +10362,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Durant, .iconPalIndex = 0, FOOTPRINT(Durant) - FOLLOWER( + OVERWORLD( sPicTable_Durant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Durant, - gShinyFollowerPalette_Durant + gOverworldPalette_Durant, + gShinyOverworldPalette_Durant ) .levelUpLearnset = sDurantLevelUpLearnset, .teachableLearnset = sDurantTeachableLearnset, @@ -10425,13 +10425,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Deino, .iconPalIndex = 2, FOOTPRINT(Deino) - FOLLOWER( + OVERWORLD( sPicTable_Deino, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Deino, - gShinyFollowerPalette_Deino + gOverworldPalette_Deino, + gShinyOverworldPalette_Deino ) .levelUpLearnset = sDeinoLevelUpLearnset, .teachableLearnset = sDeinoTeachableLearnset, @@ -10487,13 +10487,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Zweilous, .iconPalIndex = 2, FOOTPRINT(Zweilous) - FOLLOWER( + OVERWORLD( sPicTable_Zweilous, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zweilous, - gShinyFollowerPalette_Zweilous + gOverworldPalette_Zweilous, + gShinyOverworldPalette_Zweilous ) .levelUpLearnset = sZweilousLevelUpLearnset, .teachableLearnset = sZweilousTeachableLearnset, @@ -10549,13 +10549,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Hydreigon, .iconPalIndex = 2, FOOTPRINT(Hydreigon) - FOLLOWER( + OVERWORLD( sPicTable_Hydreigon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hydreigon, - gShinyFollowerPalette_Hydreigon + gOverworldPalette_Hydreigon, + gShinyOverworldPalette_Hydreigon ) .levelUpLearnset = sHydreigonLevelUpLearnset, .teachableLearnset = sHydreigonTeachableLearnset, @@ -10611,13 +10611,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Larvesta, .iconPalIndex = 0, FOOTPRINT(Larvesta) - FOLLOWER( + OVERWORLD( sPicTable_Larvesta, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Larvesta, - gShinyFollowerPalette_Larvesta + gOverworldPalette_Larvesta, + gShinyOverworldPalette_Larvesta ) .levelUpLearnset = sLarvestaLevelUpLearnset, .teachableLearnset = sLarvestaTeachableLearnset, @@ -10676,13 +10676,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Volcarona, .iconPalIndex = 0, FOOTPRINT(Volcarona) - FOLLOWER( + OVERWORLD( sPicTable_Volcarona, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Volcarona, - gShinyFollowerPalette_Volcarona + gOverworldPalette_Volcarona, + gShinyOverworldPalette_Volcarona ) .levelUpLearnset = sVolcaronaLevelUpLearnset, .teachableLearnset = sVolcaronaTeachableLearnset, @@ -10738,13 +10738,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Cobalion, .iconPalIndex = 0, FOOTPRINT(Cobalion) - FOLLOWER( + OVERWORLD( sPicTable_Cobalion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cobalion, - gShinyFollowerPalette_Cobalion + gOverworldPalette_Cobalion, + gShinyOverworldPalette_Cobalion ) .isLegendary = TRUE, .levelUpLearnset = sCobalionLevelUpLearnset, @@ -10801,13 +10801,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Terrakion, .iconPalIndex = 2, FOOTPRINT(Terrakion) - FOLLOWER( + OVERWORLD( sPicTable_Terrakion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Terrakion, - gShinyFollowerPalette_Terrakion + gOverworldPalette_Terrakion, + gShinyOverworldPalette_Terrakion ) .isLegendary = TRUE, .levelUpLearnset = sTerrakionLevelUpLearnset, @@ -10864,13 +10864,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Virizion, .iconPalIndex = 1, FOOTPRINT(Virizion) - FOLLOWER( + OVERWORLD( sPicTable_Virizion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Virizion, - gShinyFollowerPalette_Virizion + gOverworldPalette_Virizion, + gShinyOverworldPalette_Virizion ) .isLegendary = TRUE, .levelUpLearnset = sVirizionLevelUpLearnset, @@ -10928,13 +10928,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_TornadusIncarnate, .iconPalIndex = 1, FOOTPRINT(Tornadus) - FOLLOWER( + OVERWORLD( sPicTable_TornadusIncarnate, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_TornadusIncarnate, - gShinyFollowerPalette_TornadusIncarnate + gOverworldPalette_TornadusIncarnate, + gShinyOverworldPalette_TornadusIncarnate ) .isLegendary = TRUE, .levelUpLearnset = sTornadusLevelUpLearnset, @@ -11049,13 +11049,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_ThundurusIncarnate, .iconPalIndex = 0, FOOTPRINT(Thundurus) - FOLLOWER( + OVERWORLD( sPicTable_ThundurusIncarnate, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ThundurusIncarnate, - gShinyFollowerPalette_ThundurusIncarnate + gOverworldPalette_ThundurusIncarnate, + gShinyOverworldPalette_ThundurusIncarnate ) .isLegendary = TRUE, .levelUpLearnset = sThundurusLevelUpLearnset, @@ -11170,13 +11170,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Reshiram, .iconPalIndex = 0, FOOTPRINT(Reshiram) - FOLLOWER( + OVERWORLD( sPicTable_Reshiram, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Reshiram, - gShinyFollowerPalette_Reshiram + gOverworldPalette_Reshiram, + gShinyOverworldPalette_Reshiram ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -11234,13 +11234,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Zekrom, .iconPalIndex = 2, FOOTPRINT(Zekrom) - FOLLOWER( + OVERWORLD( sPicTable_Zekrom, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zekrom, - gShinyFollowerPalette_Zekrom + gOverworldPalette_Zekrom, + gShinyOverworldPalette_Zekrom ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -11299,13 +11299,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_LandorusIncarnate, .iconPalIndex = 0, FOOTPRINT(Landorus) - FOLLOWER( + OVERWORLD( sPicTable_LandorusIncarnate, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_LandorusIncarnate, - gShinyFollowerPalette_LandorusIncarnate + gOverworldPalette_LandorusIncarnate, + gShinyOverworldPalette_LandorusIncarnate ) .isLegendary = TRUE, .levelUpLearnset = sLandorusLevelUpLearnset, @@ -11422,13 +11422,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Kyurem, .iconPalIndex = 0, FOOTPRINT(Kyurem) - FOLLOWER( + OVERWORLD( sPicTable_Kyurem, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kyurem, - gShinyFollowerPalette_Kyurem + gOverworldPalette_Kyurem, + gShinyOverworldPalette_Kyurem ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -11615,13 +11615,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_KeldeoOrdinary, .iconPalIndex = 0, FOOTPRINT(Keldeo) - FOLLOWER( + OVERWORLD( sPicTable_KeldeoOrdinary, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_KeldeoOrdinary, - gShinyFollowerPalette_KeldeoOrdinary + gOverworldPalette_KeldeoOrdinary, + gShinyOverworldPalette_KeldeoOrdinary ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -11744,13 +11744,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_MeloettaAria, .iconPalIndex = 4, FOOTPRINT(Meloetta) - FOLLOWER( + OVERWORLD( sPicTable_MeloettaAria, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MeloettaAria, - gShinyFollowerPalette_MeloettaAria + gOverworldPalette_MeloettaAria, + gShinyOverworldPalette_MeloettaAria ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -11813,13 +11813,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_MeloettaPirouette, .iconPalIndex = 0, FOOTPRINT(Meloetta) - FOLLOWER( + OVERWORLD( sPicTable_MeloettaPirouette, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MeloettaPirouette, - gShinyFollowerPalette_MeloettaPirouette + gOverworldPalette_MeloettaPirouette, + gShinyOverworldPalette_MeloettaPirouette ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -11877,13 +11877,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSprite = gMonIcon_Genesect, \ .iconPalIndex = 2, \ FOOTPRINT(Genesect) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Genesect, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Genesect, \ - gShinyFollowerPalette_Genesect \ + gOverworldPalette_Genesect, \ + gShinyOverworldPalette_Genesect \ ) \ .levelUpLearnset = sGenesectLevelUpLearnset, \ .teachableLearnset = sGenesectTeachableLearnset, \ diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index 8b9c1127f2..09ad2a01d0 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -52,13 +52,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Chespin, .iconPalIndex = 1, FOOTPRINT(Chespin) - FOLLOWER( + OVERWORLD( sPicTable_Chespin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Chespin, - gShinyFollowerPalette_Chespin + gOverworldPalette_Chespin, + gShinyOverworldPalette_Chespin ) .levelUpLearnset = sChespinLevelUpLearnset, .teachableLearnset = sChespinTeachableLearnset, @@ -114,13 +114,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Quilladin, .iconPalIndex = 1, FOOTPRINT(Quilladin) - FOLLOWER( + OVERWORLD( sPicTable_Quilladin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Quilladin, - gShinyFollowerPalette_Quilladin + gOverworldPalette_Quilladin, + gShinyOverworldPalette_Quilladin ) .levelUpLearnset = sQuilladinLevelUpLearnset, .teachableLearnset = sQuilladinTeachableLearnset, @@ -175,13 +175,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Chesnaught, .iconPalIndex = 1, FOOTPRINT(Chesnaught) - FOLLOWER( + OVERWORLD( sPicTable_Chesnaught, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Chesnaught, - gShinyFollowerPalette_Chesnaught + gOverworldPalette_Chesnaught, + gShinyOverworldPalette_Chesnaught ) .levelUpLearnset = sChesnaughtLevelUpLearnset, .teachableLearnset = sChesnaughtTeachableLearnset, @@ -237,13 +237,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Fennekin, .iconPalIndex = 0, FOOTPRINT(Fennekin) - FOLLOWER( + OVERWORLD( sPicTable_Fennekin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Fennekin, - gShinyFollowerPalette_Fennekin + gOverworldPalette_Fennekin, + gShinyOverworldPalette_Fennekin ) .levelUpLearnset = sFennekinLevelUpLearnset, .teachableLearnset = sFennekinTeachableLearnset, @@ -299,13 +299,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Braixen, .iconPalIndex = 0, FOOTPRINT(Braixen) - FOLLOWER( + OVERWORLD( sPicTable_Braixen, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Braixen, - gShinyFollowerPalette_Braixen + gOverworldPalette_Braixen, + gShinyOverworldPalette_Braixen ) .levelUpLearnset = sBraixenLevelUpLearnset, .teachableLearnset = sBraixenTeachableLearnset, @@ -360,13 +360,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Delphox, .iconPalIndex = 0, FOOTPRINT(Delphox) - FOLLOWER( + OVERWORLD( sPicTable_Delphox, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Delphox, - gShinyFollowerPalette_Delphox + gOverworldPalette_Delphox, + gShinyOverworldPalette_Delphox ) .levelUpLearnset = sDelphoxLevelUpLearnset, .teachableLearnset = sDelphoxTeachableLearnset, @@ -422,13 +422,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Froakie, .iconPalIndex = 0, FOOTPRINT(Froakie) - FOLLOWER( + OVERWORLD( sPicTable_Froakie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Froakie, - gShinyFollowerPalette_Froakie + gOverworldPalette_Froakie, + gShinyOverworldPalette_Froakie ) .levelUpLearnset = sFroakieLevelUpLearnset, .teachableLearnset = sFroakieTeachableLearnset, @@ -484,13 +484,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Frogadier, .iconPalIndex = 0, FOOTPRINT(Frogadier) - FOLLOWER( + OVERWORLD( sPicTable_Frogadier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Frogadier, - gShinyFollowerPalette_Frogadier + gOverworldPalette_Frogadier, + gShinyOverworldPalette_Frogadier ) .levelUpLearnset = sFrogadierLevelUpLearnset, .teachableLearnset = sFrogadierTeachableLearnset, @@ -542,13 +542,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Greninja, .iconPalIndex = 0, FOOTPRINT(Greninja) - FOLLOWER( + OVERWORLD( sPicTable_Greninja, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Greninja, - gShinyFollowerPalette_Greninja + gOverworldPalette_Greninja, + gShinyOverworldPalette_Greninja ) .levelUpLearnset = sGreninjaLevelUpLearnset, .teachableLearnset = sGreninjaTeachableLearnset, @@ -600,13 +600,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Greninja, .iconPalIndex = 0, FOOTPRINT(Greninja) - FOLLOWER( + OVERWORLD( sPicTable_Greninja, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Greninja, - gShinyFollowerPalette_Greninja + gOverworldPalette_Greninja, + gShinyOverworldPalette_Greninja ) .levelUpLearnset = sGreninjaLevelUpLearnset, .teachableLearnset = sGreninjaTeachableLearnset, @@ -719,13 +719,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Bunnelby, .iconPalIndex = 2, FOOTPRINT(Bunnelby) - FOLLOWER( + OVERWORLD( sPicTable_Bunnelby, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bunnelby, - gShinyFollowerPalette_Bunnelby + gOverworldPalette_Bunnelby, + gShinyOverworldPalette_Bunnelby ) .levelUpLearnset = sBunnelbyLevelUpLearnset, .teachableLearnset = sBunnelbyTeachableLearnset, @@ -781,13 +781,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Diggersby, .iconPalIndex = 2, FOOTPRINT(Diggersby) - FOLLOWER( + OVERWORLD( sPicTable_Diggersby, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Diggersby, - gShinyFollowerPalette_Diggersby + gOverworldPalette_Diggersby, + gShinyOverworldPalette_Diggersby ) .levelUpLearnset = sDiggersbyLevelUpLearnset, .teachableLearnset = sDiggersbyTeachableLearnset, @@ -843,13 +843,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Fletchling, .iconPalIndex = 2, FOOTPRINT(Fletchling) - FOLLOWER( + OVERWORLD( sPicTable_Fletchling, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Fletchling, - gShinyFollowerPalette_Fletchling + gOverworldPalette_Fletchling, + gShinyOverworldPalette_Fletchling ) .levelUpLearnset = sFletchlingLevelUpLearnset, .teachableLearnset = sFletchlingTeachableLearnset, @@ -906,13 +906,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Fletchinder, .iconPalIndex = 2, FOOTPRINT(Fletchinder) - FOLLOWER( + OVERWORLD( sPicTable_Fletchinder, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Fletchinder, - gShinyFollowerPalette_Fletchinder + gOverworldPalette_Fletchinder, + gShinyOverworldPalette_Fletchinder ) .levelUpLearnset = sFletchinderLevelUpLearnset, .teachableLearnset = sFletchinderTeachableLearnset, @@ -968,13 +968,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Talonflame, .iconPalIndex = 2, FOOTPRINT(Talonflame) - FOLLOWER( + OVERWORLD( sPicTable_Talonflame, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Talonflame, - gShinyFollowerPalette_Talonflame + gOverworldPalette_Talonflame, + gShinyOverworldPalette_Talonflame ) .levelUpLearnset = sTalonflameLevelUpLearnset, .teachableLearnset = sTalonflameTeachableLearnset, @@ -1026,13 +1026,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Scatterbug, \ .iconPalIndex = 1, \ FOOTPRINT(Scatterbug) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Scatterbug, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Scatterbug, \ - gShinyFollowerPalette_Scatterbug \ + gOverworldPalette_Scatterbug, \ + gShinyOverworldPalette_Scatterbug \ ) \ .tmIlliterate = TRUE, \ .levelUpLearnset = sScatterbugLevelUpLearnset, \ @@ -1107,13 +1107,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Spewpa, \ .iconPalIndex = 1, \ FOOTPRINT(Spewpa) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Spewpa, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Spewpa, \ - gShinyFollowerPalette_Spewpa \ + gOverworldPalette_Spewpa, \ + gShinyOverworldPalette_Spewpa \ ) \ .tmIlliterate = TRUE, \ .levelUpLearnset = sSpewpaLevelUpLearnset, \ @@ -1188,13 +1188,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Vivillon ##form, \ .iconPalIndex = iconPal, \ FOOTPRINT(Vivillon) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Vivillon ##form, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Vivillon ##form, \ - gShinyFollowerPalette_Vivillon ##form \ + gOverworldPalette_Vivillon ##form, \ + gShinyOverworldPalette_Vivillon ##form \ ) \ .levelUpLearnset = sVivillonLevelUpLearnset, \ .teachableLearnset = sVivillonTeachableLearnset, \ @@ -1431,13 +1431,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Litleo, .iconPalIndex = 2, FOOTPRINT(Litleo) - FOLLOWER( + OVERWORLD( sPicTable_Litleo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Litleo, - gShinyFollowerPalette_Litleo + gOverworldPalette_Litleo, + gShinyOverworldPalette_Litleo ) .levelUpLearnset = sLitleoLevelUpLearnset, .teachableLearnset = sLitleoTeachableLearnset, @@ -1499,13 +1499,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconPalIndex = 2, .iconPalIndexFemale = 2, FOOTPRINT(Pyroar) - FOLLOWER( + OVERWORLD( sPicTable_Pyroar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pyroar, - gShinyFollowerPalette_Pyroar + gOverworldPalette_Pyroar, + gShinyOverworldPalette_Pyroar ) .levelUpLearnset = sPyroarLevelUpLearnset, .teachableLearnset = sPyroarTeachableLearnset, @@ -1556,13 +1556,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Flabebe##Form##Flower, \ .iconPalIndex = iconPal, \ FOOTPRINT(Flabebe) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Flabebe##Form##Flower, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Flabebe##Form##Flower, \ - gShinyFollowerPalette_Flabebe##Form##Flower \ + gOverworldPalette_Flabebe##Form##Flower, \ + gShinyOverworldPalette_Flabebe##Form##Flower \ ) \ .levelUpLearnset = sFlabebeLevelUpLearnset, \ .teachableLearnset = sFlabebeTeachableLearnset, \ @@ -1643,13 +1643,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Floette##form##Flower, \ .iconPalIndex = iconPal, \ FOOTPRINT(Floette) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Floette ##form##Flower, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Floette ##form##Flower, \ - gShinyFollowerPalette_Floette ##form##Flower \ + gOverworldPalette_Floette ##form##Flower, \ + gShinyOverworldPalette_Floette ##form##Flower \ ) \ .formSpeciesIdTable = sFloetteFormSpeciesIdTable @@ -1790,13 +1790,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Florges##Form##Flower, \ .iconPalIndex = iconPal, \ FOOTPRINT(Florges) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Florges ##Form##Flower, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Florges ##Form##Flower, \ - gShinyFollowerPalette_Florges ##Form##Flower \ + gOverworldPalette_Florges ##Form##Flower, \ + gShinyOverworldPalette_Florges ##Form##Flower \ ) \ .levelUpLearnset = sFlorgesLevelUpLearnset, \ .teachableLearnset = sFlorgesTeachableLearnset, \ @@ -1897,13 +1897,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Skiddo, .iconPalIndex = 1, FOOTPRINT(Skiddo) - FOLLOWER( + OVERWORLD( sPicTable_Skiddo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Skiddo, - gShinyFollowerPalette_Skiddo + gOverworldPalette_Skiddo, + gShinyOverworldPalette_Skiddo ) .levelUpLearnset = sSkiddoLevelUpLearnset, .teachableLearnset = sSkiddoTeachableLearnset, @@ -1959,13 +1959,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Gogoat, .iconPalIndex = 1, FOOTPRINT(Gogoat) - FOLLOWER( + OVERWORLD( sPicTable_Gogoat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gogoat, - gShinyFollowerPalette_Gogoat + gOverworldPalette_Gogoat, + gShinyOverworldPalette_Gogoat ) .levelUpLearnset = sGogoatLevelUpLearnset, .teachableLearnset = sGogoatTeachableLearnset, @@ -2022,13 +2022,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Pancham, .iconPalIndex = 1, FOOTPRINT(Pancham) - FOLLOWER( + OVERWORLD( sPicTable_Pancham, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pancham, - gShinyFollowerPalette_Pancham + gOverworldPalette_Pancham, + gShinyOverworldPalette_Pancham ) .levelUpLearnset = sPanchamLevelUpLearnset, .teachableLearnset = sPanchamTeachableLearnset, @@ -2085,13 +2085,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Pangoro, .iconPalIndex = 1, FOOTPRINT(Pangoro) - FOLLOWER( + OVERWORLD( sPicTable_Pangoro, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pangoro, - gShinyFollowerPalette_Pangoro + gOverworldPalette_Pangoro, + gShinyOverworldPalette_Pangoro ) .levelUpLearnset = sPangoroLevelUpLearnset, .teachableLearnset = sPangoroTeachableLearnset, @@ -2144,13 +2144,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Furfrou##_form, \ .iconPalIndex = _iconIdx, \ FOOTPRINT(Furfrou) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Furfrou##_form, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Furfrou##_form, \ - gShinyFollowerPalette_Furfrou##_form \ + gOverworldPalette_Furfrou##_form, \ + gShinyOverworldPalette_Furfrou##_form \ ) \ .levelUpLearnset = sFurfrouLevelUpLearnset, \ .teachableLearnset = sFurfrouTeachableLearnset, \ @@ -2219,13 +2219,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Espurr, .iconPalIndex = 2, FOOTPRINT(Espurr) - FOLLOWER( + OVERWORLD( sPicTable_Espurr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Espurr, - gShinyFollowerPalette_Espurr + gOverworldPalette_Espurr, + gShinyOverworldPalette_Espurr ) .levelUpLearnset = sEspurrLevelUpLearnset, .teachableLearnset = sEspurrTeachableLearnset, @@ -2282,13 +2282,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_MeowsticMale, .iconPalIndex = 0, FOOTPRINT(Meowstic) - FOLLOWER( + OVERWORLD( sPicTable_MeowsticMale, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MeowsticMale, - gShinyFollowerPalette_MeowsticMale + gOverworldPalette_MeowsticMale, + gShinyOverworldPalette_MeowsticMale ) .levelUpLearnset = sMeowsticMaleLevelUpLearnset, .teachableLearnset = sMeowsticMaleTeachableLearnset, @@ -2343,13 +2343,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_MeowsticFemale, .iconPalIndex = 0, FOOTPRINT(Meowstic) - FOLLOWER( + OVERWORLD( sPicTable_MeowsticFemale, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MeowsticFemale, - gShinyFollowerPalette_MeowsticFemale + gOverworldPalette_MeowsticFemale, + gShinyOverworldPalette_MeowsticFemale ) .levelUpLearnset = sMeowsticFemaleLevelUpLearnset, .teachableLearnset = sMeowsticFemaleTeachableLearnset, @@ -2407,13 +2407,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Honedge, .iconPalIndex = 2, FOOTPRINT(Honedge) - FOLLOWER( + OVERWORLD( sPicTable_Honedge, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Honedge, - gShinyFollowerPalette_Honedge + gOverworldPalette_Honedge, + gShinyOverworldPalette_Honedge ) .levelUpLearnset = sHonedgeLevelUpLearnset, .teachableLearnset = sHonedgeTeachableLearnset, @@ -2470,13 +2470,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Doublade, .iconPalIndex = 2, FOOTPRINT(Doublade) - FOLLOWER( + OVERWORLD( sPicTable_Doublade, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Doublade, - gShinyFollowerPalette_Doublade + gOverworldPalette_Doublade, + gShinyOverworldPalette_Doublade ) .levelUpLearnset = sDoubladeLevelUpLearnset, .teachableLearnset = sDoubladeTeachableLearnset, @@ -2535,13 +2535,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_AegislashShield, .iconPalIndex = 2, FOOTPRINT(Aegislash) - FOLLOWER( + OVERWORLD( sPicTable_AegislashShield, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_AegislashShield, - gShinyFollowerPalette_AegislashShield + gOverworldPalette_AegislashShield, + gShinyOverworldPalette_AegislashShield ) .levelUpLearnset = sAegislashLevelUpLearnset, .teachableLearnset = sAegislashTeachableLearnset, @@ -2661,13 +2661,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Spritzee, .iconPalIndex = 0, FOOTPRINT(Spritzee) - FOLLOWER( + OVERWORLD( sPicTable_Spritzee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Spritzee, - gShinyFollowerPalette_Spritzee + gOverworldPalette_Spritzee, + gShinyOverworldPalette_Spritzee ) .levelUpLearnset = sSpritzeeLevelUpLearnset, .teachableLearnset = sSpritzeeTeachableLearnset, @@ -2724,13 +2724,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Aromatisse, .iconPalIndex = 0, FOOTPRINT(Aromatisse) - FOLLOWER( + OVERWORLD( sPicTable_Aromatisse, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Aromatisse, - gShinyFollowerPalette_Aromatisse + gOverworldPalette_Aromatisse, + gShinyOverworldPalette_Aromatisse ) .levelUpLearnset = sAromatisseLevelUpLearnset, .teachableLearnset = sAromatisseTeachableLearnset, @@ -2786,13 +2786,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Swirlix, .iconPalIndex = 1, FOOTPRINT(Swirlix) - FOLLOWER( + OVERWORLD( sPicTable_Swirlix, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Swirlix, - gShinyFollowerPalette_Swirlix + gOverworldPalette_Swirlix, + gShinyOverworldPalette_Swirlix ) .levelUpLearnset = sSwirlixLevelUpLearnset, .teachableLearnset = sSwirlixTeachableLearnset, @@ -2849,13 +2849,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Slurpuff, .iconPalIndex = 1, FOOTPRINT(Slurpuff) - FOLLOWER( + OVERWORLD( sPicTable_Slurpuff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Slurpuff, - gShinyFollowerPalette_Slurpuff + gOverworldPalette_Slurpuff, + gShinyOverworldPalette_Slurpuff ) .levelUpLearnset = sSlurpuffLevelUpLearnset, .teachableLearnset = sSlurpuffTeachableLearnset, @@ -2912,13 +2912,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Inkay, .iconPalIndex = 0, FOOTPRINT(Inkay) - FOLLOWER( + OVERWORLD( sPicTable_Inkay, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Inkay, - gShinyFollowerPalette_Inkay + gOverworldPalette_Inkay, + gShinyOverworldPalette_Inkay ) .levelUpLearnset = sInkayLevelUpLearnset, .teachableLearnset = sInkayTeachableLearnset, @@ -2974,13 +2974,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Malamar, .iconPalIndex = 2, FOOTPRINT(Malamar) - FOLLOWER( + OVERWORLD( sPicTable_Malamar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Malamar, - gShinyFollowerPalette_Malamar + gOverworldPalette_Malamar, + gShinyOverworldPalette_Malamar ) .levelUpLearnset = sMalamarLevelUpLearnset, .teachableLearnset = sMalamarTeachableLearnset, @@ -3036,13 +3036,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Binacle, .iconPalIndex = 2, FOOTPRINT(Binacle) - FOLLOWER( + OVERWORLD( sPicTable_Binacle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Binacle, - gShinyFollowerPalette_Binacle + gOverworldPalette_Binacle, + gShinyOverworldPalette_Binacle ) .levelUpLearnset = sBinacleLevelUpLearnset, .teachableLearnset = sBinacleTeachableLearnset, @@ -3099,13 +3099,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Barbaracle, .iconPalIndex = 2, FOOTPRINT(Barbaracle) - FOLLOWER( + OVERWORLD( sPicTable_Barbaracle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Barbaracle, - gShinyFollowerPalette_Barbaracle + gOverworldPalette_Barbaracle, + gShinyOverworldPalette_Barbaracle ) .levelUpLearnset = sBarbaracleLevelUpLearnset, .teachableLearnset = sBarbaracleTeachableLearnset, @@ -3161,13 +3161,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Skrelp, .iconPalIndex = 2, FOOTPRINT(Skrelp) - FOLLOWER( + OVERWORLD( sPicTable_Skrelp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Skrelp, - gShinyFollowerPalette_Skrelp + gOverworldPalette_Skrelp, + gShinyOverworldPalette_Skrelp ) .levelUpLearnset = sSkrelpLevelUpLearnset, .teachableLearnset = sSkrelpTeachableLearnset, @@ -3223,13 +3223,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Dragalge, .iconPalIndex = 5, FOOTPRINT(Dragalge) - FOLLOWER( + OVERWORLD( sPicTable_Dragalge, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dragalge, - gShinyFollowerPalette_Dragalge + gOverworldPalette_Dragalge, + gShinyOverworldPalette_Dragalge ) .levelUpLearnset = sDragalgeLevelUpLearnset, .teachableLearnset = sDragalgeTeachableLearnset, @@ -3286,13 +3286,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Clauncher, .iconPalIndex = 0, FOOTPRINT(Clauncher) - FOLLOWER( + OVERWORLD( sPicTable_Clauncher, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Clauncher, - gShinyFollowerPalette_Clauncher + gOverworldPalette_Clauncher, + gShinyOverworldPalette_Clauncher ) .levelUpLearnset = sClauncherLevelUpLearnset, .teachableLearnset = sClauncherTeachableLearnset, @@ -3349,13 +3349,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Clawitzer, .iconPalIndex = 0, FOOTPRINT(Clawitzer) - FOLLOWER( + OVERWORLD( sPicTable_Clawitzer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Clawitzer, - gShinyFollowerPalette_Clawitzer + gOverworldPalette_Clawitzer, + gShinyOverworldPalette_Clawitzer ) .levelUpLearnset = sClawitzerLevelUpLearnset, .teachableLearnset = sClawitzerTeachableLearnset, @@ -3411,13 +3411,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Helioptile, .iconPalIndex = 2, FOOTPRINT(Helioptile) - FOLLOWER( + OVERWORLD( sPicTable_Helioptile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Helioptile, - gShinyFollowerPalette_Helioptile + gOverworldPalette_Helioptile, + gShinyOverworldPalette_Helioptile ) .levelUpLearnset = sHelioptileLevelUpLearnset, .teachableLearnset = sHelioptileTeachableLearnset, @@ -3474,13 +3474,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Heliolisk, .iconPalIndex = 2, FOOTPRINT(Heliolisk) - FOLLOWER( + OVERWORLD( sPicTable_Heliolisk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Heliolisk, - gShinyFollowerPalette_Heliolisk + gOverworldPalette_Heliolisk, + gShinyOverworldPalette_Heliolisk ) .levelUpLearnset = sHelioliskLevelUpLearnset, .teachableLearnset = sHelioliskTeachableLearnset, @@ -3536,13 +3536,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Tyrunt, .iconPalIndex = 2, FOOTPRINT(Tyrunt) - FOLLOWER( + OVERWORLD( sPicTable_Tyrunt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tyrunt, - gShinyFollowerPalette_Tyrunt + gOverworldPalette_Tyrunt, + gShinyOverworldPalette_Tyrunt ) .levelUpLearnset = sTyruntLevelUpLearnset, .teachableLearnset = sTyruntTeachableLearnset, @@ -3598,13 +3598,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Tyrantrum, .iconPalIndex = 0, FOOTPRINT(Tyrantrum) - FOLLOWER( + OVERWORLD( sPicTable_Tyrantrum, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tyrantrum, - gShinyFollowerPalette_Tyrantrum + gOverworldPalette_Tyrantrum, + gShinyOverworldPalette_Tyrantrum ) .levelUpLearnset = sTyrantrumLevelUpLearnset, .teachableLearnset = sTyrantrumTeachableLearnset, @@ -3660,13 +3660,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Amaura, .iconPalIndex = 0, FOOTPRINT(Amaura) - FOLLOWER( + OVERWORLD( sPicTable_Amaura, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Amaura, - gShinyFollowerPalette_Amaura + gOverworldPalette_Amaura, + gShinyOverworldPalette_Amaura ) .levelUpLearnset = sAmauraLevelUpLearnset, .teachableLearnset = sAmauraTeachableLearnset, @@ -3722,13 +3722,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Aurorus, .iconPalIndex = 0, FOOTPRINT(Aurorus) - FOLLOWER( + OVERWORLD( sPicTable_Aurorus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Aurorus, - gShinyFollowerPalette_Aurorus + gOverworldPalette_Aurorus, + gShinyOverworldPalette_Aurorus ) .levelUpLearnset = sAurorusLevelUpLearnset, .teachableLearnset = sAurorusTeachableLearnset, @@ -3789,13 +3789,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Hawlucha, .iconPalIndex = 0, FOOTPRINT(Hawlucha) - FOLLOWER( + OVERWORLD( sPicTable_Hawlucha, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hawlucha, - gShinyFollowerPalette_Hawlucha + gOverworldPalette_Hawlucha, + gShinyOverworldPalette_Hawlucha ) .levelUpLearnset = sHawluchaLevelUpLearnset, .teachableLearnset = sHawluchaTeachableLearnset, @@ -3852,13 +3852,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Dedenne, .iconPalIndex = 0, FOOTPRINT(Dedenne) - FOLLOWER( + OVERWORLD( sPicTable_Dedenne, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dedenne, - gShinyFollowerPalette_Dedenne + gOverworldPalette_Dedenne, + gShinyOverworldPalette_Dedenne ) .levelUpLearnset = sDedenneLevelUpLearnset, .teachableLearnset = sDedenneTeachableLearnset, @@ -3917,13 +3917,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Carbink, .iconPalIndex = 2, FOOTPRINT(Carbink) - FOLLOWER( + OVERWORLD( sPicTable_Carbink, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Carbink, - gShinyFollowerPalette_Carbink + gOverworldPalette_Carbink, + gShinyOverworldPalette_Carbink ) .levelUpLearnset = sCarbinkLevelUpLearnset, .teachableLearnset = sCarbinkTeachableLearnset, @@ -3980,13 +3980,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Goomy, .iconPalIndex = 5, FOOTPRINT(Goomy) - FOLLOWER( + OVERWORLD( sPicTable_Goomy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Goomy, - gShinyFollowerPalette_Goomy + gOverworldPalette_Goomy, + gShinyOverworldPalette_Goomy ) .levelUpLearnset = sGoomyLevelUpLearnset, .teachableLearnset = sGoomyTeachableLearnset, @@ -4044,13 +4044,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Sliggoo, .iconPalIndex = 5, FOOTPRINT(Sliggoo) - FOLLOWER( + OVERWORLD( sPicTable_Sliggoo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sliggoo, - gShinyFollowerPalette_Sliggoo + gOverworldPalette_Sliggoo, + gShinyOverworldPalette_Sliggoo ) .levelUpLearnset = sSliggooLevelUpLearnset, .teachableLearnset = sSliggooTeachableLearnset, @@ -4107,13 +4107,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Goodra, .iconPalIndex = 5, FOOTPRINT(Goodra) - FOLLOWER( + OVERWORLD( sPicTable_Goodra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Goodra, - gShinyFollowerPalette_Goodra + gOverworldPalette_Goodra, + gShinyOverworldPalette_Goodra ) .levelUpLearnset = sGoodraLevelUpLearnset, .teachableLearnset = sGoodraTeachableLearnset, @@ -4170,13 +4170,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_SliggooHisuian, .iconPalIndex = 2, FOOTPRINT(Sliggoo) - FOLLOWER( + OVERWORLD( sPicTable_SliggooHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_SliggooHisuian, - gShinyFollowerPalette_SliggooHisuian + gOverworldPalette_SliggooHisuian, + gShinyOverworldPalette_SliggooHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sSliggooHisuianLevelUpLearnset, @@ -4234,13 +4234,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_GoodraHisuian, .iconPalIndex = 2, FOOTPRINT(Goodra) - FOLLOWER( + OVERWORLD( sPicTable_GoodraHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_GoodraHisuian, - gShinyFollowerPalette_GoodraHisuian + gOverworldPalette_GoodraHisuian, + gShinyOverworldPalette_GoodraHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sGoodraHisuianLevelUpLearnset, @@ -4301,13 +4301,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Klefki, .iconPalIndex = 0, FOOTPRINT(Klefki) - FOLLOWER( + OVERWORLD( sPicTable_Klefki, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Klefki, - gShinyFollowerPalette_Klefki + gOverworldPalette_Klefki, + gShinyOverworldPalette_Klefki ) .levelUpLearnset = sKlefkiLevelUpLearnset, .teachableLearnset = sKlefkiTeachableLearnset, @@ -4365,13 +4365,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Phantump, .iconPalIndex = 1, FOOTPRINT(Phantump) - FOLLOWER( + OVERWORLD( sPicTable_Phantump, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Phantump, - gShinyFollowerPalette_Phantump + gOverworldPalette_Phantump, + gShinyOverworldPalette_Phantump ) .levelUpLearnset = sPhantumpLevelUpLearnset, .teachableLearnset = sPhantumpTeachableLearnset, @@ -4428,13 +4428,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Trevenant, .iconPalIndex = 1, FOOTPRINT(Trevenant) - FOLLOWER( + OVERWORLD( sPicTable_Trevenant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Trevenant, - gShinyFollowerPalette_Trevenant + gOverworldPalette_Trevenant, + gShinyOverworldPalette_Trevenant ) .levelUpLearnset = sTrevenantLevelUpLearnset, .teachableLearnset = sTrevenantTeachableLearnset, @@ -4490,13 +4490,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Pumpkaboo, .iconPalIndex = 2, FOOTPRINT(Pumpkaboo) - FOLLOWER( + OVERWORLD( sPicTable_PumpkabooAverage, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pumpkaboo, - gShinyFollowerPalette_Pumpkaboo + gOverworldPalette_Pumpkaboo, + gShinyOverworldPalette_Pumpkaboo ) .levelUpLearnset = sPumpkabooLevelUpLearnset, .teachableLearnset = sPumpkabooTeachableLearnset, @@ -4721,13 +4721,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Gourgeist, .iconPalIndex = 2, FOOTPRINT(Gourgeist) - FOLLOWER( + OVERWORLD( sPicTable_GourgeistAverage, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gourgeist, - gShinyFollowerPalette_Gourgeist + gOverworldPalette_Gourgeist, + gShinyOverworldPalette_Gourgeist ) .levelUpLearnset = sGourgeistLevelUpLearnset, .teachableLearnset = sGourgeistTeachableLearnset, @@ -4951,13 +4951,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Bergmite, .iconPalIndex = 0, FOOTPRINT(Bergmite) - FOLLOWER( + OVERWORLD( sPicTable_Bergmite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bergmite, - gShinyFollowerPalette_Bergmite + gOverworldPalette_Bergmite, + gShinyOverworldPalette_Bergmite ) .levelUpLearnset = sBergmiteLevelUpLearnset, .teachableLearnset = sBergmiteTeachableLearnset, @@ -5014,13 +5014,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Avalugg, .iconPalIndex = 0, FOOTPRINT(Avalugg) - FOLLOWER( + OVERWORLD( sPicTable_Avalugg, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Avalugg, - gShinyFollowerPalette_Avalugg + gOverworldPalette_Avalugg, + gShinyOverworldPalette_Avalugg ) .levelUpLearnset = sAvaluggLevelUpLearnset, .teachableLearnset = sAvaluggTeachableLearnset, @@ -5075,13 +5075,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_AvaluggHisuian, .iconPalIndex = 5, FOOTPRINT(Avalugg) - FOLLOWER( + OVERWORLD( sPicTable_AvaluggHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_AvaluggHisuian, - gShinyFollowerPalette_AvaluggHisuian + gOverworldPalette_AvaluggHisuian, + gShinyOverworldPalette_AvaluggHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sAvaluggHisuianLevelUpLearnset, @@ -5145,13 +5145,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Noibat, .iconPalIndex = 2, FOOTPRINT(Noibat) - FOLLOWER( + OVERWORLD( sPicTable_Noibat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Noibat, - gShinyFollowerPalette_Noibat + gOverworldPalette_Noibat, + gShinyOverworldPalette_Noibat ) .levelUpLearnset = sNoibatLevelUpLearnset, .teachableLearnset = sNoibatTeachableLearnset, @@ -5211,13 +5211,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Noivern, .iconPalIndex = 2, FOOTPRINT(Noivern) - FOLLOWER( + OVERWORLD( sPicTable_Noivern, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Noivern, - gShinyFollowerPalette_Noivern + gOverworldPalette_Noivern, + gShinyOverworldPalette_Noivern ) .levelUpLearnset = sNoivernLevelUpLearnset, .teachableLearnset = sNoivernTeachableLearnset, @@ -5269,13 +5269,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_XerneasNeutral, .iconPalIndex = 0, FOOTPRINT(Xerneas) - FOLLOWER( + OVERWORLD( sPicTable_XerneasNeutral, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT - //, gFollowerPalette_XerneasNeutral - //, gShinyFollowerPalette_XerneasNeutral + //, gOverworldPalette_XerneasNeutral + //, gShinyOverworldPalette_XerneasNeutral ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5329,13 +5329,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_XerneasActive, .iconPalIndex = 0, FOOTPRINT(Xerneas) - FOLLOWER( + OVERWORLD( sPicTable_XerneasNeutral, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_XerneasNeutral, - gShinyFollowerPalette_XerneasNeutral + gOverworldPalette_XerneasNeutral, + gShinyOverworldPalette_XerneasNeutral ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5396,13 +5396,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Yveltal, .iconPalIndex = 0, FOOTPRINT(Yveltal) - FOLLOWER( + OVERWORLD( sPicTable_Yveltal, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Yveltal, - gShinyFollowerPalette_Yveltal + gOverworldPalette_Yveltal, + gShinyOverworldPalette_Yveltal ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5457,13 +5457,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Zygarde50, .iconPalIndex = 1, FOOTPRINT(Zygarde) - FOLLOWER( + OVERWORLD( sPicTable_Zygarde50, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zygarde50, - gShinyFollowerPalette_Zygarde50 + gOverworldPalette_Zygarde50, + gShinyOverworldPalette_Zygarde50 ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5517,13 +5517,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Zygarde50, .iconPalIndex = 1, FOOTPRINT(Zygarde) - FOLLOWER( + OVERWORLD( sPicTable_Zygarde50, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zygarde50, - gShinyFollowerPalette_Zygarde50 + gOverworldPalette_Zygarde50, + gShinyOverworldPalette_Zygarde50 ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5746,13 +5746,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Diancie, .iconPalIndex = 1, FOOTPRINT(Diancie) - FOLLOWER( + OVERWORLD( sPicTable_Diancie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Diancie, - gShinyFollowerPalette_Diancie + gOverworldPalette_Diancie, + gShinyOverworldPalette_Diancie ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -5873,13 +5873,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_HoopaConfined, .iconPalIndex = 0, FOOTPRINT(Hoopa) - FOLLOWER( + OVERWORLD( sPicTable_HoopaConfined, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_HoopaConfined, - gShinyFollowerPalette_HoopaConfined + gOverworldPalette_HoopaConfined, + gShinyOverworldPalette_HoopaConfined ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -5938,13 +5938,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_HoopaUnbound, .iconPalIndex = 0, FOOTPRINT(Hoopa) - FOLLOWER( + OVERWORLD( sPicTable_HoopaUnbound, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_HoopaUnbound, - gShinyFollowerPalette_HoopaUnbound + gOverworldPalette_HoopaUnbound, + gShinyOverworldPalette_HoopaUnbound ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -6004,13 +6004,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSprite = gMonIcon_Volcanion, .iconPalIndex = 0, FOOTPRINT(Volcanion) - FOLLOWER( + OVERWORLD( sPicTable_Volcanion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Volcanion, - gShinyFollowerPalette_Volcanion + gOverworldPalette_Volcanion, + gShinyOverworldPalette_Volcanion ) .isMythical = TRUE, .isFrontierBanned = TRUE, diff --git a/src/data/pokemon/species_info/gen_7_families.h b/src/data/pokemon/species_info/gen_7_families.h index df0b4be2bd..feb4fe968b 100644 --- a/src/data/pokemon/species_info/gen_7_families.h +++ b/src/data/pokemon/species_info/gen_7_families.h @@ -52,13 +52,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Rowlet, .iconPalIndex = 0, FOOTPRINT(Rowlet) - FOLLOWER( + OVERWORLD( sPicTable_Rowlet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rowlet, - gShinyFollowerPalette_Rowlet + gOverworldPalette_Rowlet, + gShinyOverworldPalette_Rowlet ) .levelUpLearnset = sRowletLevelUpLearnset, .teachableLearnset = sRowletTeachableLearnset, @@ -115,13 +115,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Dartrix, .iconPalIndex = 1, FOOTPRINT(Dartrix) - FOLLOWER( + OVERWORLD( sPicTable_Dartrix, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dartrix, - gShinyFollowerPalette_Dartrix + gOverworldPalette_Dartrix, + gShinyOverworldPalette_Dartrix ) .levelUpLearnset = sDartrixLevelUpLearnset, .teachableLearnset = sDartrixTeachableLearnset, @@ -177,13 +177,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Decidueye, .iconPalIndex = 1, FOOTPRINT(Decidueye) - FOLLOWER( + OVERWORLD( sPicTable_Decidueye, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Decidueye, - gShinyFollowerPalette_Decidueye + gOverworldPalette_Decidueye, + gShinyOverworldPalette_Decidueye ) .levelUpLearnset = sDecidueyeLevelUpLearnset, .teachableLearnset = sDecidueyeTeachableLearnset, @@ -239,13 +239,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_DecidueyeHisuian, .iconPalIndex = 0, FOOTPRINT(Decidueye) - FOLLOWER( + OVERWORLD( sPicTable_DecidueyeHisuian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_DecidueyeHisuian, - gShinyFollowerPalette_DecidueyeHisuian + gOverworldPalette_DecidueyeHisuian, + gShinyOverworldPalette_DecidueyeHisuian ) .isHisuianForm = TRUE, .levelUpLearnset = sDecidueyeHisuianLevelUpLearnset, @@ -304,13 +304,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Litten, .iconPalIndex = 0, FOOTPRINT(Litten) - FOLLOWER( + OVERWORLD( sPicTable_Litten, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Litten, - gShinyFollowerPalette_Litten + gOverworldPalette_Litten, + gShinyOverworldPalette_Litten ) .levelUpLearnset = sLittenLevelUpLearnset, .teachableLearnset = sLittenTeachableLearnset, @@ -366,13 +366,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Torracat, .iconPalIndex = 0, FOOTPRINT(Torracat) - FOLLOWER( + OVERWORLD( sPicTable_Torracat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Torracat, - gShinyFollowerPalette_Torracat + gOverworldPalette_Torracat, + gShinyOverworldPalette_Torracat ) .levelUpLearnset = sTorracatLevelUpLearnset, .teachableLearnset = sTorracatTeachableLearnset, @@ -427,13 +427,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Incineroar, .iconPalIndex = 0, FOOTPRINT(Incineroar) - FOLLOWER( + OVERWORLD( sPicTable_Incineroar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Incineroar, - gShinyFollowerPalette_Incineroar + gOverworldPalette_Incineroar, + gShinyOverworldPalette_Incineroar ) .levelUpLearnset = sIncineroarLevelUpLearnset, .teachableLearnset = sIncineroarTeachableLearnset, @@ -489,13 +489,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Popplio, .iconPalIndex = 0, FOOTPRINT(Popplio) - FOLLOWER( + OVERWORLD( sPicTable_Popplio, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Popplio, - gShinyFollowerPalette_Popplio + gOverworldPalette_Popplio, + gShinyOverworldPalette_Popplio ) .levelUpLearnset = sPopplioLevelUpLearnset, .teachableLearnset = sPopplioTeachableLearnset, @@ -551,13 +551,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Brionne, .iconPalIndex = 0, FOOTPRINT(Brionne) - FOLLOWER( + OVERWORLD( sPicTable_Brionne, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Brionne, - gShinyFollowerPalette_Brionne + gOverworldPalette_Brionne, + gShinyOverworldPalette_Brionne ) .levelUpLearnset = sBrionneLevelUpLearnset, .teachableLearnset = sBrionneTeachableLearnset, @@ -612,13 +612,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Primarina, .iconPalIndex = 0, FOOTPRINT(Primarina) - FOLLOWER( + OVERWORLD( sPicTable_Primarina, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Primarina, - gShinyFollowerPalette_Primarina + gOverworldPalette_Primarina, + gShinyOverworldPalette_Primarina ) .levelUpLearnset = sPrimarinaLevelUpLearnset, .teachableLearnset = sPrimarinaTeachableLearnset, @@ -675,13 +675,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Pikipek, .iconPalIndex = 2, FOOTPRINT(Pikipek) - FOLLOWER( + OVERWORLD( sPicTable_Pikipek, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pikipek, - gShinyFollowerPalette_Pikipek + gOverworldPalette_Pikipek, + gShinyOverworldPalette_Pikipek ) .levelUpLearnset = sPikipekLevelUpLearnset, .teachableLearnset = sPikipekTeachableLearnset, @@ -738,13 +738,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Trumbeak, .iconPalIndex = 0, FOOTPRINT(Trumbeak) - FOLLOWER( + OVERWORLD( sPicTable_Trumbeak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Trumbeak, - gShinyFollowerPalette_Trumbeak + gOverworldPalette_Trumbeak, + gShinyOverworldPalette_Trumbeak ) .levelUpLearnset = sTrumbeakLevelUpLearnset, .teachableLearnset = sTrumbeakTeachableLearnset, @@ -800,13 +800,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Toucannon, .iconPalIndex = 0, FOOTPRINT(Toucannon) - FOLLOWER( + OVERWORLD( sPicTable_Toucannon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Toucannon, - gShinyFollowerPalette_Toucannon + gOverworldPalette_Toucannon, + gShinyOverworldPalette_Toucannon ) .levelUpLearnset = sToucannonLevelUpLearnset, .teachableLearnset = sToucannonTeachableLearnset, @@ -863,13 +863,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Yungoos, .iconPalIndex = 2, FOOTPRINT(Yungoos) - FOLLOWER( + OVERWORLD( sPicTable_Yungoos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Yungoos, - gShinyFollowerPalette_Yungoos + gOverworldPalette_Yungoos, + gShinyOverworldPalette_Yungoos ) .levelUpLearnset = sYungoosLevelUpLearnset, .teachableLearnset = sYungoosTeachableLearnset, @@ -922,13 +922,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Gumshoos, .iconPalIndex = 2, FOOTPRINT(Gumshoos) - FOLLOWER( + OVERWORLD( sPicTable_Gumshoos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gumshoos, - gShinyFollowerPalette_Gumshoos + gOverworldPalette_Gumshoos, + gShinyOverworldPalette_Gumshoos ) .levelUpLearnset = sGumshoosLevelUpLearnset, .teachableLearnset = sGumshoosTeachableLearnset, @@ -980,13 +980,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Gumshoos, .iconPalIndex = 2, FOOTPRINT(Gumshoos) - FOLLOWER( + OVERWORLD( sPicTable_Gumshoos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gumshoos, - gShinyFollowerPalette_Gumshoos + gOverworldPalette_Gumshoos, + gShinyOverworldPalette_Gumshoos ) .isTotem = TRUE, .levelUpLearnset = sGumshoosLevelUpLearnset, @@ -1044,13 +1044,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Grubbin, .iconPalIndex = 0, FOOTPRINT(Grubbin) - FOLLOWER( + OVERWORLD( sPicTable_Grubbin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Grubbin, - gShinyFollowerPalette_Grubbin + gOverworldPalette_Grubbin, + gShinyOverworldPalette_Grubbin ) .levelUpLearnset = sGrubbinLevelUpLearnset, .teachableLearnset = sGrubbinTeachableLearnset, @@ -1107,13 +1107,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Charjabug, .iconPalIndex = 1, FOOTPRINT(Charjabug) - FOLLOWER( + OVERWORLD( sPicTable_Charjabug, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Charjabug, - gShinyFollowerPalette_Charjabug + gOverworldPalette_Charjabug, + gShinyOverworldPalette_Charjabug ) .levelUpLearnset = sCharjabugLevelUpLearnset, .teachableLearnset = sCharjabugTeachableLearnset, @@ -1167,13 +1167,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Vikavolt, .iconPalIndex = 0, FOOTPRINT(Vikavolt) - FOLLOWER( + OVERWORLD( sPicTable_Vikavolt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vikavolt, - gShinyFollowerPalette_Vikavolt + gOverworldPalette_Vikavolt, + gShinyOverworldPalette_Vikavolt ) .levelUpLearnset = sVikavoltLevelUpLearnset, .teachableLearnset = sVikavoltTeachableLearnset, @@ -1225,13 +1225,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Vikavolt, .iconPalIndex = 0, FOOTPRINT(Vikavolt) - FOLLOWER( + OVERWORLD( sPicTable_Vikavolt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Vikavolt, - gShinyFollowerPalette_Vikavolt + gOverworldPalette_Vikavolt, + gShinyOverworldPalette_Vikavolt ) .isTotem = TRUE, .levelUpLearnset = sVikavoltLevelUpLearnset, @@ -1290,13 +1290,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Crabrawler, .iconPalIndex = 2, FOOTPRINT(Crabrawler) - FOLLOWER( + OVERWORLD( sPicTable_Crabrawler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Crabrawler, - gShinyFollowerPalette_Crabrawler + gOverworldPalette_Crabrawler, + gShinyOverworldPalette_Crabrawler ) .levelUpLearnset = sCrabrawlerLevelUpLearnset, .teachableLearnset = sCrabrawlerTeachableLearnset, @@ -1354,13 +1354,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Crabominable, .iconPalIndex = 2, FOOTPRINT(Crabominable) - FOLLOWER( + OVERWORLD( sPicTable_Crabominable, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Crabominable, - gShinyFollowerPalette_Crabominable + gOverworldPalette_Crabominable, + gShinyOverworldPalette_Crabominable ) .levelUpLearnset = sCrabominableLevelUpLearnset, .teachableLearnset = sCrabominableTeachableLearnset, @@ -1417,13 +1417,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_OricorioBaile, .iconPalIndex = 0, FOOTPRINT(Oricorio) - FOLLOWER( + OVERWORLD( sPicTable_OricorioBaile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_OricorioBaile, - gShinyFollowerPalette_OricorioBaile + gOverworldPalette_OricorioBaile, + gShinyOverworldPalette_OricorioBaile ) .levelUpLearnset = sOricorioLevelUpLearnset, .teachableLearnset = sOricorioTeachableLearnset, @@ -1652,13 +1652,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Cutiefly, .iconPalIndex = 2, FOOTPRINT(Cutiefly) - FOLLOWER( + OVERWORLD( sPicTable_Cutiefly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cutiefly, - gShinyFollowerPalette_Cutiefly + gOverworldPalette_Cutiefly, + gShinyOverworldPalette_Cutiefly ) .levelUpLearnset = sCutieflyLevelUpLearnset, .teachableLearnset = sCutieflyTeachableLearnset, @@ -1713,13 +1713,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Ribombee, .iconPalIndex = 2, FOOTPRINT(Ribombee) - FOLLOWER( + OVERWORLD( sPicTable_Ribombee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ribombee, - gShinyFollowerPalette_Ribombee + gOverworldPalette_Ribombee, + gShinyOverworldPalette_Ribombee ) .levelUpLearnset = sRibombeeLevelUpLearnset, .teachableLearnset = sRibombeeTeachableLearnset, @@ -1772,13 +1772,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Ribombee, .iconPalIndex = 2, FOOTPRINT(Ribombee) - FOLLOWER( + OVERWORLD( sPicTable_Ribombee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Ribombee, - gShinyFollowerPalette_Ribombee + gOverworldPalette_Ribombee, + gShinyOverworldPalette_Ribombee ) .isTotem = TRUE, .levelUpLearnset = sRibombeeLevelUpLearnset, @@ -1832,13 +1832,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Rockruff, .iconPalIndex = 2, FOOTPRINT(Rockruff) - FOLLOWER( + OVERWORLD( sPicTable_Rockruff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rockruff, - gShinyFollowerPalette_Rockruff + gOverworldPalette_Rockruff, + gShinyOverworldPalette_Rockruff ) .levelUpLearnset = sRockruffLevelUpLearnset, .teachableLearnset = sRockruffTeachableLearnset, @@ -1892,13 +1892,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Rockruff, .iconPalIndex = 2, FOOTPRINT(Rockruff) - FOLLOWER( + OVERWORLD( sPicTable_Rockruff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rockruff, - gShinyFollowerPalette_Rockruff + gOverworldPalette_Rockruff, + gShinyOverworldPalette_Rockruff ) .levelUpLearnset = sRockruffLevelUpLearnset, .teachableLearnset = sRockruffTeachableLearnset, @@ -1955,13 +1955,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_LycanrocMidday, .iconPalIndex = 2, FOOTPRINT(Lycanroc) - FOLLOWER( + OVERWORLD( sPicTable_LycanrocMidday, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_LycanrocMidday, - gShinyFollowerPalette_LycanrocMidday + gOverworldPalette_LycanrocMidday, + gShinyOverworldPalette_LycanrocMidday ) .levelUpLearnset = sLycanrocMiddayLevelUpLearnset, .teachableLearnset = sLycanrocMiddayTeachableLearnset, @@ -2016,13 +2016,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_LycanrocMidnight, .iconPalIndex = 0, FOOTPRINT(Lycanroc) - FOLLOWER( + OVERWORLD( sPicTable_LycanrocMidnight, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_LycanrocMidnight, - gShinyFollowerPalette_LycanrocMidnight + gOverworldPalette_LycanrocMidnight, + gShinyOverworldPalette_LycanrocMidnight ) .levelUpLearnset = sLycanrocMidnightLevelUpLearnset, .teachableLearnset = sLycanrocMidnightTeachableLearnset, @@ -2077,13 +2077,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_LycanrocDusk, .iconPalIndex = 0, FOOTPRINT(Lycanroc) - FOLLOWER( + OVERWORLD( sPicTable_LycanrocDusk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_LycanrocDusk, - gShinyFollowerPalette_LycanrocDusk + gOverworldPalette_LycanrocDusk, + gShinyOverworldPalette_LycanrocDusk ) .levelUpLearnset = sLycanrocDuskLevelUpLearnset, .teachableLearnset = sLycanrocDuskTeachableLearnset, @@ -2141,13 +2141,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_WishiwashiSolo, .iconPalIndex = 2, FOOTPRINT(Wishiwashi) - FOLLOWER( + OVERWORLD( sPicTable_WishiwashiSolo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_WishiwashiSolo, - gShinyFollowerPalette_WishiwashiSolo + gOverworldPalette_WishiwashiSolo, + gShinyOverworldPalette_WishiwashiSolo ) .levelUpLearnset = sWishiwashiLevelUpLearnset, .teachableLearnset = sWishiwashiTeachableLearnset, @@ -2262,13 +2262,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Mareanie, .iconPalIndex = 2, FOOTPRINT(Mareanie) - FOLLOWER( + OVERWORLD( sPicTable_Mareanie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mareanie, - gShinyFollowerPalette_Mareanie + gOverworldPalette_Mareanie, + gShinyOverworldPalette_Mareanie ) .levelUpLearnset = sMareanieLevelUpLearnset, .teachableLearnset = sMareanieTeachableLearnset, @@ -2325,13 +2325,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Toxapex, .iconPalIndex = 0, FOOTPRINT(Toxapex) - FOLLOWER( + OVERWORLD( sPicTable_Toxapex, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Toxapex, - gShinyFollowerPalette_Toxapex + gOverworldPalette_Toxapex, + gShinyOverworldPalette_Toxapex ) .levelUpLearnset = sToxapexLevelUpLearnset, .teachableLearnset = sToxapexTeachableLearnset, @@ -2388,13 +2388,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Mudbray, .iconPalIndex = 2, FOOTPRINT(Mudbray) - FOLLOWER( + OVERWORLD( sPicTable_Mudbray, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mudbray, - gShinyFollowerPalette_Mudbray + gOverworldPalette_Mudbray, + gShinyOverworldPalette_Mudbray ) .levelUpLearnset = sMudbrayLevelUpLearnset, .teachableLearnset = sMudbrayTeachableLearnset, @@ -2451,13 +2451,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Mudsdale, .iconPalIndex = 0, FOOTPRINT(Mudsdale) - FOLLOWER( + OVERWORLD( sPicTable_Mudsdale, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Mudsdale, - gShinyFollowerPalette_Mudsdale + gOverworldPalette_Mudsdale, + gShinyOverworldPalette_Mudsdale ) .levelUpLearnset = sMudsdaleLevelUpLearnset, .teachableLearnset = sMudsdaleTeachableLearnset, @@ -2514,13 +2514,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Dewpider, .iconPalIndex = 0, FOOTPRINT(Dewpider) - FOLLOWER( + OVERWORLD( sPicTable_Dewpider, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dewpider, - gShinyFollowerPalette_Dewpider + gOverworldPalette_Dewpider, + gShinyOverworldPalette_Dewpider ) .levelUpLearnset = sDewpiderLevelUpLearnset, .teachableLearnset = sDewpiderTeachableLearnset, @@ -2574,13 +2574,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Araquanid, .iconPalIndex = 2, FOOTPRINT(Araquanid) - FOLLOWER( + OVERWORLD( sPicTable_Araquanid, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Araquanid, - gShinyFollowerPalette_Araquanid + gOverworldPalette_Araquanid, + gShinyOverworldPalette_Araquanid ) .levelUpLearnset = sAraquanidLevelUpLearnset, .teachableLearnset = sAraquanidTeachableLearnset, @@ -2632,13 +2632,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Araquanid, .iconPalIndex = 2, FOOTPRINT(Araquanid) - FOLLOWER( + OVERWORLD( sPicTable_Araquanid, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Araquanid, - gShinyFollowerPalette_Araquanid + gOverworldPalette_Araquanid, + gShinyOverworldPalette_Araquanid ) .isTotem = TRUE, .levelUpLearnset = sAraquanidLevelUpLearnset, @@ -2697,13 +2697,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Fomantis, .iconPalIndex = 1, FOOTPRINT(Fomantis) - FOLLOWER( + OVERWORLD( sPicTable_Fomantis, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Fomantis, - gShinyFollowerPalette_Fomantis + gOverworldPalette_Fomantis, + gShinyOverworldPalette_Fomantis ) .levelUpLearnset = sFomantisLevelUpLearnset, .teachableLearnset = sFomantisTeachableLearnset, @@ -2757,13 +2757,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Lurantis, .iconPalIndex = 1, FOOTPRINT(Lurantis) - FOLLOWER( + OVERWORLD( sPicTable_Lurantis, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lurantis, - gShinyFollowerPalette_Lurantis + gOverworldPalette_Lurantis, + gShinyOverworldPalette_Lurantis ) .levelUpLearnset = sLurantisLevelUpLearnset, .teachableLearnset = sLurantisTeachableLearnset, @@ -2815,13 +2815,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Lurantis, .iconPalIndex = 1, FOOTPRINT(Lurantis) - FOLLOWER( + OVERWORLD( sPicTable_Lurantis, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lurantis, - gShinyFollowerPalette_Lurantis + gOverworldPalette_Lurantis, + gShinyOverworldPalette_Lurantis ) .isTotem = TRUE, .levelUpLearnset = sLurantisLevelUpLearnset, @@ -2881,13 +2881,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Morelull, .iconPalIndex = 0, FOOTPRINT(Morelull) - FOLLOWER( + OVERWORLD( sPicTable_Morelull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Morelull, - gShinyFollowerPalette_Morelull + gOverworldPalette_Morelull, + gShinyOverworldPalette_Morelull ) .levelUpLearnset = sMorelullLevelUpLearnset, .teachableLearnset = sMorelullTeachableLearnset, @@ -2945,13 +2945,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Shiinotic, .iconPalIndex = 1, FOOTPRINT(Shiinotic) - FOLLOWER( + OVERWORLD( sPicTable_Shiinotic, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Shiinotic, - gShinyFollowerPalette_Shiinotic + gOverworldPalette_Shiinotic, + gShinyOverworldPalette_Shiinotic ) .levelUpLearnset = sShiinoticLevelUpLearnset, .teachableLearnset = sShiinoticTeachableLearnset, @@ -3008,13 +3008,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Salandit, .iconPalIndex = 2, FOOTPRINT(Salandit) - FOLLOWER( + OVERWORLD( sPicTable_Salandit, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Salandit, - gShinyFollowerPalette_Salandit + gOverworldPalette_Salandit, + gShinyOverworldPalette_Salandit ) .levelUpLearnset = sSalanditLevelUpLearnset, .teachableLearnset = sSalanditTeachableLearnset, @@ -3068,13 +3068,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Salazzle, .iconPalIndex = 0, FOOTPRINT(Salazzle) - FOLLOWER( + OVERWORLD( sPicTable_Salazzle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Salazzle, - gShinyFollowerPalette_Salazzle + gOverworldPalette_Salazzle, + gShinyOverworldPalette_Salazzle ) .levelUpLearnset = sSalazzleLevelUpLearnset, .teachableLearnset = sSalazzleTeachableLearnset, @@ -3126,13 +3126,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Salazzle, .iconPalIndex = 0, FOOTPRINT(Salazzle) - FOLLOWER( + OVERWORLD( sPicTable_Salazzle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Salazzle, - gShinyFollowerPalette_Salazzle + gOverworldPalette_Salazzle, + gShinyOverworldPalette_Salazzle ) .isTotem = TRUE, .levelUpLearnset = sSalazzleLevelUpLearnset, @@ -3190,13 +3190,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Stufful, .iconPalIndex = 0, FOOTPRINT(Stufful) - FOLLOWER( + OVERWORLD( sPicTable_Stufful, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Stufful, - gShinyFollowerPalette_Stufful + gOverworldPalette_Stufful, + gShinyOverworldPalette_Stufful ) .levelUpLearnset = sStuffulLevelUpLearnset, .teachableLearnset = sStuffulTeachableLearnset, @@ -3252,13 +3252,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Bewear, .iconPalIndex = 0, FOOTPRINT(Bewear) - FOLLOWER( + OVERWORLD( sPicTable_Bewear, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bewear, - gShinyFollowerPalette_Bewear + gOverworldPalette_Bewear, + gShinyOverworldPalette_Bewear ) .levelUpLearnset = sBewearLevelUpLearnset, .teachableLearnset = sBewearTeachableLearnset, @@ -3315,13 +3315,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Bounsweet, .iconPalIndex = 1, FOOTPRINT(Bounsweet) - FOLLOWER( + OVERWORLD( sPicTable_Bounsweet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bounsweet, - gShinyFollowerPalette_Bounsweet + gOverworldPalette_Bounsweet, + gShinyOverworldPalette_Bounsweet ) .levelUpLearnset = sBounsweetLevelUpLearnset, .teachableLearnset = sBounsweetTeachableLearnset, @@ -3379,13 +3379,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Steenee, .iconPalIndex = 1, FOOTPRINT(Steenee) - FOLLOWER( + OVERWORLD( sPicTable_Steenee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Steenee, - gShinyFollowerPalette_Steenee + gOverworldPalette_Steenee, + gShinyOverworldPalette_Steenee ) .levelUpLearnset = sSteeneeLevelUpLearnset, .teachableLearnset = sSteeneeTeachableLearnset, @@ -3442,13 +3442,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Tsareena, .iconPalIndex = 1, FOOTPRINT(Tsareena) - FOLLOWER( + OVERWORLD( sPicTable_Tsareena, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Tsareena, - gShinyFollowerPalette_Tsareena + gOverworldPalette_Tsareena, + gShinyOverworldPalette_Tsareena ) .levelUpLearnset = sTsareenaLevelUpLearnset, .teachableLearnset = sTsareenaTeachableLearnset, @@ -3507,13 +3507,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Comfey, .iconPalIndex = 1, FOOTPRINT(Comfey) - FOLLOWER( + OVERWORLD( sPicTable_Comfey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Comfey, - gShinyFollowerPalette_Comfey + gOverworldPalette_Comfey, + gShinyOverworldPalette_Comfey ) .levelUpLearnset = sComfeyLevelUpLearnset, .teachableLearnset = sComfeyTeachableLearnset, @@ -3570,13 +3570,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Oranguru, .iconPalIndex = 0, FOOTPRINT(Oranguru) - FOLLOWER( + OVERWORLD( sPicTable_Oranguru, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Oranguru, - gShinyFollowerPalette_Oranguru + gOverworldPalette_Oranguru, + gShinyOverworldPalette_Oranguru ) .levelUpLearnset = sOranguruLevelUpLearnset, .teachableLearnset = sOranguruTeachableLearnset, @@ -3633,13 +3633,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Passimian, .iconPalIndex = 1, FOOTPRINT(Passimian) - FOLLOWER( + OVERWORLD( sPicTable_Passimian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Passimian, - gShinyFollowerPalette_Passimian + gOverworldPalette_Passimian, + gShinyOverworldPalette_Passimian ) .levelUpLearnset = sPassimianLevelUpLearnset, .teachableLearnset = sPassimianTeachableLearnset, @@ -3696,13 +3696,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Wimpod, .iconPalIndex = 2, FOOTPRINT(Wimpod) - FOLLOWER( + OVERWORLD( sPicTable_Wimpod, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Wimpod, - gShinyFollowerPalette_Wimpod + gOverworldPalette_Wimpod, + gShinyOverworldPalette_Wimpod ) .levelUpLearnset = sWimpodLevelUpLearnset, .teachableLearnset = sWimpodTeachableLearnset, @@ -3758,13 +3758,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Golisopod, .iconPalIndex = 2, FOOTPRINT(Golisopod) - FOLLOWER( + OVERWORLD( sPicTable_Golisopod, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Golisopod, - gShinyFollowerPalette_Golisopod + gOverworldPalette_Golisopod, + gShinyOverworldPalette_Golisopod ) .levelUpLearnset = sGolisopodLevelUpLearnset, .teachableLearnset = sGolisopodTeachableLearnset, @@ -3821,13 +3821,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Sandygast, .iconPalIndex = 1, FOOTPRINT(Sandygast) - FOLLOWER( + OVERWORLD( sPicTable_Sandygast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sandygast, - gShinyFollowerPalette_Sandygast + gOverworldPalette_Sandygast, + gShinyOverworldPalette_Sandygast ) .levelUpLearnset = sSandygastLevelUpLearnset, .teachableLearnset = sSandygastTeachableLearnset, @@ -3884,13 +3884,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Palossand, .iconPalIndex = 2, FOOTPRINT(Palossand) - FOLLOWER( + OVERWORLD( sPicTable_Palossand, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Palossand, - gShinyFollowerPalette_Palossand + gOverworldPalette_Palossand, + gShinyOverworldPalette_Palossand ) .levelUpLearnset = sPalossandLevelUpLearnset, .teachableLearnset = sPalossandTeachableLearnset, @@ -3946,13 +3946,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Pyukumuku, .iconPalIndex = 0, FOOTPRINT(Pyukumuku) - FOLLOWER( + OVERWORLD( sPicTable_Pyukumuku, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pyukumuku, - gShinyFollowerPalette_Pyukumuku + gOverworldPalette_Pyukumuku, + gShinyOverworldPalette_Pyukumuku ) .levelUpLearnset = sPyukumukuLevelUpLearnset, .teachableLearnset = sPyukumukuTeachableLearnset, @@ -4009,13 +4009,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_TypeNull, .iconPalIndex = 0, FOOTPRINT(Type_Null) - FOLLOWER( + OVERWORLD( sPicTable_TypeNull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_TypeNull, - gShinyFollowerPalette_TypeNull + gOverworldPalette_TypeNull, + gShinyOverworldPalette_TypeNull ) .isLegendary = TRUE, .levelUpLearnset = sTypeNullLevelUpLearnset, @@ -4070,13 +4070,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Silvally, \ .iconPalIndex = 0, \ FOOTPRINT(Silvally) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_Silvally, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_Silvally, \ - gShinyFollowerPalette_Silvally \ + gOverworldPalette_Silvally, \ + gShinyOverworldPalette_Silvally \ ) \ .levelUpLearnset = sSilvallyLevelUpLearnset, \ .teachableLearnset = sSilvallyTeachableLearnset, \ @@ -4157,13 +4157,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MiniorMeteor, \ .iconSprite = gMonIcon_MiniorMeteor, \ .iconPalIndex = 0, \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_MiniorMeteor, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_MiniorMeteor, \ - gShinyFollowerPalette_MiniorMeteor \ + gOverworldPalette_MiniorMeteor, \ + gShinyOverworldPalette_MiniorMeteor \ ) \ .formChangeTable = sMinior ##Form##FormChangeTable, \ MINIOR_MISC_INFO(BODY_COLOR_BROWN), \ @@ -4262,13 +4262,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Komala, .iconPalIndex = 2, FOOTPRINT(Komala) - FOLLOWER( + OVERWORLD( sPicTable_Komala, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Komala, - gShinyFollowerPalette_Komala + gOverworldPalette_Komala, + gShinyOverworldPalette_Komala ) .levelUpLearnset = sKomalaLevelUpLearnset, .teachableLearnset = sKomalaTeachableLearnset, @@ -4326,13 +4326,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Turtonator, .iconPalIndex = 0, FOOTPRINT(Turtonator) - FOLLOWER( + OVERWORLD( sPicTable_Turtonator, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Turtonator, - gShinyFollowerPalette_Turtonator + gOverworldPalette_Turtonator, + gShinyOverworldPalette_Turtonator ) .levelUpLearnset = sTurtonatorLevelUpLearnset, .teachableLearnset = sTurtonatorTeachableLearnset, @@ -4386,13 +4386,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Togedemaru, .iconPalIndex = 2, FOOTPRINT(Togedemaru) - FOLLOWER( + OVERWORLD( sPicTable_Togedemaru, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Togedemaru, - gShinyFollowerPalette_Togedemaru + gOverworldPalette_Togedemaru, + gShinyOverworldPalette_Togedemaru ) .levelUpLearnset = sTogedemaruLevelUpLearnset, .teachableLearnset = sTogedemaruTeachableLearnset, @@ -4445,13 +4445,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Togedemaru, .iconPalIndex = 2, FOOTPRINT(Togedemaru) - FOLLOWER( + OVERWORLD( sPicTable_Togedemaru, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Togedemaru, - gShinyFollowerPalette_Togedemaru + gOverworldPalette_Togedemaru, + gShinyOverworldPalette_Togedemaru ) .isTotem = TRUE, .levelUpLearnset = sTogedemaruLevelUpLearnset, @@ -4507,13 +4507,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_MimikyuDisguised, .iconPalIndex = 1, FOOTPRINT(Mimikyu) - FOLLOWER( + OVERWORLD( sPicTable_MimikyuDisguised, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MimikyuDisguised, - gShinyFollowerPalette_MimikyuDisguised + gOverworldPalette_MimikyuDisguised, + gShinyOverworldPalette_MimikyuDisguised ) .levelUpLearnset = sMimikyuLevelUpLearnset, .teachableLearnset = sMimikyuTeachableLearnset, @@ -4731,13 +4731,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Bruxish, .iconPalIndex = 0, FOOTPRINT(Bruxish) - FOLLOWER( + OVERWORLD( sPicTable_Bruxish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Bruxish, - gShinyFollowerPalette_Bruxish + gOverworldPalette_Bruxish, + gShinyOverworldPalette_Bruxish ) .levelUpLearnset = sBruxishLevelUpLearnset, .teachableLearnset = sBruxishTeachableLearnset, @@ -4795,13 +4795,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Drampa, .iconPalIndex = 0, FOOTPRINT(Drampa) - FOLLOWER( + OVERWORLD( sPicTable_Drampa, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Drampa, - gShinyFollowerPalette_Drampa + gOverworldPalette_Drampa, + gShinyOverworldPalette_Drampa ) .levelUpLearnset = sDrampaLevelUpLearnset, .teachableLearnset = sDrampaTeachableLearnset, @@ -4860,13 +4860,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Dhelmise, .iconPalIndex = 1, FOOTPRINT(Dhelmise) - FOLLOWER( + OVERWORLD( sPicTable_Dhelmise, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dhelmise, - gShinyFollowerPalette_Dhelmise + gOverworldPalette_Dhelmise, + gShinyOverworldPalette_Dhelmise ) .levelUpLearnset = sDhelmiseLevelUpLearnset, .teachableLearnset = sDhelmiseTeachableLearnset, @@ -4923,13 +4923,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_JangmoO, .iconPalIndex = 2, FOOTPRINT(JangmoO) - FOLLOWER( + OVERWORLD( sPicTable_JangmoO, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_JangmoO, - gShinyFollowerPalette_JangmoO + gOverworldPalette_JangmoO, + gShinyOverworldPalette_JangmoO ) .levelUpLearnset = sJangmoOLevelUpLearnset, .teachableLearnset = sJangmoOTeachableLearnset, @@ -4986,13 +4986,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_HakamoO, .iconPalIndex = 2, FOOTPRINT(HakamoO) - FOLLOWER( + OVERWORLD( sPicTable_HakamoO, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_HakamoO, - gShinyFollowerPalette_HakamoO + gOverworldPalette_HakamoO, + gShinyOverworldPalette_HakamoO ) .levelUpLearnset = sHakamoOLevelUpLearnset, .teachableLearnset = sHakamoOTeachableLearnset, @@ -5045,13 +5045,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_KommoO, .iconPalIndex = 2, FOOTPRINT(KommoO) - FOLLOWER( + OVERWORLD( sPicTable_KommoO, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_KommoO, - gShinyFollowerPalette_KommoO + gOverworldPalette_KommoO, + gShinyOverworldPalette_KommoO ) .levelUpLearnset = sKommoOLevelUpLearnset, .teachableLearnset = sKommoOTeachableLearnset, @@ -5103,13 +5103,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_KommoO, .iconPalIndex = 2, FOOTPRINT(KommoO) - FOLLOWER( + OVERWORLD( sPicTable_KommoO, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_KommoO, - gShinyFollowerPalette_KommoO + gOverworldPalette_KommoO, + gShinyOverworldPalette_KommoO ) .isTotem = TRUE, .levelUpLearnset = sKommoOLevelUpLearnset, @@ -5168,13 +5168,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_TapuKoko, .iconPalIndex = 0, FOOTPRINT(TapuKoko) - FOLLOWER( + OVERWORLD( sPicTable_TapuKoko, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_TapuKoko, - gShinyFollowerPalette_TapuKoko + gOverworldPalette_TapuKoko, + gShinyOverworldPalette_TapuKoko ) .isLegendary = TRUE, .levelUpLearnset = sTapuKokoLevelUpLearnset, @@ -5232,13 +5232,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_TapuLele, .iconPalIndex = 0, FOOTPRINT(TapuLele) - FOLLOWER( + OVERWORLD( sPicTable_TapuLele, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_TapuLele, - gShinyFollowerPalette_TapuLele + gOverworldPalette_TapuLele, + gShinyOverworldPalette_TapuLele ) .isLegendary = TRUE, .levelUpLearnset = sTapuLeleLevelUpLearnset, @@ -5296,13 +5296,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_TapuBulu, .iconPalIndex = 2, FOOTPRINT(TapuBulu) - FOLLOWER( + OVERWORLD( sPicTable_TapuBulu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_TapuBulu, - gShinyFollowerPalette_TapuBulu + gOverworldPalette_TapuBulu, + gShinyOverworldPalette_TapuBulu ) .isLegendary = TRUE, .levelUpLearnset = sTapuBuluLevelUpLearnset, @@ -5361,13 +5361,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_TapuFini, .iconPalIndex = 0, FOOTPRINT(TapuFini) - FOLLOWER( + OVERWORLD( sPicTable_TapuFini, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_TapuFini, - gShinyFollowerPalette_TapuFini + gOverworldPalette_TapuFini, + gShinyOverworldPalette_TapuFini ) .isLegendary = TRUE, .levelUpLearnset = sTapuFiniLevelUpLearnset, @@ -5425,13 +5425,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Cosmog, .iconPalIndex = 2, FOOTPRINT(Cosmog) - FOLLOWER( + OVERWORLD( sPicTable_Cosmog, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cosmog, - gShinyFollowerPalette_Cosmog + gOverworldPalette_Cosmog, + gShinyOverworldPalette_Cosmog ) .isLegendary = TRUE, .tmIlliterate = TRUE, @@ -5491,13 +5491,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Cosmoem, .iconPalIndex = 0, FOOTPRINT(Cosmoem) - FOLLOWER( + OVERWORLD( sPicTable_Cosmoem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cosmoem, - gShinyFollowerPalette_Cosmoem + gOverworldPalette_Cosmoem, + gShinyOverworldPalette_Cosmoem ) .isLegendary = TRUE, .tmIlliterate = TRUE, @@ -5556,13 +5556,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Solgaleo, .iconPalIndex = 0, FOOTPRINT(Solgaleo) - FOLLOWER( + OVERWORLD( sPicTable_Solgaleo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Solgaleo, - gShinyFollowerPalette_Solgaleo + gOverworldPalette_Solgaleo, + gShinyOverworldPalette_Solgaleo ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5619,13 +5619,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Lunala, .iconPalIndex = 2, FOOTPRINT(Lunala) - FOLLOWER( + OVERWORLD( sPicTable_Lunala, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Lunala, - gShinyFollowerPalette_Lunala + gOverworldPalette_Lunala, + gShinyOverworldPalette_Lunala ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -5684,13 +5684,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Nihilego, .iconPalIndex = 0, FOOTPRINT(Nihilego) - FOLLOWER( + OVERWORLD( sPicTable_Nihilego, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Nihilego, - gShinyFollowerPalette_Nihilego + gOverworldPalette_Nihilego, + gShinyOverworldPalette_Nihilego ) .isUltraBeast = TRUE, .levelUpLearnset = sNihilegoLevelUpLearnset, @@ -5748,13 +5748,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Buzzwole, .iconPalIndex = 0, FOOTPRINT(Buzzwole) - FOLLOWER( + OVERWORLD( sPicTable_Buzzwole, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Buzzwole, - gShinyFollowerPalette_Buzzwole + gOverworldPalette_Buzzwole, + gShinyOverworldPalette_Buzzwole ) .isUltraBeast = TRUE, .levelUpLearnset = sBuzzwoleLevelUpLearnset, @@ -5811,13 +5811,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Pheromosa, .iconPalIndex = 2, FOOTPRINT(Pheromosa) - FOLLOWER( + OVERWORLD( sPicTable_Pheromosa, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pheromosa, - gShinyFollowerPalette_Pheromosa + gOverworldPalette_Pheromosa, + gShinyOverworldPalette_Pheromosa ) .isUltraBeast = TRUE, .levelUpLearnset = sPheromosaLevelUpLearnset, @@ -5874,13 +5874,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Xurkitree, .iconPalIndex = 0, FOOTPRINT(Xurkitree) - FOLLOWER( + OVERWORLD( sPicTable_Xurkitree, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Xurkitree, - gShinyFollowerPalette_Xurkitree + gOverworldPalette_Xurkitree, + gShinyOverworldPalette_Xurkitree ) .isUltraBeast = TRUE, .levelUpLearnset = sXurkitreeLevelUpLearnset, @@ -5939,13 +5939,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Celesteela, .iconPalIndex = 0, FOOTPRINT(Celesteela) - FOLLOWER( + OVERWORLD( sPicTable_Celesteela, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Celesteela, - gShinyFollowerPalette_Celesteela + gOverworldPalette_Celesteela, + gShinyOverworldPalette_Celesteela ) .isUltraBeast = TRUE, .levelUpLearnset = sCelesteelaLevelUpLearnset, @@ -6003,13 +6003,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Kartana, .iconPalIndex = 0, FOOTPRINT(Kartana) - FOLLOWER( + OVERWORLD( sPicTable_Kartana, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kartana, - gShinyFollowerPalette_Kartana + gOverworldPalette_Kartana, + gShinyOverworldPalette_Kartana ) .isUltraBeast = TRUE, .levelUpLearnset = sKartanaLevelUpLearnset, @@ -6066,13 +6066,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Guzzlord, .iconPalIndex = 0, FOOTPRINT(Guzzlord) - FOLLOWER( + OVERWORLD( sPicTable_Guzzlord, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Guzzlord, - gShinyFollowerPalette_Guzzlord + gOverworldPalette_Guzzlord, + gShinyOverworldPalette_Guzzlord ) .isUltraBeast = TRUE, .levelUpLearnset = sGuzzlordLevelUpLearnset, @@ -6132,13 +6132,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Necrozma, .iconPalIndex = 0, FOOTPRINT(Necrozma) - FOLLOWER( + OVERWORLD( sPicTable_Necrozma, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Necrozma, - gShinyFollowerPalette_Necrozma + gOverworldPalette_Necrozma, + gShinyOverworldPalette_Necrozma ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -6197,13 +6197,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_NecrozmaDuskMane, .iconPalIndex = 0, FOOTPRINT(Necrozma) - FOLLOWER( + OVERWORLD( sPicTable_NecrozmaDuskMane, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_NecrozmaDuskMane, - gShinyFollowerPalette_NecrozmaDuskMane + gOverworldPalette_NecrozmaDuskMane, + gShinyOverworldPalette_NecrozmaDuskMane ) .isLegendary = TRUE, .cannotBeTraded = TRUE, @@ -6264,13 +6264,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_NecrozmaDawnWings, .iconPalIndex = 0, FOOTPRINT(Necrozma) - FOLLOWER( + OVERWORLD( sPicTable_NecrozmaDawnWings, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_NecrozmaDawnWings, - gShinyFollowerPalette_NecrozmaDawnWings + gOverworldPalette_NecrozmaDawnWings, + gShinyOverworldPalette_NecrozmaDawnWings ) .isLegendary = TRUE, .cannotBeTraded = TRUE, @@ -6395,13 +6395,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Magearna, .iconPalIndex = 0, FOOTPRINT(Magearna) - FOLLOWER( + OVERWORLD( sPicTable_Magearna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Magearna, - gShinyFollowerPalette_Magearna + gOverworldPalette_Magearna, + gShinyOverworldPalette_Magearna ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -6516,13 +6516,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Marshadow, .iconPalIndex = 0, FOOTPRINT(Marshadow) - FOLLOWER( + OVERWORLD( sPicTable_Marshadow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Marshadow, - gShinyFollowerPalette_Marshadow + gOverworldPalette_Marshadow, + gShinyOverworldPalette_Marshadow ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -6580,13 +6580,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Poipole, .iconPalIndex = 0, FOOTPRINT(Poipole) - FOLLOWER( + OVERWORLD( sPicTable_Poipole, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Poipole, - gShinyFollowerPalette_Poipole + gOverworldPalette_Poipole, + gShinyOverworldPalette_Poipole ) .isUltraBeast = TRUE, .levelUpLearnset = sPoipoleLevelUpLearnset, @@ -6642,13 +6642,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Naganadel, .iconPalIndex = 0, FOOTPRINT(Naganadel) - FOLLOWER( + OVERWORLD( sPicTable_Naganadel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Naganadel, - gShinyFollowerPalette_Naganadel + gOverworldPalette_Naganadel, + gShinyOverworldPalette_Naganadel ) .isUltraBeast = TRUE, .levelUpLearnset = sNaganadelLevelUpLearnset, @@ -6705,13 +6705,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Stakataka, .iconPalIndex = 0, FOOTPRINT(Stakataka) - FOLLOWER( + OVERWORLD( sPicTable_Stakataka, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Stakataka, - gShinyFollowerPalette_Stakataka + gOverworldPalette_Stakataka, + gShinyOverworldPalette_Stakataka ) .isUltraBeast = TRUE, .levelUpLearnset = sStakatakaLevelUpLearnset, @@ -6768,13 +6768,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Blacephalon, .iconPalIndex = 0, FOOTPRINT(Blacephalon) - FOLLOWER( + OVERWORLD( sPicTable_Blacephalon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Blacephalon, - gShinyFollowerPalette_Blacephalon + gOverworldPalette_Blacephalon, + gShinyOverworldPalette_Blacephalon ) .isUltraBeast = TRUE, .levelUpLearnset = sBlacephalonLevelUpLearnset, @@ -6830,13 +6830,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Zeraora, .iconPalIndex = 0, FOOTPRINT(Zeraora) - FOLLOWER( + OVERWORLD( sPicTable_Zeraora, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zeraora, - gShinyFollowerPalette_Zeraora + gOverworldPalette_Zeraora, + gShinyOverworldPalette_Zeraora ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -6893,13 +6893,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Meltan, .iconPalIndex = 2, FOOTPRINT(Meltan) - FOLLOWER( + OVERWORLD( sPicTable_Meltan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Meltan, - gShinyFollowerPalette_Meltan + gOverworldPalette_Meltan, + gShinyOverworldPalette_Meltan ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -6954,13 +6954,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .iconSprite = gMonIcon_Melmetal, .iconPalIndex = 2, FOOTPRINT(Melmetal) - FOLLOWER( + OVERWORLD( sPicTable_Melmetal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Melmetal, - gShinyFollowerPalette_Melmetal + gOverworldPalette_Melmetal, + gShinyOverworldPalette_Melmetal ) .isMythical = TRUE, .isFrontierBanned = TRUE, diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index cd2ab09cb2..353597e96a 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -52,13 +52,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Grookey, .iconPalIndex = 1, FOOTPRINT(Grookey) - FOLLOWER( + OVERWORLD( sPicTable_Grookey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Grookey, - gShinyFollowerPalette_Grookey + gOverworldPalette_Grookey, + gShinyOverworldPalette_Grookey ) .levelUpLearnset = sGrookeyLevelUpLearnset, .teachableLearnset = sGrookeyTeachableLearnset, @@ -113,13 +113,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Thwackey, .iconPalIndex = 1, FOOTPRINT(Thwackey) - FOLLOWER( + OVERWORLD( sPicTable_Thwackey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Thwackey, - gShinyFollowerPalette_Thwackey + gOverworldPalette_Thwackey, + gShinyOverworldPalette_Thwackey ) .levelUpLearnset = sThwackeyLevelUpLearnset, .teachableLearnset = sThwackeyTeachableLearnset, @@ -173,13 +173,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Rillaboom, .iconPalIndex = 1, FOOTPRINT(Rillaboom) - FOLLOWER( + OVERWORLD( sPicTable_Rillaboom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rillaboom, - gShinyFollowerPalette_Rillaboom + gOverworldPalette_Rillaboom, + gShinyOverworldPalette_Rillaboom ) .levelUpLearnset = sRillaboomLevelUpLearnset, .teachableLearnset = sRillaboomTeachableLearnset, @@ -293,13 +293,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Scorbunny, .iconPalIndex = 0, FOOTPRINT(Scorbunny) - FOLLOWER( + OVERWORLD( sPicTable_Scorbunny, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Scorbunny, - gShinyFollowerPalette_Scorbunny + gOverworldPalette_Scorbunny, + gShinyOverworldPalette_Scorbunny ) .levelUpLearnset = sScorbunnyLevelUpLearnset, .teachableLearnset = sScorbunnyTeachableLearnset, @@ -354,13 +354,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Raboot, .iconPalIndex = 0, FOOTPRINT(Raboot) - FOLLOWER( + OVERWORLD( sPicTable_Raboot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Raboot, - gShinyFollowerPalette_Raboot + gOverworldPalette_Raboot, + gShinyOverworldPalette_Raboot ) .levelUpLearnset = sRabootLevelUpLearnset, .teachableLearnset = sRabootTeachableLearnset, @@ -415,13 +415,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Cinderace, .iconPalIndex = 0, FOOTPRINT(Cinderace) - FOLLOWER( + OVERWORLD( sPicTable_Cinderace, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cinderace, - gShinyFollowerPalette_Cinderace + gOverworldPalette_Cinderace, + gShinyOverworldPalette_Cinderace ) .levelUpLearnset = sCinderaceLevelUpLearnset, .teachableLearnset = sCinderaceTeachableLearnset, @@ -537,13 +537,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Sobble, .iconPalIndex = 2, FOOTPRINT(Sobble) - FOLLOWER( + OVERWORLD( sPicTable_Sobble, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sobble, - gShinyFollowerPalette_Sobble + gOverworldPalette_Sobble, + gShinyOverworldPalette_Sobble ) .levelUpLearnset = sSobbleLevelUpLearnset, .teachableLearnset = sSobbleTeachableLearnset, @@ -598,13 +598,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Drizzile, .iconPalIndex = 2, FOOTPRINT(Drizzile) - FOLLOWER( + OVERWORLD( sPicTable_Drizzile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Drizzile, - gShinyFollowerPalette_Drizzile + gOverworldPalette_Drizzile, + gShinyOverworldPalette_Drizzile ) .levelUpLearnset = sDrizzileLevelUpLearnset, .teachableLearnset = sDrizzileTeachableLearnset, @@ -659,13 +659,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Inteleon, .iconPalIndex = 0, FOOTPRINT(Inteleon) - FOLLOWER( + OVERWORLD( sPicTable_Inteleon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Inteleon, - gShinyFollowerPalette_Inteleon + gOverworldPalette_Inteleon, + gShinyOverworldPalette_Inteleon ) .levelUpLearnset = sInteleonLevelUpLearnset, .teachableLearnset = sInteleonTeachableLearnset, @@ -780,13 +780,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Skwovet, .iconPalIndex = 2, FOOTPRINT(Skwovet) - FOLLOWER( + OVERWORLD( sPicTable_Skwovet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Skwovet, - gShinyFollowerPalette_Skwovet + gOverworldPalette_Skwovet, + gShinyOverworldPalette_Skwovet ) .levelUpLearnset = sSkwovetLevelUpLearnset, .teachableLearnset = sSkwovetTeachableLearnset, @@ -843,13 +843,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Greedent, .iconPalIndex = 0, FOOTPRINT(Greedent) - FOLLOWER( + OVERWORLD( sPicTable_Greedent, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Greedent, - gShinyFollowerPalette_Greedent + gOverworldPalette_Greedent, + gShinyOverworldPalette_Greedent ) .levelUpLearnset = sGreedentLevelUpLearnset, .teachableLearnset = sGreedentTeachableLearnset, @@ -905,13 +905,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Rookidee, .iconPalIndex = 0, FOOTPRINT(Rookidee) - FOLLOWER( + OVERWORLD( sPicTable_Rookidee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rookidee, - gShinyFollowerPalette_Rookidee + gOverworldPalette_Rookidee, + gShinyOverworldPalette_Rookidee ) .levelUpLearnset = sRookideeLevelUpLearnset, .teachableLearnset = sRookideeTeachableLearnset, @@ -968,13 +968,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Corvisquire, .iconPalIndex = 0, FOOTPRINT(Corvisquire) - FOLLOWER( + OVERWORLD( sPicTable_Corvisquire, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Corvisquire, - gShinyFollowerPalette_Corvisquire + gOverworldPalette_Corvisquire, + gShinyOverworldPalette_Corvisquire ) .levelUpLearnset = sCorvisquireLevelUpLearnset, .teachableLearnset = sCorvisquireTeachableLearnset, @@ -1029,13 +1029,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Corviknight, .iconPalIndex = 0, FOOTPRINT(Corviknight) - FOLLOWER( + OVERWORLD( sPicTable_Corviknight, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Corviknight, - gShinyFollowerPalette_Corviknight + gOverworldPalette_Corviknight, + gShinyOverworldPalette_Corviknight ) .levelUpLearnset = sCorviknightLevelUpLearnset, .teachableLearnset = sCorviknightTeachableLearnset, @@ -1149,13 +1149,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Blipbug, .iconPalIndex = 0, FOOTPRINT(Blipbug) - FOLLOWER( + OVERWORLD( sPicTable_Blipbug, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Blipbug, - gShinyFollowerPalette_Blipbug + gOverworldPalette_Blipbug, + gShinyOverworldPalette_Blipbug ) .tmIlliterate = TRUE, .levelUpLearnset = sBlipbugLevelUpLearnset, @@ -1213,13 +1213,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Dottler, .iconPalIndex = 2, FOOTPRINT(Dottler) - FOLLOWER( + OVERWORLD( sPicTable_Dottler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dottler, - gShinyFollowerPalette_Dottler + gOverworldPalette_Dottler, + gShinyOverworldPalette_Dottler ) .levelUpLearnset = sDottlerLevelUpLearnset, .teachableLearnset = sDottlerTeachableLearnset, @@ -1276,13 +1276,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Orbeetle, .iconPalIndex = 0, FOOTPRINT(Orbeetle) - FOLLOWER( + OVERWORLD( sPicTable_Orbeetle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Orbeetle, - gShinyFollowerPalette_Orbeetle + gOverworldPalette_Orbeetle, + gShinyOverworldPalette_Orbeetle ) .levelUpLearnset = sOrbeetleLevelUpLearnset, .teachableLearnset = sOrbeetleTeachableLearnset, @@ -1398,13 +1398,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Nickit, .iconPalIndex = 2, FOOTPRINT(Nickit) - FOLLOWER( + OVERWORLD( sPicTable_Nickit, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Nickit, - gShinyFollowerPalette_Nickit + gOverworldPalette_Nickit, + gShinyOverworldPalette_Nickit ) .levelUpLearnset = sNickitLevelUpLearnset, .teachableLearnset = sNickitTeachableLearnset, @@ -1460,13 +1460,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Thievul, .iconPalIndex = 2, FOOTPRINT(Thievul) - FOLLOWER( + OVERWORLD( sPicTable_Thievul, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Thievul, - gShinyFollowerPalette_Thievul + gOverworldPalette_Thievul, + gShinyOverworldPalette_Thievul ) .levelUpLearnset = sThievulLevelUpLearnset, .teachableLearnset = sThievulTeachableLearnset, @@ -1522,13 +1522,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Gossifleur, .iconPalIndex = 1, FOOTPRINT(Gossifleur) - FOLLOWER( + OVERWORLD( sPicTable_Gossifleur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Gossifleur, - gShinyFollowerPalette_Gossifleur + gOverworldPalette_Gossifleur, + gShinyOverworldPalette_Gossifleur ) .levelUpLearnset = sGossifleurLevelUpLearnset, .teachableLearnset = sGossifleurTeachableLearnset, @@ -1584,13 +1584,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Eldegoss, .iconPalIndex = 1, FOOTPRINT(Eldegoss) - FOLLOWER( + OVERWORLD( sPicTable_Eldegoss, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Eldegoss, - gShinyFollowerPalette_Eldegoss + gOverworldPalette_Eldegoss, + gShinyOverworldPalette_Eldegoss ) .levelUpLearnset = sEldegossLevelUpLearnset, .teachableLearnset = sEldegossTeachableLearnset, @@ -1646,13 +1646,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Wooloo, .iconPalIndex = 0, FOOTPRINT(Wooloo) - FOLLOWER( + OVERWORLD( sPicTable_Wooloo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Wooloo, - gShinyFollowerPalette_Wooloo + gOverworldPalette_Wooloo, + gShinyOverworldPalette_Wooloo ) .levelUpLearnset = sWoolooLevelUpLearnset, .teachableLearnset = sWoolooTeachableLearnset, @@ -1708,13 +1708,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Dubwool, .iconPalIndex = 2, FOOTPRINT(Dubwool) - FOLLOWER( + OVERWORLD( sPicTable_Dubwool, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dubwool, - gShinyFollowerPalette_Dubwool + gOverworldPalette_Dubwool, + gShinyOverworldPalette_Dubwool ) .levelUpLearnset = sDubwoolLevelUpLearnset, .teachableLearnset = sDubwoolTeachableLearnset, @@ -1769,13 +1769,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Chewtle, .iconPalIndex = 0, FOOTPRINT(Chewtle) - FOLLOWER( + OVERWORLD( sPicTable_Chewtle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Chewtle, - gShinyFollowerPalette_Chewtle + gOverworldPalette_Chewtle, + gShinyOverworldPalette_Chewtle ) .levelUpLearnset = sChewtleLevelUpLearnset, .teachableLearnset = sChewtleTeachableLearnset, @@ -1830,13 +1830,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Drednaw, .iconPalIndex = 0, FOOTPRINT(Drednaw) - FOLLOWER( + OVERWORLD( sPicTable_Drednaw, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Drednaw, - gShinyFollowerPalette_Drednaw + gOverworldPalette_Drednaw, + gShinyOverworldPalette_Drednaw ) .levelUpLearnset = sDrednawLevelUpLearnset, .teachableLearnset = sDrednawTeachableLearnset, @@ -1951,13 +1951,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Yamper, .iconPalIndex = 1, FOOTPRINT(Yamper) - FOLLOWER( + OVERWORLD( sPicTable_Yamper, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Yamper, - gShinyFollowerPalette_Yamper + gOverworldPalette_Yamper, + gShinyOverworldPalette_Yamper ) .levelUpLearnset = sYamperLevelUpLearnset, .teachableLearnset = sYamperTeachableLearnset, @@ -2013,13 +2013,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Boltund, .iconPalIndex = 1, FOOTPRINT(Boltund) - FOLLOWER( + OVERWORLD( sPicTable_Boltund, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Boltund, - gShinyFollowerPalette_Boltund + gOverworldPalette_Boltund, + gShinyOverworldPalette_Boltund ) .levelUpLearnset = sBoltundLevelUpLearnset, .teachableLearnset = sBoltundTeachableLearnset, @@ -2075,13 +2075,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Rolycoly, .iconPalIndex = 0, FOOTPRINT(Rolycoly) - FOLLOWER( + OVERWORLD( sPicTable_Rolycoly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Rolycoly, - gShinyFollowerPalette_Rolycoly + gOverworldPalette_Rolycoly, + gShinyOverworldPalette_Rolycoly ) .levelUpLearnset = sRolycolyLevelUpLearnset, .teachableLearnset = sRolycolyTeachableLearnset, @@ -2136,13 +2136,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Carkol, .iconPalIndex = 0, FOOTPRINT(Carkol) - FOLLOWER( + OVERWORLD( sPicTable_Carkol, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Carkol, - gShinyFollowerPalette_Carkol + gOverworldPalette_Carkol, + gShinyOverworldPalette_Carkol ) .levelUpLearnset = sCarkolLevelUpLearnset, .teachableLearnset = sCarkolTeachableLearnset, @@ -2197,13 +2197,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Coalossal, .iconPalIndex = 0, FOOTPRINT(Coalossal) - FOLLOWER( + OVERWORLD( sPicTable_Coalossal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Coalossal, - gShinyFollowerPalette_Coalossal + gOverworldPalette_Coalossal, + gShinyOverworldPalette_Coalossal ) .levelUpLearnset = sCoalossalLevelUpLearnset, .teachableLearnset = sCoalossalTeachableLearnset, @@ -2318,13 +2318,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Applin, .iconPalIndex = 1, FOOTPRINT(Applin) - FOLLOWER( + OVERWORLD( sPicTable_Applin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Applin, - gShinyFollowerPalette_Applin + gOverworldPalette_Applin, + gShinyOverworldPalette_Applin ) .tmIlliterate = TRUE, .levelUpLearnset = sApplinLevelUpLearnset, @@ -2383,13 +2383,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Flapple, .iconPalIndex = 1, FOOTPRINT(Flapple) - FOLLOWER( + OVERWORLD( sPicTable_Flapple, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Flapple, - gShinyFollowerPalette_Flapple + gOverworldPalette_Flapple, + gShinyOverworldPalette_Flapple ) .levelUpLearnset = sFlappleLevelUpLearnset, .teachableLearnset = sFlappleTeachableLearnset, @@ -2501,13 +2501,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Appletun, .iconPalIndex = 1, FOOTPRINT(Appletun) - FOLLOWER( + OVERWORLD( sPicTable_Appletun, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Appletun, - gShinyFollowerPalette_Appletun + gOverworldPalette_Appletun, + gShinyOverworldPalette_Appletun ) .levelUpLearnset = sAppletunLevelUpLearnset, .teachableLearnset = sAppletunTeachableLearnset, @@ -2727,13 +2727,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Silicobra, .iconPalIndex = 1, FOOTPRINT(Silicobra) - FOLLOWER( + OVERWORLD( sPicTable_Silicobra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Silicobra, - gShinyFollowerPalette_Silicobra + gOverworldPalette_Silicobra, + gShinyOverworldPalette_Silicobra ) .levelUpLearnset = sSilicobraLevelUpLearnset, .teachableLearnset = sSilicobraTeachableLearnset, @@ -2789,13 +2789,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Sandaconda, .iconPalIndex = 1, FOOTPRINT(Sandaconda) - FOLLOWER( + OVERWORLD( sPicTable_Sandaconda, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sandaconda, - gShinyFollowerPalette_Sandaconda + gOverworldPalette_Sandaconda, + gShinyOverworldPalette_Sandaconda ) .levelUpLearnset = sSandacondaLevelUpLearnset, .teachableLearnset = sSandacondaTeachableLearnset, @@ -2909,13 +2909,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Cramorant, .iconPalIndex = 0, FOOTPRINT(Cramorant) - FOLLOWER( + OVERWORLD( sPicTable_Cramorant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cramorant, - gShinyFollowerPalette_Cramorant + gOverworldPalette_Cramorant, + gShinyOverworldPalette_Cramorant ) .levelUpLearnset = sCramorantLevelUpLearnset, .teachableLearnset = sCramorantTeachableLearnset, @@ -3084,13 +3084,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Arrokuda, .iconPalIndex = 2, FOOTPRINT(Arrokuda) - FOLLOWER( + OVERWORLD( sPicTable_Arrokuda, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Arrokuda, - gShinyFollowerPalette_Arrokuda + gOverworldPalette_Arrokuda, + gShinyOverworldPalette_Arrokuda ) .levelUpLearnset = sArrokudaLevelUpLearnset, .teachableLearnset = sArrokudaTeachableLearnset, @@ -3146,13 +3146,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Barraskewda, .iconPalIndex = 2, FOOTPRINT(Barraskewda) - FOLLOWER( + OVERWORLD( sPicTable_Barraskewda, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Barraskewda, - gShinyFollowerPalette_Barraskewda + gOverworldPalette_Barraskewda, + gShinyOverworldPalette_Barraskewda ) .levelUpLearnset = sBarraskewdaLevelUpLearnset, .teachableLearnset = sBarraskewdaTeachableLearnset, @@ -3208,13 +3208,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Toxel, .iconPalIndex = 2, FOOTPRINT(Toxel) - FOLLOWER( + OVERWORLD( sPicTable_Toxel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Toxel, - gShinyFollowerPalette_Toxel + gOverworldPalette_Toxel, + gShinyOverworldPalette_Toxel ) .levelUpLearnset = sToxelLevelUpLearnset, .teachableLearnset = sToxelTeachableLearnset, @@ -3271,13 +3271,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_ToxtricityAmped, .iconPalIndex = 2, FOOTPRINT(Toxtricity) - FOLLOWER( + OVERWORLD( sPicTable_ToxtricityAmped, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ToxtricityAmped, - gShinyFollowerPalette_ToxtricityAmped + gOverworldPalette_ToxtricityAmped, + gShinyOverworldPalette_ToxtricityAmped ) .levelUpLearnset = sToxtricityAmpedLevelUpLearnset, .teachableLearnset = sToxtricityAmpedTeachableLearnset, @@ -3385,13 +3385,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_ToxtricityLowKey, .iconPalIndex = 2, FOOTPRINT(Toxtricity) - FOLLOWER( + OVERWORLD( sPicTable_ToxtricityLowKey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ToxtricityLowKey, - gShinyFollowerPalette_ToxtricityLowKey + gOverworldPalette_ToxtricityLowKey, + gShinyOverworldPalette_ToxtricityLowKey ) .levelUpLearnset = sToxtricityLowKeyLevelUpLearnset, .teachableLearnset = sToxtricityLowKeyTeachableLearnset, @@ -3444,13 +3444,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_ToxtricityGigantamax, .iconPalIndex = 0, FOOTPRINT(Toxtricity) - FOLLOWER( + OVERWORLD( sPicTable_ToxtricityLowKey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ToxtricityLowKey, - gShinyFollowerPalette_ToxtricityLowKey + gOverworldPalette_ToxtricityLowKey, + gShinyOverworldPalette_ToxtricityLowKey ) .isGigantamax = TRUE, .levelUpLearnset = sToxtricityLowKeyLevelUpLearnset, @@ -3509,13 +3509,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Sizzlipede, .iconPalIndex = 0, FOOTPRINT(Sizzlipede) - FOLLOWER( + OVERWORLD( sPicTable_Sizzlipede, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sizzlipede, - gShinyFollowerPalette_Sizzlipede + gOverworldPalette_Sizzlipede, + gShinyOverworldPalette_Sizzlipede ) .levelUpLearnset = sSizzlipedeLevelUpLearnset, .teachableLearnset = sSizzlipedeTeachableLearnset, @@ -3571,13 +3571,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Centiskorch, .iconPalIndex = 0, FOOTPRINT(Centiskorch) - FOLLOWER( + OVERWORLD( sPicTable_Centiskorch, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Centiskorch, - gShinyFollowerPalette_Centiskorch + gOverworldPalette_Centiskorch, + gShinyOverworldPalette_Centiskorch ) .levelUpLearnset = sCentiskorchLevelUpLearnset, .teachableLearnset = sCentiskorchTeachableLearnset, @@ -3692,13 +3692,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Clobbopus, .iconPalIndex = 0, FOOTPRINT(Clobbopus) - FOLLOWER( + OVERWORLD( sPicTable_Clobbopus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Clobbopus, - gShinyFollowerPalette_Clobbopus + gOverworldPalette_Clobbopus, + gShinyOverworldPalette_Clobbopus ) .levelUpLearnset = sClobbopusLevelUpLearnset, .teachableLearnset = sClobbopusTeachableLearnset, @@ -3753,13 +3753,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Grapploct, .iconPalIndex = 2, FOOTPRINT(Grapploct) - FOLLOWER( + OVERWORLD( sPicTable_Grapploct, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Grapploct, - gShinyFollowerPalette_Grapploct + gOverworldPalette_Grapploct, + gShinyOverworldPalette_Grapploct ) .levelUpLearnset = sGrapploctLevelUpLearnset, .teachableLearnset = sGrapploctTeachableLearnset, @@ -3815,13 +3815,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Sinistea, .iconPalIndex = 2, FOOTPRINT(Sinistea) - FOLLOWER( + OVERWORLD( sPicTable_Sinistea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sinistea, - gShinyFollowerPalette_Sinistea + gOverworldPalette_Sinistea, + gShinyOverworldPalette_Sinistea ) .levelUpLearnset = sSinisteaLevelUpLearnset, .teachableLearnset = sSinisteaTeachableLearnset, @@ -3878,13 +3878,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Sinistea, .iconPalIndex = 2, FOOTPRINT(Sinistea) - FOLLOWER( + OVERWORLD( sPicTable_Sinistea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Sinistea, - gShinyFollowerPalette_Sinistea + gOverworldPalette_Sinistea, + gShinyOverworldPalette_Sinistea ) .levelUpLearnset = sSinisteaLevelUpLearnset, .teachableLearnset = sSinisteaTeachableLearnset, @@ -3940,13 +3940,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Polteageist, .iconPalIndex = 2, FOOTPRINT(Polteageist) - FOLLOWER( + OVERWORLD( sPicTable_Polteageist, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Polteageist, - gShinyFollowerPalette_Polteageist + gOverworldPalette_Polteageist, + gShinyOverworldPalette_Polteageist ) .levelUpLearnset = sPolteageistLevelUpLearnset, .teachableLearnset = sPolteageistTeachableLearnset, @@ -4002,13 +4002,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Polteageist, .iconPalIndex = 2, FOOTPRINT(Polteageist) - FOLLOWER( + OVERWORLD( sPicTable_Polteageist, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Polteageist, - gShinyFollowerPalette_Polteageist + gOverworldPalette_Polteageist, + gShinyOverworldPalette_Polteageist ) .levelUpLearnset = sPolteageistLevelUpLearnset, .teachableLearnset = sPolteageistTeachableLearnset, @@ -4065,13 +4065,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Hatenna, .iconPalIndex = 0, FOOTPRINT(Hatenna) - FOLLOWER( + OVERWORLD( sPicTable_Hatenna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hatenna, - gShinyFollowerPalette_Hatenna + gOverworldPalette_Hatenna, + gShinyOverworldPalette_Hatenna ) .levelUpLearnset = sHatennaLevelUpLearnset, .teachableLearnset = sHatennaTeachableLearnset, @@ -4126,13 +4126,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Hattrem, .iconPalIndex = 0, FOOTPRINT(Hattrem) - FOLLOWER( + OVERWORLD( sPicTable_Hattrem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hattrem, - gShinyFollowerPalette_Hattrem + gOverworldPalette_Hattrem, + gShinyOverworldPalette_Hattrem ) .levelUpLearnset = sHattremLevelUpLearnset, .teachableLearnset = sHattremTeachableLearnset, @@ -4186,13 +4186,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Hatterene, .iconPalIndex = 0, FOOTPRINT(Hatterene) - FOLLOWER( + OVERWORLD( sPicTable_Hatterene, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Hatterene, - gShinyFollowerPalette_Hatterene + gOverworldPalette_Hatterene, + gShinyOverworldPalette_Hatterene ) .levelUpLearnset = sHattereneLevelUpLearnset, .teachableLearnset = sHattereneTeachableLearnset, @@ -4307,13 +4307,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Impidimp, .iconPalIndex = 0, FOOTPRINT(Impidimp) - FOLLOWER( + OVERWORLD( sPicTable_Impidimp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Impidimp, - gShinyFollowerPalette_Impidimp + gOverworldPalette_Impidimp, + gShinyOverworldPalette_Impidimp ) .levelUpLearnset = sImpidimpLevelUpLearnset, .teachableLearnset = sImpidimpTeachableLearnset, @@ -4368,13 +4368,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Morgrem, .iconPalIndex = 0, FOOTPRINT(Morgrem) - FOLLOWER( + OVERWORLD( sPicTable_Morgrem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Morgrem, - gShinyFollowerPalette_Morgrem + gOverworldPalette_Morgrem, + gShinyOverworldPalette_Morgrem ) .levelUpLearnset = sMorgremLevelUpLearnset, .teachableLearnset = sMorgremTeachableLearnset, @@ -4429,13 +4429,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Grimmsnarl, .iconPalIndex = 0, FOOTPRINT(Grimmsnarl) - FOLLOWER( + OVERWORLD( sPicTable_Grimmsnarl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Grimmsnarl, - gShinyFollowerPalette_Grimmsnarl + gOverworldPalette_Grimmsnarl, + gShinyOverworldPalette_Grimmsnarl ) .levelUpLearnset = sGrimmsnarlLevelUpLearnset, .teachableLearnset = sGrimmsnarlTeachableLearnset, @@ -4550,13 +4550,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Milcery, .iconPalIndex = 1, FOOTPRINT(Milcery) - FOLLOWER( + OVERWORLD( sPicTable_Milcery, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Milcery, - gShinyFollowerPalette_Milcery + gOverworldPalette_Milcery, + gShinyOverworldPalette_Milcery ) .levelUpLearnset = sMilceryLevelUpLearnset, .teachableLearnset = sMilceryTeachableLearnset, @@ -4619,13 +4619,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_AlcremieStrawberryVanillaCream, /*AlcremieStrawberry##cream##*/ \ .iconPalIndex = 1, \ FOOTPRINT(Alcremie) \ - FOLLOWER( \ + OVERWORLD( \ sPicTable_AlcremieStrawberry, /*Alcremie ##sweet*/ \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - gFollowerPalette_AlcremieStrawberryVanillaCream, /*Alcremie ##sweet##cream*/ \ - gShinyFollowerPalette_AlcremieStrawberryVanillaCream /*Alcremie ##sweet##cream*/ \ + gOverworldPalette_AlcremieStrawberryVanillaCream, /*Alcremie ##sweet##cream*/ \ + gShinyOverworldPalette_AlcremieStrawberryVanillaCream /*Alcremie ##sweet##cream*/ \ ) \ .levelUpLearnset = sAlcremieLevelUpLearnset, \ .teachableLearnset = sAlcremieTeachableLearnset, \ @@ -4786,13 +4786,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Falinks, .iconPalIndex = 0, FOOTPRINT(Falinks) - FOLLOWER( + OVERWORLD( sPicTable_Falinks, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Falinks, - gShinyFollowerPalette_Falinks + gOverworldPalette_Falinks, + gShinyOverworldPalette_Falinks ) .levelUpLearnset = sFalinksLevelUpLearnset, .teachableLearnset = sFalinksTeachableLearnset, @@ -4847,13 +4847,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Pincurchin, .iconPalIndex = 2, FOOTPRINT(Pincurchin) - FOLLOWER( + OVERWORLD( sPicTable_Pincurchin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Pincurchin, - gShinyFollowerPalette_Pincurchin + gOverworldPalette_Pincurchin, + gShinyOverworldPalette_Pincurchin ) .levelUpLearnset = sPincurchinLevelUpLearnset, .teachableLearnset = sPincurchinTeachableLearnset, @@ -4911,13 +4911,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Snom, .iconPalIndex = 0, FOOTPRINT(Snom) - FOLLOWER( + OVERWORLD( sPicTable_Snom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Snom, - gShinyFollowerPalette_Snom + gOverworldPalette_Snom, + gShinyOverworldPalette_Snom ) .levelUpLearnset = sSnomLevelUpLearnset, .teachableLearnset = sSnomTeachableLearnset, @@ -4974,13 +4974,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Frosmoth, .iconPalIndex = 0, FOOTPRINT(Frosmoth) - FOLLOWER( + OVERWORLD( sPicTable_Frosmoth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Frosmoth, - gShinyFollowerPalette_Frosmoth + gOverworldPalette_Frosmoth, + gShinyOverworldPalette_Frosmoth ) .levelUpLearnset = sFrosmothLevelUpLearnset, .teachableLearnset = sFrosmothTeachableLearnset, @@ -5036,13 +5036,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Stonjourner, .iconPalIndex = 2, FOOTPRINT(Stonjourner) - FOLLOWER( + OVERWORLD( sPicTable_Stonjourner, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Stonjourner, - gShinyFollowerPalette_Stonjourner + gOverworldPalette_Stonjourner, + gShinyOverworldPalette_Stonjourner ) .levelUpLearnset = sStonjournerLevelUpLearnset, .teachableLearnset = sStonjournerTeachableLearnset, @@ -5099,13 +5099,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_EiscueIceFace, .iconPalIndex = 0, FOOTPRINT(Eiscue) - FOLLOWER( + OVERWORLD( sPicTable_EiscueIceFace, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_EiscueIceFace, - gShinyFollowerPalette_EiscueIceFace + gOverworldPalette_EiscueIceFace, + gShinyOverworldPalette_EiscueIceFace ) .levelUpLearnset = sEiscueLevelUpLearnset, .teachableLearnset = sEiscueTeachableLearnset, @@ -5219,13 +5219,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_IndeedeeMale, .iconPalIndex = 2, FOOTPRINT(Indeedee) - FOLLOWER( + OVERWORLD( sPicTable_IndeedeeMale, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_IndeedeeMale, - gShinyFollowerPalette_IndeedeeMale + gOverworldPalette_IndeedeeMale, + gShinyOverworldPalette_IndeedeeMale ) .levelUpLearnset = sIndeedeeMaleLevelUpLearnset, .teachableLearnset = sIndeedeeMaleTeachableLearnset, @@ -5336,13 +5336,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_MorpekoFullBelly, .iconPalIndex = 2, FOOTPRINT(Morpeko) - FOLLOWER( + OVERWORLD( sPicTable_MorpekoFullBelly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_MorpekoFullBelly, - gShinyFollowerPalette_MorpekoFullBelly + gOverworldPalette_MorpekoFullBelly, + gShinyOverworldPalette_MorpekoFullBelly ) .levelUpLearnset = sMorpekoLevelUpLearnset, .teachableLearnset = sMorpekoTeachableLearnset, @@ -5457,13 +5457,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Cufant, .iconPalIndex = 0, FOOTPRINT(Cufant) - FOLLOWER( + OVERWORLD( sPicTable_Cufant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Cufant, - gShinyFollowerPalette_Cufant + gOverworldPalette_Cufant, + gShinyOverworldPalette_Cufant ) .levelUpLearnset = sCufantLevelUpLearnset, .teachableLearnset = sCufantTeachableLearnset, @@ -5519,13 +5519,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Copperajah, .iconPalIndex = 0, FOOTPRINT(Copperajah) - FOLLOWER( + OVERWORLD( sPicTable_Copperajah, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Copperajah, - gShinyFollowerPalette_Copperajah + gOverworldPalette_Copperajah, + gShinyOverworldPalette_Copperajah ) .levelUpLearnset = sCopperajahLevelUpLearnset, .teachableLearnset = sCopperajahTeachableLearnset, @@ -5641,13 +5641,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Dracozolt, .iconPalIndex = 1, FOOTPRINT(Dracozolt) - FOLLOWER( + OVERWORLD( sPicTable_Dracozolt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dracozolt, - gShinyFollowerPalette_Dracozolt + gOverworldPalette_Dracozolt, + gShinyOverworldPalette_Dracozolt ) .levelUpLearnset = sDracozoltLevelUpLearnset, .teachableLearnset = sDracozoltTeachableLearnset, @@ -5702,13 +5702,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Arctozolt, .iconPalIndex = 0, FOOTPRINT(Arctozolt) - FOLLOWER( + OVERWORLD( sPicTable_Arctozolt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Arctozolt, - gShinyFollowerPalette_Arctozolt + gOverworldPalette_Arctozolt, + gShinyOverworldPalette_Arctozolt ) .levelUpLearnset = sArctozoltLevelUpLearnset, .teachableLearnset = sArctozoltTeachableLearnset, @@ -5764,13 +5764,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Dracovish, .iconPalIndex = 0, FOOTPRINT(Dracovish) - FOLLOWER( + OVERWORLD( sPicTable_Dracovish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dracovish, - gShinyFollowerPalette_Dracovish + gOverworldPalette_Dracovish, + gShinyOverworldPalette_Dracovish ) .levelUpLearnset = sDracovishLevelUpLearnset, .teachableLearnset = sDracovishTeachableLearnset, @@ -5826,13 +5826,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Arctovish, .iconPalIndex = 0, FOOTPRINT(Arctovish) - FOLLOWER( + OVERWORLD( sPicTable_Arctovish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Arctovish, - gShinyFollowerPalette_Arctovish + gOverworldPalette_Arctovish, + gShinyOverworldPalette_Arctovish ) .levelUpLearnset = sArctovishLevelUpLearnset, .teachableLearnset = sArctovishTeachableLearnset, @@ -5887,13 +5887,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Duraludon, .iconPalIndex = 0, FOOTPRINT(Duraludon) - FOLLOWER( + OVERWORLD( sPicTable_Duraludon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Duraludon, - gShinyFollowerPalette_Duraludon + gOverworldPalette_Duraludon, + gShinyOverworldPalette_Duraludon ) .levelUpLearnset = sDuraludonLevelUpLearnset, .teachableLearnset = sDuraludonTeachableLearnset, @@ -6066,13 +6066,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Dreepy, .iconPalIndex = 0, FOOTPRINT(Dreepy) - FOLLOWER( + OVERWORLD( sPicTable_Dreepy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dreepy, - gShinyFollowerPalette_Dreepy + gOverworldPalette_Dreepy, + gShinyOverworldPalette_Dreepy ) .levelUpLearnset = sDreepyLevelUpLearnset, .teachableLearnset = sDreepyTeachableLearnset, @@ -6128,13 +6128,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Drakloak, .iconPalIndex = 0, FOOTPRINT(Drakloak) - FOLLOWER( + OVERWORLD( sPicTable_Drakloak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Drakloak, - gShinyFollowerPalette_Drakloak + gOverworldPalette_Drakloak, + gShinyOverworldPalette_Drakloak ) .levelUpLearnset = sDrakloakLevelUpLearnset, .teachableLearnset = sDrakloakTeachableLearnset, @@ -6190,13 +6190,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Dragapult, .iconPalIndex = 0, FOOTPRINT(Dragapult) - FOLLOWER( + OVERWORLD( sPicTable_Dragapult, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Dragapult, - gShinyFollowerPalette_Dragapult + gOverworldPalette_Dragapult, + gShinyOverworldPalette_Dragapult ) .levelUpLearnset = sDragapultLevelUpLearnset, .teachableLearnset = sDragapultTeachableLearnset, @@ -6251,13 +6251,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_ZacianHeroOfManyBattles, .iconPalIndex = 2, FOOTPRINT(Zacian) - FOLLOWER( + OVERWORLD( sPicTable_ZacianHeroOfManyBattles, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ZacianHeroOfManyBattles, - gShinyFollowerPalette_ZacianHeroOfManyBattles + gOverworldPalette_ZacianHeroOfManyBattles, + gShinyOverworldPalette_ZacianHeroOfManyBattles ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -6315,13 +6315,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_ZacianCrownedSword, .iconPalIndex = 2, FOOTPRINT(Zacian) - FOLLOWER( + OVERWORLD( sPicTable_ZacianCrownedSword, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ZacianCrownedSword, - gShinyFollowerPalette_ZacianCrownedSword + gOverworldPalette_ZacianCrownedSword, + gShinyOverworldPalette_ZacianCrownedSword ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -6381,13 +6381,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_ZamazentaHeroOfManyBattles, .iconPalIndex = 2, FOOTPRINT(Zamazenta) - FOLLOWER( + OVERWORLD( sPicTable_ZamazentaHeroOfManyBattles, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ZamazentaHeroOfManyBattles, - gShinyFollowerPalette_ZamazentaHeroOfManyBattles + gOverworldPalette_ZamazentaHeroOfManyBattles, + gShinyOverworldPalette_ZamazentaHeroOfManyBattles ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -6445,13 +6445,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_ZamazentaCrownedShield, .iconPalIndex = 2, FOOTPRINT(Zamazenta) - FOLLOWER( + OVERWORLD( sPicTable_ZamazentaCrownedShield, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_ZamazentaCrownedShield, - gShinyFollowerPalette_ZamazentaCrownedShield + gOverworldPalette_ZamazentaCrownedShield, + gShinyOverworldPalette_ZamazentaCrownedShield ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -6512,13 +6512,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Eternatus, .iconPalIndex = 0, FOOTPRINT(Eternatus) - FOLLOWER( + OVERWORLD( sPicTable_Eternatus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Eternatus, - gShinyFollowerPalette_Eternatus + gOverworldPalette_Eternatus, + gShinyOverworldPalette_Eternatus ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -6632,13 +6632,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Kubfu, .iconPalIndex = 1, FOOTPRINT(Kubfu) - FOLLOWER( + OVERWORLD( sPicTable_Kubfu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Kubfu, - gShinyFollowerPalette_Kubfu + gOverworldPalette_Kubfu, + gShinyOverworldPalette_Kubfu ) .isLegendary = TRUE, .levelUpLearnset = sKubfuLevelUpLearnset, @@ -6697,13 +6697,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Urshifu, .iconPalIndex = 2, FOOTPRINT(Urshifu) - FOLLOWER( + OVERWORLD( sPicTable_Urshifu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Urshifu, - gShinyFollowerPalette_Urshifu + gOverworldPalette_Urshifu, + gShinyOverworldPalette_Urshifu ) .isLegendary = TRUE, .levelUpLearnset = sUrshifuSingleStrikeStyleLevelUpLearnset, @@ -6817,13 +6817,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Urshifu, .iconPalIndex = 2, FOOTPRINT(Urshifu) - FOLLOWER( + OVERWORLD( sPicTable_Urshifu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Urshifu, - gShinyFollowerPalette_Urshifu + gOverworldPalette_Urshifu, + gShinyOverworldPalette_Urshifu ) .isLegendary = TRUE, .levelUpLearnset = sUrshifuRapidStrikeStyleLevelUpLearnset, @@ -6940,13 +6940,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Zarude, .iconPalIndex = 1, FOOTPRINT(Zarude) - FOLLOWER( + OVERWORLD( sPicTable_Zarude, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Zarude, - gShinyFollowerPalette_Zarude + gOverworldPalette_Zarude, + gShinyOverworldPalette_Zarude ) .isMythical = TRUE, .isFrontierBanned = TRUE, @@ -7060,13 +7060,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Regieleki, .iconPalIndex = 0, FOOTPRINT(Regieleki) - FOLLOWER( + OVERWORLD( sPicTable_Regieleki, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Regieleki, - gShinyFollowerPalette_Regieleki + gOverworldPalette_Regieleki, + gShinyOverworldPalette_Regieleki ) .isLegendary = TRUE, .levelUpLearnset = sRegielekiLevelUpLearnset, @@ -7124,13 +7124,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Regidrago, .iconPalIndex = 0, FOOTPRINT(Regidrago) - FOLLOWER( + OVERWORLD( sPicTable_Regidrago, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Regidrago, - gShinyFollowerPalette_Regidrago + gOverworldPalette_Regidrago, + gShinyOverworldPalette_Regidrago ) .isLegendary = TRUE, .levelUpLearnset = sRegidragoLevelUpLearnset, @@ -7186,13 +7186,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Glastrier, .iconPalIndex = 0, FOOTPRINT(Glastrier) - FOLLOWER( + OVERWORLD( sPicTable_Glastrier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Glastrier, - gShinyFollowerPalette_Glastrier + gOverworldPalette_Glastrier, + gShinyOverworldPalette_Glastrier ) .isLegendary = TRUE, .levelUpLearnset = sGlastrierLevelUpLearnset, @@ -7249,13 +7249,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Spectrier, .iconPalIndex = 0, FOOTPRINT(Spectrier) - FOLLOWER( + OVERWORLD( sPicTable_Spectrier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Spectrier, - gShinyFollowerPalette_Spectrier + gOverworldPalette_Spectrier, + gShinyOverworldPalette_Spectrier ) .isLegendary = TRUE, .levelUpLearnset = sSpectrierLevelUpLearnset, @@ -7312,13 +7312,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_Calyrex, .iconPalIndex = 0, FOOTPRINT(Calyrex) - FOLLOWER( + OVERWORLD( sPicTable_Calyrex, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_Calyrex, - gShinyFollowerPalette_Calyrex + gOverworldPalette_Calyrex, + gShinyOverworldPalette_Calyrex ) .isLegendary = TRUE, .isFrontierBanned = TRUE, @@ -7376,13 +7376,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_CalyrexIceRider, .iconPalIndex = 0, FOOTPRINT(Calyrex) - FOLLOWER( + OVERWORLD( sPicTable_CalyrexIceRider, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_CalyrexIceRider, - gShinyFollowerPalette_CalyrexIceRider + gOverworldPalette_CalyrexIceRider, + gShinyOverworldPalette_CalyrexIceRider ) .isLegendary = TRUE, .cannotBeTraded = TRUE, @@ -7440,13 +7440,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_CalyrexShadowRider, .iconPalIndex = 0, FOOTPRINT(Calyrex) - FOLLOWER( + OVERWORLD( sPicTable_CalyrexShadowRider, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, - gFollowerPalette_CalyrexShadowRider, - gShinyFollowerPalette_CalyrexShadowRider + gOverworldPalette_CalyrexShadowRider, + gShinyOverworldPalette_CalyrexShadowRider ) .isLegendary = TRUE, .cannotBeTraded = TRUE, @@ -7508,13 +7508,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_EnamorusIncarnate, .iconPalIndex = 1, FOOTPRINT(Enamorus) - FOLLOWER( + OVERWORLD( sPicTable_EnamorusIncarnate, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE - //, gFollowerPalette_EnamorusIncarnate - //, gShinyFollowerPalette_EnamorusIncarnate + //, gOverworldPalette_EnamorusIncarnate + //, gShinyOverworldPalette_EnamorusIncarnate ) .isLegendary = TRUE, .levelUpLearnset = sEnamorusLevelUpLearnset, @@ -7570,13 +7570,13 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .iconSprite = gMonIcon_EnamorusTherian, .iconPalIndex = 1, FOOTPRINT(Enamorus) - FOLLOWER( + OVERWORLD( sPicTable_EnamorusTherian, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE - //, gFollowerPalette_EnamorusTherian - //, gShinyFollowerPalette_EnamorusTherian + //, gOverworldPalette_EnamorusTherian + //, gShinyOverworldPalette_EnamorusTherian ) .isLegendary = TRUE, .levelUpLearnset = sEnamorusLevelUpLearnset, diff --git a/src/event_object_movement.c b/src/event_object_movement.c index c57732ef9d..80a36d6818 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -506,7 +506,7 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = { {gObjectEventPal_Lugia, OBJ_EVENT_PAL_TAG_LUGIA}, {gObjectEventPal_RubySapphireBrendan, OBJ_EVENT_PAL_TAG_RS_BRENDAN}, {gObjectEventPal_RubySapphireMay, OBJ_EVENT_PAL_TAG_RS_MAY}, -#if OW_MON_POKEBALLS +#if OW_FOLLOWERS_POKEBALLS {gObjectEventPal_MasterBall, OBJ_EVENT_PAL_TAG_BALL_MASTER}, {gObjectEventPal_UltraBall, OBJ_EVENT_PAL_TAG_BALL_ULTRA}, {gObjectEventPal_GreatBall, OBJ_EVENT_PAL_TAG_BALL_GREAT}, @@ -537,7 +537,7 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = { #ifdef ITEM_STRANGE_BALL {gObjectEventPal_StrangeBall, OBJ_EVENT_PAL_TAG_BALL_STRANGE}, #endif //ITEM_STRANGE_BALL -#endif //OW_MON_POKEBALLS +#endif //OW_FOLLOWERS_POKEBALLS {gObjectEventPal_Substitute, OBJ_EVENT_PAL_TAG_SUBSTITUTE}, {gObjectEventPaletteEmotes, OBJ_EVENT_PAL_TAG_EMOTES}, #ifdef BUGFIX @@ -1878,25 +1878,25 @@ struct ObjectEvent *GetFollowerObject(void) static const struct ObjectEventGraphicsInfo *SpeciesToGraphicsInfo(u16 species, u8 form) { const struct ObjectEventGraphicsInfo *graphicsInfo = NULL; -#if OW_FOLLOWERS_ENABLED +#if OW_POKEMON_OBJECT_EVENTS switch (species) { case SPECIES_UNOWN: // Letters >A are defined as species >= NUM_SPECIES, so are not contiguous with A form %= NUM_UNOWN_FORMS; - graphicsInfo = &gSpeciesInfo[form ? SPECIES_UNOWN_B + form - 1 : species].followerData; + graphicsInfo = &gSpeciesInfo[form ? SPECIES_UNOWN_B + form - 1 : species].overworldData; break; default: - graphicsInfo = &gSpeciesInfo[species].followerData; + graphicsInfo = &gSpeciesInfo[species].overworldData; break; } // Try to avoid OOB or undefined access if ((graphicsInfo->tileTag == 0 && species < NUM_SPECIES) || (graphicsInfo->tileTag != TAG_NONE && species >= NUM_SPECIES)) { if (OW_SUBSTITUTE_PLACEHOLDER) - return &gSpeciesInfo[SPECIES_NONE].followerData; + return &gSpeciesInfo[SPECIES_NONE].overworldData; return NULL; } -#endif +#endif // OW_POKEMON_OBJECT_EVENTS return graphicsInfo; } @@ -1905,9 +1905,9 @@ static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny) { u32 paletteNum; // Use standalone palette, unless entry is OOB or NULL (fallback to front-sprite-based) -#if OW_FOLLOWERS_ENABLED == TRUE && OW_FOLLOWERS_SHARE_PALETTE == FALSE - if ((shiny && gSpeciesInfo[species].followerPalette) - || (!shiny && gSpeciesInfo[species].followerShinyPalette)) +#if OW_POKEMON_OBJECT_EVENTS == TRUE && OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE + if ((shiny && gSpeciesInfo[species].overworldPalette) + || (!shiny && gSpeciesInfo[species].overworldShinyPalette)) { struct SpritePalette spritePalette; u16 palTag = shiny ? (species + SPECIES_SHINY_TAG + OBJ_EVENT_PAL_TAG_DYNAMIC) : (species + OBJ_EVENT_PAL_TAG_DYNAMIC); @@ -1916,9 +1916,9 @@ static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny) return paletteNum; spritePalette.tag = palTag; if (shiny) - spritePalette.data = gSpeciesInfo[species].followerShinyPalette; + spritePalette.data = gSpeciesInfo[species].overworldShinyPalette; else - spritePalette.data = gSpeciesInfo[species].followerPalette; + spritePalette.data = gSpeciesInfo[species].overworldPalette; // Check if pal data must be decompressed if (IsLZ77Data(spritePalette.data, PLTT_SIZE_4BPP, PLTT_SIZE_4BPP)) @@ -1930,7 +1930,7 @@ static u8 LoadDynamicFollowerPalette(u16 species, u8 form, bool32 shiny) paletteNum = LoadSpritePalette(&spritePalette); } else -#endif //OW_FOLLOWERS_SHARE_PALETTE +#endif //OW_POKEMON_OBJECT_EVENTS == TRUE && OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE { // Note that the shiny palette tag is `species + SPECIES_SHINY_TAG`, which must be increased with more pokemon // so that palette tags do not overlap @@ -2077,7 +2077,8 @@ void UpdateFollowingPokemon(void) // 1. GetFollowerInfo returns FALSE // 2. Map is indoors and gfx is larger than 32x32 // 3. flag is set - if (OW_FOLLOWERS_ENABLED == FALSE + if (OW_POKEMON_OBJECT_EVENTS == FALSE + || OW_FOLLOWERS_ENABLED == FALSE || !GetFollowerInfo(&species, &form, &shiny) || SpeciesToGraphicsInfo(species, form) == NULL || (gMapHeader.mapType == MAP_TYPE_INDOOR && SpeciesToGraphicsInfo(species, form)->oam->size > ST_OAM_SIZE_2) @@ -5344,7 +5345,7 @@ bool8 MovementType_FollowPlayer_Moving(struct ObjectEvent *objectEvent, struct S else if (objectEvent->movementActionId < MOVEMENT_ACTION_EXIT_POKEBALL) { UpdateFollowerTransformEffect(objectEvent, sprite); - if (OW_MON_BOBBING == TRUE && (sprite->data[5] & 7) == 2) + if (OW_FOLLOWERS_BOBBING == TRUE && (sprite->data[5] & 7) == 2) sprite->y2 ^= -1; } return FALSE; @@ -5365,7 +5366,7 @@ bool8 FollowablePlayerMovement_Idle(struct ObjectEvent *objectEvent, struct Spri // finish movement action objectEvent->singleMovementActive = 0; } - else if (OW_MON_BOBBING == TRUE && (sprite->data[3] & 7) == 2) + else if (OW_FOLLOWERS_BOBBING == TRUE && (sprite->data[3] & 7) == 2) { sprite->y2 ^= -1; } @@ -5409,7 +5410,7 @@ bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Spri ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_EXIT_POKEBALL); objectEvent->singleMovementActive = 1; sprite->sTypeFuncId = 2; - if (OW_MON_BOBBING == TRUE) + if (OW_FOLLOWERS_BOBBING == TRUE) sprite->y2 = 0; return TRUE; } @@ -5449,7 +5450,7 @@ bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Spri else { objectEvent->movementActionId = GetWalkNormalMovementAction(direction); - if (OW_MON_BOBBING == TRUE) + if (OW_FOLLOWERS_BOBBING == TRUE) sprite->y2 = -1; } } @@ -5473,7 +5474,7 @@ bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Spri else { ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(direction)); - if (OW_MON_BOBBING == TRUE) + if (OW_FOLLOWERS_BOBBING == TRUE) sprite->y2 = -1; } #endif @@ -7036,7 +7037,7 @@ static u8 LoadFillColorPalette(u16 color, u16 paletteTag, struct Sprite *sprite) static void ObjectEventSetPokeballGfx(struct ObjectEvent *objEvent) { - #if OW_MON_POKEBALLS + #if OW_FOLLOWERS_POKEBALLS u32 ball = BALL_POKE; if (objEvent->localId == OBJ_EVENT_ID_FOLLOWER) { @@ -7054,7 +7055,7 @@ static void ObjectEventSetPokeballGfx(struct ObjectEvent *objEvent) return; } } - #endif + #endif //OW_FOLLOWERS_POKEBALLS ObjectEventSetGraphicsId(objEvent, OBJ_EVENT_GFX_POKE_BALL); }